diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7a3ae9591d0815528b4260b77c4e9c7672021cf7..2f910e4e313e75889fdec0c600da45be0558de64 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -463,6 +463,20 @@ android:value="com.android.settings.TetherSettings" /> + + + + + + + + + @@ -2949,6 +2964,7 @@ diff --git a/color-check-baseline.xml b/color-check-baseline.xml index 1ba1cf54aa0f7e144ced9c8ee775b3810a42740c..7ce4da7f9d4335f4043ce83041c9a87158846866 100644 --- a/color-check-baseline.xml +++ b/color-check-baseline.xml @@ -2141,55 +2141,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - - - - - @@ -2205,7 +2157,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2221,7 +2173,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2237,7 +2189,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2477,7 +2429,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2492,8 +2444,8 @@ errorLine1=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2508,8 +2460,8 @@ errorLine1=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2525,7 +2477,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2541,7 +2493,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2557,7 +2509,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml index 8e20e68c3e13e3dd03e69a8e971c30d6a33f07dc..31d787ec5cabb5cff9d6fd47afd97993953a3c73 100644 --- a/res/values-af/arrays.xml +++ b/res/values-af/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Druk knoppie" "PIN van eweknietoestel" diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 3d5c73917a0e2340ebc2ee8a1e139ab8d6898f62..d048b5398e8c76537d7c518846589f837eb9a272 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -854,6 +854,7 @@ "Outo" "2,4 GHz-band" "5,0 GHz-band" + "5,0 GHz-band verkies" "2,4 GHz" "5,0 GHz" "Kies minstens een band vir Wi-Fi-warmkol:" @@ -972,7 +973,7 @@ "Swerfvoorkeur" - "Verkieslik Wi-Fi" + "Wi-Fi verkies" "Verkies mobiel" "Net Wi-Fi" @@ -987,7 +988,7 @@ "0" - "Verkieslik Wi-Fi" + "Verkies Wi-Fi" "Verkies mobiel" @@ -1065,7 +1066,7 @@ "Natuurlik" "Gemaksimeer" "Intens" - "Outomaties" + "Aanpasbaar" "Gebruik net akkurate kleure" "Verstel tussen helder en akkurate kleure" "Wissel oriëntasie outomaties wanneer tablet gedraai word" @@ -3161,7 +3162,7 @@ "Gedemp, maar laat %1$s en %2$s toe" "Gedemp, maar laat %1$s, %2$s en %3$s toe" "Boodskappe, geleenthede en onthounotas" - "Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik." + "Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik." "Klaar" "Instellings" "Geen visuele elemente of klank van kennisgewings af nie" @@ -3427,7 +3428,7 @@ "Wanneer jy jou PIN invoer om hierdie toestel te begin, sal toeganklikheiddienste soos %1$s nog nie beskikbaar wees nie." "Wanneer jy jou patroon invoer om hierdie toestel te begin, sal toeganklikheiddienste soos %1$s nog nie beskikbaar wees nie." "Wanneer jy jou wagwoord invoer om hierdie toestel te begin, sal toeganklikheiddienste soos %1$s nog nie beskikbaar wees nie." - "Let wel: Ná \'n herselflaai kan hierdie program nie begin voordat jy jou foon ontsluit het nie" + "Let wel: As jy jou foon herbegin en \'n skermslot gestel het, kan hierdie program eers begin nadat jy jou foon ontsluit het" "IMEI-inligting" "IMEI se relatiewe inligting" "(Gleuf%1$d)" diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml index 67591cf132333fb2f1bd36eb3e2ca33cab5a7c90..2cee52c715313c26bcf29886c8ccdd92fd15490a 100644 --- a/res/values-am/arrays.xml +++ b/res/values-am/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "አዝራር ተጫን" "ፒን ከአቻ መሣሪያ" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index da7c69800e5e0d8e251b5821c3d2837a1aaeca9d..fc0bcd4841ad90c406a060dc1056ced03ffef0a8 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -854,6 +854,7 @@ "ራስ-ሰር" "2.4 ጊሄዝ ባንድ" "5.0 ጊኸ ባንድ" + "5.0 ጊኸዝ ባንድ ይመረጣል" "2.4 ጊኸ" "5.0 ጊኸ" "ለWi-Fi መገናኛ ነጥብ ቢያንስ አንድ ሞገድ ይምረጡ፦" @@ -1065,7 +1066,7 @@ "ተፈጥሯዊ" "ተጨምሯል" "ቀለም የሞላ" - "ራስ-ሰር" + "ተለማማጅ" "ትክክለኛ ቀለማትን ብቻ ተጠቀም" "በግልጽ እና ትክክለኛ ቀለማት መካከል ያስተካክሉ" "ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር" @@ -3161,7 +3162,7 @@ "ድምጸ-ከል ተደርጎበታል፣ ነገር ግን %1$sን እና %2$sን ፍቀድ" "ድምጸ-ከል ተደርጎበታል፣ ነገር ግን %1$sን፣ %2$sን እና %3$sን ፍቀድ" "መልዕክቶች፣ ክስተቶች እና አስታዋሾች" - "አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር መልዕክቶች፣ አስታዋሾች እና ክስተቶች ድምጸ-ከል ይደረግባቸዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ እና ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ የመልዕክት ቅንብሮችን ማስተካከል ይችላሉ።" + "አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር መልዕክቶች፣ አስታዋሾች እና ክስተቶች ድምጸ-ከል ይደረግባቸዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ እና ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ የመልዕክት ቅንብሮችን ማስተካከል ይችላሉ።" "ተከናውኗል" "ቅንብሮች" "ማሳወቂያዎች ላይ ምንም ምስሎች ወይም ድምጽ የለም" @@ -3427,7 +3428,7 @@ "ይህን መሣሪያ ለማስጀምር ፒንዎን ሲያስገቡ እንደ %1$s ያሉ የተደራሽነት አገልግሎቶች ሊገኙ አይችሉም።" "ይህን መሣሪያ ለማስጀምር የስርዓተ-ጥለትዎን ሲያስገቡ እንደ %1$s ያሉ የተደራሽነት አገልግሎቶች ሊገኙ አይችሉም።" "ይህን መሣሪያ ለማስጀምር የይለፍ ቃልዎን ሲያስገቡ እንደ %1$s ያሉ የተደራሽነት አገልግሎቶች ሊገኙ አይችሉም።" - "ማስታወሻ፦ እንደገና ከማስነሳት በኋላ ይህ መተግበሪያ ስልክዎን እስከሚከፍቱት ድረስ ሊጀምር አይችልም" + "ማስታወሻ፦ ስልክዎን ዳግም ካስነሱትና የማያ ገጽ መቆለፊያን ካቀናበሩ ስልክዎን እስኪከፍቱት ድረስ ይህ መተግበሪያ ሊጀመር አይችልም" "የIMEI መረጃ" "የIMEI ተዛማጅ መረጃ" "(ቀዳዳ %1$d)" diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml index ce19c03f727cf5b33374fd7724df8b0429559ba2..9e0172b75807a6cd05a0fee22e3f10d0b251932c 100644 --- a/res/values-ar/arrays.xml +++ b/res/values-ar/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "زر الدفع" "رقم تعريف شخصي من جهاز نظير" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 00e38ca5bae5bb740bbb244b7468268d1d394bd5..0df7706edca08fe6b5981026dbb5ef5b8c41cd0b 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -778,7 +778,7 @@ "تفعيل عرض شاشة لاسلكي" "لم يتم العثور على أجهزة قريبة." "جارٍ الاتصال" - "متصل" + "متّصلة" "قيد الاستخدام" "غير متاح" "عرض الإعدادات" @@ -898,6 +898,7 @@ "تلقائي" "نطاق بتردد ٢٫٤ غيغاهرتز" "نطاق بتردد 5.0 غيغاهرتز" + "يفضّل نطاق بتردد 5.0 غيغاهرتز" "٢٫٤ غيغاهرتز" "5.0 غيغاهرتز" "‏اختر نطاقًا واحدًا على الأقل لنقطة اتصال Wi‑Fi:" @@ -1113,7 +1114,7 @@ "طبيعي" "مُحسن" "مُشبع" - "تلقائي" + "توافقي" "استخدام الألوان الدقيقة فقط" "ضبط إلى التبديل بين الألوان الزاهية والدقيقة" "تبديل الاتجاه تلقائيًا عند تدوير الجهاز اللوحي" @@ -1123,7 +1124,7 @@ "مستوى السطوع" "السطوع" "ضبط سطوع الشاشة" - "السطوع التلقائي" + "السطوع التكيُّفي" "تحسين مستوى السطوع حسب الإضاءة" "تم الإيقاف" "السطوع المفضل منخفض جدًا" @@ -1143,11 +1144,11 @@ "يمكنك تحسين مستوى السطوع حسب الإضاءة. وعند تشغيل هذه الميزة، سيظل بإمكانك ضبط السطوع مؤقتًا." "سيتم ضبط سطوع الشاشة تلقائيًا حسب البيئة المحيطة والأنشطة. ويمكنك تحريك شريط التمرير يدويًا لضبط السطوع التكيُّفي وفقًا لتفضيلاتك." "الإضاءة الليلية" - "تؤدي الإضاءة الليلية إلى تلوين الشاشة باللون الكهرماني الخفيف. ويساعد هذا في تسهيل النظر إلى الشاشة في الإضاءة المعتمة ويمكن أن يساعدك في الشعور بالنعاس أيضًا." + "تؤدي الإضاءة الليلية إلى تلوين الشاشة باللون الكهرماني الخفيف، ما يسهّل النظر إلى الشاشة في الإضاءة الخافتة ويمكن أن يساعدك على الشعور بالنعاس أيضًا." "تحديد جدول زمني" "عدم التشغيل أو الإيقاف مطلقًا" - "تشغيل في وقت مخصص" - "تشغيل من غروب الشمس إلى شروقها" + "التفعيل في وقت مخصّّص" + "التفعيل من غروب الشمس حتى شروقها" "وقت البدء" "وقت الانتهاء" "الحالة" @@ -1162,10 +1163,10 @@ "سيتم الإيقاف تلقائيًا عند شروق الشمس" "التفعيل الآن" "إيقاف الوضع الآن" - "تشغيل حتى الشروق" - "إيقاف حتى الغروب" - "إيقاف حتى %1$s" - "إيقاف حتى %1$s" + "تفعيل الميزة حتى الشروق" + "إيقاف الميزة حتى الغروب" + "تفعيل الميزة حتى %1$s" + "إيقاف الميزة حتى %1$s" "السكون" "إيقاف الشاشة" "بعد %1$s من عدم النشاط" @@ -1605,7 +1606,7 @@ "الدخول إلى موقعي" "السماح للتطبيقات التي طلبت إذنك باستخدام معلومات موقعك" "مصادر الموقع" - "حول الجهاز اللوحي" + "لمحة عن الجهاز اللوحي" "لمحة عن الهاتف" "لمحة حول الجهاز" "حول الجهاز في وضع المحاكاة" @@ -1994,9 +1995,9 @@ "يمكنك النقر على بيانات على شاشتك لتتم قراءتها بصوت عالٍ" "الترجمة" "التكبير" - "تكبير باستخدام النقر الثلاثي" + "التكبير بالنقر ثلاث مرّات" "التكبير باستخدام الزر" - "التكبير باستخدام الزر والنقر الثلاثي" + "التكبير باستخدام الزر والنقر ثلاث مرّات" "التكبير على الشاشة" "انقر ٣ مرات للتكبير." "انقر على أحد الأزرار للتكبير" @@ -2982,7 +2983,7 @@ "‏تغيير رمز PIN" "إظهار الإشعارات" "المساعدة والتعليقات" - "مقالات المساعدة، الهاتف والمحادثة، البدء" + "مقالات المساعدة، الاتصال الهاتفي والمحادثة، البدء" "حساب المحتوى" "معرف الصورة" "التهديدات القصوى" @@ -3309,7 +3310,7 @@ "تمّ كتم الصوت مع السماح لـ %1$s و%2$s." "تمّ كتم الصوت مع السماح لـ %1$s و%2$s و%3$s." "الرسائل والأحداث والتذكيرات" - "عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، سيتم تجاهل الإشعارات عن الرسائل والتذكيرات والأحداث، باستثناء الإشعارات التي تسمح بها أعلاه. يمكنك ضبط إعدادات الرسائل للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك." + "عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، سيتم تجاهل الإشعارات عن الرسائل والتذكيرات والأحداث، باستثناء الإشعارات التي تسمح بها أعلاه. يمكنك ضبط إعدادات الرسائل للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك." "تمّ" "الإعدادات" "بلا عناصر مرئيّة أو أصوات من الإشعارات." @@ -3603,7 +3604,7 @@ "عند إدخال رقم التعريف الشخصي لبدء هذا الجهاز، فلن تكون خدمات الدخول مثل %1$s متاحة." "عند إدخال نمط لبدء هذا الجهاز، فلن تكون خدمات الدخول مثل %1$s متاحة." "عند إدخال كلمة المرور لبدء هذا الجهاز، فلن تكون خدمات الدخول مثل %1$s متاحة." - "ملاحظة: بعد إعادة التشغيل، يتعذر بدء هذا التطبيق إلى أن تلغي قفل هاتفك." + "ملاحظة: عند إعادة تشغيل الهاتف وضبط قفل شاشة، سيتعذّر تشغيل هذا التطبيق إلى أن تلغي قفل هاتفك." "‏معلومات IMEI" "‏المعلومات ذات الصلة بـ IMEI" "(فتحة %1$d)" @@ -3839,8 +3840,8 @@ "معدل الاستخدام" "الاستخدام الأقصى" "لم يتم استخدام أي بيانات" - "هل تسمح بوصول %1$s إلى إعداد \"عدم الإزعاج\"؟" - "سيكون التطبيق قادرًا على تشغيل/إيقاف \"عدم الإزعاج\" وإجراء تغييرات على الإعدادات ذات الصلة." + "هل تسمح بوصول \"%1$s\" إلى إعداد \"عدم الإزعاج\"؟" + "سيكون التطبيق قادرًا على تشغيل/إيقاف ميزة \"عدم الإزعاج\" وإجراء تغييرات على الإعدادات ذات الصلة." "يجب أن يظل قيد التشغيل نظرًا لأن الوصول إلى الإشعارات قيد التشغيل" "هل تريد إبطال إمكانية وصول تطبيق %1$s إلى قواعد \"عدم الإزعاج\"؟" "ستتم إزالة كل قواعد \"عدم الإزعاج\" التي أنشأها هذا التطبيق." @@ -3964,7 +3965,7 @@ "تم ضبط الهاتف إلى الاهتزاز." "سيهتز الجهاز عند تلقي المكالمات والإشعارات." "سيهتز الهاتف عند تلقي المكالمات والإشعارات." - "تعيين جدول زمني للإضاءة الليلية" + "تحديد جدول زمني للإضاءة الليلية" "تلوين الشاشة كل ليلة تلقائيًا" "تم تشغيل الإضاءة الليلية" "الشاشة ملوّنة بلون كهرماني خفيف، وهذا قد يساعدك على النوم." diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml index 1afba41902cd6ee27f27b9896903290235216c9b..ac2bb7395fa862311cbbeed17b5434fdb2ac7d65 100644 --- a/res/values-az/arrays.xml +++ b/res/values-az/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Düyməyə basın" "Eynisəviyyəli cihazdan PIN" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 06641ed549d78dd1bc2468acc6fac53d32283a21..be879cc87ddb81edc53ae5f0c086ddef80ac3513 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -854,6 +854,7 @@ "Avtomatik" "2.4 GHz Diapazon" "5.0 GHz Band" + "5.0 GHz Band tərcih edilir" "2.4 GHz" "5.0 GHz" "Wi‑Fi hotspotu üçün minimum bir bağlantı seçin:" @@ -1065,7 +1066,7 @@ "Təbii" "Artan" "Dolğun" - "Avtomatik" + "Adaptiv" "Yalnız doğru rənglərdən istifadə edin" "Canlı və doğru rənglərlə tənzimləyin" "Planşetin pozisiyasından asılı olaraq orientasiyanı dəyiş" @@ -1099,7 +1100,7 @@ "Cədvəl" "Heç biri" "Xüsusi vaxtda aktiv edir" - "Qürubdan şəfəqə qədər aktiv edir" + "Gün çıxandan batana qədər aktiv edir" "Başlama vaxtı" "Bitmə tarixi" "Status" @@ -1114,9 +1115,9 @@ "Şəfəq vaxtı avtomatik deaktiv edəcək" "İndi aktiv edin" "İndi deaktiv edin" - "Şəfəqə qədər deaktiv edin" - "Qüruba qədər deaktiv edin" - "%1$s olana qədər deaktiv edin" + "Gün çıxanadək aktiv olsun" + "Gün batımına qədər deaktiv edin" + "%1$s olana qədər aktiv edin" "%1$s olanaq qədər deaktiv edin" "Yuxu" "Ekran sönür" @@ -3161,7 +3162,7 @@ "Səssizdədir, %1$s və %2$s icazəli olmalıdır" "Səssizdir, %1$s, %2$s və %3$s icazəli olamlıdır" "Mesaj, tədbir və xatırlatmalar" - "\"Narahat Etməyin\" aktiv olduğu zaman yuxarıda seçdiyiniz elementlər istisna olmaqla mesaj, xatırlatma və tədbirlər səssiz ediləcək. Dostlar, ailə və digər kontaktların Sizinlə əlaqə saxlaması üçün ayarları nizamlaya bilərsiniz." + "\"Narahat Etməyin\" aktiv olduğu zaman yuxarıda seçdiyiniz elementlər istisna olmaqla mesaj, xatırlatma və tədbirlər səssiz ediləcək. Dostlar, ailə və digər kontaktların Sizinlə əlaqə saxlaması üçün ayarları nizamlaya bilərsiniz." "Hazırdır" "Ayarlar" "Bildirişlər görünməyəcək və səs çıxartmayacaq" @@ -3427,7 +3428,7 @@ "Bu cihazı işə salmaq üçün PIN kodunu daxil etdiyiniz zaman %1$s kimi giriş imkanı xidmətləri hələ əlçatan olmayacaq." "Bu cihazı işə salmaq üçün modelinizi daxil etdiyiniz zaman %1$s kimi giriş imkanı xidmətləri hələ əlçatan olmayacaq." "Bu cihazı işə salmaq üçün parolunuzu daxil etdiyiniz zaman %1$s kimi giriş imkanı xidmətləri hələ əlçatan olmayacaq." - "Qeyd: Yenidən yüklənmədən sonra, bu cihazın kilidini açmamış tətbiq başlaya bilməz" + "Qeyd: Telefonu yenidən başlatmısınızsa və cihazda ekran kilidi varsa, bu telefonun kilidini açmamış tətbiq başlaya bilməz" "IMEI məlumat" "IMEI nisbi məlumat" "(Slot%1$d)" diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml index 7c75ebb842452ab1f60aacb66ce8d446a275bc4f..f1ab846de60cc81f1da4365feb93d91bca451cec 100644 --- a/res/values-b+sr+Latn/arrays.xml +++ b/res/values-b+sr+Latn/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pritiskanje dugmeta" "PIN sa ravnopravnog uređaja" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 690b103671f60b18f2697c0215690f66691ba032..640181d973cca337b563183b8cece75c04c5d131 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -865,6 +865,7 @@ "Automatski" "Opseg od 2,4 GHz" "Opseg od 5,0 GHz" + "Prednost se daje opsegu od 5.0 GHz" "2,4 GHz" "5,0 GHz" "Izaberite barem jedan opseg za Wi‑Fi hotspot:" @@ -1077,7 +1078,7 @@ "Prirodne" "Pojačane" "Zasićene" - "Automatski" + "Prilagodljiv" "Koristite samo tačne boje" "Birajte između živopisnih i tačnih boja" "Promeni položaj automatski prilikom rotiranja tableta" @@ -3198,7 +3199,7 @@ "Zvuk je isključen, ali dozvoli za: %1$s i %2$s" "Zvuk je isključen, ali dozvoli za: %1$s, %2$s i %3$s" "Poruke, događaji i podsetnici" - "Kada je uključen režim Ne uznemiravaj, zvukovi obaveštenja za poruke, podsetnike i događaje će biti isključeni, osim za stavke koje ste dozvolili iznad. Možete da prilagodite podešavanja da biste dozvolili prijateljima, članovima porodice ili drugim kontaktima da vas kontaktiraju." + "Kada je uključen režim Ne uznemiravaj, zvukovi obaveštenja za poruke, podsetnike i događaje će biti isključeni, osim za stavke koje ste dozvolili iznad. Možete da prilagodite podešavanja da biste dozvolili prijateljima, članovima porodice ili drugim kontaktima da vas kontaktiraju." "Gotovo" "Podešavanja" "Bez zvučnog signala ili vizuelnog obaveštenja" @@ -3471,7 +3472,7 @@ "Kada unesete PIN da biste pokrenuli ovaj uređaj, usluge pristupačnosti, kao što je %1$s, neće još uvek biti dostupne." "Kada unesete šablon da biste pokrenuli ovaj uređaj, usluge pristupačnosti, kao što je %1$s, neće još uvek biti dostupne." "Kada unesete lozinku da biste pokrenuli ovaj uređaj, usluge pristupačnosti, kao što je %1$s, neće još uvek biti dostupne." - "Napomena: Posle restartovanja ova aplikacija ne može da se pokrene dok ne otključate telefon" + "Napomena: Ako restartujete telefon i podesili ste zaključavanje ekrana, ova aplikacija ne može da se pokrene dok ne otključate telefon" "Informacije za IMEI" "Relativne informacije za IMEI" "(Otvor %1$d)" @@ -3534,7 +3535,7 @@ "Kategorije: nizak prioritet" "Kategorije: isključeno" "Kategorije: menja režim „Ne uznemiravaj“" - "Napredna" + "Napredno" "Konfigurišite aplikacije" "Nepoznata aplikacija" "Dozvole za aplikacije" diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml index bff1b3832c71290bc124cc2970afcc9f69742f5f..bf1632833ed139aa4a65325bdcb809553e41f1d5 100644 --- a/res/values-be/arrays.xml +++ b/res/values-be/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Націсніце кнопку" "PIN-код ад пірынгавай прылады" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 3e839d0011f87f91453a62ef4cb1840b3cec6fbe..f65425a9b1675cc072144de7a0546544d70a2eb3 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -876,6 +876,7 @@ "Аўтаматычна" "Дыяпазон 2,4 ГГц" "Дыяпазон 5,0 ГГц" + "Прыярытэтны дыяпазон 5,0 ГГц" "2,4 ГГц" "5,0 ГГц" "Выберыце як мінімум адзін дыяпазон для хот-спота Wi‑Fi:" @@ -989,7 +990,7 @@ "Wi-Fi-тэлефанія" "Выклікі па Wi‑Fi" "Званіце па сетцы Wi‑Fi, калі няма сотавай сувязі" - "Перавагі выклікаў" + "Прыярытэт выклікаў" "Рэжым Wi-Fi-тэлефаніі" "Налады роўмінгу" @@ -1090,7 +1091,7 @@ "Натуральны" "Яркія" "Насычаныя" - "Аўтаматычна" + "Адаптыўны колер" "Толькі натуральныя колеры" "Сярэдняе паміж насычанымі і натуральнымі колерамі" "Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта" @@ -1228,7 +1229,7 @@ "Версія апаратнага забеспячэння" "Iдэнтыфiкатар абсталявання" "Версія baseband" - "Вэрсія ядра" + "Версія ядра" "Нумар зборкі" "Недаступны" "Стан" @@ -3236,7 +3237,7 @@ "Без гуку, акрамя элементаў \"%1$s\" і \"%2$s\"" "Без гуку, акрамя элементаў \"%1$s\", \"%2$s\" і \"%3$s\"" "Паведамленні, падзеі і напаміны" - "Калі ўключаны рэжым \"Не турбаваць\", выключаецца гук для паведамленняў, напамінаў і падзей, акрамя выбраных вамі элементаў вышэй. Вы можаце змяніць налады паведамленняў, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязацца з вамі." + "Калі ўключаны рэжым \"Не турбаваць\", выключаецца гук для паведамленняў, напамінаў і падзей, акрамя выбраных вышэй элементаў. Вы можаце змяніць налады паведамленняў, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязацца з вамі." "Гатова" "Налады" "Апавяшчэнні без візуальных элементаў і гуку" @@ -3516,7 +3517,7 @@ "Калі вы ўводзіце свой PIN-код для загрузкі прылады, службы доступу, такія як %1$s, яшчэ не будуць даступнымі." "Калі вы ўводзіце свой графічны ключ для загрузкі прылады, службы доступу, такія як %1$s, яшчэ не будуць даступнымі." "Калі вы ўводзіце свой пароль для загрузкі прылады, службы доступу, такія як %1$s, яшчэ не будуць даступнымі." - "Заўвага. Пасля перазагрузкі гэта праграма не зможа запусціцца, пакуль вы не разблакіруеце тэлефон" + "Заўвага. Калі перазапусціць тэлефон з наладжанай блакіроўкай экрана, праграма не запусціцца, пакуль тэлефон не будзе разблакіраваны" "Інфармацыя IMEI" "Інфармацыя, звязаная з IMEI (міжнародным ідэнтыфікатарам мабільнага абсталявання)" "(Слот%1$d)" @@ -3737,8 +3738,8 @@ "Частата" "Максімальнае выкарыстанне" "Даныя не выкарыстоўваюцца" - "Адкрыць доступ да рэжыму «Не турбаваць» для %1$s?" - "Дадатак зможа уключаць/выключаць рэжым «Не турбаваць» і змяняць звязаныя з ім налады." + "Даць праграме \"%1$s\" доступ да рэжыму \"Не турбаваць\"?" + "Праграма зможа уключаць і выключаць рэжым «Не турбаваць» і змяняць адпаведныя налады." "Павінен заставацца ўключаным, таму што ўключаны доступ да апавяшчэнняў" "Адклікаць доступ да рэжыму «Не турбаваць» для %1$s?" "Усе правілы рэжыму «Не турбаваць», створаныя гэтай праграмай, будуць выдалены." diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml index a165eb23e368e96f9b7a997b5112fdaaffa2369f..f0abdf43548707fae0bfc82032321bf7719e8787 100644 --- a/res/values-bg/arrays.xml +++ b/res/values-bg/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Бутон" "ПИН от съответното устройство" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 386e0d4a0d65614f6f9a3d4e5ff9699a658284cf..0ef0ae73c6a2583ab024e229e51e1075351c1f36 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -854,6 +854,7 @@ "Автоматично" "Честота при 2,4 ГХц" "Честота при 5 ГХц" + "Предпочита се честота от 5 ГХц" "2,4 ГХц" "5 ГХц" "Изберете поне една честота за точката за достъп до Wi‑Fi:" @@ -1065,7 +1066,7 @@ "Естествени" "Подсилени" "Наситени" - "Автоматични" + "Адаптивно" "Използване само на естествени цветове" "Коригиране между ярки и естествени цветове" "Автоматично превключване на ориентацията при завъртане на таблета" @@ -3161,7 +3162,7 @@ "Звукът е спрян, но %1$s и %2$s са разрешени" "Звукът е спрян, но %1$s, %2$s и %3$s са разрешени" "Съобщения, събития и напомняния" - "Когато режимът „Не безпокойте“ е включен, съобщенията, напомнянията и събитията ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе. Можете да коригирате настройките за съобщенията, за да разрешите на близки и приятели и други контакти да се свързват с вас." + "Когато режимът „Не безпокойте“ е включен, съобщенията, напомнянията и събитията ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе. Можете да коригирате настройките за съобщенията, за да разрешите на близки и приятели и други контакти да се свързват с вас." "Готово" "Настройки" "Без визуално прекъсване или звук от известията" @@ -3427,7 +3428,7 @@ "Когато въведете ПИН кода си, за да стартирате това устройство, услугите за достъпност, като например %1$s, още няма да бъдат налични." "Когато въведете фигурата си, за да стартирате това устройство, услугите за достъпност, като например %1$s, още няма да бъдат налични." "Когато въведете паролата си, за да стартирате това устройство, услугите за достъпност, като например %1$s, още няма да бъдат налични." - "Забележка: След рестартиране това приложение не може да се стартира, докато не отключите телефона си" + "Забележка: Ако рестартирате телефона си и сте задали опция за заключване на екрана, това приложение не може да стартира, докато не отключите устройството си" "Информация за IMEI" "Информация относно IMEI" "(слот %1$d)" diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml index cabdf9d6dc2fd41f0d468b7ffa7845a727ba7ddb..1022b2d70a3fc2771803e8b5c8b7aed63637f237 100644 --- a/res/values-bn/arrays.xml +++ b/res/values-bn/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "পুশ বোতাম" "চেনা ডিভাইস থেকে পিন" @@ -296,7 +290,7 @@ "লোকেশন নিরীক্ষণ করুন" "উচ্চ ক্ষমতার লোকেশন নিরীক্ষণ করুন" "ব্যবহারের পরিসংখ্যান পান" - "মাইক্রোফোন নিঃশব্দ/সশব্দ করুন" + "মাইক্রোফোন মিউট/সশব্দ করুন" "টোস্ট দেখান" "মিডিয়া প্রোজেক্ট করুন" "VPN সক্রিয় করুন" @@ -363,7 +357,7 @@ "লোকেশন" "লোকেশন" "ব্যবহারের পরিসংখ্যান পান" - "মাইক্রোফোন নিঃশব্দ/সশব্দ করুন" + "মাইক্রোফোন মিউট/সশব্দ করুন" "টোস্ট দেখান" "মিডিয়াতে অভিক্ষেপ করুন" "VPN সক্রিয় করুন" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index b7ed5036c0582d9be66bdee661b04a4d478246f4..c1a26e08ec69572604cbdb17a3386da6841c0624 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -854,6 +854,7 @@ "অটোমেটিক" "২.৪ GHz ব্যান্ড" "৫.০ GHz ব্যান্ড" + "৫.০ গিগা হার্জ ব্যান্ড পছন্দসই" "২.৪ GHz" "৫.০ GHz" "ওয়াই-ফাই হটস্পটের জন্য অন্তত একটি ব্যান্ড বেছে নিন:" @@ -1013,7 +1014,7 @@ "ভলিউম" "সঙ্গীত প্রভাব" "রিং ভলিউম" - "নিঃশব্দ থাকাকালীন ভাইব্রেট" + "মিউট থাকাকালীন ভাইব্রেট" "ডিফল্ট বিজ্ঞপ্তির সাউন্ড" "রিংটোন" "বিজ্ঞপ্তি" @@ -1031,12 +1032,12 @@ "অপ্রয়োজনীয় আওয়াজ বাতিলকরণ" "সঙ্গীত, ভিডিও, গেম্স, ও অন্যান্য মিডিয়া" "রিংটোন ও বিজ্ঞপ্তি" - "বিজ্ঞপ্তিগুলি" + "বিজ্ঞপ্তি" "অ্যালার্মগুলি" - "রিংটোন ও বিজ্ঞপ্তি নিঃশব্দ করুন" - "সঙ্গীত ও অন্যান্য মিডিয়া নিঃশব্দ করুন" - "নিঃশব্দ বিজ্ঞপ্তিগুলি" - "অ্যালার্ম নিঃশব্দ করুন" + "রিংটোন ও বিজ্ঞপ্তি মিউট করুন" + "সঙ্গীত ও অন্যান্য মিডিয়া মিউট করুন" + "মিউট বিজ্ঞপ্তিগুলি" + "অ্যালার্ম মিউট করুন" "ডক করুন" "ডক সেটিংস" "অডিও" @@ -1065,7 +1066,7 @@ "স্বাভাবিক" "বুস্ট করা" "স্যাচুরেশন বাড়ানো" - "অটোমেটিক" + "অভিযোজিত" "শুধুমাত্র আসল রঙ ব্যবহার করুন" "উজ্জ্বল এবং আসল রঙের মধ্যে অ্যাডজাস্ট করুন" "যখন ট্যাবলেট ঘোরানো হবে তখন স্থিতিবিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন" @@ -1095,7 +1096,7 @@ "উপলব্ধ আলোর জন্য মানানসই উজ্জ্বলতার স্তর। যখন এই বৈশিষ্ট্যটি চালু থাকবে, তখনও অস্থায়ীভাবে আপনি উজ্জ্বলতা নিয়ন্ত্রণ করতে পারবেন।" "আপনার পারিপার্শ্বিক অবস্থা এবং অ্যাক্টিভিটি অনুযায়ী স্ক্রিনের উজ্জ্বলতা নিজে থেকেই অ্যাডজাস্ট করে নেওয়া হবে। স্ক্রিন কতখানি উজ্জ্বল হলে আপনার সুবিধা হয়, তা আপনি স্লাইডারের মাধ্যমে নির্দিষ্ট করে দিতে পারেন।" "নাইট লাইট" - "নাইট লাইট আপনার স্ক্রিনকে হলুদাভ করে দেয়৷ এটি আপনাকে অল্প আলোয় স্ক্রিনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং খুব ঘুমিয়ে পড়তে সাহায্য করতে পারে৷" + "নাইট লাইট আপনার স্ক্রিনকে হলুদাভ করে দেয়৷ এটি আপনাকে অল্প আলোয় স্ক্রিনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং সহজে ঘুমিয়ে পড়তে সাহায্য করে৷" "সময়সূচি" "কোনো কিছুই নয়" "কাস্টম সময়ে চালু করুন" @@ -3161,7 +3162,7 @@ "মিউট করা, কিন্তু %1$s এবং %2$s-এর অনুমতি দিন" "মিউট করা, কিন্তু %1$s, %2$s এবং %3$s-এর অনুমতি দিন" "মেসেজ, ইভেন্ট ও রিমাইন্ডার" - "\'বিরক্ত করবেন না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সমস্ত মেসেজ, রিমাইন্ডার এবং ইভেন্ট মিউট করা হবে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি মেসেজের সেটিংস অ্যাডজাস্ট করে নিতে পারেন।" + "\'বিরক্ত করবেন না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সমস্ত মেসেজ, রিমাইন্ডার এবং ইভেন্ট মিউট করা হবে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি মেসেজের সেটিংস অ্যাডজাস্ট করে নিতে পারেন।" "হয়ে গেছে" "সেটিংস" "বিজ্ঞপ্তি থেকে কোনওকিছু দেখা বা শোনা যাবে না" @@ -3196,7 +3197,7 @@ "সংবেদনশীল কন্টেন্ট লুকান" "কোনও বিজ্ঞপ্তি দেখাবেন না" "আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে বিজ্ঞপ্তি প্রদর্শন করতে চান?" - "বিজ্ঞপ্তিগুলি" + "বিজ্ঞপ্তি" "সমস্ত কর্মস্থলের বিজ্ঞপ্তির কন্টেন্ট দেখুন" "কাজের সংবেদনশীল কন্টেন্ট লুকান" "আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে প্রোফাইল বিজ্ঞপ্তিগুলি প্রদর্শন করতে চান?" @@ -3427,7 +3428,7 @@ "এই ডিভাইসটি চালু করার জন্য যখন আপনি আপনার পিন লিখবেন, তখনও %1$s এর মতো অ্যাক্সেসযোগ্যতা বিষয়ক পরিষেবাগুলি উপলব্ধ হবে না৷" "এই ডিভাইসটি চালু করার জন্য যখন আপনি আপনার প্যাটার্ন আঁকবেন, তখনও %1$s এর মতো অ্যাক্সেসযোগ্যতা বিষয়ক পরিষেবাগুলি উপলব্ধ হবে না৷" "এই ডিভাইসটি চালু করার জন্য যখন আপনি আপনার পাসওয়ার্ড লিখবেন, তখনও %1$s এর মতো অ্যাক্সেসযোগ্যতা বিষয়ক পরিষেবাগুলি উপলব্ধ হবে না৷" - "দ্রষ্টব্য: পুনরায় চালু করার পরে, আপনি আপনার ফোন আনলক না করা পর্যন্ত এই অ্যাপটিকে চালু করতে পারবেন না" + "দ্রষ্টব্য: আপনি যদি নিজের ফোন রিস্টার্ট করেন এবং স্ক্রিন লক সেট করা থাকে, তাহলে আপনার ফোন আনলক না করা পর্যন্ত আপনি এই অ্যাপটিকে চালু করতে পারবেন না" "IMEI তথ্য" "IMEI আপেক্ষিক তথ্য" "(স্লট%1$d)" @@ -3445,12 +3446,12 @@ "ব্যবহৃত সঞ্চয়স্থানের পরিমান" "পরিবর্তন করুন" "স্টোরেজ পরিবর্তন করুন" - "বিজ্ঞপ্তিগুলি" + "বিজ্ঞপ্তি" "চালু আছে" "চালু / %1$s" "বন্ধ" "%2$dটির মধ্যে %1$dটি বিভাগ বন্ধ আছে" - "নিঃশব্দ করা হয়েছে" + "মিউট করা হয়েছে" "সংবেদনশীল সামগ্রীকে লক স্ক্রীনে দেখানো হবে না" "লক স্ক্রীনে দেখানো হবে না" "\'বিরক্ত করবেন না\' ওভাররাইড করা হয়েছে" @@ -3938,14 +3939,14 @@ "অটোমেটিক" "ম্যানুয়াল" "এখনই জায়গা খালি করুন" - "অঙ্গভঙ্গিগুলি" + "ইঙ্গিত" "আপনার ফোন নিয়ন্ত্রণ করতে দ্রুত অঙ্গভঙ্গিগুলি" "আপনার ট্যাবলেট নিয়ন্ত্রণ করার দ্রুত ইঙ্গিত" "আপনার ডিভাইস নিয়ন্ত্রণ করার দ্রুত ইঙ্গিত" "ক্যামেরাতে সরাসরি যান" "ক্যামেরা দ্রুত খুলতে, পাওয়ার বোতাম দুবার প্রেস করুন৷ যেকোনও স্ক্রিনে কাজ করে৷" "ক্যামেরাটি তাড়াতাড়ি খুলুন" - "ক্যামেরা ফ্লিপ করুন" + "ক্যামেরা ফ্লিপ করা" "তাড়াতাড়ি সেলফি তুলুন" "হোম বোতামে উপরের দিকে সোয়াইপ করুন" @@ -3962,7 +3963,7 @@ "সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার ফোনটি তুলে নিন।" "সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার ট্যাবলেটটি তুলে নিন।" "সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার ডিভাইসটি তুলে নিন।" - "বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করুন" + "বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করা" "আঙ্গুলের ছাপ সোয়াইপ করুন" "আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ফোনের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷" "আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ট্যাবলেটের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷" diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml index 208f40c8ee5791994a025a40ac3a08bebbe04edb..a869cfa89569baa5ef5b62b2d09f80e7ab9c6df0 100644 --- a/res/values-bs/arrays.xml +++ b/res/values-bs/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pritisnite dugme" "PIN ravnopravnog uređaja" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 176e92f04c504e8eaf241959301cabfecc1073b6..9cb60709a1b812d6c8bd6ac9d4ceda5cf5114a9a 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -137,18 +137,18 @@ "%1$s želi uključiti Bluetooth" "Aplikacija želi uključiti Bluetooth" "Aplikacija želi isključiti Bluetooth" - "%1$s želi da vaš tablet bude vidljiv drugim uređajima sa Bluetoothom %2$d sek." - "%1$s želi da vaš telefon bude vidljiv drugim uređajima sa Bluetoothom %2$d sek." - "Aplikacija želi da vaš tablet bude vidljiv drugim uređajima sa Bluetoothom %1$d sek." - "Aplikacija želi da vaš telefon bude vidljiv drugim uređajima sa Bluetoothom %1$d sek." + "%1$s želi da vaš tablet bude vidljiv drugim uređajima sa Bluetoothom %2$d s." + "%1$s želi da vaš telefon bude vidljiv drugim uređajima sa Bluetoothom %2$d s." + "Aplikacija želi da vaš tablet bude vidljiv drugim uređajima sa Bluetoothom %1$d s." + "Aplikacija želi da vaš telefon bude vidljiv drugim uređajima sa Bluetoothom %1$d s." "%1$s želi da vaš tablet bude vidljiv drugim Bluetooth uređajima. Ovo možete promijeniti kasnije u postavkama za Bluetooth." "%1$s želi da vaš telefon bude vidljiv drugim Bluetooth uređajima. Ovo možete promijeniti kasnije u postavkama za Bluetooth." "Aplikacija želi da vaš tablet bude vidljiv drugim Bluetooth uređajima. Ovo možete kasnije promijeniti u postavkama za Bluetooth." "Aplikacija želi da vaš telefon bude vidljiv drugim Bluetooth uređajima. Ovo možete promijeniti kasnije u postavkama za Bluetooth." - "%1$s želi uključiti Bluetooth te učiniti vaš tablet vidljivim drugim uređajima %2$d sek." - "%1$s želi uključiti Bluetooth te učiniti vaš telefon vidljivim drugim uređajima %2$d sek." - "Aplikacija želi uključiti Bluetooth te učiniti vaš tablet vidljivim drugim uređajima %1$d sek." - "Aplikacija želi uključiti Bluetooth te učiniti vaš telefon vidljivim drugim uređajima %1$d sek." + "%1$s želi uključiti Bluetooth te učiniti vaš tablet vidljivim drugim uređajima %2$d s." + "%1$s želi uključiti Bluetooth te učiniti vaš telefon vidljivim drugim uređajima %2$d s." + "Aplikacija želi uključiti Bluetooth te učiniti vaš tablet vidljivim drugim uređajima %1$d s." + "Aplikacija želi uključiti Bluetooth te učiniti vaš telefon vidljivim drugim uređajima %1$d s." "%1$s želi uključiti Bluetooth i učiniti vaš tablet vidljivim drugim uređajima. Ovo možete kasnije promijeniti u postavkama za Bluetooth." "%1$s želi uključiti Bluetooth i učiniti vaš telefon vidljivim drugim uređajima. Ovo možete kasnije promijeniti u postavkama za Bluetooth." "Aplikacija želi uključiti Bluetooth i učiniti vaš tablet vidljivim drugim uređajima. Ovo možete kasnije promijeniti u postavkama za Bluetooth." @@ -865,6 +865,7 @@ "Automatski" "Opseg od 2.4 GHz" "Opseg od 5,0 GHz" + "Preferira se opseg od 5,0 GHz" "2,4 GHz" "5,0 GHz" "Odaberite barem jedan frekvencijski pojas za Wi‑Fi pristupnu tačku:" @@ -974,11 +975,11 @@ "AndroidAP WPA2 PSK pristupna tačka" "Android pristupna tačka" "Nije dostupno jer je uključen način rada u avionu" - "WiFi pozivanje" + "Pozivanje putem WiFi-ja" "Proširite mogućnost pozivanja s Wi‑Fi-jem" "Uključite pozivanje putem Wi‑Fi-ja za veću pokrivenost" - "Postavke za pozive" - "Način pozivanja preko WiFi" + "Postavka poziva" + "Način pozivanja putem WiFi-ja" "Postavke rominga" @@ -1010,7 +1011,7 @@ "2" "1" - "Kada je opcija WiFi pozivanje uključena, telefon može preusmjeravati pozive preko WiFi mreža ili mreže vašeg operatera, u zavisnosti od toga kakve su vaše postavke i koji signal je jači. Prije nego što uključite ovu funkciju, raspitajte se o naknadi i drugim informacijama kod operatera." + "Kada je opcija pozivanje putem WiFi-ja uključena, telefon može preusmjeravati pozive preko WiFi mreža ili mreže vašeg operatera, u zavisnosti od toga kakve su vaše postavke i koji signal je jači. Prije nego što uključite ovu funkciju, raspitajte se o naknadi i drugim informacijama kod operatera." "Adresa za hitne slučajeve" "Koristi se kao vaša lokacija prilikom hitnog poziva putem Wi‑Fi mreže" @@ -1077,7 +1078,7 @@ "Prirodne" "Pojačane" "Zasićene" - "Automatski" + "Prilagodljivi način" "Koristi samo precizne boje" "Prilagodite između izraženih i preciznih boja" "Automatski promijeni orijentaciju prilikom rotiranja tableta" @@ -1497,7 +1498,7 @@ "Izbriši sve" "Resetovanje nije izvršeno jer usluga Brisanje sistema nije dostupna." "Ponovo pokrenuti?" - "Ponovno postavljanje na fabričke postavke nije dostupno za ovog korisnika" + "Vraćanje na fabričke postavke nije dostupno za ovog korisnika" "Brisanje u toku" "Pričekajte..." "Postavke poziva" @@ -1654,7 +1655,7 @@ "Postavi uzorak otključavanja" "Promijeni uzorak za otključavanje" "Kako nacrtati uzorak za otključavanje" - "Previše pogrešnih pokušaja. Pokušajte ponovo za %d sek." + "Previše pogrešnih pokušaja. Pokušajte ponovo za %d s." "Aplikacija nije instalirana na vašem telefonu." "Sigurnost radnog profila" "Zaključavanje ekrana radnog profila" @@ -1682,7 +1683,7 @@ "Omogućite više opcija postavki" "Informacije o aplikaciji" "Pohrana" - "Zadano otvori" + "Zadano otvaranje" "Zadane vrijednosti" "Kompatibilnost ekrana" "Odobrenja" @@ -2099,7 +2100,7 @@ "Usluge štampanja" "Nema instaliranih usluga" - "Nije pronađen nijedan pisač" + "Nije pronađen nijedan štampač" "Postavke" "Dodaj pisače" "Uključeno" @@ -2242,7 +2243,7 @@ "Upotreba Upravitelja baterije" "Otkrij kada aplikacije troše bateriju" "Uključeno / Otkrivanje kada aplikacije troše bateriju" - "Isključi" + "Isključeno" Ograničena je %1$d aplikacija Ograničene su %1$d aplikacije @@ -2883,7 +2884,7 @@ "Promijeni PIN" "Prikaži obavještenja" "Pomoć i pov. inform." - "Članci za pomoć, telefon i chat, započinjanje" + "Članci za pomoć, telefon i chat, početak" "Račun za sadržaj" "ID fotografije" "Ekstremne prijetnje" @@ -3012,9 +3013,9 @@ "prepoznavač, ulaz, govor, govoriti, jezik, rad bez dodira, prepoznavanje, uvredljivo, riječ, zvuk, istorija, bluetooth slušalice" "stopa, jezik, zadano, govori, govoriti, tts, pristupačnost, čitač ekrana, slijepi" "sat, vojni" - "resetirati, vratiti, fabričko podešenje" - "uništiti, izbrisati, vratiti, obrisati, ukloniti, vratiti na zadano" - "pisač" + "resetirati, vratiti, fabričke postavke" + "uništiti, izbrisati, vratiti, obrisati, ukloniti, vratiti na fabričke postavke" + "štampač" "zvuk sa zvučnika, zvučnik, jačina zvuka, isključenje zvuka, tišina, zvučni zapis, muzika" "ne ne uznemiravaj, prekinuti, prekidanje, pauza" "RAM" @@ -3198,7 +3199,7 @@ "Zvuk je isključen, ali omogući %1$s i %2$s" "Zvuk je isključen, ali omogući %1$s, %2$s i %3$s" "Poruke, događaji i podsjetnici" - "Kada je uključen način rada Ne ometaj, zvuk poruka, podsjetnika i događaja će biti isključen, osim za stavke koje omogućite iznad. Postavke poruka možete podesiti tako da omogućite prijateljima, porodici ili drugim kontaktima da vas kontaktiraju." + "Kada je uključen način rada Ne ometaj, zvuk poruka, podsjetnika i događaja će se isključiti, osim za stavke kojim dozvolite iznad. Postavke poruka možete podesiti tako da prijateljima, porodici ili drugim kontaktima omogućite da vas kontaktiraju." "Gotovo" "Postavke" "Obavještenja bez vizuelnih elemenata ili zvuka" @@ -3247,7 +3248,7 @@ "Nikad ne prikazuj obavještenja" "Prikaži bez zvuka i minimiziraj" "Prikaži bez zvuka" - "Pusti zvuk" + "Reproduciraj zvuk" "Pusti zvuk i prikaži na ekranu" "Prikaži na ekranu" "Niska" @@ -3256,9 +3257,9 @@ "Hitno" "Dozvoli ometanja" "family link da aktivira zvuk, vibrira i/ili prikaže obavještenja na ekranu" - "Manje važno" - "Srednje važno" - "Veoma važno" + "Niska važnost" + "Srednja važnost" + "Visoka važnost" "Hitno" "Prikaži obavještenja" "Asistent za obavještenja" @@ -3471,11 +3472,11 @@ "Prilikom unosa PIN-a za pokretanje uređaja, usluge za pristupačnost kao što je %1$s još uvijek neće biti dostupne." "Prilikom unosa obrasca za pokretanje uređaja, usluge za pristupačnost kao što je %1$s još uvijek neće biti dostupne." "Prilikom unosa lozinke za pokretanje uređaja, usluge za pristupačnost kao što je %1$s još uvijek neće biti dostupne." - "Napomena: Nakon ponovnog pokretanja, ova aplikacija se neće moći pokrenuti dok ne otključate telefon" + "Napomena: Ako ponovo pokrenete telefon ili postavite zaključavanje ekrana, ova se aplikacija neće moći pokrenuti dok ne otključate telefon" "Informacije za IMEI" "Relativne informacije za IMEI" "(%1$d. slot)" - "Zadano otvoriti" + "Zadano otvori" "Otvaranje linkova" "Otvori podržane linkove" "Otvori bez pitanja" @@ -3492,7 +3493,7 @@ "Obavještenja" "Uključeno" "Uključeno / %1$s" - "Isključi" + "Isključeno" "Isključene kategorije: %1$d od %2$d" "Bez zvuka" "Osjetljivi sadržaj nije na zaključanom ekranu." @@ -4007,7 +4008,7 @@ "Prelazak na kameru" "Dodirnite dvaput dugme za uključivanje za brzo otvaranje kamere. Funkcionira na svakom ekranu." "Brzo otvorite kameru" - "Okretanje kamere" + "Obrtanje kamere" "Snimajte selfije brže" "Prevucite prema gore na dugmetu za Početni ekran" @@ -4175,7 +4176,7 @@ "Upoznajte se s novim uređajem" "Ova funkcija nije dostupna na ovom uređaju" "Prisilno omogući potpuno GNSS mjerenje" - "Prati sve povezane foto sfere i frekvencije GNSS-a bez ciklusa rada" + "Prati sve povezane panorame i frekvencije GNSS-a bez ciklusa rada" "Uvijek prikaži dijaloški okvir za pad aplikacije" "Prikaži dijaloški okvir pri svakom padu aplikacije" "Pristup direktorijima" @@ -4214,7 +4215,7 @@ "Ne čini ništa" "Uključeno (vibracija)" "Uključeno (isključen zvuk)" - "Isključi" + "Isključeno" "Detalji o mreži" "Naziv uređaja mogu vidjeti aplikacije na telefonu. Mogu ga vidjeti i druge osobe kada se povežete na Bluetooth uređaje ili postavite WiFi pristupnu tačku." "Uređaji" diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml index 7cb5b6eae05caee4b98c1afe6136e94bbcde8dc8..8e6549adc946f34911cd27ab5de2eea423106638 100644 --- a/res/values-ca/arrays.xml +++ b/res/values-ca/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Botó per prémer" "PIN de l\'altre dispositiu" @@ -288,7 +282,7 @@ "volum general" "volum de la veu" "volum del to" - "volum multimèdia" + "volum de multimèdia" "volum de l\'alarma" "volum de notificació" "volum del Bluetooth" @@ -296,7 +290,7 @@ "supervisa la ubicació" "fes un seguiment de la precisió de la ubicació" "obtenir estadístiques d\'ús" - "activa/desactiva el micròfon" + "silencia / deixa de silenciar el micròfon" "mostrar l\'avís" "projectar fitxers multimèdia" "activar la VPN" @@ -363,7 +357,7 @@ "Ubicació" "Ubicació" "Obtenir estadístiques d\'ús" - "Activa/desactiva el micròfon" + "Silencia / deixa de silenciar el micròfon" "Mostrar l\'avís" "Projectar fitxers multimèdia" "Activar la VPN" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 2259d40c4423936f2e2c9b5a32013356544f1611..4832e07c08135d54fcdaaad1699ad4262cb39eab 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -282,7 +282,7 @@ "Mou amunt" "Mou avall" "Mou a la part superior" - "Mou al final" + "Mou a la part inferior" "Suprimeix l\'idioma" "Selecció de l\'activitat" "Informació del dispositiu" @@ -422,7 +422,7 @@ "Les funcions de protecció del dispositiu no s\'activaran. Si perds el dispositiu o te\'l roben, no podràs evitar que altres persones l\'utilitzin." "Les funcions de protecció del dispositiu no s\'activaran. Si perds el telèfon o te\'l roben, no podràs evitar que altres persones l\'utilitzin." "Omet de totes maneres" - "Enrere" + "Torna" "Toca el sensor" "Es troba a la part posterior del telèfon. Utilitza el dit índex." "Il·lustració amb la ubicació del sensor d\'empremtes digitals i de dispositiu" @@ -854,6 +854,7 @@ "Automàtica" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Preferència per la banda de 5,0 GHz" "2,4 GHz" "5,0 GHz" "Tria almenys una banda per al punt d\'accés Wi-Fi:" @@ -1056,7 +1057,7 @@ "Comptes" "Comptes del perfil professional: %s" "Comptes del perfil personal" - "Compte professional: %s" + "Compte de la feina: %s" "Compte personal: %s" "Cerca" "Pantalla" @@ -1065,7 +1066,7 @@ "Natural" "Millorat" "Saturat" - "Automàtic" + "Automàtic" "Fes servir només colors precisos" "Ajusta entre colors vius i precisos" "Canvia l\'orientació automàticament en girar la tauleta" @@ -1095,10 +1096,10 @@ "Optimitza la brillantor segons la llum. Quan aquesta funció està activada, pots ajustar la brillantor temporalment." "La brillantor de la pantalla s\'ajustarà automàticament al teu entorn i a la teva activitat. Pots moure el control lliscant manualment perquè la brillantor automàtica aprengui les teves preferències." "Llum nocturna" - "La llum nocturna dona un to ambre a la pantalla. D\'aquesta manera, costa menys mirar-la o llegir-hi amb poca llum i és més fàcil adormir-se." + "La funció Llum nocturna dona un to ambre a la pantalla. D\'aquesta manera, costa menys mirar-la o llegir-hi amb poca llum i és més fàcil adormir-se." "Programació" "Cap" - "S\'activa a una hora determinada" + "S\'activa a una hora personalitzada" "S\'activa del vespre a l\'alba" "Hora d’inici" "Hora de finalització" @@ -1115,7 +1116,7 @@ "Activa ara" "Desactiva ara" "Activa fins a l\'alba" - "Desactiva fins a la posta de sol" + "Desactiva fins al vespre" "Activa fins a les %1$s" "Desactiva fins a les %1$s" "Repòs després de" @@ -1147,7 +1148,7 @@ "Quan es mostra" "Notificacions noves" "Activa la pantalla en rebre notificacions" - "Sempre activat" + "Sempre activada" "Mostra l\'hora, les icones de notificació i altres dades. Consumeix més bateria." "Mida de la lletra" "Amplia o redueix el text" @@ -3109,7 +3110,7 @@ "Quan la pantalla estigui desactivada" "Silencia el so i la vibració" "No activis la pantalla" - "Desactiva la llum intermitent" + "Desactiva el llum intermitent" "No mostris les notificacions a la pantalla" "Amaga les icones de la barra d\'estat" "Amaga els punts de notificació" @@ -3161,7 +3162,7 @@ "Silenciat, però permet %1$s i %2$s" "Silenciat, però permet %1$s, %2$s i %3$s" "Missatges, esdeveniments i recordatoris" - "Quan actives el mode No molestis, els missatges, els recordatoris i els esdeveniments se silencien, excepte aquells elements que hagis permès més amunt. Pots ajustar la configuració dels missatges per permetre que amics, familiars i altres contactes puguin contactar amb tu." + "Quan actives el mode No molestis, els missatges, els recordatoris i els esdeveniments se silencien, excepte aquells elements que hagis permès més amunt. Pots ajustar la configuració dels missatges per permetre que amics, familiars i altres contactes puguin contactar amb tu." "Fet" "Configuració" "Notificacions sense so ni elements visuals" @@ -3172,8 +3173,8 @@ "Sons del perfil professional" "Utilitza sons del perfil pers." "Els sons del perfil professional i personal són els mateixos" - "So de trucada professional" - "So de notificació professional predeterminat" + "So de trucada de la feina" + "So de notificació de la feina predeterminat" "So d\'alarma de la feina predeterminat" "Igual que al perfil personal" "Vols substituir els sons?" @@ -3427,7 +3428,7 @@ "Quan introdueixis el teu PIN per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara %1$s encara no estaran disponibles." "Quan introdueixis el teu patró per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara %1$s encara no estaran disponibles." "Quan introdueixis la teva contrasenya per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara %1$s encara no estaran disponibles." - "Nota: després de reiniciar, l\'aplicació no s\'iniciarà fins que no desbloquegis el telèfon" + "Nota: si reinicies el telèfon i has definit un bloqueig de pantalla, l\'aplicació no s\'iniciarà fins que no desbloquegis el telèfon" "Informació sobre l\'IMEI" "Informació relativa a l\'IMEI" "(Ranura %1$d)" @@ -3632,7 +3633,7 @@ "Ús màxim" "No s\'han fet servir dades" "Vols que %1$s tingui accés a No molestis?" - "L\'aplicació podrà activar o desactivar No molestis i fer canvis en paràmetres relacionats." + "L\'aplicació podrà activar o desactivar No molestis i fer canvis a les opcions de configuració relacionades." "Ha d\'estar activat perquè l\'accés a les notificacions també ho està" "Vols revocar l\'accés de l\'aplicació %1$s a No molestis?" "Se suprimiran totes les regles del mode No molestis creades per aquesta aplicació." @@ -3999,7 +4000,7 @@ "Tipus d\'informació que la teva organització pot veure" "Canvis fets per l\'administrador de la teva organització" "El teu accés a aquest dispositiu" - "Dades associades al teu compte professional, com ara el correu electrònic i el calendari" + "Dades associades al teu compte de la feina, com ara el correu electrònic i el calendari" "Llista de les aplicacions que hi ha al dispositiu" "Temps dedicat i dades utilitzades en cada aplicació" "Registre del trànsit de xarxa més recent" diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml index 4051c880cdc73bbccfa7e59474364178f68f3a67..5e986d8494bf0ce311f707d84292bd981f071123 100644 --- a/res/values-cs/arrays.xml +++ b/res/values-cs/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Stisknutí tlačítka" "PIN ze sdíleného zařízení" @@ -284,7 +278,7 @@ "číst obsah schránky" "upravit obsah schránky" "tlačítka médií" - "zaměření zvuku" + "priorita přehrávání" "hlavní hlasitost" "hlasitost hlasu" "hlasitost vyzvánění" @@ -351,7 +345,7 @@ "Číst obsah schránky" "Upravit obsah schránky" "Tlačítka médií" - "Zaměření zvuku" + "Priorita přehrávání" "Hlavní hlasitost" "Hlasitost hlasu" "Hlasitost vyzvánění" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index a5e5da02d811552e4a2b8c7d184286f218600db2..8cafe5625e11b48fa594379e65412bdde80a7293 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -371,7 +371,7 @@ "Zpráva na zamčené obrazovce" "Aktivovat widgety" "Zakázáno administrátorem" - "Zobrazit možnost zamknutí" + "Zobrazit možnost uzamčení" "Zobrazí vypínač, který vypíná funkci Smart Lock, odemykání otiskem prstu a oznámení na obrazovce uzamčení." "Žádná" "%1$d / %2$d" @@ -876,6 +876,7 @@ "Automatické" "Pásmo 2,4 GHz" "Pásmo 5,0 GHz" + "Upřednostňované pásmo 5,0 GHz" "2,4 GHz" "5,0 GHz" "Vyberte alespoň jedno pásmo pro hotspot Wi-Fi:" @@ -1089,7 +1090,7 @@ "Přirozené" "Zesílené" "Syté" - "Automaticky" + "Adaptivní" "Používat pouze přesné barvy" "Vyberte mezi jasnými a přesnými barvami" "Při otáčení tabletu automaticky přepínat orientaci" @@ -1122,7 +1123,7 @@ "Noční režim obrazovku zbarví do oranžova. Čtení a sledování obrazovky při tlumeném osvětlení tak bude snazší a bude se vám lépe usínat." "Plán" "Žádný" - "Zapne se ve zvoleném čas" + "Zapne se ve zvoleném čase" "Zapne se od soumraku do úsvitu" "Čas zahájení" "Čas ukončení" @@ -1472,7 +1473,7 @@ "Obnovování výchozích nastavení přístupového bodu" "Obnovit výchozí" "Výchozí nastavení přístupového bodu bylo obnoveno." - "Resetovat možnosti" + "Možnosti resetu" "Lze resetovat síť, aplikace nebo zařízení" "Resetovat Wi-Fi, data a Bluetooth" "Budou resetována nastavení všech sítí, včetně následujících:\n\n"
  • "Wi‑Fi"
    • \n
  • "Mobilní data"
    • \n
  • "Bluetooth"
    •  @@ -1951,14 +1952,14 @@ "Doba použití" "Přístupnost" "Nastavení přístupnosti" - "Čtečky obrazovky, zobrazení, ovládací prvky interakce" + "Čtečky obrazovky, zobrazení, interaktivní ovládací prvky" "Nastavení pro slabozraké" "Toto zařízení můžete přizpůsobit svým potřebám. Funkce přístupnosti lze později změnit v Nastavení." "Změňte velikost písma" "Čtečky obrazovky" "Zvuk a text na obrazovce" "Zobrazení" - "Ovládací prvky interakce" + "Interaktivní ovládací prvky" "Stažené služby" "Experimentální" "TalkBack" @@ -3235,7 +3236,7 @@ "Ztlumeno, ale povolit %1$s a %2$s" "Ztlumeno, ale povolit %1$s, %2$s a %3$s" "Zprávy, události a připomenutí" - "Když je zapnut režim Nerušit, zprávy, připomenutí a události budou ztlumeny (kromě položek, které povolíte výše). Nastavení zpráv můžete upravit, aby vás mohli kontaktovat kamarádi, členové rodiny nebo jiní vybraní lidé." + "Když je zapnut režim Nerušit, zprávy, připomenutí a události budou ztlumeny (kromě položek, které povolíte výše). Nastavení zpráv můžete upravit, aby vás mohli kontaktovat kamarádi, členové rodiny nebo jiní vybraní lidé." "Hotovo" "Nastavení" "Oznámení bez vizuálního a zvukového upozornění" @@ -3458,7 +3459,7 @@ "Automaticky zapnout" "Nikdy" "Každou noc" - "Víkendy" + "Pracovní dny (v noci)" "Čas zahájení" "Čas ukončení" "Následující den v %s" @@ -3515,7 +3516,7 @@ "Při zadávání kódu PIN ke spuštění zařízení ještě služby přístupnosti, jako je %1$s, nebudou k dispozici." "Při zadávání gesta ke spuštění zařízení ještě služby přístupnosti, jako je %1$s, nebudou k dispozici." "Při zadávání hesla ke spuštění zařízení ještě služby přístupnosti, jako je %1$s, nebudou k dispozici." - "Poznámka: Po restartování se tato aplikace nespustí, dokud telefon neodemknete." + "Poznámka: Pokud restartujete telefon a máte nastavený zámek obrazovky, tato aplikace se nespustí, dokud telefon neodemknete." "Informace o kódu IMEI" "Informace související s kódem IMEI" "(Slot %1$d)" diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml index 06a24d92542fbc007703611c67d2b93270df7b73..d05f10fc680d4d216ae4d0063e39a61cbb3a0890 100644 --- a/res/values-da/arrays.xml +++ b/res/values-da/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD"     - - - - - - "Trykknap" "Pinkode fra din vens enhed" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 74bc40b4ee171bff685c1f6ba3155dc34cc09180..daee94f1dcf6119f04486d72575ebdcfa7aa019b 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -681,7 +681,7 @@ "Navn" "Internetforbindelse" "Tastatur" - "Kontaktpersoner og opkaldshistorik" + "Kontakter og opkaldshistorik" "Vil du parre med denne enhed?" "Vil du dele telefonbogen?" "%1$s vil gerne have adgang til dine kontaktpersoner og din opkaldshistorik." @@ -759,7 +759,7 @@ "Fra" "Utilgængelig, fordi NFC er slukket" "Android Beam" - "Når denne funktion er slået til, kan du overføre appindhold til en anden NFC-kompatibel enhed ved at placere enhederne tæt på hinanden. Du kan f.eks. overføre websider, YouTube-videoer, kontaktpersoner og meget mere.\n\nDu skal blot placere enhederne tæt på hinanden (normalt bagside mod bagside) og derefter trykke på din skærm. Appen bestemmer, hvad der overføres." + "Når denne funktion er slået til, kan du overføre appindhold til en anden NFC-kompatibel enhed ved at placere enhederne tæt på hinanden. Du kan f.eks. overføre websider, YouTube-videoer, kontakter og meget mere.\n\nDu skal blot placere enhederne tæt på hinanden (normalt bagside mod bagside) og derefter trykke på din skærm. Appen bestemmer, hvad der overføres." "Wi-Fi" "Slå Wi-Fi til" "Wi-Fi" @@ -854,6 +854,7 @@ "Automatisk" "2,4 GHz-bånd" "5,0 GHz-bånd" + "5,0 GHz-bånd foretrækkes" "2,4 GHz" "5,0 GHz" "Vælg mindst ét frekvensbånd til Wi‑Fi-hotspottet:" @@ -1065,7 +1066,7 @@ "Naturlig" "Forstærket" "Mættet" - "Automatisk" + "Selvjusterende" "Anvend kun nøjagtige farver" "Skift mellem levende og nøjagtige farver" "Skift automatisk retning, når tabletcomputeren drejes" @@ -1095,7 +1096,7 @@ "Optimer lysstyrken til det omgivende lys. Når denne funktion er slået til, kan du stadig justere lysstyrken midlertidigt." "Skærmens lysstyrke tilpasses automatisk på baggrund af dine omgivelser og dine aktiviteter. Du kan flytte skyderen manuelt for at hjælpe Automatisk lysstyrke med at lære dine præferencer." "Nattelys" - "Med Nattelys er farvetonen på skærmen gul. Det gør din skærm mere behagelig at se på i svag belysning og kan gøre det nemmere at falde i søvn." + "Nattelys gør farverne på din skærm mere gullige. Det gør din skærm mere behagelig at se på i svag belysning og kan gøre det nemmere at falde i søvn." "Planlæg" "Ingen" "Aktiveres på valgt tidspunkt" @@ -1194,7 +1195,7 @@ "Android-version" "Android" - "Niveau for sikkerhedsrettelse på Android" + "Seneste sikkerhedsopdatering i Android" "Model" "Model: %1$s" "Model og hardware" @@ -2452,7 +2453,7 @@ "Vil du stoppe sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker, andre indstillinger og appdata samt slette alle kopier på Googles servere?" "Vil du stoppe med at sikkerhedskopiere enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, som apps har gemt) og slette alle kopier på fjernservere?" - "Foretag automatisk ekstern backup af enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, der er gemt i apps).\n\n Når du slår automatisk backup til, gemmes enheds- og appdata med jævne mellemrum eksternt. Appdata kan være alle former for data, som en app har gemt (afhængigt af udviklerens indstillinger), f.eks. potentielt følsomme data, såsom kontaktpersoner, beskeder og billeder." + "Foretag automatisk ekstern backup af enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, der er gemt i apps).\n\n Når du slår automatisk backup til, gemmes enheds- og appdata med jævne mellemrum eksternt. Appdata kan være alle former for data, som en app har gemt (afhængigt af udviklerens indstillinger), f.eks. potentielt følsomme data, såsom kontakter, beskeder og billeder." "Indstillinger for enhedsadministrator" "App til enhedsadministration" "Deaktiver denne app til enhedsadministration" @@ -2536,7 +2537,7 @@ %1$s" "Gmail" "Kalender" - "Kontaktpersoner" + "Kontakter" "Velkommen til Google Synkroniser!"\n"Googles tilgang til synkronisering af data giver dig adgang til dine kontaktpersoner, aftaler og meget mere, uanset hvor du er." "Indstillinger for synkronisering af app" "Data og synkronisering" @@ -2954,11 +2955,11 @@ "Apps og underretninger" "Tilladelser, standardapps" "Konti" - "Der blev ikke tilføjet nogen konti" + "Ingen konti er tilføjet" "Standardapps" "Sprog, tid, sikkerhedskopiering, opdateringer" "Indstillinger" - "Søg indstillinger" + "Søg i indstillinger" "wifi, wi-fi, netværksforbindelse, internet, trådløs, data, wi fi" "wifi, wi-fi, skift, styring" "sms, sende sms-beskeder, beskeder, sende beskeder, standard" @@ -3007,7 +3008,7 @@ "imei, meid, min, prl version, imei sv" "netværk, mobilnetværkstilstand, netværkstilstand, signalstyrke, type mobilnetværk, roaming, iccid" "serienummer, hardwareversion" - "niveau for programrettelse i Android, basebandversion, kernesystem" + "seneste sikkerhedsopdatering i Android, basebandversion, kernesystem" "Aktiv låseskærm, visning af låseskærm" "fingeraftryk" "rotere, vende, rotation, stående, liggende, retning, lodret, vandret" @@ -3161,12 +3162,12 @@ "Lyden er slået fra, men tillad %1$s og %2$s" "Lyden er slået fra, men tillad %1$s, %2$s og %3$s" "Beskeder, begivenheder og påmindelser" - "Når Forstyr ikke er aktiveret, slås lyden fra for beskeder, påmindelser og begivenheder med undtagelse af de elementer, du tillader ovenfor. Du kan ændre beskedindstillingerne, så dine venner, din familie eller andre kontaktpersoner kan få fat i dig." + "Når Forstyr ikke er aktiveret, slås lyden fra for beskeder, påmindelser og begivenheder med undtagelse af de elementer, du tillader ovenfor. Du kan ændre beskedindstillingerne, så dine venner, din familie eller andre kontaktpersoner kan få fat i dig." "Udfør" "Indstillinger" "Ingen lyd eller visuelle signaler fra underretninger" "Ingen lyd fra underretninger" - "Underretninger kan ikke ses eller høres. Opkald fra stjernemarkerede kontaktpersoner og gentagne opkald er tilladt." + "Underretninger kan ikke ses eller høres. Opkald fra stjernemarkerede kontakter og gentagne opkald er tilladt." "(aktuel indstilling)" "Vil du ændre underretningsindstillingerne for Forstyr ikke?" "Lyde for arbejdsprofil" @@ -3237,7 +3238,7 @@     "Ingen installerede apps har anmodet om adgang til underretninger." "Tillad adgang til underretninger for %1$s?" - "%1$s kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Den kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger." + "%1$s kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontakter og teksten i de meddelelser, du modtager. Den kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger." "Hvis du slår adgang til underretninger fra for %1$s, slås adgangen til Forstyr ikke muligvis også fra." "Slå fra" "Annuller" @@ -3339,7 +3340,7 @@ "Opkald" "Tillad opkald" "Når Forstyr ikke er aktiveret, blokeres indgående opkald. Du kan ændre indstillingerne, så dine venner, dine familie eller andre kontaktpersoner kan få fat i dig." - "Stjernemarkerede kontaktpersoner" + "Stjernemarkerede kontakter" %d anden %d andre @@ -3350,8 +3351,8 @@ "Nogle beskeder" "Fra hvem som helst" "Kun fra kontaktpersoner" - "Kun fra stjernemarkerede kontaktpersoner" - "Fra stjernemarkerede kontaktpersoner og ved gentagne opkald" + "Kun fra stjernemarkerede kontakter" + "Fra stjernemarkerede kontakter og ved gentagne opkald" "Fra kontaktpersoner og ved gentagne opkald" "Kun ved gentagne opkald" "Ingen" @@ -3364,7 +3365,7 @@ "Tillad begivenheder" "alle" "kontaktpersoner" - "stjernemarkerede kontaktpersoner" + "stjernemarkerede kontakter" "Gentagne opkald" "Tillad gentagne opkald" "Fra %1$s" @@ -3427,7 +3428,7 @@ "Når du angiver din pinkode for at starte denne enhed, er tilgængelighedstjenester som %1$s endnu ikke tilgængelige." "Når du angiver dit mønster for at starte denne enhed, er tilgængelighedstjenester som %1$s endnu ikke tilgængelige." "Når du angiver din adgangskode for at starte denne enhed, er tilgængelighedstjenester som %1$s endnu ikke tilgængelige." - "Bemærk! Efter en genstart kan denne app ikke starte, før du låser din telefon op" + "Bemærk! Hvis du genstarter din telefon og har indstillet en skærmlås, kan denne app ikke starte, før du låser telefonen op" "IMEI-oplysninger" "Relative IMEI-oplysninger" "(Port %1$d)" @@ -3831,7 +3832,7 @@ "Se abonnement" "Se yderligere oplysninger" "Datasparefunktion" - "Ubegrænset dataadgang" + "Ubegrænset data" "Baggrundsdata er slået fra" "Til" "Fra" @@ -4051,7 +4052,7 @@ Kameraapps "Kalenderapp" - "App til kontaktpersoner" + "App til kontakter" Mailklientapp Mailklientapps @@ -4137,7 +4138,7 @@ "Forlæng enhedens batteritid" "Forlæng telefonens batteritid" - "Stop med at ringe" + "Deaktiver ringetoner" "Tryk på afbryderknappen og Lydstyrke op på samme tid" "Genvej til at stoppe ringelyd" "Vibrer" diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml index 4f4a0cbf2e9b4b09aff7475a109f288e34355d8f..e335081d21087211e96dc9969222aed226fffdbf 100644 --- a/res/values-de/arrays.xml +++ b/res/values-de/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push-Schaltfläche" "PIN von Peer-Gerät" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 369fb2c8203c241abe7be4eec79a596f2d5571cf..bcc4a559988044cf201347ac560dee982ecf9116 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -208,7 +208,7 @@ "Du musst das Feld für den Port ausfüllen." "Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist." "Der eingegebene Port ist ungültig." - "Der HTTP-Proxy wird vom Browser verwendet, möglicherweise aber nicht von anderen Apps." + "Der HTTP-Proxy wird vom Browser verwendet, eventuell aber nicht von anderen Apps." "PAC-URL: " "DL-Bandbreite (kbit/s):" "UL-Bandbreite (kbit/s):" @@ -442,7 +442,7 @@ "Das ist nicht der Sensor" "Sensor auf Rückseite mit Zeigefinger berühren." "Registrierung wurde nicht abgeschlossen." - "Zeitüberschreitung bei Fingerabdruckregistrierung. Versuche es erneut." + "Zeitüberschreitung bei Fingerabdruckregistrierung. Bitte versuche es noch einmal." "Fehler bei Fingerabdruckregistrierung. Versuche es erneut oder verwende einen anderen Finger." "Weitere hinzufügen" "Weiter" @@ -467,8 +467,8 @@ "Du kannst deine Konten, Einstellungen, heruntergeladenen Apps und die zugehörigen Daten, Medienelemente und andere Dateien verschlüsseln. Nachdem du dein Smartphone verschlüsselt hast, musst du, sofern du eine Displaysperre eingerichtet hast (also ein Muster, eine numerische PIN oder ein Passwort), bei jedem Einschalten des Smartphones das Display entsperren, um das Smartphone zu entschlüsseln. Der einzige andere Weg zur Entschlüsselung ist das Zurücksetzen auf die Werkseinstellungen. Hierdurch werden alle deine Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Bei Beginn muss der Akku aufgeladen sein und das Smartphone muss sich während des gesamten Vorgangs im Netzbetrieb befinden. Wenn du den Vorgang unterbrichst, gehen einige oder alle deine Daten verloren." "Tablet verschlüsseln" "Smartphone verschlüsseln" - "Lade den Akku auf und versuche es erneut." - "Schließe dein Ladegerät an und versuche es erneut." + "Lade den Akku auf und versuche es noch einmal." + "Schließe dein Ladegerät an und versuche es noch einmal." "Keine PIN oder kein Passwort für Displaysperre" "Du musst eine PIN oder ein Passwort für die Displaysperre festlegen, bevor du die Verschlüsselung starten kannst." "Verschlüsseln?" @@ -664,8 +664,8 @@ "Die PIN enthält Buchstaben oder Symbole." "In der Regel 0000 oder 1234" "Muss aus 16 Ziffern bestehen" - "Möglicherweise musst du diese PIN auch auf dem anderen Gerät eingeben." - "Möglicherweise musst du diesen Zugangscode auch auf dem anderen Gerät eingeben." + "Eventuell musst du diese PIN auch auf dem anderen Gerät eingeben." + "Eventuell musst du diesen Zugangscode auch auf dem anderen Gerät eingeben." "Von:<br><b>%1$s</b><br><br> Mit diesem Gerät koppeln?" @@ -854,6 +854,7 @@ "Automatisch" "2,4-GHz-Band" "5-GHz-Band" + "5-GHz-Band bevorzugt" "2,4 GHz" "5 GHz" "Bitte für den WLAN-Hotspot mindestens eine Bandbreite auswählen:" @@ -1065,7 +1066,7 @@ "Natürlich" "Verstärkt" "Gesättigt" - "Automatisch" + "Adaptiv" "Nur originale Farben verwenden" "Farbwert zwischen kräftigen und originalen Farben einstellen" "Ausrichtung beim Drehen des Tablets automatisch ändern" @@ -1171,7 +1172,7 @@ "PIN für SIM-Karte" "Falsche PIN" "Die PINs stimmen nicht überein." - "PIN kann nicht geändert werden.\nMöglicherweise ist es die falsche PIN." + "PIN kann nicht geändert werden.\nEventuell ist es die falsche PIN." "SIM-PIN erfolgreich geändert" "Status der SIM-Kartensperrung kann nicht geändert werden.\nMöglicherweise falsche PIN." "OK" @@ -1277,8 +1278,8 @@ "Wenn du die SD-Karte entfernst, werden einige von dir verwendete Apps angehalten und sind nicht mehr verfügbar, bis du die SD-Karte wieder einsetzt." - "USB-Speicher kann nicht getrennt werden. Bitte versuche es später erneut." - "SD-Karte kann nicht entfernt werden. Bitte versuche es später erneut." + "USB-Speicher kann nicht getrennt werden. Bitte versuche es später noch einmal." + "SD-Karte kann nicht entfernt werden. Bitte versuche es später noch einmal." "USB-Speicher wird getrennt." "SD-Karte wird getrennt." "Trennen..." @@ -1358,7 +1359,7 @@ "Das Verschieben dauert etwa ^1. Dabei werden ^2 auf ^3 freigegeben." "Verschieben" "Daten werden verschoben…" - "Beachte beim Verschieben deiner Daten Folgendes: \n• Entferne nicht den Datenspeicher (^1). \n• Einige Apps funktionieren möglicherweise nicht. \n• Achte darauf, dass das Gerät dabei stets geladen wird." + "Beachte beim Verschieben deiner Daten Folgendes: \n• Entferne nicht den Datenspeicher (^1). \n• Einige Apps funktionieren eventuell nicht. \n• Achte darauf, dass das Gerät dabei immer geladen wird." "^1 kann nun verwendet werden" "Du kannst deine ^1 nun zum Speichern von Fotos und anderen Medien einsetzen." "Deine neue ^1 steht nun für dich bereit. \n\nWenn du Fotos, Dateien und App-Daten auf dieses Gerät verschieben möchtest, gehe zu \"Einstellungen\" > \"Speicher\"." @@ -1622,7 +1623,7 @@ "Zeichne ein Entsperrungsmuster." "Menütaste drücken, um die Hilfe aufzurufen" "Lass die Tasten los, wenn du fertig bist." - "Verbinde mindestens %d Punkte. Bitte versuche es erneut." + "Verbinde mindestens %d Punkte. Bitte versuche es noch einmal." "Muster wurde aufgezeichnet." "Zeichne das Muster zur Bestätigung erneut." "Dein neues Entsperrungsmuster:" @@ -2160,7 +2161,7 @@ "Energiesparmodus aktivieren" "Der Akku könnte früher als üblich leer sein" "Energiesparmodus ist aktiviert" - "Einige Funktionen sind möglicherweise eingeschränkt" + "Einige Funktionen sind eventuell eingeschränkt" "Smartphone mehr als üblich genutzt" "Tablet mehr als üblich genutzt" "Gerät mehr als üblich genutzt" @@ -2445,7 +2446,7 @@ "App-Daten, WLAN-Passwörter und andere Einstellungen auf Google-Servern sichern" "Sicherungskonto" "App-Daten einschließen" - "Autom. Wiederherstellung" + "Automatische Wiederherstellung" "Nach der Neuinstallation einer App gesicherte Einstellungen und Daten wiederherstellen" "Sicherungsdienst ist nicht aktiv" "Zurzeit werden in keinem Konto gesicherte Daten gespeichert." @@ -2709,7 +2710,7 @@ "Profil löschen" "Durchgehend aktives VPN" "Keine VPNs hinzugefügt" - "Verbindung zu VPN stets beibehalten" + "Verbindung zu VPN immer beibehalten" "Von dieser App nicht unterstützt" "Always-On-Modus aktiviert" "Verbindungen ohne VPN blockieren" @@ -2717,7 +2718,7 @@ "Wähle ein VPN-Profil für eine durchgehende Verbindung aus. Netzwerkverkehr ist nur möglich, wenn eine Verbindung zu diesem VPN besteht." "Keines" "Für ein durchgehend aktives VPN ist eine IP-Adresse für den Server und für das DNS erforderlich." - "Es ist keine Netzwerkverbindung verfügbar. Bitte versuche es später erneut." + "Es ist keine Netzwerkverbindung verfügbar. Bitte versuche es später noch einmal." "Verbindung mit VPN getrennt" "Keine" "Ein Zertifikat fehlt. Versuche, das Profil zu ändern." @@ -2745,7 +2746,7 @@ "Passwort festlegen" "Abbrechen" "Zusätzliche Systemupdates" - "Das Netzwerk wird möglicherweise überwacht." + "Das Netzwerk wird eventuell überwacht." "Fertig" Zertifikaten vertrauen oder sie entfernen @@ -2791,8 +2792,8 @@ "Profil jetzt einrichten?" "Jetzt einrichten" "Nicht jetzt" - "Nur der Besitzer des Tablets kann Nutzer verwalten." - "Nur der Besitzer des Telefons kann Nutzer verwalten." + "Nur der Eigentümer des Tablets kann Nutzer verwalten." + "Nur der Eigentümer des Telefons kann Nutzer verwalten." "In eingeschränkten Profilen können keine Konten hinzugefügt werden." "%1$s vom Gerät löschen" "Einstellungen für den Sperrbildschirm" @@ -3028,7 +3029,7 @@ "WLAN-NFC-Tag einrichten" "Schreiben" "Zum Schreiben auf ein Tag tippen…" - "Ungültiges Passwort. Bitte versuche es erneut." + "Ungültiges Passwort. Bitte versuche es noch einmal." "Erfolgreich ausgeführt!" "Es können keine Daten in das NFC-Tag geschrieben werden. Sollte das Problem weiterhin bestehen, versuche es mit einem anderen Tag." "In das NFC-Tag kann nicht geschrieben werden. Bitte verwende ein anderes Tag." @@ -3095,7 +3096,7 @@ "Kein akustisches Signal bei Benachrichtigungen" "Benachrichtigungen werden angezeigt" "Wenn auf deinem Smartphone neue Benachrichtigungen eingehen, ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren." - "Keine optisches oder akustisches Signal bei Benachrichtigungen" + "Kein optisches oder akustisches Signal bei Benachrichtigungen" "Du siehst und hörst keine Benachrichtigungen" "Auf deinem Smartphone werden keine neuen oder vorhandenen Benachrichtigungen angezeigt. Es ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren. Es erscheinen auch keine Benachrichtigungen, wenn du vom oberen Bildschirmrand nach unten wischst.\n\nBenachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden weiterhin angezeigt." "Benutzerdefiniert" @@ -3103,7 +3104,7 @@ "Benutzerdefinierte Einstellung entfernen" "Kein akustisches Signal bei Benachrichtigungen" "Teilweise ausgeblendet" - "Keine optisches oder akustisches Signal bei Benachrichtigungen" + "Kein optisches oder akustisches Signal bei Benachrichtigungen" "Benutzerdefinierte Einschränkungen" "Bei aktiviertem Display" "Bei deaktiviertem Display" @@ -3121,7 +3122,7 @@ "Töne und Vibration" "Töne, Vibration und einige visuelle Elemente von Benachrichtigungen" "Töne, Vibration und visuelle Elemente von Benachrichtigungen" - "Benachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden niemals ausgeblendet" + "Benachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden nie ausgeblendet" "Keine" "sonstige Optionen" "Hinzufügen" @@ -3161,10 +3162,10 @@ "Stummgeschaltet, aber %1$s und %2$s zulassen" "Stummgeschaltet, aber %1$s, %2$s und %3$s erlauben" "Nachrichten, Termine & Erinnerungen" - "Wenn \"Bitte nicht stören\" aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet, die du oben nicht ausdrücklich zulässt. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können." + "Wenn \"Bitte nicht stören\" aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet, die du oben nicht ausdrücklich zulässt. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können." "Fertig" "Einstellungen" - "Keine optisches oder akustisches Signal bei Benachrichtigungen" + "Kein optisches oder akustisches Signal bei Benachrichtigungen" "Kein Ton bei Benachrichtigungen" "Du siehst oder hörst keine Benachrichtigungen. Anrufe von markierten Kontakten und wiederholten Anrufern sind erlaubt." "(Aktuelle Einstellung)" @@ -3207,10 +3208,10 @@ "Kategoriegruppe für Benachrichtigungen" "Verhalten" "Akustisches Signal erlauben" - "Niemals Benachrichtigungen anzeigen" + "Nie Benachrichtigungen anzeigen" "Lautlos anzeigen und minimieren" "Ohne Ton anzeigen" - "Akustisches Signal ausgeben" + "Akustisches Signal" "Akustisches Signal und Bildschirmbenachrichtigung" "Bildschirmbenachrichtigung" "Niedrig" @@ -3280,9 +3281,9 @@ "Aktiviert" "Deaktiviert" "Alle blockieren" - "Diese Benachrichtigungen niemals anzeigen" + "Diese Benachrichtigungen nie anzeigen" "Benachrichtigungen anzeigen" - "Benachrichtigungen niemals in der Leiste oder auf Peripheriegeräten anzeigen" + "Benachrichtigungen nie in der Leiste oder auf Peripheriegeräten anzeigen" "App-Benachrichtigungspunkt erlauben" "App-Benachrichtigungspunkt anzeigen" "\"Nicht stören\" deaktivieren" @@ -3427,7 +3428,7 @@ "Wenn du zum Starten dieses Geräts deine PIN eingibst, stehen Dienste für Bedienungshilfen wie %1$s noch nicht zur Verfügung." "Wenn du zum Starten dieses Geräts dein Muster eingibst, stehen Dienste für Bedienungshilfen wie %1$s noch nicht zur Verfügung." "Wenn du zum Starten dieses Geräts dein Passwort eingibst, stehen Dienste für Bedienungshilfen wie %1$s noch nicht zur Verfügung." - "Hinweis: Nach einem Neustart wird diese App erst gestartet, wenn du dein Smartphone entsperrst" + "Hinweis: Falls du dein Smartphone neu startest und eine Displaysperre aktiviert ist, wird diese App erst gestartet, wenn du dein Smartphone entsperrst" "IMEI-Informationen" "Informationen zur relativen IMEI" "(Slot %1$d)" @@ -3945,24 +3946,24 @@ "Zur Kamera wechseln" "Ein-/Aus-Taste zweimal drücken, um Kamera direkt zu starten. Funktioniert bei jedem Display." "Kamera schnell öffnen" - "Kamera wechseln" + "Kamera umschalten" "Schnell Selfies aufnehmen" "Auf Startbildschirmtaste nach oben wischen" "Wenn du auf der Startbildschirmtaste nach oben wischst, kannst du zwischen Apps wechseln. Wenn du wieder nach oben wischst, siehst du alle Apps. Dies funktioniert auf allen Displays. Es gibt rechts auf deinem Display keine Übersichtsschaltfläche mehr." "Neue Startbildschirmtaste ausprobieren" "Neue Bewegung zum Wechseln von Apps aktivieren" - "Doppeltippen für schnellen Blick auf das Smartphone-Display" + "Für schnellen Blick aufs Display doppeltippen" "Doppeltippen für schnellen Blick auf das Display des Tablets" "Doppeltippen für schnellen Blick auf das Display des Geräts" "Auf den Bildschirm doppeltippen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen." - "Für Benachr. anheben" + "Beim Hochnehmen des Telefons Display anzeigen" "Tablet hochnehmen, um das Display anzusehen" "Gerät hochnehmen, um das Display anzusehen" "Smartphone in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen." "Tablet in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen." "Gerät in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen." - "Benachr. mit Fingerabdruck" + "Benachrichtigungen durch Wischen über Fingerabdrucksensor öffnen" "Fingerabdrucksensor verwenden" "Auf der Rückseite des Smartphones über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen." "Auf der Rückseite des Tablets über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen." @@ -4051,7 +4052,7 @@ Kamera-App "Kalender-App" - "Kontakte-App" + "Kontakte App" E-Mail-Client-Apps E-Mail-Client-App @@ -4138,7 +4139,7 @@ "Akkulaufzeit des Smartphones verbessern" "Klingeln verhindern" - "\"Ein/Aus\" & \"Lauter\" leicht zusammendrücken" + "\"Ein/Aus\" & \"Lauter\" gleichzeitig drücken" "Verknüpfung, um Klingeln zu verhindern" "Vibrieren" "Stummschalten" diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml index c0fda737b54ffa54e7efebe4feac46664420221b..131f4fab2bc94993dd177b626d723a69ab08f517 100644 --- a/res/values-el/arrays.xml +++ b/res/values-el/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Πάτημα κουμπιού" "PIN από ομότιμη συσκευή" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 40b67bdf4dc714c17da402958880b354aec68451..eef1bf5ffc6ad7d2ed14eb66ede90cde62de0da3 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -854,6 +854,7 @@ "Αυτόματα" "Ζώνη 2,4 GHz" "Ζώνη 5,0 GHz" + "Προτιμάται ζώνη 5,0 GHz" "2,4 GHz" "5,0 GHz" "Επιλέξτε τουλάχιστον μία ζώνη συχνοτήτων για το σημείο πρόσβασης Wi‑Fi:" @@ -1065,7 +1066,7 @@ "Φυσικό" "Ενισχυμένο" "Κορεσμένο" - "Αυτόματα" + "Προσαρμοστικό" "Χρήση μόνο ακριβών χρωμάτων" "Προσαρμογή μεταξύ ζωντανών και ακριβών χρωμάτων" "Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του tablet" @@ -2290,7 +2291,7 @@ "Απενεργοποιείτε το Bluetooth όταν δεν το χρησιμοποιείτε" "Δοκιμή σύνδεσης σε διαφορετική συσκευή Bluetooth" "Μπαταρία που χρησιμοποιείται από την εφαρμογή" - "Τερματισμός ή κατάργηση εγκατάστασης της εφαρμογής" + "Τερματισμός ή απεγκατάσταση της εφαρμογής" "Επιλέξτε κατάσταση εξοικονόμησης μπαταρίας" "Η εφαρμογή ενδέχεται να προσφέρει ρυθμίσεις που θα μειώσουν τη χρήση της μπαταρίας" "Μπαταρία που χρησιμοποιείται από το χρήστη" @@ -3161,7 +3162,7 @@ "Σε σίγαση, αλλά να επιτρέπονται %1$s και %2$s" "Σε σίγαση, αλλά να επιτρέπονται %1$s, %2$s και %3$s" "Μηνύματα, συμβάντα και υπενθυμίσεις" - "Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", τα μηνύματα, οι υπενθυμίσεις και τα συμβάντα θα τίθενται σε σίγαση, εκτός από τα στοιχεία που επιτρέπετε παραπάνω. Μπορείτε να προσαρμόσετε τις ρυθμίσεις μηνυμάτων για να επιτρέπετε στους φίλους και την οικογένειά σας ή σε άλλες επαφές να επικοινωνούν μαζί σας." + "Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", τα μηνύματα, οι υπενθυμίσεις και τα συμβάντα θα τίθενται σε σίγαση, εκτός από τα στοιχεία που επιτρέπετε παραπάνω. Μπορείτε να προσαρμόσετε τις ρυθμίσεις μηνυμάτων για να επιτρέπετε στους φίλους και στην οικογένειά σας ή σε άλλες επαφές να επικοινωνούν μαζί σας." "Τέλος" "Ρυθμίσεις" "Ειδοποιήσεις χωρίς οπτικά στοιχεία και ήχο" @@ -3427,7 +3428,7 @@ "Κατά την εισαγωγή του PIN σας για την εκκίνηση αυτής της συσκευής, οι υπηρεσίες προσβασιμότητας, όπως το %1$s δεν θα είναι διαθέσιμες ακόμη." "Κατά την εισαγωγή του μοτίβου σας για την εκκίνηση αυτής της συσκευής, οι υπηρεσίες προσβασιμότητας, όπως το %1$s δεν θα είναι διαθέσιμες ακόμη." "Κατά την εισαγωγή του κωδικού πρόσβασής σας για την εκκίνηση αυτής της συσκευής, οι υπηρεσίες προσβασιμότητας, όπως το %1$s δεν θα είναι διαθέσιμες ακόμη." - "Σημείωση: Μετά από μια επανεκκίνηση, δεν είναι δυνατή η έναρξη αυτής της συσκευής προτού ξεκλειδώσετε το τηλέφωνό σας" + "Σημείωση: Εάν επανεκκινήσετε το τηλέφωνό σας και έχετε ορίσει κάποιο κλείδωμα οθόνης, δεν είναι δυνατή η έναρξη αυτής της εφαρμογής μέχρι να ξεκλειδώσετε το τηλέφωνο" "Πληροφορίες IMEI" "Σχετικές πληροφορίες IMEI" "(Υποδοχή %1$d)" diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml index b1fcba8133dae9b8cfde729e3bfebc48af5555c7..4b76d6e55d8d5a44a39195c72637bc1f746ae08c 100644 --- a/res/values-en-rAU/arrays.xml +++ b/res/values-en-rAU/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push button" "PIN from peer device" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index d36f86f1e6dcb7e0b5f8db967a06f8ec5011ca04..60103346956ffb75561bf844fb9651f8b5049b52 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -854,6 +854,7 @@ "Auto" "2.4 GHz band" "5.0 GHz band" + "5.0 GHz band preferred" "2.4 GHz" "5.0 GHz" "Choose at least one band for Wi‑Fi hotspot:" @@ -1065,7 +1066,7 @@ "Natural" "Boosted" "Saturated" - "Automatic" + "Adaptive" "Use accurate colours only" "Adjust between vivid and accurate colours" "Switch orientation automatically when rotating tablet" @@ -3161,7 +3162,7 @@ "Muted, but allow %1$s and %2$s" "Muted, but allow %1$s, %2$s and %3$s" "Messages, events & reminders" - "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you." + "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you." "Finished" "Settings" "No visuals or sound from notifications" @@ -3427,7 +3428,7 @@ "When you enter your PIN to start this device, accessibility services like %1$s won\'t yet be available." "When you enter your pattern to start this device, accessibility services like %1$s won\'t yet be available." "When you enter your password to start this device, accessibility services like %1$s won\'t yet be available." - "Note: After a reboot, this app can\'t start until you unlock your phone" + "Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone" "IMEI information" "IMEI-related information" "(Slot%1$d)" diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml index b1fcba8133dae9b8cfde729e3bfebc48af5555c7..4b76d6e55d8d5a44a39195c72637bc1f746ae08c 100644 --- a/res/values-en-rGB/arrays.xml +++ b/res/values-en-rGB/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push button" "PIN from peer device" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index d36f86f1e6dcb7e0b5f8db967a06f8ec5011ca04..60103346956ffb75561bf844fb9651f8b5049b52 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -854,6 +854,7 @@ "Auto" "2.4 GHz band" "5.0 GHz band" + "5.0 GHz band preferred" "2.4 GHz" "5.0 GHz" "Choose at least one band for Wi‑Fi hotspot:" @@ -1065,7 +1066,7 @@ "Natural" "Boosted" "Saturated" - "Automatic" + "Adaptive" "Use accurate colours only" "Adjust between vivid and accurate colours" "Switch orientation automatically when rotating tablet" @@ -3161,7 +3162,7 @@ "Muted, but allow %1$s and %2$s" "Muted, but allow %1$s, %2$s and %3$s" "Messages, events & reminders" - "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you." + "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you." "Finished" "Settings" "No visuals or sound from notifications" @@ -3427,7 +3428,7 @@ "When you enter your PIN to start this device, accessibility services like %1$s won\'t yet be available." "When you enter your pattern to start this device, accessibility services like %1$s won\'t yet be available." "When you enter your password to start this device, accessibility services like %1$s won\'t yet be available." - "Note: After a reboot, this app can\'t start until you unlock your phone" + "Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone" "IMEI information" "IMEI-related information" "(Slot%1$d)" diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml index b1fcba8133dae9b8cfde729e3bfebc48af5555c7..4b76d6e55d8d5a44a39195c72637bc1f746ae08c 100644 --- a/res/values-en-rIN/arrays.xml +++ b/res/values-en-rIN/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push button" "PIN from peer device" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index d36f86f1e6dcb7e0b5f8db967a06f8ec5011ca04..60103346956ffb75561bf844fb9651f8b5049b52 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -854,6 +854,7 @@ "Auto" "2.4 GHz band" "5.0 GHz band" + "5.0 GHz band preferred" "2.4 GHz" "5.0 GHz" "Choose at least one band for Wi‑Fi hotspot:" @@ -1065,7 +1066,7 @@ "Natural" "Boosted" "Saturated" - "Automatic" + "Adaptive" "Use accurate colours only" "Adjust between vivid and accurate colours" "Switch orientation automatically when rotating tablet" @@ -3161,7 +3162,7 @@ "Muted, but allow %1$s and %2$s" "Muted, but allow %1$s, %2$s and %3$s" "Messages, events & reminders" - "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you." + "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you." "Finished" "Settings" "No visuals or sound from notifications" @@ -3427,7 +3428,7 @@ "When you enter your PIN to start this device, accessibility services like %1$s won\'t yet be available." "When you enter your pattern to start this device, accessibility services like %1$s won\'t yet be available." "When you enter your password to start this device, accessibility services like %1$s won\'t yet be available." - "Note: After a reboot, this app can\'t start until you unlock your phone" + "Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone" "IMEI information" "IMEI-related information" "(Slot%1$d)" diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml index 6c5f6d77496b34752f408c0dd6f3722e40dd4d6c..0bf886534b93d9d8c30d04c4f96381db8e3e9835 100644 --- a/res/values-es-rUS/arrays.xml +++ b/res/values-es-rUS/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Presionar botón" "PIN del dispositivo par" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index b84a8b87781877d2375e4378afc3efc1eb099704..7bdc491c7f853110b6628626baefc808be8b497f 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -518,7 +518,7 @@ "Cambiar pant. bloqueada" "Cambiar/inhab. patrón/PIN/contraseña" "Elige un método para bloquear la pantalla." - "Ninguna" + "Ninguno" "Deslizar" "Sin seguridad" @@ -854,6 +854,7 @@ "Automático" "Banda de 2.4 GHz" "Banda de 5.0 GHz" + "Banda preferida: 5.0 GHz" "2.4 GHz" "5.0 GHz" "Elige al menos una banda para el hotspot de Wi-Fi:" @@ -1065,7 +1066,7 @@ "Naturales" "Mejorados" "Saturados" - "Automático" + "Automático" "Solo usar colores precisos" "Ajustar entre colores vívidos y reales" "Cambiar la orientación automáticamente al girar el tablet" @@ -3161,7 +3162,7 @@ "Silenciar, pero permitir %1$s y %2$s" "Silenciar, pero permitir %1$s, %2$s y %3$s" "Mensajes, eventos y recordatorios" - "Si activas el modo No interrumpir, se silenciarán los mensajes, recordatorios y eventos, excepto los elementos que habilites arriba. Puedes ajustar la configuración de los mensajes para permitir que tus amigos, tu familia y otros contactos se comuniquen contigo." + "Si activas el modo No interrumpir, se silenciarán los mensajes, recordatorios y eventos, excepto los elementos que habilites arriba. También puedes ajustar la configuración de los mensajes para permitir que amigos, familiares y otros contactos se comuniquen contigo." "Listo" "Configuración" "Notificaciones sin sonido ni elementos visuales" @@ -3425,7 +3426,7 @@ "Cuando ingreses el PIN para iniciar el dispositivo, los servicios de accesibilidad, como %1$s, aún no estarán disponibles." "Cuando ingreses el patrón para iniciar el dispositivo, los servicios de accesibilidad, como %1$s, aún no estarán disponibles." "Cuando ingreses la contraseña para iniciar el dispositivo, los servicios de accesibilidad, como %1$s, aún no estarán disponibles." - "Nota: Luego de reiniciar el dispositivo, esta app no podrá iniciarse hasta que desbloquees tu teléfono" + "Nota: Si reinicias el teléfono y tienes configurado un bloqueo de pantalla, no podrá iniciarse la app hasta que lo desbloquees" "Información de IMEI" "Información relacionada con IMEI" "(Ranura %1$d)" @@ -3524,7 +3525,7 @@ "Apps con acceso de uso" "Preferencias de uso de la aplicación" "Tiempo que se usó la app" - "El acceso a los datos de uso permite que una aplicación realice un seguimiento de qué otras aplicaciones usas y de la frecuencia con que las usas, además de conocer tu proveedor, configuración de idioma y otros detalles." + "El acceso a los datos de uso permite que una aplicación controle qué otras aplicaciones utilizas y con qué frecuencia, así como el operador, la configuración de idioma y otros detalles." "Memoria" "Detalles de la memoria" "Siempre en ejecución (%s)" @@ -3629,7 +3630,7 @@ "Frecuencia" "Uso máximo" "No se utilizaron datos." - "¿Quieres que la app %1$s tenga acceso en No interrumpir?" + "¿Quieres que la app %1$s tenga acceso a No interrumpir?" "La aplicación podrá activar y desactivar la función No interrumpir y realizar cambios de configuración relacionados." "Debe seguir activado porque el acceso a las notificaciones está activado" "¿Quieres revocar el acceso de la app %1$s en No interrumpir?" @@ -3647,7 +3648,7 @@ "Aplicaciones" "Mostrar sobre otras apps" "Permitir mostrar sobre otras apps" - "Permite que esta app se muestre sobre otras que estén en uso. Es posible que interfiera con el uso de dichas apps o cambie su apariencia o comportamiento." + "Permite que esta app se muestre sobre otras en uso. Es posible que interfiera con el uso de esas apps o cambie afecte su apariencia o el comportamiento." "rv, procesador de realidad virtual, estéreo, servicio de ayuda" "sistema, alerta, ventana, cuadro de diálogo, mostrar sobre otras apps" "Mostrar sobre otras apps" @@ -3960,7 +3961,7 @@ "Para consultar la hora, los íconos de notificaciones y otros datos, levanta el teléfono." "Para consultar la hora, los íconos de notificaciones y otros datos, levanta la tablet." "Para consultar la hora, los íconos de notificaciones y otros datos, levanta el dispositivo." - "Desliza tu huella para ver notificaciones" + "Deslizar tu huella para ver notificaciones" "Deslizar huella digital" "Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior del teléfono." "Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior de la tablet." diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml index 1e16ab250987fcd74971f5e0df35d91405480013..c5bc52d95fff140dc583a19bc94304a8e175956d 100644 --- a/res/values-es/arrays.xml +++ b/res/values-es/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Botón WPS" "PIN del otro dispositivo" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 7a321a0ad83afa7bd1fdc7a704929edc36638c8e..ed3e7e3ad1c1f5b5928d62ccbe7ed483652b0829 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -198,7 +198,7 @@ "Proxy" "Borrar" "Puerto del proxy" - "Omitir proxy para" + "Saltarproxy para" "Restaurar valores predeterminados" "Ok" "Nombre de host del proxy" @@ -220,7 +220,7 @@ "Servicio de datos:" "Itinerancia:" "IMEI:" - "Desvío de llamada:" + "Desvío de llamadas:" "Número de PPP restablecido desde el inicio:" "Red actual:" "Datos recibidos:" @@ -389,7 +389,7 @@ "Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales" "Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales" "Privacidad" - "Inhabilitada por el administrador" + "Inhabilitado por el administrador" "Estado de seguridad" "Bloqueo de pantalla y huella digital" "Bloqueo de pantalla" @@ -854,6 +854,7 @@ "Automática" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Banda preferida: 5,0 GHz" "2,4 GHz" "5,0 GHz" "Selecciona al menos una banda para el punto de acceso Wi‑Fi:" @@ -972,8 +973,8 @@ "Preferencia de itinerancia" - "Preferir Wi-Fi" - "Preferir datos móviles" + "Dar preferencia a Wi-Fi" + "Dar prioridad a datos móviles" "Solo conexión Wi-Fi" @@ -987,8 +988,8 @@ "0" - "Preferir Wi-Fi" - "Preferir datos móviles" + "Dar preferencia a Wi-Fi" + "Dar prioridad a datos móviles" "Wi-Fi" @@ -1065,7 +1066,7 @@ "Naturales" "Mejorados" "Saturados" - "Automático" + "Automático" "Usar solo colores reales" "Ajustar entre colores vívidos y reales" "Cambiar orientación al girar el tablet" @@ -1099,7 +1100,7 @@ "Programación" "Ninguna" "Activar a una hora personalizada" - "Activar de anochecer a amanecer" + "Activar del anochecer al amanecer" "Hora de inicio" "Hora de finalización" "Estado" @@ -1115,7 +1116,7 @@ "Activar ahora" "Desactivar ahora" "Activar hasta el amanecer" - "Desactivar hasta el atardecer" + "Desactivar hasta el anochecer" "Activar hasta las %1$s" "Desactivar hasta las %1$s" "Suspender después de" @@ -1923,7 +1924,7 @@ "Tiempo de uso" "Accesibilidad" "Ajustes de accesibilidad" - "Lectores de pantalla, pantalla, controles de interacción" + "Lectores de pantalla, pantalla, interacción" "Ajustes de visión" "Personaliza este dispositivo para adaptarlo a tus necesidades. Puedes modificar las funciones de accesibilidad posteriormente en Ajustes." "Cambiar el tamaño de la fuente" @@ -2956,7 +2957,7 @@ "Cuentas" "No se ha añadido ninguna cuenta" "Aplicaciones predeter." - "Idiomas, hora, copias de seguridad y actualizaciones" + "Idioma, hora, copias de seg. y actualizaciones" "Ajustes" "Buscar ajustes" "wifi, wi‑fi, conexión de red, internet, inalámbrica, datos, wi fi" @@ -3161,7 +3162,7 @@ "Silenciados, pero permitir %1$s y %2$s" "Silenciados, permitir %1$s, %2$s y %3$s" "Mensajes, eventos y recordatorios" - "Cuando el modo No molestar esté activado, los mensajes, recordatorios y eventos se silenciarán, excepto los que permitas más arriba. Ajusta la configuración de los mensajes para que tus amigos, familiares u otros puedan contactarte." + "Cuando el modo No molestar esté activado, los mensajes, recordatorios y eventos se silenciarán, excepto los que permitas más arriba. Ajusta la configuración de los mensajes para que tus amigos, familiares u otras personas puedan ponerse en contacto contigo." "Listo" "Ajustes" "Notificaciones sin sonido ni elementos visuales" @@ -3396,7 +3397,7 @@ "Permitir que las notificaciones silenciadas por el modo No molestar activen la pantalla" "Ajustes de notificaciones" "Aceptar" - "Enviar sugerencias sobre el dispositivo" + "Enviar comentarios sobre el dispositivo" "Introducir el PIN del administrador" "Activado" "Desactivado" @@ -3427,7 +3428,7 @@ "Cuando introduzcas tu PIN para iniciar este dispositivo, los servicios de accesibilidad como %1$s aún no estarán disponibles." "Cuando introduzcas tu patrón para iniciar este dispositivo, los servicios de accesibilidad como %1$s aún no estarán disponibles." "Cuando introduzcas tu contraseña para iniciar este dispositivo, los servicios de accesibilidad como %1$s aún no estarán disponibles." - "Nota: Después de reiniciar, tienes que desbloquear el teléfono para que esta aplicación se pueda iniciar" + "Nota: Si reinicias el teléfono y has definido un bloqueo de pantalla, esta aplicación no se podrá iniciar hasta que desbloquees el teléfono" "Información del IMEI" "Información relacionada con el IMEI" "(N.º %1$d)" @@ -3701,7 +3702,7 @@ "Activadas para todas las aplicaciones" "%1$d aplicaciones instaladas" "24 aplicaciones instaladas" - "%1$s usado - %2$s disponible" + "%1$s usado - %2$s disponibles" "Almacenamiento interno: %1$s usado (%2$s disponible)" "Suspender tras %1$s de inactividad" "Fondo de pantalla, suspensión, tamaño de la fuente" @@ -3909,7 +3910,7 @@ "Desactivado" "Conectado a %1$s" "Conectado a varios dispositivos" - "Modo de demostración de IU del sistema" + "Modo de demostración de UI del sistema" "Modo nocturno" "Definir modo nocturno" "Ajustes rápidos de mosaicos de desarrolladores" diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml index cb80200e032cfbd12b401218dd6f6c332b37362f..e774f0ed0608e976b8054da3151b4c3cce964611 100644 --- a/res/values-et/arrays.xml +++ b/res/values-et/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Vajutusnupp" "PIN-kood partnerseadmest" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 5912672563fbf02ef40b9c9a47bb4271f0a25257..c44c5d3ba85a04dcb8c8906b15e34a6150fe40c1 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -854,6 +854,7 @@ "Automaatne" "2,4 GHz riba" "5,0 GHz riba" + "Eelistatud on 5,0 GHz riba" "2,4 GHz" "5,0 GHz" "Valige WiFi-leviala lubamiseks vähemalt üks sagedusriba:" @@ -1065,7 +1066,7 @@ "Loomulikud" "Võimendatud" "Küllastatud" - "Automaatne" + "Kohanduv" "Kasuta ainult täpseid värve" "Eredate ja täpsete värvide vahel kohandamine" "Tahvelarvuti pööramisel automaatselt paigutuse ümberlülitamine" @@ -1095,7 +1096,7 @@ "Heledust optimeeritakse valgustingimuste järgi. Kui funktsioon on sisse lülitatud, saate heledust siiski ajutiselt reguleerida." "Teie ekraanikuva eredust kohandatakse automaatselt teie keskkonna ja tegevuste järgi. Võite liugurit käsitsi liigutada, et aidata kohanduval eredusel teie eelistusi õppida." "Öövalgus" - "Funktsioon Öövalgus toonib ekraani kollaseks. Nii on hämaras ekraani mugavam vaadata ja sellelt teksti lugeda. See võib aidata teil ka hõlpsamini magama jääda." + "Funktsioon Öövalgus toonib ekraani oranžkollaseks. Nii on hämaras ekraani mugavam vaadata ja sellelt teksti lugeda. See võib aidata teil ka hõlpsamini magama jääda." "Ajastamine" "Mitte kunagi" "Lülitub sisse kohandatud ajal" @@ -3161,7 +3162,7 @@ "Vaigistatud, kuid lubatakse %1$s ja %2$s" "Vaigistatud, kuid lubatakse %1$s, %2$s ja %3$s" "Sõnumid, sündmused ja meeldetuletused" - "Kui funktsioon Mitte segada on sisse lülitatud, vaigistatakse sõnumid, meeldetuletused ja sündmused. Teil on võimalik sõnumite seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta." + "Kui funktsioon Mitte segada on sisse lülitatud, vaigistatakse sõnumid, meeldetuletused ja sündmused, välja arvatud teie ülal lubatud üksuste puhul. Võite sõnumite seadeid kohandada, et lubada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta." "Valmis" "Seaded" "Hääletud ja ekraanilt peidetud märguanded" @@ -3427,7 +3428,7 @@ "Kui sisestate PIN-koodi seadme käivitamiseks, siis pole juurdepääsetavusteenused (nagu %1$s) saadaval." "Kui sisestate mustri seadme käivitamiseks, siis pole juurdepääsetavusteenused (nagu %1$s) saadaval." "Kui sisestate parooli seadme käivitamiseks, siis pole juurdepääsetavusteenused (nagu %1$s) saadaval." - "Märkus. Pärast taaskäivitamist ei saa see rakendus käivituda enne, kui olete telefoni avanud" + "Märkus. Kui telefoni taaskäivitate ja määratud on ekraanilukk, ei saa see rakendus käivituda enne, kui olete telefoni avanud" "IMEI teave" "IMEI suhteline teave" "(%1$d. pesa)" @@ -3631,7 +3632,7 @@ "Sagedus" "Maksimaalne kasutus" "Andmeid pole kasutatud" - "Kas lubada rakenduse %1$s juurdepääs funktsioonile Mitte segada?" + "Rakenduse %1$s juurdepääs funktsioonile Mitte segada" "Rakendus saab funktsiooni Mitte segada sisse/välja lülitada ja muuta sellega seotud seadeid." "Peab jääma sisselülitatud asendisse, kuna juurdepääs märguannetele on sisse lülitatud" "Kas tühistada rakenduse %1$s juurdepääs režiimile Mitte segada?" diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml index 64b900e375151c1759df9cfff2536a091a18e4f0..83e00496bc94728c7dce6f1b23f12bcb47929612 100644 --- a/res/values-eu/arrays.xml +++ b/res/values-eu/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Sakatu botoia" "Pareko gailuaren PINa" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index b3154299e313f063c2d9a6837eb5417c0ddbd16d..faef3782a54c22c73b8f2b745de8dd07871b4a4b 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -854,6 +854,7 @@ "Automatikoa" "2,4 GHz-ko banda" "5,0 GHz-ko banda" + "5,0 GHz-ko banda hobetsia" "2,4 GHz" "5,0 GHz" "Aukeratu gutxienez banda bat Wi-Fi sare publikorako:" @@ -1065,7 +1066,7 @@ "Naturalak" "Nabarmenduak" "Saturatuak" - "Automatikoa" + "Doigarria" "Erabili kolore errealistak soilik" "Doitu kolore bizi eta errealisten artean" "Aldatu orientazioa automatikoki tableta biratzean" @@ -1096,7 +1097,7 @@ "Pantailaren distira automatikoki doituko da inguruneko argiaren eta egiten ari zarenaren arabera. Eskuz aldatu nahi baduzu distira, mugitu graduatzailea distira doigarriak zure hobespenak ikas ditzan." "Gaueko argia" "Gaueko argiak tindu horikaraz janzten du pantaila. Horrela, ez zaizu horren nekagarria egingo argi gutxirekin pantailari begira egotea eta errazago hartuko duzu lo, gainera." - "Programazioa" + "Ordutegia" "Bat ere ez" "Ordu jakinetan aktibatzen da" "Iluntzetik egunsentira aktibatzen da" @@ -1116,8 +1117,8 @@ "Desaktibatu" "Aktibatu egunsentira arte" "Desaktibatu ilunabarrera arte" - "Aktibatu %1$s arte" - "Desaktibatu %1$s arte" + "Aktibatu %1$s(a)k arte" + "Desaktibatu %1$s(a)k arte" "Ezarri egonean moduan" "Pantaila itzaltzen da" "%1$s inaktibo egon ondoren" @@ -1351,11 +1352,11 @@ "^1 formateatzen…" "Formateatzen ari den bitartean, ez kendu ^1." "Eraman datuak memoria berrira" - "Argazkiak, fitxategiak eta zenbait aplikazio ekar ditzakezu ^1 memoria-unitate berrira. \n\nTransferentzia-prozesuak ^2 irauten du gutxi gorabehera, eta ^3 askatuko ditu barneko memoriatik. Aplikazio batzuek ez dute funtzionatuko transferentzia egiten ari den bitartean." + "Argazkiak, fitxategiak eta zenbait aplikazio ekar ditzakezu ^1 memoria-unitate berrira. \n\nTransferentzia-prozesuak ^2 irauten du gutxi gorabehera, eta barneko memorian ^3 utziko dira libre. Aplikazio batzuek ez dute funtzionatuko transferentzia egiten ari den bitartean." "Mugitu orain" "Mugitu geroago" "Mugitu datuak" - "^1 inguru beharko dira datuak migratzeko. ^2 askatuko ditu ^3 gailutik." + "^1 inguru beharko dira datuak migratzeko. ^3 gailuan ^2 utziko dira libre." "Mugitu" "Datuak mugitzen…" "Transferentzia egiten den bitartean: \n• Ez kendu ^1 memoria. \n• Aplikazio batzuek ez dute ongi funtzionatuko. \n• Gailuak kargatuta egon behar du." @@ -3161,7 +3162,7 @@ "Audioa eta dardara desaktibatuta, baina baimendu %1$s eta %2$s" "Audioa eta dardara desaktibatuta, baina baimendu %1$s, %2$s eta %3$s" "Mezuak, gertaerak eta abisuak" - "\"Ez molestatu\" modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen." + "\"Ez molestatu\" modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen." "Eginda" "Ezarpenak" "Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean" @@ -3427,7 +3428,7 @@ "Gailua abiarazteko PIN kodea idazten duzunean, %1$s bezalako erabilerraztasun-zerbitzuak ez dira erabilgarri egongo oraindik." "Gailua abiarazteko eredua marrazten duzunean, %1$s bezalako erabilerraztasun-zerbitzuak ez dira erabilgarri egongo oraindik." "Gailua abiarazteko pasahitza idazten duzunean, %1$s bezalako erabilerraztasun-zerbitzuak ez dira erabilgarri egongo oraindik." - "Oharra: berrabiarazi ondoren, ezin izango da abiarazi aplikazio hau telefonoa desblokeatzen duzun arte" + "Oharra: telefonoa berrabiarazten baduzu eta pantailaren blokeoa ezarrita badaukazu, ezin izango da abiarazi aplikazio hau telefonoa desblokeatzen duzun arte" "IMEIari buruzko informazioa" "IMEIari buruzko informazioa" "(%1$d. zirrikitua)" @@ -3631,8 +3632,8 @@ "Maiztasuna" "Gehieneko erabilera" "Ez da erabili daturik" - "%1$s aplikazioari \"Ez molestatu\" egoerarako sarbidea baimendu nahi diozu?" - "Aplikazioak \"Ez molestatu\" egoera aktibatu eta desaktibatu ahal izango du, eta horrekin erlazionatutako ezarpenetan aldaketak egin ahal izango ditu." + "%1$s aplikazioari \"Ez molestatu\" modurako sarbidea eman?" + "Aplikazioak \"Ez molestatu\" egoera aktibatu eta desaktibatu ahal izango du, eta erlazionatutako ezarpenetan aldaketak egin ahal izango ditu." "Aktibatuta egon behar du, jakinarazpenetarako sarbidea aktibatuta dagoelako" "Ez molestatzeko arauetarako sarbidea kendu nahi diozu %1$s aplikazioari?" "Kendu egingo dira aplikazioak sortu dituen ez molestatzeko arau guztiak." @@ -3952,11 +3953,11 @@ "Aplikazioz aldatzeko, pasatu hatza gora Hasiera botoian, eta pasa ezazu berriro aplikazio guztiak ikusteko. Edozein pantailatan funtzionatzen du. Jada ez dago ikuspegi orokorraren botoia pantailaren behealdean eskuinetara." "Probatu Hasiera botoi berria" "Aktibatu aplikazioz aldatzeko keinu berria" - "Sakatu birritan telefonoa bertan dagoela ikusteko" + "Sakatu birritan telefonoa bertan dagoena ikusteko" "Sakatu birritan tableta bertan dagoela ikusteko" "Sakatu birritan gailua bertan dagoela ikusteko" "Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, sakatu pantaila birritan." - "Jaso telefonoa bertan dagoela ikusteko" + "Jaso telefonoa bertan dagoena ikusteko" "Jaso tableta bertan dagoela ikusteko" "Jaso gailua bertan dagoela ikusteko" "Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, hartu telefonoa." diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml index 94ae20125c6e44bd9724ede5bd4d9a9061d56939..5f4c751f9a0f003c2622ba17131b575b3509d39a 100644 --- a/res/values-fa/arrays.xml +++ b/res/values-fa/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "فشار دکمه" "پین از دستگاه مرتبط شده" @@ -300,7 +294,7 @@ "نمایش تست" "فرستادن رسانه" "‏فعال کردن VPN" - "نوشتن کاغذدیواری" + "نوشتن تصویرزمینه" "ساختار دستیار" "عکس‌ صفحه‌نمایش دستیار" "خواندن وضعیت تلفن" @@ -367,7 +361,7 @@ "نمایش تست" "فرستادن رسانه" "‏فعال کردن VPN" - "نوشتن کاغذدیواری" + "نوشتن تصویرزمینه" "ساختار دستیار" "عکس‌ صفحه‌نمایش دستیار" "خواندن وضعیت تلفن" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 55aeef3a5ad72f7cc012cd4ee53108748b7e835b..c2c9b62b64158b0f57d1f8d03bf8364b621c01d9 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -854,6 +854,7 @@ "خودکار" "باند ۲٫۴ گیگاهرتزی" "باند ۵٫۰ گیگاهرتزی" + "نوار ۵٫۰ گیگاهرتز اولویت دارد" "۲٫۴ گیگاهرتز" "۵٫۰ گیگاهرتز" "‏حداقل یک باند برای نقطه اتصال Wi‑Fi انتخاب کنید:" @@ -1065,7 +1066,7 @@ "طبیعی" "تقویت‌شده" "اشباع‌شده" - "خودکار" + "قابل تطبیق" "فقط استفاده از رنگ‌های دقیق" "تنظیم بین رنگ‌های روشن و دقیق" "هنگام چرخاندن رایانهٔ لوحی، جهت به‌طور خودکار تغییر می‌کند" @@ -1121,12 +1122,12 @@ "حالت خواب" "صفحه نمایش خاموش می‌شود" "%1$s پس از غیرفعال بودن" - "کاغذدیواری" + "تصویرزمینه" "پیش‌فرض" "سفارشی" - "تغییر کاغذدیواری" + "تغییر تصویرزمینه" "شخصی‌سازی صفحه‌نمایش" - "انتخاب کاغذدیواری از" + "انتخاب تصویرزمینه از" "محافظ صفحه" "هنگام شارژ یا اتصال به پایه" "هر دو" @@ -1945,7 +1946,7 @@ "برای بزرگ‌نمایی، ۳ بار ضربه بزنید" "برای بزرگ‌نمایی، روی دکمه‌ای ضربه بزنید" "برای بزرگ کردن""، ۳ ضربه سریع روی صفحه بزنید.\n"
    • "برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید"
      • \n
    • "برای تنظیم بزرگ‌نمایی، دو یا چند انگشتتان را نزدیک یا دور کنید"
    \n\n"برای بزرگ‌نمایی موقت""، ۳ ضربه سریع روی صفحه بزنید و ضربه سوم انگشتتان را نگه‌دارید.\n"
    • "برای حرکت در صفحه، روی صفحه بکشید"
      • \n
    • "برای کوچک کردن صفحه، انگشتتان را بردارید"
    \n\n"برای بزرگ کردن صفحه، نمی‌توانید از صفحه‌کلید و نواز پیمایش استفاده کنید."     - "زمانی‌که درشت‌نمایی روشن است، برای درشت‌نمایی سریع از دکمه «دسترس‌پذیری» در پایین صفحه استفاده کنید.\n\n""برای بزرگ‌نمایی""، روی دکمه «دسترس‌پذیری» ضربه بزنید، سپس روی جایی از صفحه ضربه بزنید.\n"
    • "برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید"
      • \n
    • "برای تنظیم بزرگ‌نمایی، دو یا چند انگشتتان را نزدیک یا دور کنید"
    \n\n"برای بزرگ‌نمایی موقت""، روی دکمه «دسترس‌پذیری» ضربه بزنید، سپس جایی از صفحه را لمس کنید و نگه‌دارید.\n"
    • "برای حرکت در صفحه، روی آن بکشید"
      • \n
    • "برای کوچک کردن صفحه، انگشتتان را بلند کنید"
    \n\n"برای بزرگ کردن صفحه، نمی‌توانید از صفحه‌کلید یا نوار پیمایش استفاده کنید."     + "زمانی‌که درشت‌نمایی روشن است، برای درشت‌نمایی سریع از دکمه «دسترس‌پذیری» در پایین صفحه استفاده کنید.\n\n""برای بزرگ‌نمایی""، روی دکمه «دسترس‌پذیری» ضربه بزنید، سپس روی جایی از صفحه ضربه بزنید.\n"
    • "برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید"
      • \n
    • "برای تنظیم بزرگ‌نمایی، دو یا چند انگشتتان را نزدیک یا دور کنید"
    \n\n"برای بزرگ‌نمایی موقت""، روی دکمه «دسترس‌پذیری» ضربه بزنید، سپس جایی از صفحه را لمس کنید و نگه‌دارید.\n"
    • "برای حرکت در صفحه، روی آن بکشید"
      • \n
    • "برای دورنمایی، انگشتتان را بلند کنید"
    \n\n"برای نزدیک‌نمایی، نمی‌توانید از صفحه‌کلید یا نوار پیمایش استفاده کنید."     "دکمه دسترس‌پذیری روی %1$s تنظیم شده است. برای استفاده از درشت‌نمایی، دکمه دسترس‌پذیری را لمس کنید و نگه‌دارید، سپس درشت‌نمایی را انتخاب کنید." "میان‌بر کلید بلندی صدا" "سرویس میان‌بر" @@ -2784,7 +2785,7 @@ "کاربر" "نمایه محدود شده" "کاربر جدیدی اضافه می‌کنید؟" - "‏می‌توانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود دارد و می‌تواند این فضا را با برنامه‌ها، کاغذدیواری و موارد دیگر سفارشی کند. کاربران همچنین می‌توانند تنظیماتی را در دستگاه ایجاد کنند که بر همه کاربرها تأثیر می‌گذارد، مانند Wi-Fi.\n\nوقتی کاربری جدید اضافه می‌کنید، آن شخص باید فضای خودش را تنظیم کند.\n\nهر کاربر می‌تواند برنامه‌ها را برای سایر کاربران به‌روزرسانی کند. دسترس‌پذیری، تنظیمات و سرویس‌ها قابل انتقال به کاربر جدید نیستند." + "‏می‌توانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود دارد و می‌تواند این فضا را با برنامه‌ها، تصویرزمینه و موارد دیگر سفارشی کند. کاربران همچنین می‌توانند تنظیماتی را در دستگاه ایجاد کنند که بر همه کاربرها تأثیر می‌گذارد، مانند Wi-Fi.\n\nوقتی کاربری جدید اضافه می‌کنید، آن شخص باید فضای خودش را تنظیم کند.\n\nهر کاربر می‌تواند برنامه‌ها را برای سایر کاربران به‌روزرسانی کند. دسترس‌پذیری، تنظیمات و سرویس‌ها قابل انتقال به کاربر جدید نیستند." "وقتی کاربر جدیدی اضافه می‌کنید آن فرد باید فضای خودش را تنظیم کند.\n\nهر کاربری می‌تواند برنامه‌ها را برای همه کاربران دیگر به‌روزرسانی کند." "هم اکنون کاربر تنظیم شود؟" "مطمئن شوید شخص در دسترس است تا دستگاه را بگیرد و فضایش را تنظیم کند" @@ -3161,7 +3162,7 @@ "صامت شده است، اما %1$s و %2$s را مجاز کنید" "صامت شده است، اما %1$s، %2$s و %3$s را مجاز کنید" "پیام‌ها، رویدادها و یادآوری‌ها" - "وقتی «مزاحم نشوید» روشن است، به‌جز مواردی که در بالا مجاز می‌کنید، پیام‌ها، یادآوری‌ها و رویدادها صامت می‌شوند. می‌توانید تنظیمات پیام را به‌گونه‌ای انجام دهید که دوستانتان، خانواده یا سایر مخاطبین بتوانند به شما دسترسی پیدا کنند." + "وقتی «مزاحم نشوید» روشن باشد، به‌جز مواردی که در بالا مجاز می‌کنید، پیام‌ها، یادآوری‌ها و رویدادها صامت خواهند شد. می‌توانید تنظیمات پیام‌ها را به‌گونه‌ای انجام دهید که دوستان، خانواده یا سایر مخاطبینتان بتوانند به شما دسترسی پیدا کنند." "تمام" "تنظیمات" "بدون تصویر یا صدای اعلان‌ها" @@ -3427,7 +3428,7 @@ "هنگامی که برای راه‌اندازی این دستگاه، پین خودتان را وارد می‌کنید، سرویس‌های دسترس‌پذیری مانند %1$s هنوز در دسترس نیستند." "هنگامی که برای راه‌اندازی این دستگاه، الگویتان را وارد می‌کنید، سرویس‌های دسترس‌پذیری مانند %1$s هنوز در دسترس نیستند." "هنگامی که برای راه‌اندازی این دستگاه، گذرواژه‌تان را وارد می‌کنید، سرویس‌های دسترس‌پذیری مانند %1$s هنوز در دسترس نیستند." - "توجه: بعد از راه‌اندازی تا زمانی‌که قفل تلفنتان را باز نکنید، این برنامه نمی‌تواند شروع شود" + "توجه: اگر تلفن را بازراه‌اندازی کنید و قفل صفحه تنظیم کرده باشید، تا قفل تلفن را باز نکنید، این برنامه نمی‌تواند شروع به کار کند" "‏اطلاعات IMEI" "‏اطلاعات مربوط به IMEI" "(شکاف%1$d)" @@ -3704,7 +3705,7 @@ "%1$s استفاده‌شده - %2$s آزاد" "فضای ذخیره‌سازی داخلی: %1$s استفاده‌شده - %2$s آزاد" "خواب پس از %1$s عدم فعالیت" - "کاغذدیواری، حالت خواب، اندازه قلم" + "تصویرزمینه، حالت خواب، اندازه قلم" "خواب پس از ۱۰ دقیقه عدم فعالیت" "به‌طور متوسط %1$s از %2$s حافظه استفاده شده است" "واردشده به سیستم با %1$s" @@ -3945,14 +3946,14 @@ "رفتن به دوربین" "برای باز کردن سریع دوربین، دکمه روشن/خاموش را دو بار فشار دهید. در همه صفحه‌ها کار می‌کند." "باز کردن سریع دوربین" - "چرخش دوربین" + "چرخاندن دوربین" "سریع‌تر گرفتن خودگرفت" "تند بالا کشیدن انگشتان روی دکمه اصلی" "برای تغییر برنامه‌ها انگشتتان را روی دکمه اصلی به بالا تند بکشید. برای دیدن همه برنامه‌ها، انگشتتان را دوباره تند به بالا بکشید. دیگردر سمت چپ پایین صفحه‌نمایشتان، دکمه نمای کلی ندارید." "دکمه صفحه اصلی جدید را امتحان کنید" "برای تغییر برنامه‌ها، اشاره جدید را روشن کنید" - "برای بررسی تلفن، دو ضربه سریع بزنید" + "دو ضربه سریع برای بررسی تلفن" "برای بررسی رایانه لوحی، دو ضربه سریع بزنید" "برای بررسی دستگاه، دو ضربه سریع بزنید" "برای بررسی زمان، نمادهای اعلان و سایر اطلاعات، روی صفحه‌نمایش دو ضربه سریع بزنید." @@ -4085,7 +4086,7 @@ "طرح‌ زمینه‌ رنگی" "پیش‌فرض" "طرح زمینه دستگاه" - "خودکار (براساس کاغذدیواری)" + "خودکار (براساس تصویرزمینه)" "روشن" "تیره" "نام شبکه" diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml index 92d2647dadc13ba2fadd05ad805289a59361157a..e4218bae8901046f04a874490ffaf317553d19fc 100644 --- a/res/values-fi/arrays.xml +++ b/res/values-fi/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD"     - - - - - - "Paina painiketta" "Vertaislaitteen PIN-koodi" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index d63a85e1d3c77853b182d3eb4436021a1d678e19..d9dadca5d274026e0e2537b9b132e0ebb89b940a 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -854,6 +854,7 @@ "Automaattinen" "2,4 GHz:n taajuus" "5,0 GHz:n taajuus" + "5,0 GHz:n taajuus ensisijainen" "2,4 GHz" "5,0 GHz" "Valitse vähintään yksi kaista Wi‑Fi-hotspotille:" @@ -964,7 +965,7 @@ "Ei käytettävissä, koska lentokonetila on päällä" "Wi-Fi-puhelut" "Laajenna puhelumahdollisuuksia Wi‑Fillä" - "Paranna kattavuutta ottamalla Wi-Fi-puhelut käyttöön" + "Paranna tavoittavuutta ottamalla Wi-Fi-puhelut käyttöön" "Puheluasetus" "Wi-Fi-puhelutila" "Roaming-asetus" @@ -1065,7 +1066,7 @@ "Luonnollinen" "Tehostettu" "Kylläinen" - "Automaattinen" + "Mukautuva" "Käytä vain todenmukaisia värejä" "Vaihtele kirkkaiden ja todenmukaisten värien välillä" "Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään" @@ -1114,10 +1115,10 @@ "Sammuu automaattisesti, kun aurinko nousee" "Ota käyttöön nyt" "Poista käytöstä nyt" - "Käytössä auringonnousuun saakka" + "Käytössä auringonnousuun asti" "Pois käytöstä auringonlaskuun asti" - "Poista käytöstä %1$s asti" - "Poista käytöstä %1$s asti" + "Käytössä %1$s asti" + "Pois käytöstä %1$s asti" "Siirtyminen virransäästöön" "Näyttö sammuu" "Laitteen oltua käyttämättä: %1$s" @@ -3161,7 +3162,7 @@ "Mykistä, salli %1$s ja %2$s" "Mykistä, salli %1$s, %2$s ja %3$s" "Viestit, tapahtumat ja muistutukset" - "Älä häiritse ‑tilassa viestit, muistutukset ja tapahtumat mykistetään yllä määritettyjä poikkeuksia lukuun ottamatta. Voit määrittää viestiasetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden." + "Älä häiritse ‑tilassa viestit, muistutukset ja tapahtumat mykistetään yllä määritettyjä poikkeuksia lukuun ottamatta. Voit määrittää viestiasetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden." "Valmis" "Asetukset" "Ei ilmoitusgrafiikoita tai ‑ääntä" @@ -3427,7 +3428,7 @@ "Kun annat PIN-koodisi käynnistääksesi tämän laitteen, käytettävyyspalvelut, kuten %1$s, eivät ole vielä käytettävissä." "Kun annat mallin käynnistääksesi tämän laitteen, käytettävyyspalvelut, kuten %1$s, eivät ole vielä käytettävissä." "Kun annat salasanasi käynnistääksesi tämän laitteen, käytettävyyspalvelut, kuten %1$s, eivät ole vielä käytettävissä." - "Huom. Jotta voit käynnistää tämän sovelluksen uudelleenkäynnistyksen jälkeen, sinun täytyy avata puhelimen lukitus." + "Huom. Jos käynnistät puhelimen uudelleen ja näytön lukitus on käytössä, sovellus voi käynnistyä vasta avattuasi lukituksen." "IMEI-koodin tiedot" "IMEI-koodiin liittyvät tiedot" "(Paikka %1$d)" diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml index e780c68eb776b7cb6f821cf3184c7a6be5c09e85..7d619ea96b3e7b4631147876baad2c7b7b037a30 100644 --- a/res/values-fr-rCA/arrays.xml +++ b/res/values-fr-rCA/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Bouton de commande" "NIP de l\'appareil associé" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 30fb08c1b9e907ea50a01a04b91c87c7c88bbdab..4fe5de5daccc321cdc3acac9fff2f245aca4ac69 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -29,7 +29,7 @@ Plus que %1$d étapes pour devenir un développeur.     "Vous êtes désormais un développeur!" - "Inuti, vous êtes déjà un développeur." + "Inutile, vous êtes déjà un concepteur." "Veuillez d\'abord activer les options pour les concepteurs" "Sans fil et réseaux" "Connexions" @@ -854,6 +854,7 @@ "Auto" "Bande de 2,4 GHz" "Bande de 5 GHz" + "Préférer la bande de 5,0 GHz" "2,4 GHz" "5 GHz" "Choisissez au moins une bande pour le point d\'accès Wi-Fi :" @@ -972,7 +973,7 @@ "Préférences d\'itinérance" - "Réseau Wi-Fi de préférence" + "Connexion Wi-Fi de préférence" "Connexion cellulaire de préférence" "Wi-Fi seulement" @@ -1065,7 +1066,7 @@ "Naturelles" "Intenses" "Saturées" - "Automatique" + "Adaptatif" "Utiliser uniquement les couleurs précises" "Ajuster entre les couleurs vives et précises" "Changer automatiquement d\'orientation lors de la rotation de la tablette" @@ -3161,7 +3162,7 @@ "Désactivés, mais autoriser : %1$s et %2$s" "Désactivés, mais autoriser : %1$s, %2$s et %3$s" "Messages, événements et rappels" - "Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez régler les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre." + "Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez régler les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre." "OK" "Paramètres" "Aucun élément visuel ni son provenant des notifications" @@ -3427,7 +3428,7 @@ "Lorsque vous entrez votre NIP pour démarrer cet appareil, les services d\'accessibilité comme %1$s ne seront pas accessibles immédiatement." "Lorsque vous entrez votre schéma pour démarrer cet appareil, les services d\'accessibilité comme %1$s ne seront pas accessibles immédiatement." "Lorsque vous entrez votre mot de passe pour démarrer cet appareil, les services d\'accessibilité comme %1$s ne seront pas accessibles immédiatement." - "Remarque : Après un redémarrage, vous ne pouvez pas lancer cette application tant que vous n\'avez pas déverrouillé votre téléphone." + "Remarque : Si vous redémarrez votre téléphone et que vous avez défini un verrouillage de l\'écran, cette application ne peut pas démarrer tant que vous n\'avez pas déverrouillé votre téléphone" "Information concernant le code IIEM" "Information concernant le code IIEM" "(Fente %1$d)" @@ -3979,7 +3980,7 @@ "Applications instantanées" "Ouvrir les liens dans les applications, même si elles ne sont pas installées" "Applications instantanées" - "Préférences des applications instantanées" + "Préf. applis instantanées" "Applications installées" "Votre espace de stockage est maintenant géré par le gestionnaire de stockage" "Comptes pour %1$s" diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml index c991c73d337b4986d33387ba68874739d1359435..2811cc43e8c4e8ebcb06e83b1ec015dc8a09ff83 100644 --- a/res/values-fr/arrays.xml +++ b/res/values-fr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Appuyer sur le bouton" "Code de l\'appareil associé" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index e18d8c99c23f17ba382f176907b682d571565edf..45a90f0d627886c812b4668610542e550443cf3c 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -114,7 +114,7 @@ "Votre appareil va se déconnecter de \"%1$s\"." "Déconnecter" "Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth." - "Associer nouvel app." + "Associer un appareil" "Lorsque le Bluetooth est activé, votre %1$s est visible par les appareils à proximité." "Adresse Bluetooth du téléphone : %1$s" "Adresse Bluetooth de la tablette : %1$s" @@ -367,7 +367,7 @@ "Message sur écran verrouillé" "Activer les widgets" "Désactivé par l\'administrateur" - "Afficher l\'option de verrouillage" + "Afficher l\'option de blocage" "Afficher l\'option du bouton Marche/Arrêt, qui désactive la fonctionnalité Smart Lock, le déverrouillage à l\'aide d\'une empreinte numérique et les notifications sur l\'écran de verrouillage" "Aucun" "%1$d/%2$d" @@ -854,6 +854,7 @@ "Automatique" "Bande 2,4 GHz" "Bande 5 GHz" + "Bande 5 GHz de préférence" "2,4 GHz" "5 GHz" "Sélectionnez au moins une bande pour le point d\'accès Wi-Fi :" @@ -972,7 +973,7 @@ "Préférences en matière d\'itinérance" - "Wi-Fi préféré" + "Wi-Fi de préférence" "Priorité au mobile" "Wi-Fi uniquement" @@ -1065,7 +1066,7 @@ "Naturel" "Contrasté" "Saturé" - "Automatique" + "Adaptatif" "N\'utiliser que des couleurs proches de la réalité" "Ajuster entre les couleurs vives et proches de la réalité" "Changer automatiquement d\'orientation lors de la rotation de la tablette" @@ -1098,7 +1099,7 @@ "L\'éclairage nocturne colore votre écran en rouge ambré. Cela vous permet de le regarder ou de lire plus facilement lorsque l\'éclairage est faible, et peut vous aider à vous endormir." "Programme" "Aucun" - "S\'active à partir d\'une certaine heure" + "Actif à une heure définie" "Actif toute la nuit" "Heure de début" "Heure de fin" @@ -1369,20 +1370,20 @@ "Ne retirez pas la mémoire de stockage \"^1\" pendant le déplacement. \n\nL\'application \"^2\" ne sera pas disponible jusqu\'à la fin de l\'opération." "Annuler le déplacement" "Ce ^1 ne semble pas rapide. \n\nVous pouvez continuer, mais les applis déplacées vers cet emplacement risquent de se bloquer et les transferts de données pourront prendre du temps. \n\nVeuillez utiliser un ^1 plus rapide pour de meilleures performances." - "Comment utiliserez-vous ^1 ?" + "Comment utiliserez-vous ce support (^1) ?" "Utiliser en stockage tabl. supp." - "Pour applis/fichiers/contenus multimédias sur cette tabl. uniq." + "Pour les applis, fichiers, contenus multimédias sur cette tablette uniquement" "Stockage sur la tablette" - "Utiliser en stockage tél. supp." - "Pour applis/fichiers/contenus multimédias sur ce tél. uniquement" + "Stockage supplémentaire sur le téléphone" + "Pour les applis, fichiers, contenus multimédias sur ce téléphone uniquement" "Stockage sur le téléphone" "Ou" - "Utiliser comme mémoire externe" - "Pour transférer fichiers/contenus multimédias entre appareils" - "Périphérique de stockage externe" + "Stockage externe" + "Pour transférer des fichiers et contenus multimédias entre des appareils" + "Stockage externe" "Configurer plus tard" - "Formater le périphérique ^1 ?" - "Le périphérique ^1 doit être formaté pour stocker des applications, des fichiers et des contenus multimédias. \n\nNotez que le formatage effacera le contenu actuel de \"^2\". Pour éviter toute perte de contenu, sauvegardez-le sur un autre périphérique ^3 ou sur un autre appareil." + "Formater le support (^1) ?" + "Le support (^1) doit être formaté pour stocker des applications, des fichiers et des contenus multimédias. \n\nNotez que le formatage effacera le contenu actuel du support (^2). Pour éviter toute perte de contenu, sauvegardez-le sur un autre support (^3) ou sur un autre appareil." "Formater ^1" "Déplacer le contenu vers ^1 ?" "Vous pouvez déplacer des fichiers, des contenus multimédias et certains applications vers le périphérique ^1. \n\nCette opération permet de libérer jusqu\'à ^2 sur votre tablette et dure environ ^3." @@ -1971,7 +1972,7 @@ "Utiliser le service" "Corriger les couleurs" "Utiliser les sous-titres" - "Appareil auditif" + "Appareils auditifs" "Aucun appareil auditif associé" "Ajouter un appareil auditif" "Pour associer votre appareil auditif, recherchez-le et appuyez dessus sur l\'écran suivant." @@ -2435,7 +2436,7 @@ "Stockage des identifiants activé" "Avant de pouvoir utiliser le stockage des identifiants, vous devez définir un écran de verrouillage sécurisé sur votre appareil" "DÉFINIR VERROUILLAGE" - "Applis avec accès données util." + "Applis avec accès données conso" "Signal de numérotation d\'urgence" "Définir le comportement en cas d\'appel d\'urgence" "Sauvegarde" @@ -2565,7 +2566,7 @@ "%1$d fichiers sélectionnés sur %2$d" "%1$s sur %2$s" "Tout sélectionner" - "Conso. des données" + "Conso des données" "Conso données" "Le suivi de la consommation effectué par votre opérateur peut différer de celui de votre appareil." "Consommation par application" @@ -2944,7 +2945,7 @@ "Réduire" "Réseau et Internet" "mobile" - "conso. des données" + "conso des données" "point d\'accès" "Appareils connectés" "Bluetooth, mode Voiture, NFC" @@ -3052,7 +3053,7 @@ "Autres sons" "Tonalités du numéroteur" "Sons du verrouillage d\'écran" - "Sons de rechargement" + "Sons de recharge" "Sons de la station d\'accueil" "Sons des touches" "Vibreur pour le toucher" @@ -3161,7 +3162,7 @@ "Son coupé, sauf pour les %1$s et %2$s" "Son coupé, sauf pour les %1$s, %2$s et %3$s" "Messages, événements et rappels" - "Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez ajuster les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre." + "Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez ajuster les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre." "OK" "Paramètres" "Aucune notification visuelle ni sonore" @@ -3427,7 +3428,7 @@ "Lorsque vous saisissez votre code PIN pour démarrer cet appareil, les services d\'accessibilité comme %1$s ne sont pas disponibles." "Lorsque vous dessinez votre schéma pour démarrer cet appareil, les services d\'accessibilité comme %1$s ne sont pas disponibles." "Lorsque vous saisissez votre mot de passe pour démarrer cet appareil, les services d\'accessibilité comme %1$s ne sont pas disponibles." - "Remarque : Après un redémarrage, vous ne pouvez pas lancer cette application tant que vous n\'avez pas déverrouillé votre téléphone." + "Remarque : Si vous redémarrez votre téléphone et que le verrouillage de l\'écran est activé, vous ne pouvez pas lancer cette application tant que vous n\'avez pas déverrouillé votre téléphone" "Informations sur le code IMEI" "Informations relatives au code IMEI" "(Emplacement %1$d)" @@ -3522,7 +3523,7 @@ "(Système)" "(Paramètres par défaut)" "Volume occupé par appli" - "Accès aux données d\'utilisation" + "Accès à la conso des données" "Autoriser l\'accès aux données d\'utilisation" "Préférences d\'utilisation de l\'application" "Temps passé sur l\'application" @@ -3591,8 +3592,8 @@ "Cet appareil" "Changement…" "Échec du changement" - "Rechargement de l\'appareil" - "Rechargement de l\'appareil connecté" + "Recharge de l\'appareil" + "Recharge de l\'appareil connecté" "Transfert de fichiers" "Partage de connexion via USB" "PTP" @@ -3776,7 +3777,7 @@ "Mises à jour automatiques du système" "Appliquer les mises à jour au démarrage de l\'appareil" "Consommation" - "Conso. données mobiles" + "Conso des données mobiles" "Consommation de données des applications" "Consommation des données Wi-Fi" "Consommation de données Ethernet" @@ -3836,7 +3837,7 @@ "Activé" "Désactivé" "Utiliser l\'économiseur de données" - "Conso. données non restreinte" + "Conso données non restreinte" "Autoriser l\'accès non restreint aux données lorsque l\'économiseur de données est activé" "Application sur la page d\'accueil" "Aucune page d\'accueil par défaut" @@ -4095,7 +4096,7 @@ "Activé" "Appli instantanée" "Désactiver le gestionnaire d\'espace de stockage ?" - "Applications defilms et TV" + "Applications de films et TV" "Informations de gestion des comptes opérateur" "Déclencher la gestion des comptes opérateur" "Mettre à jour le mode Ne pas déranger" diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml index d994d74df0bd9b270506d61fd12c59ed83ffc151..0e4b5ba90a3c2b8b7de04590ca65159b8cc1a522 100644 --- a/res/values-gl/arrays.xml +++ b/res/values-gl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pulsar o botón" "PIN do dispositivo mesmo nivel" @@ -296,7 +290,7 @@ "supervisar a localización" "supervisar localización de alta potencia" "obter estatísticas de uso" - "desactivar/activar o micrófono" + "desactivar/activar o son do micrófono" "mostrar notificación emerxente" "multimedia do proxecto" "activar VPN" @@ -363,7 +357,7 @@ "Localización" "Localización" "Obter estatísticas de uso" - "Desactivar/activar o micrófono" + "Desactivar/activar o son do micrófono" "Mostrar notificación emerxente" "Multimedia do proxecto" "Activar VPN" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index dd2b0a75e64c66db3c2bf3ce3241eb1c842daa05..09f390a7126b87c15c810ba57cc746ef8e49b8af 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -854,6 +854,7 @@ "Automática" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Banda de 5,0 GHz preferida" "2,4 GHz" "5,0 GHz" "Selecciona polo menos unha banda para a zona wifi:" @@ -966,7 +967,7 @@ "Amplía as chamadas coa wifi" "Activa as chamadas por wifi para ampliar a cobertura" "Preferencia de chamada" - "Modo de chamadas wifi" + "Modo de chamadas por wifi" "Preferencia de itinerancia" @@ -998,7 +999,7 @@ "2" "1" - "Cando están activadas as chamadas wifi, o teu teléfono pode enviar as túas chamadas a través de redes wifi ou da rede do teu operador, dependendo das túas preferencias e de cal teña o sinal máis forte. Antes de activar esta función, consulta co teu operador as tarifas e outra información." + "Cando están activadas as chamadas por wifi, o teu teléfono pode enviar as túas chamadas a través de redes wifi ou da rede do teu operador, dependendo das túas preferencias e de cal teña o sinal máis forte. Antes de activar esta función, consulta co teu operador as tarifas e outra información." "Enderezo de urxencia" "Utilízase como a túa localización cando fas unha chamada de urxencia por wifi" @@ -1065,7 +1066,7 @@ "Naturais" "Realzados" "Saturados" - "Cor automática" + "Automática" "Utiliza só cores precisas" "Axuste entre cores vivas e precisas" "Cambia a orientación automaticamente ao xirar a tableta" @@ -1098,8 +1099,8 @@ "A función Luz nocturna dálle un ton ámbar á pantalla pola noite para que che resulte máis fácil mirala con pouca luz e che axude a coller o sono." "Programar" "Nunca" - "Activar en horario personalizado" - "Activar do anoitecer ao amencer" + "Actívase en horario personalizado" + "Activar do solpor ao amencer" "Hora de inicio" "Hora de finalización" "Estado" @@ -1923,7 +1924,7 @@ "Tempo de uso" "Accesibilidade" "Configuración de accesibilidade" - "Lectores de pantalla, pantalla, controis de interacción" + "Lectores de pantalla, interacción, pantalla" "Configuración de visualización" "Podes personalizar este dispositivo segundo as túas necesidades. Podes cambiar estas funcións de accesibilidade máis tarde en Configuración." "Cambiar tamaño do tipo de letra" @@ -3162,7 +3163,7 @@ "Silenciados, pero permítense: %1$s e %2$s" "Silenciados, pero permítense: %1$s, %2$s e %3$s" "Mensaxes, eventos e recordatorios" - "Cando estea activado o modo Non molestar, silenciaranse as mensaxes, os recordatorios e os eventos, agás nos casos autorizados anteriormente. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo." + "Cando estea activado o modo Non molestar, silenciaranse as mensaxes, os recordatorios e os eventos, agás nos casos autorizados anteriormente. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo." "Feito" "Configuración" "Notificacións sen son nin elementos visuais" @@ -3255,7 +3256,7 @@ "Pantalla superposta" "Permitir pantalla superposta" "Permite que esta aplicación cree unha ventá de pantalla superposta mentres estea aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). A ventá móstrase sobre as demais aplicacións que esteas utilizando." - "Acceso en modo Non molestar" + "Acceso a Non molestar" "Ningunha aplicación instalada solicitou acceso en modo Non molestar" "Cargando aplicacións..." "Segundo solicitaches, Android bloquea a visualización de notificacións desta aplicación neste dispositivo" @@ -3314,9 +3315,9 @@ "Agora non se poden cambiar estas opcións de configuración. Unha aplicación activou automaticamente o modo Non molestar co comportamento personalizado." "Agora non se poden cambiar estas opcións de configuración. Activouse manualmente o modo Non molestar co comportamento personalizado." "Hora" - "Estableceuse a norma automática para activar Non molestar durante as horas especificadas" + "Estableceuse a norma automática para activar o modo Non molestar durante as horas especificadas" "Evento" - "Norma automática establecida para activar Non molestar durante os eventos especificados" + "Norma automática establecida para activar o modo Non molestar durante os eventos especificados" "Durante os eventos de" "Durante os eventos de %1$s" "calquera calendario" @@ -3428,7 +3429,7 @@ "Cando introduzas o teu PIN para iniciar este dispositivo, os servizos de accesibilidade como %1$s aínda non estarán dispoñibles." "Cando introduzas o teu padrón para iniciar este dispositivo, os servizos de accesibilidade como %1$s aínda non estarán dispoñibles." "Cando introduzas o teu contrasinal para iniciar este dispositivo, os servizos de accesibilidade como %1$s aínda non estarán dispoñibles." - "Nota: Tras un reinicio, non se pode iniciar esta aplicación ata que desbloquees o teléfono" + "Nota: Se reinicias o teléfono e definiches un bloqueo de pantalla, esta aplicación non se poderá iniciar ata que desbloquees o teléfono" "Información do IMEI" "Información relativa ao IMEI" "(Rañura%1$d)" @@ -3632,11 +3633,11 @@ "Frecuencia" "Uso máximo" "Non se utilizaron datos" - "Queres que %1$s teña acceso ao modo Non molestar?" + "Queres permitir o acceso da aplicación %1$s ao modo Non molestar?" "A aplicación poderá activar ou desactivar o modo Non molestar e facer cambios na configuración relacionada." "Debe permanecer activado porque o acceso ás notificacións está activado" - "Queres revogarlle o acceso a %1$s ás normas Non molestar?" - "Eliminaranse todas as normas Non molestar creadas por esta aplicación." + "Queres revogar o acceso da aplicación %1$s ao modo Non molestar?" + "Eliminaranse todas as normas do modo Non molestar creadas por esta aplicación." "Non optimizar" "Optimizar" "A batería pódese esgotar máis rápido. Deixarase de restrinxir o uso da batería en segundo plano por parte da aplicación." @@ -3902,7 +3903,7 @@ "Información de control sobre a pantalla de bloqueo" "Mostrar ou ocultar o contido das notificacións" "Todo" - "Consellos e asistencia" + "Asistencia e consellos" "Menor largura" "Ningunha aplicación instalada solicitou acceso ás mensaxes premium" "É posible que teñas que pagar polas mensaxes premium, cuxos custos se engadirán ás facturas do teu operador. Se activas o permiso para unha aplicación, poderás enviar mensaxes premium a través desa aplicación." @@ -3953,7 +3954,7 @@ "Para cambiar de aplicacións, pasa o dedo cara arriba no botón de inicio. Pásao de novo para ver todas as aplicacións. Este xesto funciona en calquera pantalla, así que na parte inferior dereita, xa non terás o botón Visión xeral." "Proba o novo botón de inicio" "Activa o novo xesto para cambiar de aplicacións" - "Tocar dúas veces para consultar o teléfono" + "Dobre toque para consultar o teléfono" "Tocar dúas veces para consultar a tableta" "Tocar dúas veces para consultar o dispositivo" "Para consultar a hora, as iconas de notificación e outra información, toca a pantalla dúas veces." @@ -4138,9 +4139,9 @@ "Mellora a vida útil da batería do dispositivo" "Mellora a vida útil da batería do teléfono" - "Silenciar o son" + "Evitar que soe" "Manter premidos os botóns de acendido e subir volume ao mesmo tempo" - "Atallo para evitar facer soar o dispositivo" + "Atallo para evitar que soe o dispositivo" "Vibrar" "Silenciar" "Non facer nada" diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml index bcce32dcff8d8f1ffc4c5a5b4a48e4162d9f4e21..b3876a40ac853fc2cd98853941ffe5b48bcb4ea2 100644 --- a/res/values-gu/arrays.xml +++ b/res/values-gu/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "પુશ બટન" "પીઅર ઉપકરણ પરથી પિન" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 2e57b51be3d311e4de233d11e8f8a53f43438fbc..adcf0d2f7341c8954f76062598a7b8dd33107f23 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -854,6 +854,7 @@ "આપમેળે" "2.4 GHz બેન્ડ" "5.0 GHz બેન્ડ" + "5.0 GHz બૅન્ડ પસંદ કર્યું" "2.4 GHz" "5.0 GHz" "વાઇ-ફાઇ હૉટસ્પૉટ માટે ઓછામાં ઓછું એક બેન્ડ પસંદ કરો:" @@ -1065,7 +1066,7 @@ "કુદરતી" "બુસ્ટ કરેલ" "સંતૃપ્ત" - "આપમેળે" + "સુવિધાજનક" "માત્ર સચોટ રંગોનો જ ઉપયોગ કરો" "આબેહૂબ અને સચોટ રંગો વચ્ચે સમાયોજિત કરો" "ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો" @@ -3161,7 +3162,7 @@ "મ્યૂટ કરેલ છે, પરંતુ %1$s અને %2$sને મંજૂરી આપો" "મ્યૂટ કરેલ છે, પરંતુ %1$s, %2$s અને %3$sને મંજૂરી આપો" "સંદેશા, ઇવેન્ટ અને રિમાઇન્ડર" - "ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે સંદેશા, રિમાઇન્ડર અને ઇવેન્ટ મ્યૂટ કરવામાં આવશે, જેમાં તમે ઉપરની જે આઇટમોને મંજૂરી આપો તે અપવાદ છે. તમારા મિત્રો, પરિવારજનો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સંદેશાની સેટિંગ અનુકૂળ કરી શકો છો." + "ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે સંદેશા, રિમાઇન્ડર અને ઇવેન્ટ મ્યૂટ કરવામાં આવશે, જેમાં તમે ઉપરની જે આઇટમને મંજૂરી આપો તે અપવાદ છે. તમારા મિત્રો, પરિવારજનો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સંદેશાની સેટિંગ અનુકૂળ કરી શકો છો." "થઈ ગયું" "સેટિંગ" "નોટિફિકેશનમાં કોઈ વિઝ્યુઅલ અથવા સાઉન્ડ નથી" @@ -3427,7 +3428,7 @@ "જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારો પિન દાખલ કરો છો, ત્યારે અ‍ૅક્સેસિબિલિટી સેવાઓ જેમ કે %1$s, હજી પણ ઉપલબ્ધ રહેશે નહીં." "જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારી પૅટર્ન દાખલ કરો છો, ત્યારે અ‍ૅક્સેસિબિલિટી સેવાઓ જેમ કે %1$s, હજી પણ ઉપલબ્ધ રહેશે નહીં." "જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારો પાસવર્ડ દાખલ કરો છો, ત્યારે અ‍ૅક્સેસિબિલિટી સેવાઓ જેમ કે %1$s, હજી પણ ઉપલબ્ધ રહેશે નહીં." - "નોંધ: રીબૂટ કર્યાં પછી, જ્યાં સુધી તમે તમારો ફોન અનલૉક કરશો નહીં ત્યાં સુધી આ ઍપ્લિકેશન શરૂ થઈ શકશે નહીં" + "નોંધ: જો તમે તમારો ફોન ફરી ચાલુ કરો અને સ્ક્રીન લૉક સેટ કરેલ રાખો, તો જ્યાં સુધી તમે તમારો ફોન અનલૉક કરશો નહીં ત્યાં સુધી આ ઍપ શરૂ થઈ શકશે નહીં" "IMEI માહિતી" "IMEI સંબંધિત માહિતી" "(સ્લોટ%1$d)" diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml index 3c7d033d19f5451dfeddbce7b0948275b637aefc..55916dc94ae2501849d502f6cc42d6fa78ce89c7 100644 --- a/res/values-hi/arrays.xml +++ b/res/values-hi/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "पुश बटन" "साथी डिवाइस से पिन" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index c580753dc413decfe3a1cec8f0c2a3edcc03522d..ffc70ad7498d397184b48eaf2784749ef555fa22 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -854,6 +854,7 @@ "अपने आप" "2.4 GHz बैंड" "5.0 गीगाहर्ट्ज़ का बैंड" + "5.0 गीगाहर्ट्ज़ बैंड का इस्तेमाल करना बेहतर होगा" "2.4 गीगाहर्ट्ज़" "5.0 गीगाहर्ट्ज़" "वाई-फ़ाई हॉटस्पॉट से डिवाइस काे जाेड़ने के लिए कम से कम एक बैंड चुनें:" @@ -965,7 +966,7 @@ "वाई-फ़ाई कॉलिंग" "वाई-फ़ाई के ज़रिए कॉल करने की सुविधा चालू करें" "वाई-फ़ाई कॉलिंग चालू करके कॉल करने का एक और विकल्प पाएं" - "कॉल को प्राथमिकता" + "कॉल करने का प्राथमिक तरीका" "वाई-फ़ाई कॉलिंग मोड" "रोमिंग की प्राथमिकताएं" @@ -1065,7 +1066,7 @@ "बिना किसी बदलाव के" "बढ़ाया गया" "सैचुरेट किया गया" - "अपने आप रंग चुनकर दिखाने वाला मोड" + "आस-पास की रोशनी के अनुसार स्क्रीन की चमक बदले" "सिर्फ़ सटीक रंगों का इस्तेमाल करें" "चटख और सटीक रंगों के बीच मनमुताबिक बदलाव करें" "टैबलेट घुमाने पर स्क्रीन की दिशा अपने आप बदलें" @@ -3048,7 +3049,7 @@ "ऐप की ओर से दी जाने वाली ध्वनि" "सूचना की डिफ़ॉल्ट टोन" "अलार्म की डिफ़ॉल्ट आवाज़" - "कॉल के लिए भी कंपन (वाइब्रेशन) करें" + "कॉल आने पर वाइब्रेट भी करें" "अन्य आवाज़ें" "डायल पैड टोन" "स्क्रीन लॉक करने की आवाज़ें" @@ -3161,7 +3162,7 @@ "म्यूट किया गया है लेकिन %1$s और %2$s को मंज़ूरी दें" "म्यूट किया गया है लेकिन %1$s, %2$s और %3$s को मंज़ूरी दी गई है" "मैसेज, इवेंट और रिमाइंडर" - "\'परेशान न करें\' सुविधा चालू होने पर मैसेज, रिमाइंडर और इवेंट की सूचनाएं म्यूट कर दी जाएंगी. आपको सिर्फ़ उन ही सूचनाओं की आवाज़ सुनाई देगी या वाइब्रेशन महसूस होगा जिनके लिए आप मंज़ूरी देंगे. आप मैसेज सेटिंग में बदलाव कर अपने दोस्तों, परिवार के लोगों और अन्य संपर्कों के मैसेज की सूचना मिलने की मंज़ूरी दे सकते हैं." + "\'परेशान न करें\' सुविधा चालू होने पर मैसेज (एसएमएस), रिमाइंडर और इवेंट की सूचनाएं म्यूट कर दी जाएंगी. आपको सिर्फ़ उन ही सूचनाओं की आवाज़ सुनाई देगी या वाइब्रेशन महसूस होगा जिनके लिए आप मंज़ूरी देंगे. आप मैसेज सेटिंग में बदलाव करके अपने दोस्तों, परिवार के लोगों या दूसरे संपर्कों के मैसेज (एसएमएस) मिलने की मंज़ूरी दे सकते हैं." "हो गया" "सेटिंग" "सूचनाएं आने पर न तो स्क्रीन पर कुछ दिखे और न ही कोई आवाज़ सुनाई दे" @@ -3284,7 +3285,7 @@ "सूचना दिखाएं" "सूचना कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं" "नई सूचनाएं बताने वाले गोल निशान की अनुमति दें" - "सूचना बिंदु दिखाएं" + "नई सूचनाएं बताने वाला गोल निशान दिखाएं" "\'परेशान न करें\' मोड बंद करें" "\'परेशान न करें\' मोड चालू होने पर भी ये सूचनाएं दिखाना जारी रखें" "लॉक स्क्रीन पर दिखाई दे" @@ -3427,7 +3428,7 @@ "जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पिन डालते हैं, तो %1$s जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी." "जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पैटर्न डालते हैं, तो %1$s जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी." "जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पासवर्ड डालते हैं, तो %1$s जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी." - "नोट: पुनः बूट करने के बाद, यह ऐप्लिकेशन तब तक शुरू नहीं हो सकता है जब तक कि आप अपना फ़ोन अनलॉक ना कर लें" + "ध्यान दें: अगर फ़ोन को रीस्टार्ट करते समय उसकी स्क्रीन लॉक है, तो यह ऐप्लिकेशन तब तक शुरू नहीं होगा, जब तक आप फ़ोन को अनलॉक नहीं करते" "IMEI की जानकारी" "IMEI से जुड़ी जानकारी" "(स्लॉट%1$d)" diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml index 6cb9b7fa944a5739f1ab435df381d32f1dea2c47..1d3e9971e2ab88d317f8e746d620563cdd3db3de 100644 --- a/res/values-hr/arrays.xml +++ b/res/values-hr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Gumb" "PIN s paralelnog uređaja" @@ -262,7 +256,7 @@ "izmjena zapisnika poziva" "čitanje kalendara" "izmjena kalendara" - "skeniranje Wi-Fi-ja" + "skeniranje Wi-Fija" "obavijest" "skeniranje ćelije" "poziv na telefon" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 827bf745105d194361144a68a3efb1192177e161..e5574b53658efbb59600e580a3863c1a7ea73159 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -42,7 +42,7 @@ "Onemogući podatkovnu vezu" "VoLTE omogućen" "Pružena usluga videopoziva" - "Pružena usluga poziva putem Wi-Fi-ja" + "Pružena usluga poziva putem Wi-Fija" "Pruža se usluga EAB-a/prisutnosti" "Snaga mobilnog radija" "Prikaži imenik SIM-a" @@ -774,13 +774,13 @@ "Wi-Fi" "Uključite Wi-Fi" "Wi-Fi" - "Upotreba Wi-Fi-ja" - "Postavke Wi-Fi-ja" + "Upotreba Wi-Fija" + "Postavke Wi-Fija" "Wi-Fi" "Postavljanje i upravljanje bežičnim pristupnim točkama" "Odaberite Wi‑Fi mrežu" - "Uključivanje Wi-Fi-ja…" - "Isključivanje Wi-Fi-ja…" + "Uključivanje Wi-Fija…" + "Isključivanje Wi-Fija…" "Pogreška" "U ovoj zemlji nije dostupna frekvencija od 5 GHz" "U načinu rada u zrakoplovu" @@ -800,13 +800,13 @@ "Za upotrebu odaberite kompatibilnog ocjenjivača mreže" "Instaliranje certifikata" "Da bi se poboljšala točnost lokacije, aplikacije i usluge i dalje mogu tražiti Wi‑Fi mreže u bilo kojem trenutku, čak i kada je Wi‑Fi isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji. To možete promijeniti u LINK_BEGINpostavkama pretraživanjaLINK_END." - "Radi poboljšanja preciznosti lokacije uključite traženje Wi-Fi-ja u LINK_BEGINpostavkama traženjaLINK_END." + "Radi poboljšanja preciznosti lokacije uključite traženje Wi-Fija u LINK_BEGINpostavkama traženjaLINK_END." "Ne prikazuj ponovno" "Zadrži Wi-Fi tijekom mirovanja" "Wi‑Fi ostaje aktivan u mirovanju" "Pojavio se problem s promjenom postavke" "Poboljšaj učinkovitost" - "Optimizacija Wi-Fi-ja" + "Optimizacija Wi-Fija" "Minimiziraj potrošnju baterije kad je Wi-Fi uključen" "Ograniči bateriju za Wi‑Fi" "Prijeđi na mobilne podatke ako Wi‑Fi izgubi pristup internetu." @@ -832,7 +832,7 @@ "Nemate dopuštenje za promjenu Wi‑Fi mreže." "Više" "Autom. postavljanje (WPS)" - "Uključiti traženje Wi-Fi-ja?" + "Uključiti traženje Wi-Fija?" "Za automatsko uključivanje Wi‑Fi-ja najprije morate uključiti traženje Wi‑Fi-ja." "Traženje Wi‑Fi-ja omogućuje aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kojem trenutku, čak i kada je Wi‑Fi isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji." "Uključi" @@ -865,6 +865,7 @@ "Automatski" "Frekvencija od 2,4 GHz" "Frekvencija od 5,0 GHz" + "Prednost se daje frekvenciji od 5,0 GHz" "2,4 GHz" "5,0 GHz" "Odaberite barem jedan pojas za žarišnu točku Wi‑Fi-ja:" @@ -1077,7 +1078,7 @@ "Prirodno" "Pojačano" "Zasićeno" - "Automatski" + "Prilagodljivo" "Upotreba samo točnih boja" "Odaberite žive ili točne boje" "Prebaci orijentaciju automatski pri rotaciji tabletnog uređaja" @@ -1248,7 +1249,7 @@ "Jakost signala" "Roaming" "Mreža" - "MAC adresa Wi-Fi-ja" + "MAC adresa Wi-Fija" "Bluetooth adresa" "Serijski broj" "Vrijeme aktivnosti" @@ -1554,7 +1555,7 @@ "Dopustite aplikacijama i uslugama da traže uređaje u blizini u bilo kojem trenutku, čak i kada je Bluetooth isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji." "Lokacija Wi-Fi i mob. mreža" "Omogućite aplik. da upotrebljavaju Googleovu uslugu lokacije za brže lociranje. Anonimni podaci prikupljat će se i slati Googleu." - "Lokacija utvrđena pomoću Wi-Fi-ja" + "Lokacija utvrđena pomoću Wi-Fija" "GPS sateliti" "Omogućite aplikacijama da upotrebljavaju GPS na tabletnom računalu za označavanje vaše lokacije" "Omogućite aplikacijama da upotrebljavaju GPS na vašem telefonu za označavanje vaše lokacije" @@ -2302,7 +2303,7 @@ "Info o aplikaciji" "Postavke aplikacije" "Postavke zaslona" - "Postavke Wi-Fi-ja" + "Postavke Wi-Fija" "Bluetooth postavke" "Baterija upotrijebljena uslugom glasovnog poziva" "Upotreba baterije kad je tabletni uređaj u mirovanju" @@ -2481,7 +2482,7 @@ "Želite li zaustaviti stvaranje sigurnosnih kopija Wi-Fi zaporki, oznaka, drugih postavki i podataka aplikacija te izbrisati sve kopije na Googleovim poslužiteljima?" "Želite li zaustaviti sigurnosno kopiranje podatka s uređaja (kao što su zaporke za Wi-Fi i povijest poziva) i podataka aplikacija (kao što su postavke i datoteke koje aplikacije spremaju) te izbrisati sve kopije na udaljenim poslužiteljima?" - "Daljinski pokrenite automatsku izradu sigurnosne kopije podataka uređaja (kao što su zaporke Wi-Fi-ja i povijest poziva) i podataka aplikacija (kao što su postavke i datoteke koje aplikacije pohranjuju).\n\nKada uključite automatsku izradu sigurnosnih kopija, podaci uređaja i aplikacija periodično se daljinski spremaju. Podaci aplikacije mogu biti bilo koji podaci koje je aplikacija spremila (na temelju postavki razvojnog programera), uključujući potencijalno osjetljive podatke kao što su kontakti, poruke i fotografije." + "Daljinski pokrenite automatsku izradu sigurnosne kopije podataka uređaja (kao što su zaporke Wi-Fija i povijest poziva) i podataka aplikacija (kao što su postavke i datoteke koje aplikacije pohranjuju).\n\nKada uključite automatsku izradu sigurnosnih kopija, podaci uređaja i aplikacija periodično se daljinski spremaju. Podaci aplikacije mogu biti bilo koji podaci koje je aplikacija spremila (na temelju postavki razvojnog programera), uključujući potencijalno osjetljive podatke kao što su kontakti, poruke i fotografije." "Postavke administratora uređaja" "Aplikacija administratora uređaja" "Deaktiviraj aplikaciju administratora ovog uređaja" @@ -3198,7 +3199,7 @@ "Zanemareno, ali dopusti %1$s i %2$s" "Zanemareno, ali dopusti %1$s, %2$s i %3$s" "Poruke, događaji i podsjetnici" - "Kada je način Ne uznemiravaj uključen, zanemarit će se poruke, podsjetnici i događaji, osim prethodno navedenih stavki koje dopustite. Možete prilagoditi postavke poruka da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama." + "Kada je način Ne uznemiravaj uključen, zanemarit će se poruke, podsjetnici i događaji, osim prethodno navedenih stavki koje dopustite. Možete prilagoditi postavke poruka da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama." "Gotovo" "Postavke" "Bez vizualnih i zvučnih signala obavijesti" @@ -3471,7 +3472,7 @@ "Kada unesete PIN za pokretanje uređaja, usluge pristupačnosti, kao što je %1$s, još neće biti dostupne." "Kada unesete uzorak za pokretanje uređaja, usluge pristupačnosti, kao što je %1$s, još neće biti dostupne." "Kada unesete zaporku za pokretanje uređaja, usluge pristupačnosti, kao što je %1$s, još neće biti dostupne." - "Napomena: ova se aplikacija ne može pokrenuti nakon ponovnog pokretanja dok ne otključate telefon" + "Napomena: ako ponovo pokrenete telefon i postavite zaključavanje zaslona, ova se aplikacija ne može pokrenuti dok ne otključate telefon" "Informacije IMEI-ja" "Relativne informacije IMEI-ja" "(Utor %1$d)" @@ -3792,9 +3793,9 @@ "Štednja baterije je uključena" "Štednja baterije isključuje neke značajke uređaja i ograničava aplikacije" "Mobilni su podaci isključeni" - "Internet je dostupan samo putem Wi-Fi-ja" + "Internet je dostupan samo putem Wi-Fija" "Štednja podat. prometa uključ." - "Pozadinski podaci dostupni su samo putem Wi-Fi-ja. To može utjecati na neke aplikacije ili usluge kada Wi-Fi nije dostupan." + "Pozadinski podaci dostupni su samo putem Wi-Fija. To može utjecati na neke aplikacije ili usluge kada Wi-Fi nije dostupan." "Radni je profil isključen" "Isključene su aplikacije, sinkronizacija u pozadini i ostale značajke povezane s vašim radnim profilom." "Uključi zvuk" @@ -3833,7 +3834,7 @@ "Potrošnja" "Potrošnja mobilnih podataka" "Potrošnja podatkovnog prometa za aplikacije" - "Potrošnja podatkovnog prometa putem Wi-Fi-ja" + "Potrošnja podatkovnog prometa putem Wi-Fija" "Potrošnja ethernet podataka" "Wi-Fi" "Ethernet" @@ -4212,7 +4213,7 @@ "Vibriranje" "Isključi zvuk" "Ne poduzimaj ništa" - "Uključi (vibriraj)" + "Uključeno (vibracija)" "Uključi (isključi zvuk)" "Isključi" "Pojedinosti o mreži" diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml index ee5072c9d660fe476ea87deabf0df74804c21d5f..9c0450b1a5548e055b5031d58b561b84dc8bfcc3 100644 --- a/res/values-hu/arrays.xml +++ b/res/values-hu/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Nyomógomb" "Partnereszköztől kapott PIN" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 65a2bf45db3e16952bfcbdab616c467108e98de9..c901305f89ae5bb43842d7776f12eb96b6b953f0 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -854,6 +854,7 @@ "Automatikus" "2,4 GHz-es sáv" "5 GHz-es sáv" + "Előnyben részesített sáv: 5 GHz" "2,4 GHz" "5 GHz" "Válasszon legalább egy sávot a Wi-Fi-hotspot számára:" @@ -1065,7 +1066,7 @@ "Természetes" "Élénk" "Telített" - "Automatikus" + "Adaptív" "Csak pontos színek használata" "Váltás élénk és pontos színek között" "Tájolás automatikus váltása a táblagép forgatásakor" @@ -2331,7 +2332,7 @@ "Automatikus bekapcsolás" "Soha" "%1$s töltöttségnél" - "Az akkumulátor töltöttségi szintje (%%)" + "Az akkumulátor töltöttségi szintje" "Megjeleníti az akkumulátor százalékban kifejezett töltöttségi szintjét az állapotsoron" "Folyamatstatisztikák" "A futó folyamatok statisztikái" @@ -3161,7 +3162,7 @@ "Némítva, de a(z) %1$s és a(z) %2$s hangjainak engedélyezése" "Némítva, de a(z) %1$s, %2$s és %3$s hangjainak engedélyezése" "Üzenetek, események és emlékeztetők" - "Ha a „Ne zavarjanak” mód aktív, akkor az SMS-ek, emlékeztetők és események némítva lesznek, kivéve a fent engedélyezett elemeket. Az üzenetek beállításainak megadásával lehetővé teheti, hogy ismerősei, családtagjai vagy más névjegyei elérhessék Önt." + "Ha a „Ne zavarjanak” mód aktív, akkor az üzenetek, emlékeztetők és események némítva lesznek, kivéve a fent engedélyezett elemeket. Az üzenetek beállításainak megadásával lehetővé teheti, hogy ismerősei, családtagjai vagy más névjegyei elérhessék Önt." "Kész" "Beállítások" "Nincs hang vagy vizuális jelzés az értesítéseknél" @@ -3427,7 +3428,7 @@ "Amikor megadja a PIN-kódot az eszköz indításához, a(z) %1$s funkcióhoz hasonló kisegítő lehetőségek még nem lesznek elérhetők." "Amikor megadja a mintát az eszköz indításához, a(z) %1$s funkcióhoz hasonló kisegítő lehetőségek még nem lesznek elérhetők." "Amikor megadja a jelszót az eszköz indításához, a(z) %1$s funkcióhoz hasonló kisegítő lehetőségek még nem lesznek elérhetők." - "Megjegyzés: Újraindítás után ez az alkalmazás csak a telefon feloldását követően indul el" + "Megjegyzés: Ha újraindítja a telefont, és képernyőzárat állított be, ez az alkalmazás csak a telefon feloldását követően indul el." "IMEI-információ" "Relatív IMEI-információ" "(Hely: %1$d)" @@ -3952,7 +3953,7 @@ "Az alkalmazások közti váltáshoz csúsztassa gyorsan ujját felfelé a Kezdőképernyő gombon. A műveletet megismételve az összes alkalmazást megtekintheti. Minden képernyőn működik. Az Áttekintés gomb többé nem jelenik meg a képernyő jobb alsó sarkában." "Az új Kezdőképernyő gomb kipróbálása" "Új kézmozdulat bekapcsolása az alkalmazások közti váltáshoz" - "Koppintson duplán a telefon képernyőjének megtekintéséhez" + "Dupla koppintás a képernyő megtekintéséhez" "Koppintson duplán a táblagép képernyőjének megtekintéséhez" "Koppintson duplán az eszköz képernyőjének megtekintéséhez" "Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez koppintson kétszer a képernyőre." diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml index 4c546a326ecb6525e334ca3b1c19bbab3da6181b..25df77bc984f5c416a935e1a97582681a1df69d2 100644 --- a/res/values-hy/arrays.xml +++ b/res/values-hy/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Սեղմման կոճակ" "Հավասարազոր սարքի PIN-ը" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 3b82efd60b3e4c4922b153563fad0fc741087cf2..62f234ddea3210050e6714a408bbf204aa386c50 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -263,8 +263,8 @@ "Օգտագործված բայտերը`" "USB կրիչի սկանավորում՝ մեդիայի համար..." "SD քարտը սկանավորվում է` մեդիա գտնելու համար..." - "USB կրիչը միացված է` միայն ընթերցելու գործառույթով:" - "SD քարտը միացված է` միայն ընթերցելու գործառույթով:" + "USB կրիչը միացված է` միայն կարդալու գործառույթով:" + "SD քարտը միացված է` միայն կարդալու գործառույթով:" "Բաց թողնել" "Հաջորդը" "Լեզուներ" @@ -311,10 +311,10 @@ "SMS հաղորդագրություններ" "Թույլատրել տվյալների օգտագործումը բջջային ցանցի միջոցով" "Թույլ տալ տվյալների կապի օգտագործումը ռոումինգում" - "Տվյալների ռոումինգ" + "Բջջային ինտերնետ ռոումինգում" "Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում" "Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում" - "Դուք կորցրել եք տվյալների կապը, քանի որ անջատված եք թողել ձեր գլխավոր ցանցի տվյալների ռոումինգը:" + "Ինտերնետ կապ չկա, քանի որ ռոումինգում ինտերնետ կապն անջատված է կարգավորումներից։" "Միացնել" "Դրա համար ձեզանից կարող են խոշոր վճարներ գանձվել:" "Երբ դուք թույլատրում եք տվյալների ռոումինգը, հնարավոր է` ձեզնից գանձվեն զգալի գումարային վճարներ:\n\nԱյս կարգավորումը վերաբերում է պլանշետի բոլոր օգտատերերին:" @@ -470,8 +470,8 @@ "Գաղտնագրել տվյալները" "Լիցքավորեք մարտկոցն ու նորից փորձեք:" "Միացրեք ձեր լիցքավորիչը և կրկին փորձեք:" - "Կողպէկրանի PIN կամ գաղտնաբառ չկա" - "Դուք պետք է կարգավորեք էկրանի կողպման PIN-ը կամ գաղտնաբառը գաղտնագրումը սկսելուց առաջ:" + "Էկրանի ապակողպման PIN կամ գաղտնաբառ չկա" + "Դուք պետք է կարգավորեք էկրանի ապակողպման PIN-ը կամ գաղտնաբառը գաղտնագրումը սկսելուց առաջ:" "Գաղտնագրե՞լ:" "Գաղտնագրման գործողությունը անդարձ է, և այն ընդհատելու դեպքում, տվյալներ կկորցնեք: Գաղտնագրումը մեկ ժամ է տևում, անգամ ավելին, որի ընթացքում սարքը մի քանի անգամ կվերագործարկվի:" "Գաղտնագրման գործընթացը անհետադարձելի է, և եթե դուք այն ընդհատեք, կկորցնեք բոլոր տվյալները: Գաղտնագրումը տևում է մեկ ժամ կամ ավելի, որի ընթացքում հեռախոսը մի քանի անգամ կվերագործարկվի:" @@ -854,6 +854,7 @@ "Ավտոմատ" "2,4 ԳՀց շերտ" "5․0 ԳՀց" + "5.0 ԳՀց (նախընտրելի)" "2,4 ԳՀց" "5,0 ԳՀց" "Ընտրեք նվազագույնը մեկ հաճախականություն Wi‑Fi թեժ կետի համար՝" @@ -1065,7 +1066,7 @@ "Բնական" "Պայծառ" "Հագեցած" - "Ավտոմատ" + "Հարմարողական" "Օգտագործեք միայն ճշգրիտ վերարտադրվող գույներ" "Կարգավորեք գույների պայծառությունն ու ճշգրտությունը" "Ավտոմատ փոխել դիրքավորումը պլանշետը պտտելիս" @@ -1099,7 +1100,7 @@ "Ժամանակացույց" "Չկա" "Միանում է սահմանված ժամին" - "Միանում է մայրամուտից մինչև արևածագ" + "Միանում է մայրամուտից մինչև լուսաբաց" "Սկիզբ" "Ավարտ" "Կարգավիճակ" @@ -1923,7 +1924,7 @@ "Օգտագործման ժամանակը" "Հատուկ գործառույթներ" "Հատուկ գործառույթների կարգավորումներ" - "Էկրանի ընթերցիչներ, էկրան, փոխազդման կառավարման տարրեր" + "Էկրանի ընթերցիչներ, էկրան, կառավարման տարրեր" "Տեսողության կարգավորումներ" "Օգտվեք հատուկ հնարավորություններից՝ հարմար աշխատանքի համար։ Այս գործառույթները կարող եք փոփոխել սարքի կարգավորումներում։" "Փոխել տառաչափը" @@ -2574,7 +2575,7 @@ "Սահմանել թրաֆիկի օգտագործման սահմանաչափը" "Տվյալների օգտագործման աշխատաշրջան" "Սպառումը ըստ ծրագրի" - "Տվյալների ռոումինգ" + "Բջջային ինտերնետ ռոումինգում" "Սահմանափակել ֆոնային տվյալները" "Թույլ տալ ֆոնային տվյալները" "Առանձնացնել 4G-ի օգտագործումը" @@ -2820,7 +2821,7 @@ "Միացնել զանգերն ու SMS-ները" "Հեռացնել օգտատիրոջը" "Միացնե՞լ հեռախոսազանգերը:" - "Զանգերի պատմությունը կհամօգտագործվի այս օգտատիրոջ հետ:" + "Զանգերի պատմությունը հասանելի կլինի այս օգտատիրոջը։" "Միացնե՞լ հեռախոսազանգերն ու SMS-ները:" "Զանգերի և SMS-ների պատմությունը հասանելի կլինի այս օգտատիրոջը:" "Անհետաձգելի բուժօգնության տվյալներ" @@ -3161,7 +3162,7 @@ "Ձայնն անջատած է: Միայն թույլատրել %1$sը և %2$sը" "Ձայնն անջատած է: Միայն թույլատրել %1$sը, %2$sը և %3$sը" "Հաղորդագրություններ, իրադարձություններ և հիշեցումներ" - "«Չանհանգստացնել» ռեժիմում հաղորդագրությունների, հիշեցումների և իրադարձությունների համար ձայնն անջատվում է: Բացառություն են կազմում վերևում ձեր թույլատրած կետերը: Դուք կարող եք փոփոխել հաղորդագրությունների կարգավորումները, որպեսզի ձեր ընկերները, ընտանիքի անդամները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:" + "«Չանհանգստացնել» ռեժիմում հաղորդագրությունների, հիշեցումների և միջոցառումների համար ձայնն անջատվում է: Բացառություն են կազմում վերևում ձեր թույլատրած կետերը: Դուք կարող եք փոփոխել հաղորդագրությունների կարգավորումները, որպեսզի ձեր ընկերները, ընտանիքի անդամները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:" "Պատրաստ է" "Կարգավորումներ" "Ծանուցումներն ամբողջությամբ անջատել" @@ -3210,8 +3211,8 @@ "Երբեք չցուցադրել ծանուցումները" "Ցուցադրել անձայն ռեժիմում և ծալել" "Ցույց տալ անձայն" - "Ձայն հանել" - "Ձայն հանել և ցուցադրել էկրանին" + "Ձայն" + "Ձայն և ելնող պատուհան" "Ցուցադրել էկրանին" "Ցածր" "Միջին" @@ -3427,7 +3428,7 @@ "Երբ մուտքագրեք ձեր PIN-ը՝ այս սարքը մեկնարկելու համար, մատչելիության ծառայութունները, ինչպես օրինակ՝ %1$s-ը, դեռևս հասանելի չեն լինի:" "Երբ մուտքագրեք ձեր նախշը՝ այս սարքը մեկնարկելու համար, մատչելիության ծառայութունները, ինչպես օրինակ՝ %1$s-ը, դեռևս հասանելի չեն լինի:" "Երբ մուտքագրեք ձեր գաղտնաբառը՝ այս սարքը մեկնարկելու համար, մատչելիության ծառայութունները, ինչպես օրինակ՝ %1$s-ը, դեռևս հասանելի չեն լինի:" - "Ուշադրություն. Վերաբեռնումից հետո այս հավելվածը չի գործարկվի մինչև չապակողպեք հեռախոսը" + "Ուշադրություն. եթե դուք վերագործարկեք ձեր հեռախոսը, որում սահմանված է էկրանի կողպում, այս հավելվածը չի աշխատի, մինչև չապակողպեք հեռախոսը։" "IMEI կոդ" "IMEI-ին վերաբերող տվյալներ" "(Սլոտ%1$d)" @@ -3562,7 +3563,7 @@ "Սնուցման կառավարում" "Վերջին լրիվ լիցքավորումից հետո մարտկոցը չի օգտագործվել" "Հավելվածի կարգավորումներ" - "Ցուցադրել Համակարգի ՕՄ-ի ընդունիչը" + "Ցուցադրել Համակարգի ՕՄ-ի կարգավորիչը" "Լրացուցիչ թույլտվություններ" "Եվս %1$d" "Տրամադրե՞լ վրիպակի զեկույցը:" @@ -3631,7 +3632,7 @@ "Հաճախականություն" "Առավելագույն օգտագործումը" "Առանց տվյալների օգտագործման" - "Թույլատրե՞լ %1$s հավելվածին միացնել/անջատել «Չանհանգստացնել» գործառույթը:" + "Թույլատրե՞լ %1$s-ին օգտագործել «Չանհանգստացնել» ռեժիմը" "Հավելվածը կարող է միացնել/անջատել «Չանհանգստացնել» գործառույթը և փոփոխել նրան առնչվող կարգավորումները:" "Պետք է միացած մնա, քանի որ ծանուցումների օգտագործումն ակտիվացված է" "Չեղարկե՞լ %1$s հավելվածին տրամադրված «Չանհանգստացնել» գործառույթն օգտագործելու թույլտվությունը:" diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml index d626fdf6fb1cc4152f3d12021f1b7ece560f22e6..a875547d6f93bc239130878b7c901d12142d7267 100644 --- a/res/values-in/arrays.xml +++ b/res/values-in/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Tekan tombol" "PIN dari perangkat rekan" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 3a2f698a74bc9e080b2590121f8db4a7ce81397d..d57678cf31c85f53e295300f2d06ce3508a6fb00 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -854,6 +854,7 @@ "Otomatis" "Pita frekuensi 2,4 GHz" "Pita frekuensi 5,0 GHz" + "Disarankan Band 5.0 GHz" "2,4 GHz" "5,0 GHz" "Pilih minimal satu pita frekuensi untuk hotspot Wi‑Fi:" @@ -1065,7 +1066,7 @@ "Alami" "Ditingkatkan" "Disaturasi" - "Otomatis" + "Adaptif" "Gunakan hanya warna yang akurat" "Sesuaikan antara warna yang jernih dan akurat" "Ubah orientasi secara otomatis ketika memutar tablet" @@ -1095,7 +1096,7 @@ "Optimalkan tingkat kecerahan untuk cahaya di sekitar. Jika fitur ini diaktifkan, Anda tetap dapat mengatur kecerahan sementara." "Kecerahan layar akan disesuaikan otomatis dengan lingkungan dan aktivitas Anda. Anda dapat memindahkan penggeser secara manual untuk membantu kecerahan adaptif belajar dari preferensi Anda." "Cahaya Malam" - "Cahaya Malam memberi rona kuning pada layar. Membuat Anda dapat melihat layar atau membaca dengan lebih mudah saat cahaya redup, serta membantu Anda lebih mudah tidur." + "Cahaya Malam memberikan rona kuning pada layar. Membuat Anda dapat melihat layar atau membaca dengan lebih mudah saat cahaya redup, serta membantu Anda lebih mudah tidur." "Jadwal" "Tidak ada" "Aktifkan pada waktu khusus" @@ -2106,7 +2107,7 @@ "%1$s - %2$s" "%1$s tersisa" "%1$s lagi agar terisi penuh" - "Pembatasan background" + "Pembatasan akses latar belakang" "Izinkan aplikasi berjalan di latar belakang" "Aplikasi tidak diizinkan berjalan di background" "Penggunaan background tidak dapat dibatasi" @@ -3161,7 +3162,7 @@ "Dimatikan, namun mengizinkan %1$s dan %2$s" "Dimatikan, namun mengizinkan %1$s, %2$s, dan %3$s" "Pesan, acara & pengingat" - "Jika mode Jangan Ganggu diaktifkan, pesan, pengingat, dan acara akan dimatikan suara dan getarannya, kecuali item yang Anda izinkan di atas. Anda dapat menyesuaikan setelan pesan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda." + "Jika mode Jangan Ganggu diaktifkan, pesan, pengingat, dan acara akan dimatikan suara dan getarannya, kecuali item yang Anda izinkan di atas. Anda dapat menyesuaikan setelan pesan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda." "Selesai" "Setelan" "Tidak ada visual atau suara dari notifikasi" @@ -3427,7 +3428,7 @@ "Jika Anda memasukkan PIN untuk memulai perangkat ini, layanan aksesibilitas seperti %1$s belum dapat tersedia." "Jika Anda memasukkan pola untuk memulai perangkat ini, layanan aksesibilitas seperti %1$s belum dapat tersedia." "Jika Anda memasukkan sandi untuk memulai perangkat ini, layanan aksesibilitas seperti %1$s belum dapat tersedia." - "Catatan: Setelah boot ulang, aplikasi ini tidak dapat dimulai hingga kunci ponsel dibuka" + "Catatan: Jika Anda menyalakan ulang ponsel dan menyetel kunci layar, aplikasi ini tidak dapat dimulai jika Anda tidak membuka kunci ponsel" "Informasi IMEI" "Informasi relatif IMEI" "(Slot%1$d)" @@ -3632,7 +3633,7 @@ "Penggunaan maksimum" "Tidak ada data yang digunakan" "Izinkan akses ke status Jangan Ganggu untuk %1$s?" - "Aplikasi dapat mengaktifkan/menonaktifkan status Jangan Ganggu dan mengubah setelan terkait." + "Aplikasi akan dapat mengaktifkan/menonaktifkan status Jangan Ganggu dan mengubah setelan terkait." "Harus tetap aktif karena akses notifikasi juga aktif" "Cabut akses ke status Jangan Ganggu untuk %1$s?" "Semua aturan Jangan Ganggu yang dibuat oleh aplikasi ini akan dihapus." @@ -3644,15 +3645,15 @@ "Tidak ada" "Menonaktifkan akses penggunaan aplikasi ini tidak mencegah admin melacak penggunaan data aplikasi di profil kerja" "%1$d dari %2$d karakter digunakan" - "Tampilkan di atas aplikasi lain" - "Tampilkan di atas aplikasi lain" + "Tampilkan di atas apl lain" + "Tampilkan di atas apl lain" "Aplikasi" - "Tampilkan di dalam aplikasi lain" + "Tampilkan di dalam apl lain" "Izinkan ditampilkan di atas aplikasi lain" "Izinkan aplikasi ini ditampilkan di atas aplikasi lain yang sedang digunakan. Setelan ini dapat mengganggu penggunaan aplikasi tersebut atau mengubah tampilan atau perilakunya." "vr pemroses virtual reality stereo layanan bantuan" "dialog jendela notifikasi sistem ditampilkan di atas aplikasi lain" - "Tampilkan di atas aplikasi lain" + "Tampilkan di atas apl lain" "%1$d dari %2$d aplikasi diizinkan untuk ditampilkan di atas aplikasi lain" "Aplikasi yang memiliki izin" "Diizinkan" @@ -3674,7 +3675,7 @@ "Membuka aplikasi kamera dengan memutar pergelangan tangan dua kali" "Tekan tombol daya dua kali untuk kamera" "Membuka kamera dengan cepat tanpa membuka kunci layar" - "Ukuran layar" + "Ukuran tampilan" "Membuat item di layar menjadi lebih besar atau lebih kecil" "layar, kepadatan, zoom layar, skala, penskalaan" "Buat item di layar jadi lebih kecil atau lebih besar. Beberapa aplikasi di layar dapat berubah posisi." @@ -4137,7 +4138,7 @@ "Tingkatkan masa pakai baterai perangkat" "Tingkatkan masa pakai baterai ponsel" - "Mencegah berdering" + "Cegah berdering" "Tekan tombol Power & Keraskan Volume secara bersamaan" "Pintasan untuk mencegah berdering" "Getar" diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml index 393365b2beb1233830a0a7b949b2504fa78cda11..4e0e52ad93f81bd31609c763dc7ed07a07fbdcb8 100644 --- a/res/values-is/arrays.xml +++ b/res/values-is/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Hnappur" "PIN-númer úr tengdu tæki" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 815a7a2ba8956b9a9fdd94e9c6fe69a59e310a1a..2166b5ce61e1d92988c97148777ad484cba7b9e8 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -854,6 +854,7 @@ "Sjálfvirkt" "2,4 GHz tíðnisvið" "5,0 GHz tíðnisvið" + "5.0 GHz tíðnisvið í forgangi" "2,4 GHz" "5,0 GHz" "Veldu a.m.k. eitt svið fyrir heitan Wi‑Fi reit:" @@ -1065,7 +1066,7 @@ "Náttúrulegir" "Efldir" "Mettaðir" - "Sjálfvirk" + "Breytilegur" "Nota aðeins nákvæma liti" "Stilla á líflega eða nákvæma liti" "Snúa skjámynd sjálfkrafa þegar spjaldtölvu er snúið" @@ -3161,7 +3162,7 @@ "Þaggað, en leyfa %1$s og %2$s" "Þaggað, en leyfa %1$s, %2$s og %3$s" "Skilaboð, viðburðir og áminningar" - "Þegar kveikt er á „Ónáðið ekki“ munu engin hljóð heyrast vegna skilaboða, áminninga eða viðburða, nema fyrir þá sem þú heimilar að ofan. Hægt er að breyta stillingum til leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum." + "Þegar kveikt er á „Ónáðið ekki“ munu engin hljóð heyrast vegna skilaboða, áminninga eða viðburða, nema fyrir það sem þú heimilar að ofan. Hægt er að breyta stillingum til leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum." "Lokið" "Stillingar" "Engin skilaboð á skjá eða hljóð frá tilkynningum" @@ -3427,7 +3428,7 @@ "Þegar þú slærð inn PIN-númerið þitt til að ræsa þetta tæki verður aðgengisþjónusta á borð við %1$s ekki strax í boði." "Þegar þú teiknar mynstrið þitt til að ræsa þetta tæki verður aðgengisþjónusta á borð við %1$s ekki strax í boði." "Þegar þú slærð inn aðgangsorðið þitt til að ræsa þetta tæki verður aðgengisþjónusta á borð við %1$s ekki strax í boði." - "Athugaðu: Eftir endurræsingu er ekki hægt að ræsa þetta forrit fyrr en þú tekur símann úr lás" + "Athugaðu: Ef þú endurræsir símann og hann er með skjálás er ekki hægt að ræsa þetta forrit fyrr en þú tekur símann úr lás" "IMEI-upplýsingar" "IMEI-tengdar upplýsingar" "(Rauf%1$d)" diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml index 638c32073faebd7b4dc5c58703e93ebd93607d0d..20755c2a6983dd9619a98095bf4ecc4445202680 100644 --- a/res/values-it/arrays.xml +++ b/res/values-it/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pulsante di comando" "PIN del dispositivo peer" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index d87def2191cc3c90dbbce477affbc7c1902b84d4..7e540c513bb60febb8aaafe70f6f43f33dc002fa 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -485,11 +485,11 @@ "Avviso. I dati del dispositivo verranno cancellati dopo altri ^1 tentativi di sblocco non riusciti." "Digita la password" "Crittografia non riuscita" - "La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. \n\nPer riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google." - "La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. \n\nPer riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google." + "La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. \n\nPer riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo Account Google." + "La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. \n\nPer riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo Account Google." "Decrittografia non riuscita" - "La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il tablet, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del tablet dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo account Google." - "La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il telefono, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del telefono dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo account Google." + "La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il tablet, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del tablet dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo Account Google." + "La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il telefono, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del telefono dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo Account Google." "Cambia metodo di immissione" "Proteggi il tuo telefono" "Imposta un blocco schermo per proteggere il tablet" @@ -854,6 +854,7 @@ "Automatica" "Banda a 2,4 GHz" "Banda a 5 GHz" + "Banda a 5,0 GHz preferita" "2,4 GHz" "5 GHz" "Scegli almeno una banda per l\'hotspot Wi‑Fi:" @@ -973,7 +974,7 @@ "Preferenze durante il roaming" "Reta preferita: Wi-Fi" - "Modalità preferita: rete mobile" + "Modalità preferita: dati mobili" "Solo Wi-Fi" @@ -988,7 +989,7 @@ "Rete preferita: Wi-Fi" - "Modalità preferita: rete mobile" + "Modalità preferita: dati mobili" "Wi-Fi" @@ -1065,7 +1066,7 @@ "Naturali" "Migliorati" "Intensi" - "Automatici" + "Adattivo" "Usa solo colori precisi" "Regola la vivacità e la precisione dei colori" "Cambia automaticamente l\'orientamento quando il tablet viene ruotato" @@ -1591,7 +1592,7 @@ "Le password non corrispondono" "I PIN non corrispondono" "Traccia di nuovo la sequenza" - "Selezione metodo di sblocco" + "Seleziona metodo di sblocco" "Password impostata" "PIN impostato" "Sequenza impostata" @@ -1674,7 +1675,7 @@ "Compatibilità schermo" "Autorizzazioni" "Cache" - "Cancella cache" + "Svuota cache" "Cache" %d elementi @@ -1924,7 +1925,7 @@ "Accessibilità" "Impostazioni di accessibilità" "Screen reader, display, controlli di interazione" - "Impostazioni vista" + "Impostazioni visive" "Puoi personalizzare questo dispositivo in base alle tue esigenze. Queste funzioni di accessibilità possono essere modificate in un secondo momento nelle Impostazioni." "Cambia dimensioni carattere" "Screen reader" @@ -2622,8 +2623,8 @@ "Questa funzione può causare l\'interruzione del funzionamento di un\'applicazione che dipende dai dati in background quando sono disponibili solo le reti mobili.\n\nPuoi trovare controlli di utilizzo dei dati più appropriati nelle impostazioni disponibili all\'interno dell\'applicazione." "La limitazione dei dati in background è possibile solo se hai impostato un limite per i dati mobili." "Attivare sincron. automatica?" - "Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul tablet.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul tablet. Gli account Google funzionano in questo modo." - "Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul telefono.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli account Google funzionano in questo modo." + "Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul tablet.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul tablet. Gli Account Google funzionano in questo modo." + "Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul telefono.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli Account Google funzionano in questo modo." "Disattivare sincron. automatica?" "In questo modo limiterai l\'utilizzo di dati e della batteria, ma dovrai sincronizzare ciascun account manualmente per ottenere le informazioni recenti. Inoltre non riceverai notifiche di aggiornamenti disponibili." "Data reimpostazione ciclo utilizzo" @@ -2850,7 +2851,7 @@ "Cambia PIN" "Mostra notifiche" "Guida e feedback" - "Articoli della guida, assistenza telefonica e chat, guida introduttiva" + "Guida, assistenza telefonica e chat, primi passi" "Account per i contenuti" "ID foto" "Minacce estreme" @@ -3161,7 +3162,7 @@ "Audio disattivato, ma consenti %1$s e %2$s" "Audio disattivato, ma consenti %1$s, %2$s e %3$s" "Messaggi, eventi e promemoria" - "Quando la modalità Non disturbare è attiva, l\'audio di messaggi, promemoria ed eventi verrà disattivato, ad eccezione degli elementi da te sopra consentiti. Puoi regolare le impostazioni dei messaggi affinché amici, familiari o altri contatti possano raggiungerti." + "Quando la modalità Non disturbare è attiva, l\'audio di messaggi, promemoria ed eventi è disattivato, ad eccezione degli elementi da te sopra consentiti. Puoi regolare le impostazioni dei messaggi affinché amici, familiari o altri contatti possano raggiungerti." "Fine" "Impostazioni" "Nessuna immagine o nessun suono delle notifiche" @@ -3427,7 +3428,7 @@ "Quando inserisci il tuo codice PIN per avviare questo dispositivo, i servizi di accessibilità quali %1$s non saranno ancora disponibili." "Quando inserisci un pattern per avviare questo dispositivo, i servizi di accessibilità quali %1$s non saranno ancora disponibili." "Quando inserisci una password per avviare questo dispositivo, i servizi di accessibilità quali %1$s non saranno ancora disponibili." - "Nota: dopo il riavvio, devi sbloccare il telefono per poter avviare l\'app." + "Nota: se riavvii il telefono ed è impostato un blocco schermo, l\'app non può avviarsi fin quando non sblocchi il telefono" "Dati IMEI" "Dati relativi all\'IMEI" "(Slot %1$d)" @@ -3755,7 +3756,7 @@ "Programma Luminosità notturna" "Riduci automaticamente la luminosità dello schermo ogni notte" "Luminosità notturna attiva" - "Lo schermo è diventato color ambra. Potrebbe conciliare il sonno." + "Lo schermo è diventato color ambra per aiutare a conciliare il sonno." "Consigliate per te" "Suggerimenti" "+ %1$d" diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml index 644010c759c9ae13f127fe11ebd560782143e399..b3cbc7466d804ba6c59f360711c0ce9244a55e0e 100644 --- a/res/values-iw/arrays.xml +++ b/res/values-iw/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "לחצן דחיפה" "קוד גישה ממכשיר עמית" @@ -330,7 +324,7 @@ "קרא יומן" "שנה יומן" "מיקום" - "פרסם התראה" + "פירסום התראה" "מיקום" "שיחת טלפון" "‏קרא SMS/MMS" @@ -357,7 +351,7 @@ "עוצמת קול של צלצול" "עוצמת קול של מדיה" "עוצמת קול של התראה" - "עוצמת קול של הודעות" + "עוצמת קול של התראות" "‏עוצמת קול של Bluetooth" "שמור במצב פעיל" "מיקום" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index c7c9a278c5514c173c41a80b0004ae3f6864ef03..9351adfcc98ed53524d53b32cdce673a8de3e831 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -876,6 +876,7 @@ "אוטומטי" "‏פס של ‎2.4 GHz" "‏פס של ‎5.0 GHz" + "‏עדיפות לתדר 5.0 GHz" "‎2.4 GHz" "‎5.0 GHz" "‏יש לבחור תדר אחד לכל הפחות לנקודת Wi‑Fi לשיתוף אינטרנט:" @@ -1089,7 +1090,7 @@ "טבעי" "מוגבר" "רווי" - "אוטומטי" + "ניתן להתאמה" "שימוש בצבעים מדויקים בלבד" "כוונון בטווח של צבעים מלאי חיים עד צבעים מדויקים" "שנה כיוון באופן אוטומטי בעת סיבוב הטאבלט" @@ -2531,7 +2532,7 @@ "אפשרויות אחרות מושבתות על ידי מנהל המכשיר." "פרטים נוספים" "כללי" - "יומן הודעות" + "יומן התראות" "צלצול ורטט שיחה" "מערכת" "‏הגדרת Wi-Fi" @@ -3114,7 +3115,7 @@ "עוצמת צלצול" "עוצמת קול של הודעות" "רינגטון של טלפון" - "צליל ברירת המחדל להודעות" + "צליל ברירת המחדל להתראות" "צליל שסיפקה האפליקציה" "צליל ברירת המחדל להודעות" "צליל לשעון מעורר" @@ -3237,14 +3238,14 @@ "מושתקים, אבל אני רוצה לאפשר %1$s וכן %2$s" "מושתקים, אבל אני רוצה לאפשר %1$s, %2$s וכן %3$s" "הודעות, אירועים ותזכורות" - "כשמצב \'נא לא להפריע\' פועל, הודעות, תזכורות ואירועים מושתקים, חוץ מהפריטים שאפשרת למעלה. ניתן לשנות את הגדרות ההודעות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר." + "כשמצב \'נא לא להפריע\' פועל, הודעות, תזכורות ואירועים מושתקים, חוץ מהפריטים שאפשרת למעלה. ניתן לשנות את הגדרות ההודעות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר." "סיום" "הגדרות" "ללא סימנים חזותיים או צלילים מהודעות" "ללא צליל מהודעות" "הודעות לא יוצגו ולא יושמעו. מותרות שיחות מאנשי קשר שמסומנים בכוכב וממתקשרים חוזרים." "(ההגדרה הנוכחית)" - "האם לשנות את ההגדרות של ההודעות במצב \'נא לא להפריע\'?" + "האם לשנות את ההגדרות של ההתראות במצב \'נא לא להפריע\'?" "צלילי פרופיל עבודה" "השתמש בצלילי הפרופיל האישי" "הצלילים זהים עבור הפרופיל האישי ופרופיל העבודה" @@ -3268,17 +3269,17 @@ "אור מהבהב" "במסך הנעילה" "כשפרופיל העבודה נעול" - "תוכן ההודעות יופיע במלואו" + "תוכן ההתראות יופיע במלואו" "הסתרה של תוכן רגיש" "לא יוצגו הודעות בכלל" "איך להציג הודעות כשהמכשיר נעול?" "הודעות" - "הצג את כל התוכן של הודעות מהעבודה" + "הצג את כל התוכן של התראות מהעבודה" "הסתרה של תוכן עבודה רגיש" "כיצד אתה רוצה שיוצגו הודעות פרופיל כאשר המכשיר נעול?" "הודעות פרופיל" "הודעות" - "הודעות אפליקציה" + "התראות אפליקציה" "קטגוריית הודעות" "קבוצת קטגוריות של הודעות" "התנהגות" @@ -3286,7 +3287,7 @@ "לעולם אל תציג הודעות" "יש להציג באופן שקט וממוזער" "הצג ללא צליל" - "השמע צליל" + "עם צליל" "השמע צליל והצג במסך" "הצג במסך" "נמוכה" @@ -3300,11 +3301,11 @@ "חשיבות גבוהה" "חשיבות דחופה" "הצגת הודעות" - "אסיסטנט ההודעות" + "אסיסטנט ההתראוות" "~%1$s ביום" "~%1$s בשבוע" "אף פעם" - "גישה אל הודעות" + "גישה אל התראות" "הגישה להודעות של פרופיל העבודה חסומה" "אפליקציות לא יכולות לקרוא הודעות" @@ -3313,8 +3314,8 @@ ‏%d אפליקציות יכולות לקרוא הודעות ‏אפליקציה %d יכולה לקרוא הודעות - "אין אפליקציות מותקנות שביקשו גישה להודעות." - "האם להתיר ל-%1$s לגשת אל הודעות?" + "אין אפליקציות מותקנות שביקשו גישה להתראות." + "האם להתיר ל-%1$s לגשת אל התראות?" "%1$s יוכל לקרוא את כל ההודעות, כולל מידע אישי כמו שמות של אנשי קשר והודעות טקסט שתקבל. הוא יוכל גם לבטל הודעות או להפעיל לחצני פעולה שהן כוללות. \n\nכמו כן, הדבר יאפשר לאפליקציה להפעיל או לכבות את התכונה \'נא לא להפריע\' ולשנות הגדרות קשורות." "אם תכבה ל-%1$s את הגישה להודעות, ניתן יהיה לכבות גם את הגישה לתכונה \'נא לא להפריע\'." "כבה" @@ -3363,12 +3364,12 @@ "מופעל" "כבוי" - "חסום הכל" + "לחסום הכל" "לעולם אל תציג את ההודעות האלה" "הצג הודעות" "אף פעם אל תציג הודעות בהצללה או במכשירים היקפיים" - "הצגה של סימן ההודעות" - "הצגה של סימן ההודעות" + "הצגה של סימן ההתראות" + "הצגה של סימן ההתראות" "ביטול / שינוי של \'נא לא להפריע\'" "הודעות אלה יוכלו להמשיך ולהפריע כשמצב \'נא לא להפריע\' מופעל" "במסך הנעילה" @@ -3484,7 +3485,7 @@ "כאשר המסך כבוי" "הודעות שהושתקו במצב \'נא לא להפריע\' יפעילו את המסך ואת האור המהבהב" "הודעות שהושתקו במצב \'נא לא להפריע\' יפעילו את המסך" - "הגדרות התראה" + "הגדרת התראות" "אישור" "שליחת משוב על המכשיר הזה" "הזן את קוד הגישה של מנהל המכשיר" @@ -3517,7 +3518,7 @@ "כשתזין את קוד הגישה להפעלת המכשיר הזה, שירותי נגישות כמו %1$s עדיין לא יהיו זמינים." "כשתזין את קו ביטול הנעילה להפעלת המכשיר הזה, שירותי נגישות כמו %1$s עדיין לא יהיו זמינים." "כשתזין את הסיסמה להפעלת המכשיר הזה, שירותי נגישות כמו %1$s עדיין לא יהיו זמינים." - "שים לב: לאחר הפעלה מחדש של המכשיר, ניתן להפעיל את האפליקציה רק לאחר שתבטל את נעילת הטלפון" + "הערה: אם ביצעת הפעלה מחדש לטלפון ונעילת המסך מוגדרת, לא ניתן יהיה להפעיל את האפליקציה הזו לפני ביטול נעילת המסך של הטלפון" "‏פרטי IMEI" "‏מידע הקשור ל-IMEI" "(חריץ %1$d)" @@ -4019,7 +4020,7 @@ "‏אפס הגבלת דירוג ב-ShortcutManager" "‏אופסה הגבלת דירוג ב-ShortcutManager" "בחירת הפרטים שמופיעים במסך הנעילה" - "הצג או הסתר תוכן הודעה" + "הצגה או הסתרה של תוכן ההתראה" "הכול" "טיפים ותמיכה" "הרוחב הקטן ביותר" diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml index 20e2658036bbbe4a62b638da4ee6365d0092c6de..1e412ec290a6402646e953936990adbbe08476a8 100644 --- a/res/values-ja/arrays.xml +++ b/res/values-ja/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ボタンを押す" "ピアデバイスのPIN" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index ba002976a91aa65cc1007abc600398a43305a223..267879d5af29ecb21b8926d95254ac2b24722d87 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -487,7 +487,7 @@ "暗号化できませんでした" "暗号化処理が中断されて完了できなかったためタブレット上のデータにアクセスできなくなりました。\n\nタブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。" "暗号化処理が中断されて完了できなかったため端末上のデータにアクセスできなくなりました。\n\n端末の使用を再開するには出荷時設定にリセットする必要があります。リセット後、端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。" - "復号化の失敗" + "復号の失敗" "入力したパスワードは正しいのですが、データが破損しています。\n\nタブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。" "入力したパスワードは正しいのですが、データが破損しています。\n\nスマートフォンの使用を再開するには出荷時設定にリセットする必要があります。リセット後、スマートフォンのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。" "入力方法の切り替え" @@ -854,6 +854,7 @@ "自動" "2.4 GHz 帯" "5.0 GHz 帯" + "5.0 GHz 帯を優先" "2.4 GHz" "5.0 GHz" "Wi‑Fi アクセス ポイントの帯域幅を少なくとも 1 つ選択してください。" @@ -1065,7 +1066,7 @@ "ナチュラル" "ブースト" "ビビッド" - "自動" + "アダプティブ" "正確な色のみを使用" "鮮明な色と正確な色の間で調整" "画面の向きに合わせて縦横表示を切り替える" @@ -1094,8 +1095,8 @@ "電池使用量が増えます" "周囲に合わせて明るさを最適化します。この機能が ON の場合でも、一時的に明るさを調整できます。" "画面の明るさは環境やアクティビティに応じて自動的に調整されます。スライダーを手動で動かして、明るさの自動調節機能に設定を学習させることもできます。" - "読書灯" - "読書灯を利用すると画面が黄味がかった色になります。薄明かりの下でも画面を見やすくなり、寝付きを良くする効果も期待できます。" + "夜間モード" + "夜間モードを利用すると画面が黄味がかった色になります。薄明かりの下でも画面を見やすくなり、寝付きを良くする効果も期待できます。" "スケジュール" "使用しない" "指定した時間に ON" @@ -3052,7 +3053,7 @@ "アプリの通知音" "デフォルトの通知音" "デフォルトのアラーム音" - "着信時もバイブレーションON" + "着信時にバイブレーションもON" "その他の音" "ダイヤルパッドの操作音" "画面ロック音" @@ -3165,7 +3166,7 @@ "ミュート中（%1$s、%2$sを除く）" "ミュート中（%1$s、%2$s、%3$sを除く）" "メッセージ、予定、リマインダー" - "マナーモードが ON の場合、上記の許可した項目を除き、メッセージ、リマインダー、予定はミュートされます。メッセージの設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。" + "マナーモードが ON の場合、上記の許可した項目を除き、メッセージ、リマインダー、予定はミュートされます。メッセージの設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。" "完了" "設定" "通知の非表示、通知音なし" @@ -3214,8 +3215,8 @@ "通知を表示しない" "マナーモードで表示し最小化" "マナーモードで表示する" - "音声で知らせる" - "音声とポップアップで知らせる" + "音で知らせる" + "音とポップアップで知らせる" "ポップアップ" "低" "中" @@ -3289,8 +3290,8 @@ "シェードにも周辺端末にも通知を表示しない" "通知ドットの許可" "通知ドットの表示" - "マナーモードのオーバーライド" - "マナーモードが ON の場合もこの通知を引き続き表示します" + "ミュートの例外" + "ミュートが ON の場合もこの通知を引き続き表示します" "ロック画面上" "ブロック済み" "優先" @@ -3431,7 +3432,7 @@ "PINを入力してこの端末を開始しても、%1$sのようなユーザー補助サービスはまだご利用になれません。" "パターンを入力してこの端末を開始しても、%1$sのようなユーザー補助サービスはまだご利用になれません。" "パスワードを入力してこの端末を開始する場合、%1$sのようなユーザー補助サービスはまだご利用になれません。" - "注: 再起動後、スマートフォンのロックを解除するまでこのアプリを起動することはできません" + "注: スマートフォンを再起動したときに画面ロックが設定されている場合は、スマートフォンのロックを解除するまでこのアプリは起動できません" "IMEI情報" "IMEI関連情報" "（スロット%1$d）" @@ -3756,9 +3757,9 @@ "スマートフォンはバイブレーションに設定されています" "着信と通知を端末のバイブレーションで知らせます" "着信と通知をスマートフォンのバイブレーションで知らせます" - "読書灯のスケジュールの設定" + "夜間モードのスケジュールの設定" "夜間に画面の色みを自動的に変えて見やすくします" - "読書灯 ON" + "夜間モード ON" "画面が黄味がかった色になります。寝付きを良くする効果も期待できます。" "おすすめ" "候補" diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml index 18609cd23144a37cab3077919b81ec3c4ec6d2bc..06a01c2bf1d8a286e1df8f409488880859da4f4b 100644 --- a/res/values-ka/arrays.xml +++ b/res/values-ka/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push ღილაკი" "ერთრანგიანი მოწყობილობის პინი" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 7b2e7fe873760092867bd84de6b8e0ddae0865f0..aaa0fba15de2ccbc353ca7b012b3a9c700a3ab0e 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -854,6 +854,7 @@ "ავტომატური" "2,4 GHz დიაპაზონი" "5 GHz დიაპაზონი" + "სასურველია 5-გიგაჰერციანი დიაპაზონი" "2.4 გჰც" "5 გჰც" "აირჩიეთ მინიმუმ ერთი დიაპაზონი Wi‑Fi უსადენო ქსელისთვის:" @@ -1065,7 +1066,7 @@ "ბუნებრივი" "კონტრასტული" "ინტენსიური" - "ავტომატური" + "ადაპტაციური" "მხოლოდ მკვეთრი ფერების გამოყენება" "ცოცხალსა და მკვეთრ ფერებს შორის დარეგულირება" "ტაბლეტის გადატრიალებისას ეკრანის ორიენტაციის ავტომატური შეცვლა" @@ -3161,7 +3162,7 @@ "დადუმებული, თუმცა დაიშვას %1$s და %2$s" "დადუმებული, თუმცა დაიშვას %1$s, %2$s და %3$s" "შეტყობინებები, მოვლენები და შეხსენებები" - "როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, დადუმდება ყველა შეტყობინება, შეხსენება და მოვლენა იმ ერთეულების გარდა, რომლებსაც ზემოთ დაუშვებთ. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს." + "როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, დადუმდება ყველა შეტყობინება, შეხსენება და მოვლენა იმ ერთეულების გარდა, რომლებსაც ზემოთ დაუშვებთ. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს." "მზადაა" "პარამეტრები" "უხილავი და უხმო შეტყობინებები" @@ -3427,7 +3428,7 @@ "როდესაც ამ მოწყობილობის ჩასართავად თქვენს PIN-ს შეიყვანთ, მარტივი წვდომის სერვისები, როგორიცაა %1$s ხელმისაწვდომი ჯერ არ იქნება." "როდესაც ამ მოწყობილობის ჩასართავად თქვენს ნიმუშს შეიყვანთ, მარტივი წვდომის სერვისები, როგორიცაა %1$s ხელმისაწვდომი ჯერ არ იქნება." "როდესაც ამ მოწყობილობის ჩასართავად თქვენს პაროლს შეიყვანთ, მარტივი წვდომის სერვისები, როგორიცაა %1$s ხელმისაწვდომი ჯერ არ იქნება." - "შენიშვნა: გადატვირთვის შემდეგ, ეს აპი ვერ გაეშვება, სანამ ტელეფონს არ განბლოკავთ" + "შენიშვნა: თუ ეკრანის დაბლოკვის მეთოდს იყენებთ, ტელეფონის გადატვირთვის შემდეგ ეს აპი ვერ გაეშვება, სანამ ტელეფონს არ განბლოკავთ" "IMEI ინფორმაცია" "IMEI შესაბამისი ინფორმაცია" "(სლოტი%1$d)" diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml index 515c4a465aaa7cf702fe8e3438c1cfac9bdc19ff..819406fdb759e1a60a0c250edd06af0309d62fef 100644 --- a/res/values-kk/arrays.xml +++ b/res/values-kk/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Итеру түймесі" "Басқа құрылғының PIN коды" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index f52385da0ed083359f030d2be8658afb814b44d4..6670c0b4632bc447a5e37297eb1c48bc4303cf92 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -854,6 +854,7 @@ "Авто" "2,4 ГГц диапазоны" "5,0 ГГц диапазоны" + "5,0 ГГц диапазоны таңдалды" "2,4 ГГц" "5,0 ГГц" "Wi‑Fi хотспоты үшін кемінде бір диапазонды таңдаңыз:" @@ -1065,7 +1066,7 @@ "Табиғи" "Жарқын" "Қаныққан" - "Автоматты" + "Адаптивті" "Тек анық түстерді пайдаланыңыз" "Түстердің ашықтығы мен анықтығын реттеңіз" "Планшетті айналдырғанда бағытын автоматты түрде ауыстыру" @@ -1095,7 +1096,7 @@ "Қолжетімді жарықтандыруға сәйкес жарық деңгейін оңтайландырыңыз. Бұл функция қосулы кезде, жарық деңгейін уақытша реттей аласыз." "Экран жарықтығы қоршаған ортаға және әрекеттерге автоматты түрде бейімделеді. Бейімделгіш жарықтық параметрлерде сақталуы үшін, жүгірткіні қолмен жылжытуыңызға болады." "Түнгі жарық" - "Түнгі жарық функциясы экраныңызға ашық сары реңк береді. Бұл қараңғыда экранға қарауды жеңілдетеді әрі жылдам ұйықтауға да көмектесуі мүмкін." + "\"Түнгі жарық\" функциясы экраныңызға ашық сары реңк береді. Бұл қараңғыда экранға қарауды жеңілдетеді әрі жылдам ұйықтауға да көмектесуі мүмкін." "Уақыт кестесі" "Ешқашан" "Арнаулы уақытта қосылады" @@ -3161,7 +3162,7 @@ "Дыбысы өшірілген, бірақ %1$s және %2$s үшін рұқсат берілген" "Дыбысы өшірілген, бірақ %1$s, %2$s және %3$s үшін рұқсат берілген" "Хабарлар, іс-шаралар және еске салғыштар" - "\"Мазаламау\" режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз." + "\"Мазаламау\" режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз." "Дайын" "Параметрлер" "Хабарландырулар визуалды не дыбыстық сигналсыз беріледі" @@ -3427,7 +3428,7 @@ "Осы құрылғыны іске қосу үшін PIN кодын енгізгенде %1$s сияқты арнайы мүмкіндіктер қызметтері әлі қол жетімді болмайды." "Осы құрылғыны іске қосу үшін өрнекті енгізгенде %1$s сияқты арнайы мүмкіндіктер қызметтері әлі қол жетімді болмайды." "Осы құрылғыны іске қосу үшін құпия сөзді енгізгенде %1$s сияқты арнайы мүмкіндіктер қызметтері әлі қол жетімді болмайды." - "Ескертпе: қайта жүктегеннен кейін, телефонның құлпын ашпайынша, бұл қолданба іске қосылмайды" + "Ескертпе: телефоныңызды қайта қоссаңыз және экран құлыпталса, телефонның құлпы ашылмайынша, қолданба іске қосылмайды." "IMEI ақпараты" "IMEI кодына қатысты ақпарат" "(%1$d ұяшығы)" @@ -3631,7 +3632,7 @@ "Жиілік" "Ең көп пайдалануы" "Деректер пайдаланылмаған" - "%1$s үшін «Мазаламау» режиміне кіру рұқсатын бересіз бе?" + "%1$s қолданбасына «Мазаламау» режиміне кіруге бола ма?" "Қолданба «Мазаламау» режимін қосуы/өшіруі және қатысты параметрлерге өзгерістер енгізуі мүмкін." "Хабарландыру параметрі қосулы болғандықтан, міндетті түрде қосулы болуы тиіс" "%1$s үшін \"Мазаламау\" режиміне қатынасты қайтару керек пе?" diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml index 7c3196e2f1df459607caef67c69be515c9e42914..df841b6af0a01b979c31f3bbfffb9d9c5a0187b0 100644 --- a/res/values-km/arrays.xml +++ b/res/values-km/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ប៊ូតុង​ចុច" "កូដ PIN ពី​ឧបករណ៍​" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 0fecbf932dddc23f2fc866148a7e143a937f2954..0deb07fa4a38948a9db98f7d97a3ecfd838dc77b 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -595,7 +595,7 @@ "ដោយសារ​មាន​ការព្យាយាម​ដោះសោ​មិនត្រឹមត្រូវ​ច្រើនដងពេក ទិន្នន័យ​របស់​ឧបករណ៍នេះនឹងត្រូវបានលុប។" "ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប។" "ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក កម្រងព័ត៌មានការងារនេះ និងទិន្នន័យរបស់វានឹងត្រូវបានលុប។" - "បដិសេធ" + "ច្រានចោល" "ត្រូវ​​មាន​យ៉ាង​ហោច​ណាស់ %d តួ" "កូដ PIN ​ត្រូវ​មាន​លេខ​យ៉ាង​ហោច​ណាស់ %d ខ្ទង់" "បន្ត" @@ -854,6 +854,7 @@ "ស្វ័យប្រវត្តិ" "រលកសញ្ញា 2.4 GHz" "រលកសញ្ញា 5.0 GHz" + "ប្រើ​រលកសញ្ញា 5.0 GHz ជា​អាទិភាព" "2.4 GHz" "5.0 GHz" "សូម​ជ្រើសរើស​ប៊ែន​យ៉ាង​ហោចណាស់​មួយសម្រាប់​ហតស្ប៉ត Wi‑Fi៖" @@ -966,13 +967,13 @@ "ពង្រីក​វិសាលភាពនៃការ​ហៅ​ទូសព្ទ​តាម Wi‑Fi" "បើក​ការហៅ​តាម Wi‑Fi ដើម្បី​ពង្រីក​ដែន​សេវា" "ចំណូលចិត្តលើការហៅ" - "របៀបហៅតាម Wi-Fi" + "មុខងារហៅតាម Wi-Fi" "ចំណូលចិត្តរ៉ូមីង" "ចំណូលចិត្តរ៉ូមីង" - "គួរប្រើ Wi-Fi" + "Wi-Fi ជាអាទិភាព" "បាន​ជ្រើសរើសប្រើទិន្នន័យចល័ត" "Wi-Fi តែប៉ុណ្ណោះ" @@ -987,7 +988,7 @@ "0" - "ប្រើ Wi-Fi" + "Wi-Fi ជាអាទិភាព" "បាន​ជ្រើសរើសប្រើទិន្នន័យចល័ត" @@ -1065,7 +1066,7 @@ "ធម្មជាតិ" "បង្កើនពន្លឺ" "ឆ្អែត" - "ស្វ័យប្រវត្តិ" + "បត់បែន" "ប្រើតែ​ពណ៌​ត្រូវ​ប៉ុណ្ណោះ" "កែ​តម្រូវ​រវាង​ពណ៌ស្រស់ និង​ពណ៌​ដែលត្រូវ" "ប្ដូរ​ទិស​ស្វ័យ​ប្រវត្តិ​ពេល​បង្វិល​កុំព្យូទ័រ​បន្ទះ" @@ -1209,7 +1210,7 @@ "ស្ថានភាព​ថ្ម បណ្ដាញ និង​ព័ត៌មាន​ផ្សេងៗ" "លេខ​ទូរស័ព្ទ សញ្ញា ។ល។" "ទំហំ​ផ្ទុក" - "ឧបករណ៍​ផ្ទុក" + "ទំហំ​ផ្ទុក" "កំណត់​ការ​​ផ្ទុក" "ផ្ដាច់​​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី មើល​ទំហំ​ដែល​មាន" "ផ្ដាច់​​កាត​អេស​ឌី មើល​ទំហំ​ដែល​មាន" @@ -2683,7 +2684,7 @@ "អាសយដ្ឋាន​ម៉ាស៊ីនមេ DNS ត្រូវតែជាលេខសម្រាប់ VPN ដែលបើកជានិច្ច" "ព័ត៌មានដែល​បានបញ្ចូល​មិនស្គាល់ VPN ដែលបើកជានិច្ចទេ" "បោះ​បង់​" - "បដិសេធ" + "ច្រានចោល" "រក្សាទុក" "តភ្ជាប់" "ជំនួស" @@ -3161,7 +3162,7 @@ "បានបិទ​សំឡេង ប៉ុន្តែ​អនុញ្ញាត​ %1$s និង %2$s" "បានបិទ​សំឡេង​ ប៉ុន្តែ​អនុញ្ញាត​ %1$s, %2$s និង %3$s" "សារ ព្រឹត្តិការណ៍ និងការរំលឹក" - "នៅ​ពេល​មុខងារ​កុំរំខាន​បើក សារ ការរំលឹក និង​ព្រឹត្តិការណ៍​នឹង​​ត្រូវបានបិទ​សំឡេង លើក​លែង​តែធាតុ​ដែល​អ្នកអនុញ្ញាត​ខាង​លើតែប៉ុណ្ណោះ។ អ្នក​អាច​កែតម្រូវ​ការកំណត់​សារ ដើម្បី​អនុញ្ញាត​​ឱ្យ​មិត្តភ័ក្តិ ក្រុមគ្រួសារ ឬ​ទំនាក់ទំនង​ផ្សេង​ទៀត​របស់អ្នកអាច​ទាក់ទង​អ្នកបាន។" + "នៅ​ពេល​មុខងារ​កុំរំខាន​បើក សារ ការរំលឹក និង​ព្រឹត្តិការណ៍​នានានឹង​​ត្រូវបានបិទ​សំឡេង លើក​លែង​តែធាតុ​ដែល​អ្នកអនុញ្ញាត​ខាង​លើតែប៉ុណ្ណោះ។ អ្នក​អាច​កែតម្រូវ​ការកំណត់​សារ ដើម្បី​អនុញ្ញាត​​ឱ្យ​មិត្តភ័ក្តិ គ្រួសារ ឬ​ទំនាក់ទំនង​ផ្សេង​ទៀត​របស់អ្នកអាច​ទាក់ទង​អ្នកបាន។" "រួចរាល់" "ការកំណត់" "គ្មាន​រូបភាព ឬសំឡេងពីការជូនដំណឹង​ទេ" @@ -3427,7 +3428,7 @@ "នៅ​ពេល​អ្នក​បញ្ចូល​​កូដ PIN ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​នេះ សេវាកម្ម​ភាព​ងាយស្រួល​ដូច​ជា %1$s នឹង​មិន​អាច​ប្រើ​បាន​នៅ​ឡើយ​ទេ។" "នៅ​ពេល​អ្នក​បញ្ចូល​​លំនាំ​ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​នេះ សេវាកម្ម​ភាព​ងាយស្រួល​ដូច​ជា %1$s នឹង​មិន​អាច​ប្រើ​បាន​នៅ​ឡើយ​ទេ។" "នៅ​ពេល​អ្នក​បញ្ចូល​ពាក្យ​សម្ងាត់​ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​នេះ សេវាកម្ម​ភាព​ងាយស្រួល​ដូច​ជា %1$s នឹង​មិន​អាច​ប្រើ​បាន​នៅ​ឡើយ​ទេ។" - "ចំណាំ៖ បន្ទាប់ពីបិទបើកឡើងវិញហើយ កម្មវិធីនេះមិនអាចចាប់ផ្តើមបានទេ រហូតទាល់តែអ្នកដោះសោទូរស័ព្ទរបស់អ្នក" + "ចំណាំ៖ ប្រសិនបើ​អ្នកចាប់ផ្ដើម​ទូរសព្ទ​របស់អ្នក​ឡើងវិញ និងបានកំណត់​ការចាក់សោលើ​អេក្រង់ កម្មវិធីនេះនឹង​មិនអាច​ចាប់ផ្តើម​បានទេ រហូតទាល់តែ​អ្នកដោះសោ​ទូរសព្ទ​របស់អ្នក" "ព័ត៌មាន IMEI" "ព័ត៌មាន​ទាក់ទង​នឹង IMEI" "(រន្ធ %1$d)" @@ -3887,7 +3888,7 @@ "បានបាត់វត្ថុដាក់ចំណាត់ថ្នាក់" "វត្ថុដាក់ចំណាត់ថ្នាក់មិនផ្ទុកគន្លឹះនេះទេ" "ត្រាប់អេក្រង់ដែលមានក្បាលឆក" - "ស្នាមចោះ​ផ្ទាំងអេក្រង់ ស្នាមក្រិត" + "សក់សេះ, ក្បាលឆក" "គ្មាន" "ការចូលប្រើប្រាស់កម្មវិធីពិសេស" @@ -3942,7 +3943,7 @@ "ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងទូរស័ព្ទរបស់អ្នក" "ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងថេប្លេតរបស់អ្នក" "ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងឧបករណ៍របស់អ្នក" - "លោតទៅកាមេរ៉ា" + "ប្តូរទៅកាមេរ៉ា" "ដើម្បីបើកកាមេរ៉ាឲ្យបានរហ័ស សូមចុចប៊ូតុងថាមពលពីរដង។ ដំណើរការនៅលើអេក្រង់ណាមួយក៏បាន។" "បើក​កាមេរ៉ា​យ៉ាង​រហ័ស" "ត្រឡប់កាមេរ៉ា" diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml index 2a4afa6f337e66622b6a610d877ccda5fb545abe..86ec77755ad47a12ccca13b2b3823ab0e5da85a8 100644 --- a/res/values-kn/arrays.xml +++ b/res/values-kn/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ಒತ್ತುವ ಬಟನ್" "ಪೀರ್ ಸಾಧನದಿಂದ ಪಿನ್‌" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index a238674463379e393fe71ee6cdabe5ba29780fd0..29966ffad6628d7f2cd39fbea914d7dd3d478a63 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -854,6 +854,7 @@ "ಸ್ವಯಂ" "2.4 GHz ಬ್ಯಾಂಡ್" "5.0 GHz ಬ್ಯಾಂಡ್" + "5.0 GHz ಬ್ಯಾಂಡ್‌ಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ" "2.4 GHz" "5.0 GHz" "ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್‌ಗಾಗಿ ಕನಿಷ್ಠ ಒಂದು ಬ್ಯಾಂಡ್ ಆಯ್ಕೆಮಾಡಿ:" @@ -972,7 +973,7 @@ "ರೋಮಿಂಗ್ ಪ್ರಾಶಸ್ತ್ಯ" - "ವೈ-ಫೈಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ" + "ವೈ-ಫೈಗೆ ಆದ್ಯತೆ" "ಮೊಬೈಲ್‌ಗೆ ಆದ್ಯತೆ" "ವೈ-ಫೈ ಮಾತ್ರ" @@ -987,7 +988,7 @@ "0" - "ವೈ-ಫೈಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ" + "ವೈ-ಫೈಗೆ ಆದ್ಯತೆ" "ಮೊಬೈಲ್‌ಗೆ ಆದ್ಯತೆ" @@ -1065,7 +1066,7 @@ "ಪ್ರಾಕೃತಿಕ" "ಬೂಸ್ಟ್ ಮಾಡಲಾಗಿದೆ" "ಸ್ಯಾಚುರೇಟೆಡ್" - "ಸ್ವಯಂಚಾಲಿತ" + "ಅಡಾಪ್ಟಿವ್" "ನಿಖರ ಬಣ್ಣಗಳನ್ನು ಮಾತ್ರ ಬಳಸಿ" "ಹೊಳೆಯುವ ಮತ್ತು ನಿಖರ ಬಣ್ಣಗಳ ನಡುವೆ ಹೊಂದಿಸಿ" "ಟ್ಯಾಬ್ಲೆಟ್‌ ತಿರುಗಿಸುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಓರಿಯಂಟೇಶನ್ ಬದಲಾಯಿಸು" @@ -1098,8 +1099,8 @@ "ನೈಟ್ ಲೈಟ್ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಕಡು ಕಂದು ಬಣ್ಣಕ್ಕೆ ತಿರುಗಿಸುತ್ತದೆ. ಇದರಿಂದಾಗಿ ಮಂದ ಬೆಳಕಿನಲ್ಲಿಯೂ ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೋಡಲು ಅಥವಾ ಓದಲು ಸುಲಭವಾಗುತ್ತದೆ ಮತ್ತು ಸುಲಭವಾಗಿ ನಿದ್ರಿಸಲು ಇದು ನಿಮಗೆ ಸಹಾಯ ಮಾಡಬಹುದು." "ಅವಧಿ" "ಯಾವುದೂ ಅಲ್ಲ" - "ಕಸ್ಟಮ್ ಸಮಯದಲ್ಲಿ ಆನ್ ಮಾಡಿ" - "ಸೂರ್ಯಾಸ್ತದಿಂದ ಸೂರ್ಯೋದಯದವರೆಗೂ ಆನ್‌ ಮಾಡಿರುತ್ತದೆ" + "ಕಸ್ಟಮ್ ಸಮಯದಲ್ಲಿ ಆನ್ ಆಗುತ್ತದೆ" + "ಸೂರ್ಯಾಸ್ತದಿಂದ ಸೂರ್ಯೋದಯದವರೆಗೂ ಆನ್‌ ಆಗಿರುತ್ತದೆ" "ಪ್ರಾರಂಭದ ಸಮಯ" "ಮುಕ್ತಾಯದ ಸಮಯ" "ಸ್ಥಿತಿ" @@ -3161,7 +3162,7 @@ "ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ %1$s ಮತ್ತು %2$s ರನ್ನು ಅನುಮತಿಸಿ" "ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ %1$s, %2$s, ಮತ್ತು %3$s ರನ್ನು ಅನುಮತಿಸಿ" "ಸಂದೇಶಗಳು, ಈವೆಂಟ್‌ಗಳು & ಜ್ಞಾಪನೆಗಳು" - "ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ, ನೀವು ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅನುಮತಿಸುವ ಐಟಂಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ಸಂದೇಶಗಳು, ಜ್ಞಾಪನೆಗಳು ಮತ್ತು ಈವೆಂಟ್‌ಗಳು ಮ್ಯೂಟ್ ಆಗುತ್ತವೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ, ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿಸಲು ಸಂದೇಶಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೀವು ಸರಿಹೊಂದಿಸಬಹುದು." + "ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ, ನೀವು ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅನುಮತಿಸುವ ಐಟಂಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ಸಂದೇಶಗಳು, ಜ್ಞಾಪನೆಗಳು ಮತ್ತು ಈವೆಂಟ್‌ಗಳು ಮ್ಯೂಟ್ ಆಗುತ್ತವೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ, ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿಸಲು ಸಂದೇಶಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೀವು ಸರಿಹೊಂದಿಸಬಹುದು." "ಮುಗಿದಿದೆ" "ಸೆಟ್ಟಿಂಗ್‌ಗಳು" "ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ದೃಶ್ಯಗಳು ಅಥವಾ ಧ್ವನಿಗಳಿಲ್ಲ" @@ -3427,7 +3428,7 @@ "ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ನಿಮ್ಮ ಪಿನ್‌‌ ಅನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ, %1$s ಅಂತಹ ಪ್ರವೇಶ ಸೇವೆಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ." "ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ, %1$s ಅಂತಹ ಪ್ರವೇಶ ಸೇವೆಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ." "ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ, %1$s ರೀತಿಯ ಪ್ರವೇಶ ಸೇವೆಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ." - "ಗಮನಿಸಿ: ರೀಬೂಟ್ ನಂತರ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಅನ್‌ಲಾಕ್ ಮಾಡುವ ತನಕ ಈ ಆಪ್ ಪ್ರಾರಂಭಗೊಳ್ಳುವುದಿಲ್ಲ" + "ಗಮನಿಸಿ: ನೀವು ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿದಲ್ಲಿ ಮತ್ತು ಪರದೆಯ ಲಾಕ್‌ ಹೊಂದಿದ್ದರೆ, ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಅನ್‌ಲಾಕ್‌ ಮಾಡುವವರೆಗೂ ಈ ಆ್ಯಪ್‌ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ" "IMEI ಮಾಹಿತಿ" "IMEI ಸಂಬಂಧಿತ ಮಾಹಿತಿ" "(ಸ್ಲಾಟ್‌%1$d)" diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml index 3741ac3b3464f694ad15cb0c69e801c57b2647c2..df41476127f2585013be80e8d2d9f65b0879cbde 100644 --- a/res/values-ko/arrays.xml +++ b/res/values-ko/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "누름 버튼" "피어 기기 PIN" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index f0818f903c52d86ddf8fb778b22599a1f87c6d13..44b4b65fa3640eb90d8676970a67ea16b5a381f4 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -854,6 +854,7 @@ "자동" "2.4GHz 대역" "5.0GHz 대역" + "5.0GHz 대역 사용 선호" "2.4GHz" "5.0GHz" "Wi‑Fi 핫스팟 대역을 한 개 이상 선택하세요." @@ -973,7 +974,7 @@ "로밍 환경설정" "Wi-Fi를 기본으로 설정" - "모바일에 최적화됨" + "모바일을 기본으로 설정" "Wi-Fi에서만" @@ -988,7 +989,7 @@ "Wi-Fi를 기본으로 설정" - "모바일에 최적화됨" + "모바일을 기본으로 설정" "Wi-Fi" @@ -1065,7 +1066,7 @@ "자연스럽게" "부스트" "선명하게" - "자동" + "색상 자동 조절" "정확한 색상만 사용" "색상 선명도와 정확도 간 조정" "태블릿 회전 시 자동으로 방향 바꾸기" @@ -1095,11 +1096,11 @@ "주변의 밝기에 맞춰 밝기 수준을 최적화합니다. 이 기능이 사용 설정되어 있는 동안에도 밝기를 일시 조정할 수 있습니다." "화면 밝기가 환경 및 활동에 맞게 자동으로 조정됩니다. 슬라이더를 수동으로 이동하여 밝기 자동 조절 기능이 사용자의 환경설정을 학습하도록 할 수 있습니다." "야간 조명" - "야간 조명을 사용하면 밤에 화면이 황색광으로 표시되어 희미한 빛에서도 편안하게 읽을 수 있으며 수면 방해 효과가 줄어듭니다." + "야간 조명을 사용하면 화면이 황색광으로 표시되어 희미한 빛에서도 편안하게 화면을 보고 읽을 수 있으며 수면 방해 효과가 줄어듭니다." "예약" "없음" "맞춤 시간에 켜짐" - "일몰부터 일출까지 사용" + "일몰부터 일출까지 켜짐" "시작 시간" "종료 시간" "상태" @@ -1689,7 +1690,7 @@ "사용자 데이터" "USB 저장소 데이터" "SD 카드" - "제거" + "설치 제거" "모든 사용자에 대해 제거" "설치" "사용 안함" @@ -2560,7 +2561,7 @@ "잘못된 PIN" "확인 중..." "Android 시작하는 중..." - "삭제" + "홈 화면에서 삭제" "기타 파일" "%2$d개 중 %1$d개가 선택됨" "%1$s/%2$s" @@ -2810,10 +2811,10 @@ "모든 앱과 데이터가 삭제됩니다." "새 사용자 추가 중..." "사용자 삭제" - "삭제" - "손님" - "손님 삭제" - "손님을 삭제하시겠습니까?" + "홈 화면에서 삭제" + "게스트" + "게스트 삭제" + "게스트를 삭제하시겠습니까?" "이 세션에 있는 모든 앱과 데이터가 삭제됩니다." "삭제" "통화 기능 사용" @@ -2954,7 +2955,7 @@ "앱 및 알림" "권한, 기본 앱" "계정" - "추가된 계정이 없습니다." + "추가된 계정 없음" "기본 앱" "언어, 시간, 백업, 업데이트" "설정" @@ -3161,7 +3162,7 @@ "%1$s 및 %2$s을(를) 제외하고 음소거됨" "%1$s, %2$s, %3$s을(를) 제외하고 음소거됨" "메시지, 일정, 알림" - "알림 일시중지가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 메시지, 알림, 일정이 음소거됩니다. 메시지 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다." + "알림 일시중지가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 메시지, 알림, 일정이 음소거됩니다. 메시지 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다." "완료" "설정" "알림 표시 및 소리 차단" @@ -3427,7 +3428,7 @@ "기기를 시작하기 위해 PIN을 입력할 때에는 %1$s 등의 접근성 서비스가 지원되지 않습니다." "기기를 시작하기 위해 패턴을 입력할 때에는 %1$s 등의 접근성 서비스가 지원되지 않습니다." "기기를 시작하기 위해 비밀번호를 입력할 때에는 %1$s 등의 접근성 서비스가 지원되지 않습니다." - "참고: 재부팅한 후 이 앱은 휴대전화를 잠금 해제해야 시작됩니다." + "참고: 화면 잠금이 설정되어 있다면 휴대전화를 다시 시작한 후 이 앱을 시작하려면 휴대전화를 잠금 해제해야 합니다." "IMEI 정보" "IMEI 상대 정보" "(슬롯 %1$d개)" @@ -4138,7 +4139,7 @@ "휴대전화 배터리 수명 향상" "벨 울림 방지" - "전원 및 볼륨 크게 버튼 함께 누르기" + "전원 및 볼륨 업 버튼 함께 누르기" "벨 울림 방지 단축키" "진동" "음소거" diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml index f5118e276737b298c931259ee1d613232b627438..5b70df5203fd98873d363584f805f05873811877 100644 --- a/res/values-ky/arrays.xml +++ b/res/values-ky/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Баскычты басыңыз" "Туташуучу түзмөктүн PIN\'и" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 34ec5f431b6afa7cf5460070cd344ff60f9d5802..c913d5c7484cc909fd13febecc75ad9e3ae579ab 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -845,7 +845,7 @@ "CA тастыктамасы" "Домен" "Колдонуучунун тастыктамасы" - "Аныктыгы" + "Идентификация" "Аныктыгы жашыруун" "Сырсөз" "Сырсөздү көрсөтүү" @@ -853,6 +853,7 @@ "Авто" "2.4 ГГц жыштыгы" "5.0 ГГц жыштыгы" + "5.0 ГГц жыштыгы сунушталат" "2.4 ГГц" "5.0 ГГц" "Wi‑Fi туташуу түйүнүн иштетүү үчүн кеминде бир жыштыкты тандаңыз:" @@ -1064,7 +1065,7 @@ "Табигый" "Күчөтүлгөн" "Каныккан" - "Автоматтык" + "Ыңгайлаштырылуучу" "Так түстөрдү гана колдонуу" "Ачык жана так түстөрдү тууралоо" "Планшет тегеренип жатканда багытын автоматтык түрдө которуштуруу" @@ -3084,7 +3085,7 @@ "\"Тынчымды алба\" режиминин эрежелерин коюу" "Эреже колдонулсун" "Шашылыш эскертмелер гана" - "Ойготкучтар гана" + "Ойготкуч гана" "Тымтырс" "%1$s: %2$s" "Визуалдык эскертмелерди бөгөттөө" @@ -3160,7 +3161,7 @@ "Үнсүз, бирок төмөнкүлөргө урусат берилсин: %1$s жана %2$s" "Үнсүз, бирок төмөнкүлөргө уруксат берилсин: %1$s, %2$s жана %3$s" "Билдирүүлөр, иш-чаралар жана эстеткичтер" - "\"Тынчымды алба\" режими күйүп турганда, жогоруда сиз уруксат берген нерселерден тышкары билдирүүлөр, эстеткичтер жана иш-чаралардын үнү басылат. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот." + "\"Тынчымды алба\" режими күйүп турганда, жогоруда сиз уруксат берген нерселерден тышкары билдирүүлөр, эстеткичтер жана иш-чаралардын үнү басылат. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот." "Бүттү" "Жөндөөлөр" "Билдирмелерди көрбөйсүз да, укпайсыз" @@ -3426,7 +3427,7 @@ "Бул түзмөктү иштетүү үчүн PIN киргизилгенде, %1$s сыяктуу атайын мүмкүнчүлүктөр кызматтары иштебей калат." "Бул түзмөктү иштетүү үчүн үлгүңүз киргизилгенде, %1$s сыяктуу атайын мүмкүнчүлүктөр кызматтары иштебей калат." "Бул түзмөктү иштетүү үчүн сырсөзүңүз киргизилгенде, %1$s сыяктуу атайын мүмкүнчүлүктөр кызматтары иштебей калат." - "Эскертүү: Өчүрүп-күйгүзгөндөн кийин, бул колдонмо телефондун кулпусу ачылмайынча иштебейт" + "Эскертүү: Эгер телефонуңузду өчүрүп күйгүзгөндө экранды бөгөттөө жөндөлгөн болсо, телефонду бөгөттөн чыгармайынча бул колдонмо ачылбайт" "IMEI маалыматы" "IMEI байланыштуу маалымат" "(Оюк%1$d)" @@ -3630,7 +3631,7 @@ "Жыштык" "Эң көп керектелиши" "Колдонулган дайындар жок" - "%1$s колдонмосуна \"Тынчымды алба\" функциясын пайдаланууга уруксат берилсинби?" + "%1$s колдонмосуна \"Тынчымды алба\" режимине уруксат бересизби?" "Бул колдонмо \"Тынчымды алба\" режимин күйгүзүп/өчүрүп, тийиштүү жөндөөлөрдү өзгөртө алат." "Эскертмелерге уруксат берилгендиктен, күйүп турушу керек" "%1$s колдонмосуна \"Тынчымды алба\" функциясын пайдалануу мүмкүнчүлүгү калыбына келтирилсинби?" @@ -4136,9 +4137,9 @@ "Түзмөктүн батареясынын кубатынын мөөнөтүн көбөйтүү" "Телефондун батареясынын кубатынын мөөнөтүн көбөйтүү" - "Шыңгыратууну өчүрүү" + "Шыңгырдын үнүн өчүрүү" "Кубат менен үнүн чоңойтуу баскычтарын чогуу басуу" - "Шыңгыратууну өчүрүү баскычы" + "Шыңгырдын үнүн ыкчам өчүрүү" "Дирилдөө" "Үнсүз" "Эч нерсе кылынбасын" diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml index 7d15b71e21cbf049bd207f1c2bb41b6283e69b14..d070743d585f529bd28190d0e025b218755ff1ec 100644 --- a/res/values-lo/arrays.xml +++ b/res/values-lo/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ປຸ່ມ Push" "PIN ຈາກອຸປະກອນທີ່ເຊື່ອມຕໍ່ກັນ" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index 5cf01ff8514e59c483a09190528e3676074caee3..d2deea2b930502fd983922503fb9535d186f4a8b 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -379,7 +379,7 @@ "ສະຖານທີ່" "ໃຊ້​ສະຖານທີ່" "ບັນຊີ" - "ຄວາມປອດໄພ & ສະຖານທີ່" + "ຄວາມປອດໄພ ແລະ ສະຖານທີ່" "ການເຂົ້າລະຫັດ ແລະ ຂໍ້ມູນການເຂົ້າສູ່ລະບົບ" "ເຂົ້າລະຫັດໂທລະສັບແລ້ວ" "ໂທລະສັບບໍ່ໄດ້ຖືກເຂົ້າລະຫັດ" @@ -854,6 +854,7 @@ "ອັດຕະໂນມັດ" "ຄື້ນ 2.4 GHz" "ຄື້ນ 5.0 GHz" + "ເລືອກຄື້ນຄວາມຖີ່ 5.0 GHz ກ່ອນ" "2.4 GHz" "5.0 GHz" "ເລືອກແຖບຄວາມຖີ່ຢ່າງໜ້ອຍໜຶ່ງອັນສຳລັບ Wi‑Fi:" @@ -1065,7 +1066,7 @@ "ທຳ​ມະ​ຊາດ" "ເລັ່ງແລ້ວ" "ເພີ່ມສີແລ້ວ" - "ອັດຕະໂນມັດ" + "ປັບປ່ຽນໄດ້" "ໃຊ້ສີທີ່ຖືກຕ້ອງເທົ່ານັ້ນ" "ປັບແຕ່ງລະຫວ່າງສີແບບສົດໃສ ແລະ ຖືກຕ້ອງ" "ປັບປ່ຽນທິດທາງອັດຕະໂນມັດເມື່ອໝຸນແທັບເລັດ" @@ -1095,7 +1096,7 @@ "ປັບແຕ່ງຄວາມສະຫວ່າງຂອງແສງ. ເມື່ອເປີດໃຊ້ຄຸນສົມບັດນີ້, ທ່ານຈະຍັງຄົງສາມາດປັບແຕ່ງລະດັບຄວາມສະຫວ່າງຊົ່ວຄາວໄດ້ຢູ່." "ຄວາມສະຫວ່າງໜ້າຈໍຂອງທ່ານຈະຖືກປັບໂດຍອັດຕະໂນມັດໂດຍອ້າງອີງຈາກສະພາບແວດລ້ອມ ແລະ ກິດຈະກຳທີ່ທ່ານເຮັດ. ທ່ານສາມາດຍ້າຍຕົວເລື່ອນດ້ວຍຕົນເອງເພື່ອຊ່ວຍໃຫ້ລະບົບຮຽນຮູ້ການຕັ້ງຄ່າຂອງທ່ານໄດ້." "ແສງກາງຄືນ" - "ຄຸນສົມບັດ ແສງກາງຄືນ ຈະໃສ່ສີໜ້າຈໍຂອງທ່ານເປັນສີແດງໃນເວລາກາງຄືນ. ນີ້ຈະເຮັດໃຫ້ສາມາດເບິ່ງໜ້າຈໍໄດ້ງ່າຍຂຶ້ນໃນສະພາບແສງໜ້ອຍ ແລະ ອາດຊ່ວຍໃຫ້ທ່ານນອນຫຼັບງ່າຍຂຶ້ນໄດ້ນຳ." + "ຄຸນສົມບັດ ແສງກາງຄືນ ຈະໃສ່ສີໜ້າຈໍຂອງທ່ານເປັນສີອົມເຫຼືອງໃນເວລາກາງຄືນ. ນີ້ຈະເຮັດໃຫ້ສາມາດເບິ່ງໜ້າຈໍໄດ້ງ່າຍຂຶ້ນໃນສະພາບແສງໜ້ອຍ ແລະ ອາດຊ່ວຍໃຫ້ທ່ານນອນຫຼັບງ່າຍຂຶ້ນໄດ້ນຳ." "ຕັ້ງເວລາ" "ບໍ່ໃຊ້" "ເປີດໃຊ້ໃນເວລາທີ່ກຳນົດເອງ" @@ -2526,7 +2527,7 @@ "ການຊິ້ງຂໍ້ມູນຖືກເປີດໃຊ້" "ການຊິ້ງຂໍ້ມູນຖືກປິດຢູ່" "ການຊິ້ງຂໍ້ມູນຜິດພາດ" - "ຊິ້ງຂໍ້ມູນຄັ້ງຫຼ້າສຸດ %1$s" + "ຊິ້ງຂໍ້ມູນຫຼ້າສຸດ %1$s" "ກຳລັງຊິ້ງຂໍ້ມູນ..." "ສຳຮອງຂໍ້ມູນການຕັ້ງຄ່າ" "ສຳຮອງຂໍ້ມູນການຕັ້ງຄ່າຂອງຂ້ອຍ" @@ -3161,7 +3162,7 @@ "ປິດສຽງ, ແຕ່ອະນຸຍາດ %1$s ແລະ %2$s" "ປິດສຽງ, ແຕ່ອະນຸຍາດ %1$s, %2$s ແລະ %3$s" "ຂໍ້ຄວາມ, ນັດໝາຍ ແລະ ການເຕືອນ" - "ເມື່ອເປີດໂໝດຫ້າມລົບກວນແລ້ວ, ຂໍ້ຄວາມ, ການເຕືອນ ແລະ ນັດໝາຍຕ່າງໆຈະຖືກປິດສຽງໄວ້, ຍົກເວັ້ນລາຍການທີ່ທ່ານອະນຸຍາດຂ້າງເທິງ. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າຂໍ້ຄວາມເພື່ອໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຄົນອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້." + "ເມື່ອເປີດໂໝດຫ້າມລົບກວນ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ແລະ ເຫດການຕ່າງໆຈະຖືກປິດສຽງໄວ້, ຍົກເວັ້ນລາຍການທີ່ທ່ານອະນຸຍາດຂ້າງເທິງ. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າຂໍ້ຄວາມເພື່ອໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຄົນອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້." "ແລ້ວໆ" "ການຕັ້ງຄ່າ" "ບໍ່ມີພາບ ຫຼື ສຽງຈາກການແຈ້ງເຕືອນ" @@ -3427,7 +3428,7 @@ "ເມື່ອ​ທ່ານ​ປ້ອນ​ລະ​ຫັດ PIN ​ຂອງ​ທ່ານ​ເພື່ອ​ເລີ່ມ​ອຸ​ປະ​ກອນ​ນີ້, ​ບໍ​ລິ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ​ເຊັ່ນ %1$s ຈະ​ຍັງ​ບໍ່​ສາ​ມາດ​ນຳ​ໃຊ້​ໄດ້." "ເມື່ອ​ທ່ານ​ປ້ອນ​ຮູບ​ແບບ​ປົດ​ລັອກ​ຂອງ​ທ່ານ​ເພື່ອ​ເລີ່ມ​ອຸ​ປະ​ກອນ​ນີ້, ​ບໍ​ລິ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ​ເຊັ່ນ %1$s ຈະ​ຍັງ​ບໍ່​ສາ​ມາດ​ນຳ​ໃຊ້​ໄດ້." "ເມື່ອ​ທ່ານ​ປ້ອນ​ລະ​ຫັດ​ຜ່ານ​ຂອງ​ທ່ານ​ເພື່ອ​ເລີ່ມ​ອຸ​ປະ​ກອນ​ນີ້, ​ບໍ​ລິ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ​ເຊັ່ນ %1$s ​ຈະ​ຍັງ​ບໍ່​ສາ​ມາດ​ນຳ​ໃຊ້​ໄດ້." - "ໝາຍເຫດ: ຫຼັງຈາກເປີດຂຶ້ນມາໃໝ່ແລ້ວ, ແອັບນີ້ຈະບໍ່ສາມາດເລີ່ມໄດ້ຈົນກວ່າທ່ານຈະປົດລັອກໂທລະສັບຂອງທ່ານ" + "ໝາຍເຫດ: ຖ້າທ່ານປິດເປີດໂທລະສັບຂອງທ່ານຄືນໃໝ່ ແລະ ໄດ້ຕັ້ງການລັອກໜ້າຈໍໄວ້, ແອັບນີ້ບໍ່ສາມາດເລີ່ມຕົ້ນໄດ້ຈົນກວ່າວ່າທ່ານປົດລັອກໂທລະສັບຂອງທ່ານ" "ຂໍ້ມູນ IMEI" "ຂໍ້ມູນ​ກ່ຽວ​ຂ້ອງ​ກັບ IMEI" "(ຊ່ອງ %1$d)" @@ -3631,8 +3632,8 @@ "ຄວາມຖີ່" "ການ​ໃຊ້​ສູງ​ສຸດ" "ບໍ່​ມີ​ຂໍ້​ມູນ​ທີ່​ໃຊ້​ແລ້ວ" - "ອະນຸຍາດ​ການ​ເຂົ້າ​ເຖິງ ບໍ່​ລົບ​ກວນ​ ສຳລັບ %1$s ບໍ?" - "​ແອັບ​ຈະ​ສາມາດ​ເປີດ/ປິດ ບໍ່​ລົບ​ກວນ ​ແລະ​ເຮ​ັດການ​ປ່ຽນ​ແປງ​ຕໍ່​ກັບ​ການ​ຕັ້ງ​ຄ່າ​ທີ່​ກ່ຽວຂ້ອງ." + "ອະນຸຍາດໃຫ້ເຂົ້າເຖິງໂໝດຫ້າມລົບກວນສຳລັບ %1$s ບໍ່?" + "ແອັບຈະສາມາດເປີດ/ປີດ ໂໝດຫ້າມລົບກວນ ແລະ ປ່ຽນແປງການຕັ້ງຄ່າທີ່ກ່ຽວຂ້ອງໄດ້." "ຕ້ອງເປີດໄວ້ເນື່ອງຈາກການເຂົ້າເຖິງການແຈ້ງເຕືອນຖືກເປີດໃຊ້" "ຖອດຖອນ​ການ​ເຂົ້າ​ເຖິງຫ້າມ​ລົບ​ກວນສຳລັບ %1$s ບໍ?" "ທຸກກົດ​ລະບຽບຫ້າມ​ລົບ​ກວນທີ່​ສ້າງ​ຂຶ້ນ​ໂດຍ​ແອັບຯ​ນີ້​ຈະ​ຖືກລຶບ​ອອກ." diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml index 9f5198a499e3faf1630fd5fec9f3eb88b90c97ee..569f3f2806249026bd5f4f932fef6bf4ea039613 100644 --- a/res/values-lt/arrays.xml +++ b/res/values-lt/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Mygtuko paspaudimas" "PIN kodas iš susieto įrenginio" @@ -307,7 +301,7 @@ "pridėti balso pašto pranešimą" "naudoti SIP" "apdoroti siunčiamąjį skambutį" - "kontrolinis kodas" + "piršto antspaudas" "kūno jutikliai" "skaityti transliacijas mobiliuoju" "imituoti vietovę" @@ -374,7 +368,7 @@ "Pridėti balso pašto pranešimą" "Naudoti SIP" "Apdoroti siunčiamąjį skambutį" - "Kontrolinis kodas" + "Piršto antspaudas" "Kūno jutikliai" "Skaityti transliacijas mobiliuoju" "Imituoti vietovę" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 670e18939492e0357c3b64695d5bdc9c1a11f4dc..57cfde3dde4fb0335ed7bb01005cde21b72188c2 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -372,7 +372,7 @@ "Įgalinti valdiklius" "Išjungė administratorius" "Rodyti užrakinimo parinktį" - "Rodyti maitinimo mygtuko parinktį, kuri išjungia „Smart Lock“, atrakinimą naudojant kontrolinį kodą ir užrakinimo ekrano pranešimus" + "Rodyti maitinimo mygtuko parinktį, kuri išjungia „Smart Lock“, atrakinimą naudojant piršto antspaudą ir užrakinimo ekrano pranešimus" "Nėra" "%1$d / %2$d" "Pvz., Tomo „Android“." @@ -395,12 +395,12 @@ "Privatumas" "Išjungė administratorius" "Saugos būsena" - "Ekrano užraktas, kontrolinis kodas" + "Ekrano užraktas, piršto antspaudas" "Ekrano užraktas" "Kontr. kodo jutiklis" "Kontrolin. kodų tvark." "Kontrolinių kodų naud." - "Pridėti kontrolinį kodą" + "Pridėti piršto antspaudą" "ekrano užraktas" Nustatytas %1$d piršto atspaudas @@ -410,16 +410,16 @@ "Atrakinimas piršto atspaudu" - "Kontrolinio kodo naudojimas" - "Tiesiog palieskite kontrolinio kodo jutiklį, kad galėtumėte atrakinti telefoną, įgalioti pirkimo operacijas arba prisijungti prie programų. Naudojant visus pridėtus kontrolinius kodus bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: kontrolinis kodas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas." + "Piršto antspaudo naudojimas" + "Tiesiog palieskite piršto antspaudo jutiklį, kad galėtumėte atrakinti telefoną, įgalioti pirkimo operacijas arba prisijungti prie programų. Naudojant visus pridėtus kontrolinius kodus bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: piršto antspaudas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas." "Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: negalite atrakinti šio įrenginio piršto atspaudu. Norėdami gauti daugiau informacijos, susisiekite su organizacijos administratoriumi." "Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: piršto atspaudas gali būti ne toks saugus kaip patikimas atrakinimo piešinys ar PIN kodas." "Atšaukti" "Tęsti" "Praleisti" "Kitas" - "Praleisti kontrolinį kodą?" - "Kontrolinio kodo sąranka užtrunka tik minutę ar dvi. Jei praleisite šį veiksmą, vėliau kontrolinį kodą galėsite pridėti nustatymuose." + "Praleisti piršto antspaudą?" + "Piršto antspaudo sąranka užtrunka tik minutę ar dvi. Jei praleisite šį veiksmą, vėliau piršto antspaudą galėsite pridėti nustatymuose." "Praleisti ekrano užraktą?" "Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti planšetiniu kompiuteriu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite." "Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti įrenginiu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite." @@ -431,7 +431,7 @@ "Grįžti" "Palieskite jutiklį" "Jis yra telefono užpakalinėje dalyje. Naudokite smilių." - "Įrenginio ir kontrolinio kodo jutiklio vietos iliustracija" + "Įrenginio ir piršto antspaudo jutiklio vietos iliustracija" "Pavadinimas" "Gerai" "Ištrinti" @@ -440,7 +440,7 @@ "Patraukite ir vėl prilieskite" "Vis patraukite pirštą, kad pridėtumėte skirtingas piršto atspaudo dalis" "Piršto atspaudas pridėtas" - "Kai rodoma ši piktograma, tapatybei nustatyti ar pirkimo operacijai patvirtinti naudokite kontrolinį kodą" + "Kai rodoma ši piktograma, tapatybei nustatyti ar pirkimo operacijai patvirtinti naudokite piršto antspaudą" "Atlikti vėliau" "Praleisti pirštų atspaudų nustatymą?" "Pasirinkote naudoti piršto atspaudą kaip vieną iš telefono atrakinimo būdų. Jei praleisite dabar, turėsite nustatyti funkciją vėliau. Nustatymas apytiksliai užtruks tik minutę." @@ -449,23 +449,23 @@ "Oi, tai ne jutiklis" "Smiliumi palieskite jutiklį tel. užp. dalyje." "Registracija neužbaigta" - "Pasiektas kontrolinio kodo registracijos laiko apribojimas. Bandykite dar kartą." - "Nepavyko užregistruoti kontrolinio kodo. Bandykite dar kartą arba atlikite tai kitu pirštu." + "Pasiektas piršto antspaudo registracijos laiko apribojimas. Bandykite dar kartą." + "Nepavyko užregistruoti piršto antspaudo. Bandykite dar kartą arba atlikite tai kitu pirštu." "Pridėti kitą" "Kitas" - "Naudodami kontrolinį kodą galite atrakinti telefoną, be to, galite įgalioti pirkimo veiksmus ir programų prieigą. ""Sužinokite daugiau" - " Ekrano užrakto parinktis išjungta. Jei norite sužinoti daugiau, susisiekite su savo organizacijos administratoriumi. ""Daugiau išsamios informacijos"\n\n"Vis tiek galite naudoti savo kontrolinį kodą ir įgalioti pirkinius bei prieigą prie programų. ""Sužinokite daugiau" + "Naudodami piršto antspaudą galite atrakinti telefoną, be to, galite įgalioti pirkimo veiksmus ir programų prieigą. ""Sužinokite daugiau" + " Ekrano užrakto parinktis išjungta. Jei norite sužinoti daugiau, susisiekite su savo organizacijos administratoriumi. ""Daugiau išsamios informacijos"\n\n"Vis tiek galite naudoti savo piršto antspaudą ir įgalioti pirkinius bei prieigą prie programų. ""Sužinokite daugiau" "Patraukite pirštą, tada vėl palieskite jutiklį" "Galite pridėti iki %d kontrol. kod." "Pridėjote maksimalų skaičių kontrolinių kodų" "Negalima pridėti daugiau kontrolinių kodų" "Pašalinti visus kontrolinius kodus?" "Pašalinti „%1$s“" - "Ar norite ištrinti šį kontrolinį kodą?" + "Ar norite ištrinti šį piršto antspaudą?" "Negalėsite naudoti kontrolinių kodų norėdami atrakinti telefoną, įgalioti pirkimo procesus ar prisijungti prie programų" "Negalėsite naudoti kontrolinių kodų norėdami atrakinti darbo profilį, įgalioti pirkimo operacijas ar prisijungti prie darbo programų" "Taip, pašalinti" - "Naudokite kontrolinį kodą, kad galėtumėte tęsti." + "Naudokite piršto antspaudą, kad galėtumėte tęsti." "Šifruotė" "Šifruoti planšetinį kompiuterį" "Šifruoti telefoną" @@ -536,18 +536,18 @@ "Aukštas saugos lygis" "Ne dabar" "Esamas ekrano užraktas" - "Kontrolinis kodas + atrakinimo piešinys" - "Kontrolinis kodas + PIN kodas" - "Kontrolinis kodas + slaptažodis" - "Tęsti be kontrolinio kodo" - "Telefoną galite atrakinti kontroliniu kodu. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą." + "Piršto antspaudas + atrakinimo piešinys" + "Piršto antspaudas + PIN kodas" + "Piršto antspaudas + slaptažodis" + "Tęsti be piršto antspaudo" + "Telefoną galite atrakinti piršto antspaudu. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą." "Neleido: admin., šifr. polit. ar pr. duom. atmin." "Nėra" "Perbraukti" "Piešinys" "PIN kodas" "Slaptažodis" - "Kai nustatysite ekrano užraktą, taip pat galėsite nustatyti kontrolinį kodą skiltyje „Nustatymai > Sauga“." + "Kai nustatysite ekrano užraktą, taip pat galėsite nustatyti piršto antspaudą skiltyje „Nustatymai > Sauga“." "Išjungti ekrano užraktą" "Pašalinti įrenginio apsaugą?" "Pašalinti profilio apsaugą?" @@ -876,6 +876,7 @@ "Automatinė" "2,4 GHz dažnio juosta" "5 GHz dažnio juosta" + "Pageidaujama 5,0 GHz dažnio juosta" "2,4 GHz" "5 GHz" "Pasirinkite bent vieną „Wi‑Fi“ viešosios interneto prieigos taško dažnio juostą:" @@ -1089,7 +1090,7 @@ "Natūrali" "Suintensyvinta" "Sodri" - "Automatinė" + "Prisitaikanti" "Naudokite tik tikslias spalvas" "Koreguokite tarp ryškių ir tikslių spalvų" "Sukant planšetinį kompiuterį automatiškai perjungti orientaciją" @@ -1119,7 +1120,7 @@ "Optimizuokite šviesumo lygį pagal esamą šviesą. Kai ši funkcija įjungta, vis tiek galite laikinai koreguoti šviesumą." "Ekrano šviesumas automatiškai prisitaikys prie jūsų aplinkos ir veiklos. Galite šliaužiklį perkelti patys, kad prisitaikantis šviesumas įsimintų jūsų nuostatas." "Nakties šviesa" - "Nustačius „Nakties šviesą“, naktį rodomas gintaro spalvos atspalvio ekranas. Taip bus patogiau žiūrėti į ekraną prietemoje ir galbūt lengviau užmigsite." + "Nustačius Nakties šviesą, naktį rodomas gintaro spalvos atspalvio ekranas. Taip bus patogiau žiūrėti į ekraną prietemoje ir galbūt lengviau užmigsite." "Tvarkaraštis" "Nėra" "Įjungiama pasirinktu laiku" @@ -3077,7 +3078,7 @@ "serijos numeris, aparatinės įrangos versija" "„Android“ saugos pataisos lygis, nemoduliuotų signalų įrangos versija, branduolio versija" "Aplinkos ekranas, užrakinimo ekranas" - "kontrolinis kodas" + "piršto antspaudas" "pasukti, apversti, pasukimas, stačia, gulsčia, orientacija, vertikali, horizontali" "atnaujinti, android" "dnd, tvarkaraštis, pranešimai, blokuoti, tyla, vibruoti, miego būsena, darbas, fokusavimas, garsas, nutildyti, diena, savaitės diena, savaitgalis, savaitės naktis, renginys" @@ -3235,7 +3236,7 @@ "Nutildyta, bet leisti %1$s ir %2$s" "Nutildyta, bet leisti %1$s, %2$s ir %3$s" "Pranešimai, įvykiai ir priminimai" - "Įjungus netrukdymo režimą pranešimai, priminimai ir įvykiai bus nutildomi, išskyrus anksčiau nurodytus elementus, kuriuos leidžiate. Galite koreguoti nustatymus, kad jūsų šeimos nariai, draugai arba kiti kontaktai galėtų su jumis susisiekti." + "Įjungus netrukdymo režimą pranešimai, priminimai ir įvykiai bus nutildomi, išskyrus anksčiau nurodytus elementus, kuriuos leidžiate. Galite koreguoti nustatymus, kad jūsų šeimos nariai, draugai arba kiti kontaktai galėtų su jumis susisiekti." "Atlikta" "Nustatymai" "Nieko nerodyti arba neskambėti gavus pranešimų" @@ -3502,9 +3503,9 @@ "Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?" "Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiant būtų prašoma nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?" "Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiat būtų prašoma įvesti slaptažodį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti įvesti slaptažodį norint paleisti jūsų įrenginį?" - "Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?" - "Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?" - "Be kontrolinio kodo, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti slaptažodį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?" + "Be to, kad atrakinant įrenginį prašoma piršto antspaudo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?" + "Be to, kad atrakinant įrenginį prašoma piršto antspaudo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?" + "Be piršto antspaudo, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti slaptažodį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?" "Taip" "Ne" "Apribota" @@ -3515,7 +3516,7 @@ "Kai įvesite PIN kodą, norėdami paleisti įrenginį, pritaikymo neįgaliesiems paslaugos, pvz., „%1$s“, dar nebus pasiekiamos." "Kai nupiešite atrakinimo piešinį, norėdami paleisti įrenginį, pritaikymo neįgaliesiems paslaugos, pvz., „%1$s“, dar nebus pasiekiamos." "Kai įvesite slaptažodį, norėdami paleisti įrenginį, pritaikymo neįgaliesiems paslaugos, pvz., „%1$s“, dar nebus pasiekiamos." - "Pastaba: paleidus iš naujo nebus galima paleisti programos, kol neatrakinsite telefono" + "Pastaba: jei esate nustatę ekrano užraktą ir iš naujo paleisite telefoną, nebus galima atidaryti programos, kol neatrakinsite telefono" "IMEI informacija" "IMEI susijusi informacija" "(%1$d lizdas)" @@ -3960,7 +3961,7 @@ "Reikalauti atrakinimo piešinio norint paleisti įrenginį. Kai įrenginys išjungtas, juo nepriimami skambučiai, pranešimai, informaciniai pranešimai ar įspėjimai." "Reikalauti PIN kodo norint paleisti įrenginį. Kai įrenginys išjungtas, juo nepriimami skambučiai, pranešimai, informaciniai pranešimai ar įspėjimai." "Reikalauti slaptažodžio norint paleisti įrenginį. Kai įrenginys išjungtas, juo nepriimami skambučiai, pranešimai, informaciniai pranešimai ar įspėjimai." - "Pridėkite kitą kontrolinį kodą" + "Pridėkite kitą piršto antspaudą" "Atrakinkite naudodami kitą pirštą" "Įjungta" "Bus įjungta pasiekus %1$s" @@ -4086,11 +4087,11 @@ "Paimkite telefoną, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją." "Paimkite planšetinį kompiuterį, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją." "Paimkite įrenginį, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją." - "Perbraukimas kontrolinio kodo jutikliu norint peržiūrėti pranešimus" + "Perbraukimas piršto antspaudo jutikliu norint peržiūrėti pranešimus" "Perbr. kontr. k. jutikliu" - "Jei norite patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu telefono užpakalinėje dalyje." - "Jei norite greitai patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu planšetinio kompiuterio užpakalinėje dalyje." - "Jei norite patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu įrenginio užpakalinėje dalyje." + "Jei norite patikrinti pranešimus, perbraukite žemyn piršto antspaudo jutikliu telefono užpakalinėje dalyje." + "Jei norite greitai patikrinti pranešimus, perbraukite žemyn piršto antspaudo jutikliu planšetinio kompiuterio užpakalinėje dalyje." + "Jei norite patikrinti pranešimus, perbraukite žemyn piršto antspaudo jutikliu įrenginio užpakalinėje dalyje." "Greitai peržiūrėkite pranešimus" "Įjungta" "Išjungta" diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml index d44717f94f2889a36b30f8917fd1a5f7fba4ed65..6a2b51394accdd13166721cb411fb36f42e11e6c 100644 --- a/res/values-lv/arrays.xml +++ b/res/values-lv/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Spiedpoga" "Vienādranga ierīces PIN kods" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index e9cc5242c57ce4f36c3877cac74a72009857e64b..841a9ffb33e0e4da5a23c43dfd267d6b830532af 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -865,6 +865,7 @@ "Automātiski" "2,4 GHz josla" "5,0 GHz josla" + "Ieteicama 5,0 GHz josla" "2,4 GHz" "5,0 GHz" "Izvēlieties vismaz vienu joslu Wi‑Fi tīklājam:" @@ -1077,7 +1078,7 @@ "Dabiska" "Paspilgtināta" "Piesātināta" - "Automātiski" + "Adaptīva krāsa" "Izmantot tikai precīzas krāsas" "Pielāgot krāsas no spilgtām līdz precīzām" "Mainīt orientāciju automātiski, rotējot planšetdatoru" @@ -2396,7 +2397,7 @@ "Saglabāts kešatmiņā" "Balss ievade un izvade" "Balss ievades un izvades iestatījumi" - "Balss meklēšana" + "Meklēšana ar balsi" "Android tastatūra" "Balss ievades iestatījumi" "Balss ievade" @@ -3198,7 +3199,7 @@ "Izslēgta skaņa, bet atļaut: %1$s un %2$s" "Izslēgta skaņa, bet atļaut: %1$s, %2$s un %3$s" "Ziņojumi, pasākumi un atgādinājumi" - "Esot ieslēgtam režīmam Netraucēt, netiks rādīti ziņojumi, atgādinājumi un paziņojumi, izņemot vienumus, ko atļāvāt. Varat pielāgot ziņojumu iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties." + "Kad ir ieslēgts režīms Netraucēt, netiks rādīti ziņojumi, atgādinājumi un paziņojumi par pasākumiem, izņemot vienumus, ko iepriekš būsiet atļāvis. Varat pielāgot ziņojumu iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties." "Gatavs" "Iestatījumi" "Nav vizuālo vai skaņas signālu no paziņojumiem" @@ -3471,7 +3472,7 @@ "Kad ievadīsiet PIN kodu, lai sāknētu šo ierīci, pieejamības pakalpojumi, piemēram, %1$s, vēl nebūs pieejami." "Kad ievadīsiet kombināciju, lai sāknētu šo ierīci, pieejamības pakalpojumi, piemēram, %1$s, vēl nebūs pieejami." "Kad ievadīsiet paroli, lai sāknētu šo ierīci, pieejamības pakalpojumi, piemēram, %1$s, vēl nebūs pieejami." - "Piezīme. Šo lietotni pēc atkārtotas palaišanas nevarēs startēt, kamēr netiks atbloķēts tālrunis." + "Piezīme. Ja restartēsiet tālruni un iestatīsiet ekrāna bloķēšanu, šo lietotni varēs startēt tikai pēc tālruņa atbloķēšanas." "IMEI informācija" "Ar IMEI saistīta informācija" "(%1$d. slots)" diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml index 8fecee827814491e6b0104ffaf018d3c1453a489..a779ca00b206ec1bc465a9d5983d4deb928f35af 100644 --- a/res/values-mk/arrays.xml +++ b/res/values-mk/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Копче „Притисни“" "PIN од спарен уред" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index ed6bf6e9589a95e65f914a38419d7a877a960933..1c75404e09d732eac5fb644a89b63a52fef5c199 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -854,6 +854,7 @@ "Автоматски" "Појас од 2,4 GHz" "Појас од 5,0 GHz" + "Претпочитан појас: 5,0 GHz" "2,4 GHz" "5,0 GHz" "Изберете барем еден појас за Wi‑Fi точка на пристап:" @@ -1065,7 +1066,7 @@ "Природно" "Нагласено" "Заситено" - "Автоматски" + "Адаптивна" "Користи само прецизни бои" "Приспособувај помеѓу живописни и прецизни бои" "Автоматски префрли ја ориентацијата при ротирање на таблетот" @@ -3161,7 +3162,7 @@ "Исклучи го звукот, но дозволи %1$s и %2$s" "Исклучи го звукот, но дозволи %1$s, %2$s и %3$s" "Пораки, настани и потсетници" - "Кога е вклучен режимот „Не вознемирувај“, ќе се исклучи звукот на пораките, потсетниците и настаните, освен за ставките што ќе ги дозволите погоре. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат." + "Кога е вклучен режимот „Не вознемирувај“, звукот на пораките, потсетниците и настаните е исклучен, освен за ставките што сте ги дозволите погоре. Може да ги приспособите поставките за пораки за да им дозволите на пријателите, семејството или другите контакти да ве добијат." "Готово" "Поставки" "Без визуелни вознемирувања или звук од известувањата" @@ -3285,7 +3286,7 @@ "Никогаш не прикажувај известувања во сенка или на периферни уреди" "Дозволи точка за известување" "Прикажи точка за известување" - "Отфрли го Не вознемирувај" + "Отфрли го „Не вознемирувај“" "Остави ги известувањава да продолжат да прекинуваат кога опцијата „Не вознемирувај“ е вклучена" "На заклучен екран" "Блокирана" @@ -3427,7 +3428,7 @@ "Кога ќе го внесете PIN-кодот за да го вклучите уредот, услугите за пристапност како %1$s сè уште нема да бидат достапни." "Кога ќе ја внесете шемата за да го вклучите уредот, услугите за пристапност како %1$s сè уште нема да бидат достапни." "Кога ќе ја внесете лозинката за да го вклучите уредот, услугите за пристапност како %1$s сè уште нема да бидат достапни." - "Забелешка: по рестартирање, апликацијава не може да се вклучи додека не го отклучите телефонот" + "Забелешка: ако го рестартирате телефонот, а имате поставено заклучување на екранот, апликацијава нема да може да се стартува додека не го отклучите телефонот" "Информации за IMEI" "Информации во врска со IMEI" "(Отвор%1$d)" diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml index 4350dd2af5588f73f86b839e78cd12c2a72770f6..cfd06addb5887c6168a870e1973a45644c5e3f5a 100644 --- a/res/values-ml/arrays.xml +++ b/res/values-ml/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "പുഷ് ബട്ടൺ" "പിയർ ഉപകരണത്തിൽ നിന്നുള്ള പിൻ" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index 8be175e7aaa956bc066fed556372e2690e7942bb..dbe40abea00f061d6d5d20c84c15ce4b6f3ce6f1 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -854,6 +854,7 @@ "സ്വമേധയാ" "2.4 GHz ബാൻഡ്" "5.0 GHz ബാൻഡ്" + "5.0 GHz ബാൻഡ് തിരഞ്ഞെടുത്തു" "2.4 GHz" "5.0 GHz" "വൈഫൈ ഹോട്ട്‌സ്‌പോട്ടിനായി കുറഞ്ഞത് ഒരു ബാൻഡ് എങ്കിലും തിരഞ്ഞെടുക്കുക:" @@ -1065,7 +1066,7 @@ "സ്വാഭാവികം" "ബൂസ്‌റ്റ് ചെയ്‌‌ത" "സാച്ചുറേറ്റ് ചെയ്‌‌ത" - "സ്വമേധയാ" + "അനുയോജ്യമായത്" "കൃത്യമായ നിറങ്ങൾ മാത്രം ഉപയോഗിക്കുക" "വ്യത്യസ്‌തവും കൃത്യവുമായ നിറങ്ങൾക്കിടയിൽ ക്രമീകരിക്കുക" "ടാബ്‌ലെറ്റ് തിരിക്കുമ്പോൾ ഒാറിയൻ്റേഷനിലേയ്ക്ക് സ്വയം മാറുക" @@ -1096,10 +1097,10 @@ "നിങ്ങളുടെ പരിതസ്ഥിതിയ്ക്കും പ്രവർത്തനങ്ങൾക്കുമനുസരിച്ച് സ്‌ക്രീൻ തെളിച്ചം സ്വമേധയാ ക്രമീകരിക്കപ്പെടും. മുൻഗണനകൾ മനസ്സിലാക്കാൻ അനുയോജ്യമായ തെളിച്ചത്തിനെ സഹായിക്കുന്നതിന് നിങ്ങൾക്ക് സ്ലൈഡർ നേരിട്ട് നീക്കാം." "നൈറ്റ് ലൈറ്റ്" "\'നൈറ്റ് ലൈറ്റ്\' നിങ്ങളുടെ സ്ക്രീനിന് ചെറിയ ആംബർ നിറം നൽകുന്നു. മങ്ങിയ വെളിച്ചത്തിൽ സ്ക്രീനിൽ നോക്കുന്നതും വായിക്കുന്നതും ഈ ഡിസ്പ്ലേ എളുപ്പമാക്കുന്നു, പെട്ടെന്ന് ഉറങ്ങാനും ഇത് നിങ്ങളെ സഹായിച്ചേക്കാം." - "സമയക്രമം" + "ഷെഡ്യൂള്‍‌" "ഒന്നുമില്ല" "ഇഷ്ടാനുസൃത സമയത്ത് ഓണാക്കുന്നു" - "സൂര്യോദയം മുതൽ അസ്തമയം വരെ ഓണാക്കുന്നു" + "സൂര്യാസ്തമയം മുതൽ ഉദയം വരെ ഓണാക്കുന്നു" "ആരംഭിക്കുന്ന സമയം" "അവസാനിക്കുന്ന സമയം" "നില" @@ -3161,7 +3162,7 @@ "മ്യൂട്ട് ചെയ്തു, എന്നാൽ %1$s, %2$s എന്നിവ അനുവദിക്കുന്നു" "മ്യൂട്ട് ചെയ്തു, എന്നാൽ %1$s, %2$s, %3$s എന്നിവ അനുവദിക്കുന്നു" "സന്ദേശങ്ങളും റിമൈൻഡറുകളും ഇവന്റുകളും" - "ശല്യപ്പെടുത്തരുത് ഓണായിരിക്കുമ്പോൾ, നിങ്ങൾ മുകളിൽ അനുവദിച്ചിട്ടുള്ള ഇനങ്ങൾ ഒഴികെയുള്ള, സന്ദേശങ്ങളും റിമൈൻഡറുകളും ഇവന്റുകളും മ്യൂട്ട് ചെയ്യപ്പെടും. നിങ്ങളെ വിളിക്കുന്നതിന് സുഹൃത്തുക്കളെയോ കുടുംബാംഗങ്ങളെയോ മറ്റ് കോൺടാക്‌റ്റുകളെയോ അനുവദിക്കാൻ നിങ്ങൾക്ക് ക്രമീകരണം ക്രമപ്പെടുത്താവുന്നതാണ്." + "\'ശല്യപ്പെടുത്തരുത്\' ഓണായിരിക്കുമ്പോൾ, നിങ്ങൾ മുകളിൽ അനുവദിച്ചിട്ടുള്ള ഇനങ്ങൾ ഒഴികെയുള്ള, സന്ദേശങ്ങളും റിമൈൻഡറും ഇവന്റുകളും മ്യൂട്ട് ചെയ്യപ്പെടും. നിങ്ങളെ വിളിക്കുന്നതിന് സുഹൃത്തുക്കളെയോ കുടുംബാംഗങ്ങളെയോ മറ്റ് കോൺടാക്‌റ്റുകളെയോ അനുവദിക്കാൻ നിങ്ങൾക്ക് ക്രമീകരണം ക്രമപ്പെടുത്താവുന്നതാണ്." "പൂർത്തിയാക്കി" "ക്രമീകരണം" "അറിയിപ്പുകളിൽ നിന്ന് വിഷ്വലുകളോ അല്ലെങ്കിൽ ശബ്‌ദമോ ഇല്ല" @@ -3427,7 +3428,7 @@ "ഈ ഉപകരണം ആരംഭിക്കാൻ PIN നൽകുന്ന സമയത്ത്, %1$s പോലുള്ള ഉപയോഗസഹായി സേവനങ്ങൾ ലഭ്യമാകില്ല." "ഈ ഉപകരണം ആരംഭിക്കാൻ പാറ്റേൺ നൽകുന്ന സമയത്ത്, %1$s പോലുള്ള ഉപയോഗസഹായി സേവനങ്ങൾ ലഭ്യമാകില്ല." "ഈ ഉപകരണം ആരംഭിക്കാൻ പാസ്‌വേഡ് നൽകുന്ന സമയത്ത്, %1$s പോലുള്ള ഉപയോഗസഹായി സേവനങ്ങൾ ലഭ്യമാകില്ല." - "ശ്രദ്ധിക്കുക: റീബൂട്ടിന് ശേഷം, ഫോൺ അൺലോക്കുചെയ്യുന്നത് വരെ ഈ ആപ്പ് ആരംഭിക്കാൻ കഴിയില്ല" + "ശ്രദ്ധിക്കുക: നിങ്ങളുടെ ഫോൺ റീസ്‌റ്റാർട്ട് ചെയ്‌ത്, സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിച്ചിട്ടുണ്ടെങ്കിൽ നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യുന്നതുവരെ ഈ ആപ്പ് ആരംഭിക്കാനാവില്ല" "IMEI വിവരങ്ങൾ" "IMEI അനുബന്ധ വിവരങ്ങൾ" "(സ്ലോട്ട്%1$d)" @@ -3632,7 +3633,7 @@ "പരമാവധി ഉപയോഗം" "ഡാറ്റയൊന്നും ഉപയോഗിച്ചില്ല" "\'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് %1$s-ന് ആക്സസ് അനുവദിക്കണോ?" - "\'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കാനും/ഓഫാക്കാനും ബന്ധപ്പെട്ട ക്രമീകരണത്തിലേക്ക് മാറ്റങ്ങൾ വരുത്താനും ആപ്പിന് കഴിയും." + "\'ശല്യപ്പെടുത്തരുത്\' ഓൺ/ഓഫ് ആക്കാനും ബന്ധപ്പെട്ട ക്രമീകരണത്തിലേക്ക് മാറ്റങ്ങൾ വരുത്താനും ആപ്പിന് കഴിയും." "അറിയിപ്പ് ആക്സസ്സ് ഓണായിരിക്കുന്നതിനാൽ ഇതും ഓണായി തുടരണം" "\'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് %1$s ആപ്പിനുള്ള ആക്സസ് പിൻവലിക്കണോ?" "ഈ ആപ്പ് സൃഷ്ടിച്ചിട്ടുള്ള എല്ലാ \'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങളും നീക്കംചെയ്യപ്പെടും." @@ -3952,7 +3953,7 @@ "ആപ്പുകൾ മാറാൻ, ഹോം ബട്ടണിൽ സ്വൈപ്പ് ചെയ്യുക. എല്ലാ ആപ്പുകളും കാണാൻ വീണ്ടും സ്വൈപ്പ് ചെയ്യുക. ഏത് സ്‌ക്രീനിൽ നിന്നും പ്രവർത്തിക്കുന്നു. നിങ്ങളുടെ സ്‌ക്രീനിന്റെ താഴെ വലത് ഭാഗത്ത് തുടർന്നങ്ങോട്ട് അവലോകന ബട്ടൺ ഉണ്ടാവുകയില്ല." "പുതിയ ഹോം ബട്ടൺ പരീക്ഷിക്കുക" "ആപ്പുകൾ മാറാൻ പുതിയ വിരൽചലനം ഓണാക്കുക" - "ഫോൺ പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക" + "ഫോൺ പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പ് ചെയ്യുക" "ടാബ്‌ലെറ്റ് പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക" "ഉപകരണം പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക" "സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, സ്ക്രീനിൽ രണ്ടുതവണ ടാപ്പുചെയ്യുക." @@ -3962,7 +3963,7 @@ "സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, ഫോൺ കയ്യിലെടുക്കുക." "സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, ടാബ്‌ലെറ്റ് കയ്യിലെടുക്കുക." "സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, ഫോൺ കയ്യിലെടുക്കുക." - "അറിയിപ്പുകൾക്ക് വിരലടയാളം സ്വൈപ്പുചെയ്യുക" + "അറിയിപ്പുകൾക്ക് വിരലടയാളം സ്വൈപ്പ് ചെയ്യുക" "ഫിംഗർപ്രിന്‍റ് സ്വൈപ്പ്" "നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ ഫോണിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക." "നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ, ടാബ്‌ലെറ്റിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക." diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml index 96b972e489eb48bc0ff76acce6d1d9aa73a04132..c39c167307e1759e2ac5e381274e03fd4e12712d 100644 --- a/res/values-mn/arrays.xml +++ b/res/values-mn/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Товчлуур" "Түнш төхөөрөмжийн PIN" @@ -287,8 +281,8 @@ "аудио фокус" "үндсэн дууны хэмжээ" "хоолойн дууны хэмжээ" - "хонхны дууны хэмжээ" - "медиа дууны хэмжээ" + "хонхны дууны түвшин" + "медиа дууны түвшин" "сэрүүлгийн дууны түвшин" "мэдэгдлийн дууны хэмжээ" "блютүүтийн хэмжээ" @@ -354,8 +348,8 @@ "Аудио фокус" "Үндсэн дууны хэмжээ" "Хоолойн дууны хэмжээ" - "Хонхны дууны хэмжээ" - "Медиа дууны хэмжээ" + "Хонхны дууны түвшин" + "Медиа дууны түвшин" "Сэрүүлгийн дууны түвшин" "Мэдэгдлийн дууны хэмжээ" "Блютүүтийн хэмжээ" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 7c00f7dfe3d2cb9fc85e626b9104172872209533..a9c46767508f841226f4653189e2c87dd2e6f352 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -45,7 +45,7 @@ "EAB/Presence-г бэлтгэсэн" "Мобайл радио цахилгаан" "SIM хаягийн лавлахыг харах" - "Тогтвортой залгах дугаарыг харах" + "Тогтсон залгах дугааруудыг харах" "Үйлчилгээний Залгах Дугаарыг харах" "IMS үйлчилгээний төлөв" "IMS төлөв" @@ -854,6 +854,7 @@ "Автомат" "2.4 ГГц зурвас" "5.0 Гц зурвас" + "5.0 Гц Зурвасыг тохиромжтой гэж үздэг" "2.4 Гц" "5.0 Гц" "Wi-Fi сүлжээний цэгт хамгийн багадаа нэг зурвасыг сонгоно уу:" @@ -972,8 +973,8 @@ "Роуминг тохиргоо" - "Wi-Fi илүү эрхэмлэдэг" - "Давуу эрхтэй мобайл" + "Wi-Fi давуу эрхтэй" + "Мобайл давуу эрхтэй" "Зөвхөн Wi-Fi" @@ -987,8 +988,8 @@ "0" - "Wi-Fi-г эрхэмлэдэг" - "Давуу эрхтэй мобайл" + "Wi-Fi давуу эрхтэй" + "Мобайл давуу эрхтэй" "Wi-Fi" @@ -1065,7 +1066,7 @@ "Байгалийн" "Өдөөсөн" "Өнгө ялгасан" - "Автомат" + "Дасан зохицох" "Зөвхөн оновчтой өнгийг ашиглах" "Тод болон оновчтой өнгө хооронд тохируулах" "Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх" @@ -3038,10 +3039,10 @@ "Хонхыг чичиргээтэй болгож тохируулсан" "Хонхыг чимээгүй болгож тохируулсан" "Хонх дуугаргах түвшин 80%-д" - "Медиа дууны хэмжээ" + "Медиа дууны түвшин" "Дуудлагын дууны түвшин" "Сэрүүлгийн дууны түвшин" - "Хонхны дууны хэмжээ" + "Хонхны дууны түвшин" "Мэдэгдлийн дууны хэмжээ" "Утасны хонхны ая" "Мэдэгдлийн өгөгдмөл ая" @@ -3161,7 +3162,7 @@ "Дууг хаасан хэдий ч %1$s болон %2$s-г зөвшөөрдөг" "Дууг хаасан хэдий ч %1$s, %2$s болон %3$s-г зөвшөөрдөг" "Зурвас, арга хэмжээ & сануулагч" - "Бүү саад бол горим асаалттай үед зурвас, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд зурвасын тохиргоог өөрчлөх боломжтой." + "Бүү саад бол горим асаалттай үед зурвас, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд зурвасын тохиргоог өөрчлөх боломжтой." "Дууссан" "Тохиргоо" "Мэдэгдэл харагдахгүй бөгөөд дуугарахгүй" @@ -3425,7 +3426,7 @@ "Та энэ төхөөрөмжийг эхлүүлэхдээ PIN оруулах үед %1$s мэтийн хандалтын үйлчилгээнүүд хараахан ашиглах боломжгүй байна." "Та энэ төхөөрөмжийг эхлүүлэхдээ хээ оруулах үед %1$s мэтийн хандалтын үйлчилгээнүүд хараахан ашиглах боломжгүй байна." "Та энэ төхөөрөмжийг эхлүүлэхдээ нууц үг оруулах үед %1$s мэтийн хандалтын үйлчилгээнүүд хараахан ашиглах боломжгүй байна." - "Санамж: Дахин асаасны дараа энэ апп нь таныг утасны түгжээгээ тайлах хүртэл эхлэх боломжгүй" + "Санамж: Хэрэв та утсаа дахин эхлүүлэх болон дэлгэцийн түгжээ тохируулбал энэ апп таныг утасныхаа түгжээг тайлах хүртэл эхлэх боломжгүй" "IMEI мэдээлэл" "IMEI хамаарах мэдээлэл" "(Слот%1$d)" diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml index 83c5742fe930565b370ee92885962bc527158ad5..9dec5a58926cfccb37ff990bab92e0294642c0a6 100644 --- a/res/values-mr/arrays.xml +++ b/res/values-mr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "पुश बटण" "पीअर डिव्हाइसवरील पिन" @@ -189,7 +183,7 @@ "AKA\'" - "काहीही नाही" + "नको" "PAP" "MSCHAP" "MSCHAPV2" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 3893ddf0786258799505f594d355a0635689d95d..1a2089c995e442395dd6d5e7afbd3f8b2328b76d 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -854,6 +854,7 @@ "आपोआप" "2.4 GHz बँड" "५.० GHz बँड" + "५.० GHz बँडला प्राधान्य दिले" "२.४ GHz" "५.० GHz" "वाय-फाय हॉटस्‍पॉटसाठी किमान एक बँड निवडा:" @@ -1065,7 +1066,7 @@ "नैसर्गिक" "बूस्ट केलेला" "संपृक्त" - "आपोआप" + "अॅडॅप्टिव्ह" "फक्त अचूक रंग वापरा" "उठावदार आणि अचूक रंगामध्ये अॅडजस्‍ट करा" "टॅब्लेट फिरवताना ओरिएंटेशन आपोआप स्विच करा" @@ -1095,13 +1096,13 @@ "उपलब्ध प्रकाशासाठी उज्ज्वलता स्तर अनुकूल करा. हे वैशिष्ट्य चालू असताना, तुम्ही तरीही उज्ज्वलता तात्पुरती समायोजित करू शकता." "तुमच्या स्क्रीनची चमक तुमच्या वातावरण आणि अॅक्टिव्हिटीशी आपोआप समायोजित होईल. अनुकूलित चमकेला तुमची प्राधान्ये जाणून घेण्यात मदत करण्यासाठी तुम्ही स्लाइडर व्यक्तिचलितपणे हलवू शकता." "रात्रीचा प्रकाश" - "रात्रीचा प्रकाश तुमच्या स्क्रीनला पिवळसर तपकिरी रंगछटा देतो. यामुळे मंद प्रकाशात तुमचा स्क्रीन पाहणे किंवा वाचणे सोपे होते आणि तुम्हाला झोप येण्यात मदत होऊ शकते." - "शेड्यूल" + "रात्रीचा प्रकाश तुमच्या स्क्रीनला पिवळसर तपकिरी छटा देतो. यामुळे मंद प्रकाशात तुमची स्क्रीन पाहणे किंवा वाचणे सोपे होते आणि तुम्हाला झोप येण्यात मदत होऊ शकते." + "शेड्युल" "काहीही नाही" - "कस्टम वेळी चालू होते" - "सूर्योदय ते सूर्यास्तादरम्यान चालू होते" + "ठराविक वेळी चालू होतो" + "सूर्यास्त-सूर्योदय चालू राहतो" "प्रारंभ वेळ" - "समाप्ती वेळ" + "संपण्याची वेळ" "स्थिती" "तीव्रता" "बंद / %1$s" @@ -3162,7 +3163,7 @@ "म्यूट केले आहे पण %1$s आणि %2$s ला अनुमती द्या" "म्यूट केले आहे पण %1$s, %2$s आणि %3$s ला अनुमती द्या" "मेसेज, इव्हेंट आणि रिमाइंडर" - "जेव्हा व्यत्यय आणू नका सुरू असते तेव्हा मेसेज, रिमाइंडर आणि इव्हेंट म्यूट असतील, तुम्ही वरती अनुमती दिलेल्या आयटम व्यतिरिक्त. तुम्ही सेटिंग्ज मध्ये बदल करून तुमच्या मित्रमैत्रिणींना, कुटुंबियांना आणि इतर संपर्कांना तुमच्यापर्यंत पोहोचण्याची अनुमती देऊ शकता." + "जेव्हा व्यत्यय आणू नका सुरू असते तेव्हा मेसेज, रिमाइंडर आणि इव्हेंट म्यूट असतील, तुम्ही वरती अनुमती दिलेल्या आयटम व्यतिरिक्त. तुम्ही सेटिंग्ज मध्ये बदल करून तुमच्या मित्रमैत्रिणींना, कुटुंबियांना आणि इतर संपर्कांना तुमच्यापर्यंत पोहोचण्याची अनुमती देऊ शकता." "झाले" "सेटिंग्ज" "सूचना आल्यावर व्हिज्युअल किंवा आवाज नाही" @@ -3376,7 +3377,7 @@ "कधीही नाही" "प्रत्येक रात्री" "आठवड्याच्या रात्री" - "प्रारंभ वेळ" + "सुरू होण्याची वेळ" "समाप्ती वेळ" "%s पुढील दिवशी" "अनिश्चितपणे केवळ अलार्म वर बदला" @@ -3428,7 +3429,7 @@ "या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही तुमचा पिन एंटर करता, तेव्हा %1$s सारख्या सेवांची प्रवेशयोग्यता उपलब्धता असणार नाही." "हे डिव्हाइस सुरू करण्यासाठी तुम्ही तुमचा पॅटर्न एंटर करता, तेव्हा %1$s सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही." "या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही तुमचा पासवर्ड एंटर करता, तेव्हा %1$s सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही." - "टीप: रीबूट केल्यानंतर, तुम्ही तुमचा फोन अनलॉक करे पर्यंत हे अॅप सुरू होऊ शकत नाही" + "टीप: तुम्ही तुमचा फोन रीस्टार्ट केल्यास आणि स्क्रीन लॉक सेट केले असल्यास, तुम्ही तुमचा फोन अनलॉक करेपर्यंत हे अॅप सुरू होऊ शकत नाही" "IMEI माहिती" "IMEI सापेक्ष माहिती" "(स्लॉट%1$d)" @@ -3632,7 +3633,7 @@ "वारंवारता" "कमाल वापर" "कोणताही डेटा वापरला नाही" - "%1$s साठी व्यत्यय आणू नका ला प्रवेशाची अनुमती द्यायची?" + "%1$s वर व्यत्यय आणू नका ला अॅक्सेस द्यायचा का?" "व्यत्यय आणू नका चालू/बंद करण्‍यात आणि संबंधित स्‍ट्रिंगमध्‍ये बदल करण्‍यात अ‍ॅप सक्षम असेल." "सूचना प्रवेश चालू असल्याने चालू केलेले ठेवणे आवश्यक आहे" "%1$s साठी व्यत्यय आणू नका मध्‍ये प्रवेश करणे रद्द करायचे?" @@ -3872,7 +3873,7 @@ "बॅज दर्शवू शकता" "हेतू" "हेतू हटवा" - "पूर्ण स्क्रीन हेतू" + "फुल स्क्रीन हेतू" "कृती:" "शीर्षक" "दूरस्थ इनपुट" diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml index 46188d3dbc571062b621562bbf797ecad7a67bfd..ea6be581178cd298d686cc97cc3ecd096f522fd5 100644 --- a/res/values-ms/arrays.xml +++ b/res/values-ms/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Butang tekan" "PIN daripada peranti rakan" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 321f282e5f985f3c74f89afc6626eb01c9e78d5f..c981621bb0025e20831e0472adf19aa52abdd137 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -854,6 +854,7 @@ "Automatik" "Jalur 2.4 GHz" "Jalur 5.0 GHz" + "Lajur 5.0 GHz diutamakan" "2.4 GHz" "5.0 GHz" "Pilih sekurang-kurangnya satu jalur untuk tempat liputan Wi-Fi:" @@ -1065,7 +1066,7 @@ "Asli" "Ditingkatkan" "Tepu" - "Automatik" + "Boleh suai" "Gunakan warna tepat sahaja" "Laraskan antara warna terang dengan tepat" "Menukar orientasi secara automatik apabila memutarkan tablet" @@ -3161,7 +3162,7 @@ "Diredamkan tetapi benarkan %1$s dan %2$s" "Diredamkan, tetapi benarkan %1$s, %2$s dan %3$s" "Mesej, acara & peringatan" - "Apabila Jangan Ganggu Dihidupkan, mesej, peringatan dan acara akan diredamkan, kecuali item yang anda benarkan di atas. Anda boleh melaraskan tetapan mesej untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda." + "Apabila Jangan Ganggu dihidupkan, mesej, peringatan dan acara akan diredamkan, kecuali item yang anda benarkan di atas. Anda boleh melaraskan tetapan mesej untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda." "Selesai" "Tetapan" "Tiada visual atau bunyi daripada pemberitahuan" @@ -3285,7 +3286,7 @@ "Jangan sekali-kali tunjukkan pemberitahuan dalam bidai atau pada peranti persisian" "Benarkan titik pemberitahuan" "Tunjukkan titik pemberitahuan" - "Atasi Jangan Ganggu" + "Batalkan Jangan Ganggu" "Benarkan pemberitahuan ini terus mengganggu apabila Jangan Ganggu dihidupkan" "Pada skrin kunci" "Disekat" @@ -3427,7 +3428,7 @@ "Apabila anda memasukkan PIN anda untuk memulakan peranti ini, perkhidmatan kebolehaksesan seperti %1$s belum tersedia lagi." "Apabila anda memasukkan corak anda untuk memulakan peranti ini, perkhidmatan kebolehaksesan seperti %1$s belum tersedia lagi." "Apabila anda memasukkan kata laluan anda untuk memulakan peranti ini, perkhidmatan kebolehaksesan seperti %1$s belum tersedia lagi." - "Perhatian: Selepas but semula, apl ini tidak dapat dimulakan sehingga anda membuka kunci telefon" + "Nota: Jika anda memulakan semula telefon dan telah menyediakan kunci skrin, apl ini tidak boleh dimulakan sehingga anda membuka kunci telefon" "Maklumat IMEI" "Maklumat relatif IMEI" "(Slot%1$d)" diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml index f2c2f068b1cc8390ed2581daf5b3c46bf3a483dc..ee9d4338b5229120461121b35e0b9cfde55e3f85 100644 --- a/res/values-my/arrays.xml +++ b/res/values-my/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "နှိပ်ရန်ခလုတ်" "တန်းတူစက်ပစ္စည်းမှပင်နံပါတ်" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 61bc929f1485a4a4ecd5a4c67d743ac61f1e9629..3841c5aa3ece42733634efa7c6b7d7495ce0d3eb 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -839,7 +839,7 @@ "လိုင်းအမြန်နှုန်း" "လှိုင်းနှုန်း" "အိုင်ပီလိပ်စာ" - "မှတဆင့် သိမ်းဆည်းရန်" + "မှတဆင့် သိမ်းရန်" "%1$s အထောက်အထားများ" "EAPနည်းလမ်း" "အဆင့်(၂) စစ်မှန်ကြောင်းအတည်ပြုခြင်း" @@ -854,6 +854,7 @@ "အလိုအလျောက်" "၂.၄ GHz လိုင်း" "၅.၀ GHz လိုင်း" + "5.0 GHz လိုင်း ရွေးချယ်ထားသည်" "၂.၄ GHz" "၅.၀ GHz" "Wi‑Fi ဟော့စပေါ့အတွက် အနည်းဆုံး လိုင်းတစ်လိုင်းရွေးပါ−" @@ -865,7 +866,7 @@ "စနစ်ပိုင်း အသိအမှတ်ပြုလက်မှတ်များကို သုံးပါ" "မပေးထားပါ" "အတည်မပြုပါ" - "အသိမှတ်ပြုလက်မှတ် မသတ်မှတ်ထားပါ။ သင့်ချိတ်ဆက်မှု တသီးတသန့်ဖြစ်မည် မဟုတ်ပါ။" + "အသိမှတ်ပြုလက်မှတ် သတ်မှတ်မထားပါ။ သင့်ချိတ်ဆက်မှု တသီးတသန့်ဖြစ်မည် မဟုတ်ပါ။" "ကွန်ရက်အမည် ရှည်လွန်းပါသည်။" "ဒိုမိန်းတစ်ခု သတ်မှတ်ပေးရပါမည်။" "WPSရရှိုနိုင်သည်" @@ -1065,7 +1066,7 @@ "သဘာဝ" "အရောင်တင်ထားသည်" "ပြည့်ဝ အရောင်" - "အလိုအလျောက်" + "အလိုက်အထိုက်" "မူလအရောင်များကိုသာ သုံးပါ" "တောက်ပခြင်းနှင့် မူလအရောင်များအကြား ချိန်ညှိပါ" "တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်" @@ -1337,7 +1338,7 @@ "^1 အား လေ့လာပါ" "အခြားပါဝင်မှုများမှာ အက်ပ်များမှ သိမ်းဆည်းလိုက်သည့် မျှဝေထားသော ဖိုင်များ၊ အင်တာနက် သို့မဟုတ် ဘလူးတုသ်မှ ဒေါင်းလုဒ်လုပ်ထားသည့် ဖိုင်များ၊ Android ဖိုင်များ စသည်တို့ဖြစ်သည်။ \n\n ဤ ^1 ၏ မြင်နိုင်သော အကြောင်းအရာများကိုကြည့်ရန် လေ့လာရန် ကိုတို့ပါ။" "စနစ်တွင် Android ဗားရှင်း %s ဖြင့် ဖွင့်ခဲ့သည့်ဖိုင်များ ပါဝင်သည်" - "^1 သည် ဓာတ်ပုံ၊ ဂီတ၊ အက်ပ် သို့မဟုတ် အခြားဒေတာများအား သိမ်းဆည်းရန် သိုလှောင်ခန်း၏ ^2 အထိ နေရာယူထားသည်။\n\nအသေးစိတ်ကို ကြည့်ရန် ^1 သို့ ပြောင်းပါ။" + "^1 သည် ဓာတ်ပုံ၊ ဂီတ၊ အက်ပ် သို့မဟုတ် အခြားဒေတာများအား သိမ်းရန် သိုလှောင်ခန်း၏ ^2 အထိ နေရာယူထားသည်။\n\nအသေးစိတ်ကို ကြည့်ရန် ^1 သို့ ပြောင်းပါ။" "သင့် ^1 ကိုတပ်ဆင်မည်" "ရွှေ့လျားနိုင်သည့် သိုလှောင်မှုအဖြစ် သုံးမည်" "စက်ပစ္စည်းများအကြား ပုံများနှင့် အခြားမီဒီယာများရွှေ့လျားရန်အတွက်။" @@ -1382,7 +1383,7 @@ "ဖြုတ်လွယ်သွင်းလွယ် သိုလှောင်ခန်း" "နောက်မှ စနစ်သတ်မှတ်ရန်" "^1 ကို ဖော်မက်လုပ်လိုပါသလား။" - "ဤ ^1 တွင် အက်ပ်၊ ဖိုင်နှင့် မီဒီယာများကို သိမ်းဆည်းရန် ဖော်မက်လုပ်ရပါမည်။ \n\nဖော်မက်လုပ်ခြင်းဖြင့် ^2 ရှိ အရာအားလုံးကို ဖျက်လိုက်ပါမည်။ အကြောင်းအရာများ မဆုံးရှုံးစေရန် အခြား ^3 သို့မဟုတ် စက်ပစ္စည်းတစ်ခုသို့ မိတ္တူကူးထားပါ။" + "ဤ ^1 တွင် အက်ပ်၊ ဖိုင်နှင့် မီဒီယာများကို သိမ်းရန် ဖော်မက်လုပ်ရပါမည်။ \n\nဖော်မက်လုပ်ခြင်းဖြင့် ^2 ရှိ အရာအားလုံးကို ဖျက်လိုက်ပါမည်။ အကြောင်းအရာများ မဆုံးရှုံးစေရန် အခြား ^3 သို့မဟုတ် စက်ပစ္စည်းတစ်ခုသို့ မိတ္တူကူးထားပါ။" "^1 ဖော်မက်လုပ်ရန်" "အကြောင်းအရာကို ^1 သို့ ရွှေ့မလား။" "ဖိုင်၊ မီဒီယာနှင့် အချို့သော အက်ပ်များကို ဤ ^1 သို့ ရွှေ့နိုင်ပါသည်။ \n\nဤသို့ ရွှေ့ခြင်းအားဖြင့် သင့်တက်ဘလက်သိုလှောင်ခန်းတွင် ^2 နေရာလွတ်သွားစေမည်ဖြစ်ပြီး ^3 ခန့် ကြာနိုင်ပါသည်။" @@ -1406,7 +1407,7 @@ "ဘက်ထရီ အားအဆင့်" "APNs" "ဝင်ရောက်မည့်ပွိုင့်အားပြင်ဆင်ရန်" - "မသတ်မှတ်ထားပါ" + "သတ်မှတ်မထားပါ" "အမည်" "APN" "ပရောက်စီ" @@ -2832,7 +2833,7 @@ "အဲဒါ အလုပ် လုပ်ပုံ" "စတိုးဆိုင်များတွင် သင်၏ ဖုန်းဖြင့် ငွေပေးချေပါ" "ငွေချေရန် မူရင်းသတ်မှတ်ခြင်း" - "မသတ်မှတ်ထားပါ" + "သတ်မှတ်မထားပါ" "%1$s - %2$s" "မူရင်းသတ်မှတ်ချက် သုံးရန်" "အမြဲတမ်း" @@ -3161,7 +3162,7 @@ "ပိတ်ထားသော်လည်း %1$s နှင့် %2$s ကို ခွင့်ပြုသည်" "ပိတ်ထားသော်လည်း %1$s၊ %2$s နှင့် %3$s ကို ခွင့်ပြုသည်" "မက်ဆေ့ဂျ်၊ အစီအစဉ်နှင့် သတိပေးချက်များ" - "\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ မက်ဆေ့ဂျ်၊ သတိပေးချက်နှင့် အစီအစဉ်များကို ပိတ်ထားပါမည်။ သင့်မိတ်ဆွေများ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်ကိုဆက်သွယ်နိုင်စေရန် မက်ဆေ့ဂျ်ဆက်တင်များကို ပြင်ဆင်နိုင်သည်။" + "\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ သင်အထက်တွင် ခွင့်ပြုထားသည်များအတွက်မှလွဲ၍ မက်ဆေ့ဂျ်၊ သတိပေးချက်နှင့် အစီအစဉ်များကို ပိတ်ထားပါမည်။ သင့်မိတ်ဆွေများ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်အားဆက်သွယ်နိုင်စေရန် မက်ဆေ့ဂျ်ဆက်တင်များကို ပြင်ဆင်နိုင်သည်။" "ပြီးပါပြီ" "ဆက်တင်များ" "အကြောင်းကြားချက်များအတွက် ရုပ်ပုံ သို့မဟုတ် အသံ မဖွင့်ရန်" @@ -3284,7 +3285,7 @@ "အကြောင်းကြားချက်များ ပြပါ" "အရိပ်ထဲ သို့မဟုတ် တွဲချိတ်ထားသည့် စက်ပစ္စည်းများပေါ်တွင် အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်" "အကြောင်းကြားချက်အမှတ်အသားကို ခွင့်ပြုရန်" - "အကြောင်းကြားချက်အမှတ်အသားကို ပြသရန်" + "အကြောင်းကြားချက် အစက် ပြရန်" "\'မနှောင့်ယှက်ရ\' နေရာတွင် အစားထိုးခြင်း" "\"မနှောင့်ယှက်ရ\" ဖွင့်ထားသည့်အခါ ဤသတိပေးချက်များကို ဆက်ပြီး ဖော်ပြခွင့် ပြုပါ" "လော့ခ်ချချိန် မျက်နှာပြင်တွင်" @@ -3427,7 +3428,7 @@ "ဤစက်ပစ္စည်း စရန် သင့် PIN ရိုက်ထည့်ပြီးသောအခါ၊%1$s ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။" "ဤစက်ပစ္စည်း စရန် သင့် ပုံဆွဲရေးဆွဲပြီး သော့ဖွင့်သောအခါ၊%1$s ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။" "ဤစက်ပစ္စည်း စရန် သင့် လျှို့ဝှက်ကုဒ် ရိုက်သွင်းသောအခါ၊%1$s ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။" - "မှတ်ချက် − ပြန်လည်စတင်ပြီးနောက် သင့်ဖုန်းကိုလော့ခ်မဖွင့်မချင်း ဤအက်ပ်ကို အသုံးပြု၍မရပါ" + "မှတ်ချက်- သင်၏ဖုန်းကို ပြန်လည်စတင်ပြီး မျက်နှာပြင်လော့ခ်ချထားလျှင် သင့်ဖုန်းကို လော့ခ်မဖွင့်မချင်း ဤအက်ပ်ကို အသုံးပြု၍မရပါ" "IMEI အချက်အလက်များ" "IMEI ဆက်စပ် အချက်အလက်များ" "(အပေါက်%1$d)" @@ -3632,7 +3633,7 @@ "အများဆုံး အသုံးပြုမှု" "မည်သည့်ဒေတာမျှ အသုံးမပြုပါ" "%1$sအတွက် မနှောင့်ယှက်ရန်ကို အသုံးပြုခွင့်ပေးမလား?" - "အပ်ဖ်သည် မနှောင့်ယှက်ရန်ကို အဖွင့်/အပိတ်ပြုလုပ်နိုင်ကာ သက်ဆိုင်ရာ ချိန်ညှိချက်များကို ပြောင်းလဲနိုင်ပါသည်။" + "အက်ပ်သည် မနှောင့်ယှက်ရန်ကို အဖွင့်/အပိတ်ပြုလုပ်နိုင်ကာ သက်ဆိုင်ရာ ချိန်ညှိချက်များကို ပြောင်းလဲနိုင်ပါသည်။" "အကြောင်းကြားချက် အသုံးပြုခွင့်ကိုဖွင့်ထားသောကြောင့် ဆက်လက်ဖွင့်ထားရပါမည်" "%1$sအတွက် Do Not Disturb အား သုံးခွင့်ကို ပြန်ရုပ်သိမ်းမလား။" "ဤအက်ပ်မှ ဖန်တီးခဲ့သည့် Do Not Disturb စည်းမျဉ်းများ အားလုံးကို ဖယ်ရှားပစ်ပါမည်။" @@ -4143,7 +4144,7 @@ "တုန်ခါရန်" "အသံတိတ်ရန်" "ပြောင်းလဲမှု မလုပ်ပါနှင့်" - "ဖွင့်ရန် (တုန်ခါမှု)" + "ဖွင့်ထားသည် (တုန်ခါမှု)" "ဖွင့်ရန် (အသံတိတ်ရန်)" "ပိတ်ရန်" "ကွန်ရက် အသေးစိတ်များ" diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml index 6bae31ec2d5c1a9ece374b182ca280c9088063b3..636bb0b50f5391d6655325c8dc69b36e4eba582c 100644 --- a/res/values-nb/arrays.xml +++ b/res/values-nb/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Trykk på knappen" "Personlig kode fra motpart" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index eca56f9af233bd57f616edfb08d70171dd8295ab..6e614191c0b043a78101c46d904256ebfb3a8ed4 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -854,6 +854,7 @@ "Automatisk" "2,4 GHz-bånd" "5,0 GHz-bånd" + "5,0 GHz-bånd foretrekkes" "2,4 GHz" "5,0 GHz" "Velg minst ett bånd for Wi-Fi-sonen:" @@ -1065,7 +1066,7 @@ "Naturlig" "Forsterket" "Mettet" - "Automatisk" + "Tilpasset" "Bruk bare nøyaktige farger" "Juster mellom levende og nøyaktige farger" "Bytt retning automatisk når nettbrettet roteres" @@ -1095,7 +1096,7 @@ "Optimaliser lysstyrken etter omgivelsene. Når denne funksjonen er på, kan du fremdeles justere lysstyrken midlertidig." "Lysstyrken på skjermen din justeres automatisk etter omgivelser og aktiviteter. Du kan flytte glidebryteren manuelt for få tilpasset lysstyrke til å registrere preferansene dine." "Nattlys" - "Nattlys gir skjermen en ravgul nyanse. Dette gjør det mer komfortabelt å se på skjermen eller lese ved svakt lys, og det kan gjøre det enklere å sovne." + "Nattlys gir skjermen en ravgul nyanse. Dette gjør det mer komfortabelt å se eller lese på skjermen i svakt lys, og det kan gjøre det enklere å sovne." "Planlegg" "Ingen" "Slås på på et egendefinert tidspunkt" @@ -1116,8 +1117,8 @@ "Slå av nå" "Slå på til soloppgang" "Slå av til solnedgang" - "Slå av til %1$s" - "Slå av til %1$s" + "Slå på til kl. %1$s" + "Slå av til kl. %1$s" "Hvilemodus" "Skjermen slås av" "Etter %1$s med inaktivitet" @@ -1719,7 +1720,7 @@ "Filter" "Velg filteralternativer" "Alle apper" - "Avslåtte apper" + "Deaktiverte apper" "Tredjeparts" "Kjører" "USB-lagring" @@ -3161,7 +3162,7 @@ "Ignorert, men tillat %1$s og %2$s" "Ignorert, men tillat %1$s, %2$s og %3$s" "Meldinger, aktiviteter og påminnelser" - "Når «Ikke forstyrr» er på, ignoreres meldinger, påminnelser og aktiviteter, med unntak av elementene du tillater ovenfor. Du kan justere meldingsinnstillinger for å la venner, familie eller andre kontakter nå deg." + "Når «Ikke forstyrr» er på, ignoreres meldinger, påminnelser og aktiviteter, med unntak av elementene du tillater ovenfor. Du kan justere meldingsinnstillingene for å la venner, familie eller andre kontakter nå deg." "Ferdig" "Innstillinger" "Ingen lyder eller visuelle elementer fra varsler" @@ -3427,7 +3428,7 @@ "Når du taster inn PIN-koden din for å starte denne enheten, er tilgjengelighetstjenester som %1$s ikke tilgjengelige ennå." "Når du tegner mønsteret ditt for å starte denne enheten, er tilgjengelighetstjenester som %1$s ikke tilgjengelige ennå." "Når du skriver inn passordet ditt for å starte denne enheten, er tilgjengelighetstjenester som %1$s ikke tilgjengelige ennå." - "Merk: Etter en omstart kan ikke denne appen starte før du låser opp telefonen din" + "Merk: Hvis du starter telefonen på nytt og har en skjermlås angitt, kan ikke denne appen starte før du låser opp telefonen" "IMEI-informasjon" "IMEI-relatert informasjon" "(Spor %1$d)" diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml index bd4ae2e195d5a577533de7f7f3eca5910de416cf..46425ceab20fdd48e9a1bfc36f25c6c9445a3a5a 100644 --- a/res/values-ne/arrays.xml +++ b/res/values-ne/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push बटन" "PIN जोडी उपकरणबाट" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 934766abe2dc412878be42dcc5b8ba1689869fed..57a91f1a88d44f04943a3581bd06351fd5de8ff2 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -854,6 +854,7 @@ "स्वतः निर्धारित" "2.4 GHz ब्यान्ड" "५.० GHz ब्यान्ड" + "५.० GHz ब्यान्ड रुचाइयो" "२.४ GHz" "५.० GHz" "Wi‑Fi हटस्पटका लागि कम्तीमा एक ब्यान्ड छनौट गर्नुहोस्:" @@ -1065,7 +1066,7 @@ "प्राकृतिक" "बढाइएको" "परिपूर्ण पारिएको" - "स्वचालित" + "अनुकूलनीय" "सही रङहरू मात्र प्रयोग गर्नुहोस्" "स्पष्ट र सही रङहरूबीच समायोजन गर्नुहोस्" "ट्याब्लेट घुमाउँदा स्वचालित रूपमा अभिमुखिकरण स्विच गर्नुहोस्" @@ -1101,7 +1102,7 @@ "आफू अनुकूल समयमा सक्रिय गर्छ" "सूर्यास्तदेखि सूर्योदयसम्म सक्रिय गर्छ" "सुरु समय" - "समय समाप्ति" + "समाप्ति समय" "स्थिति" "तीव्रता" "निष्क्रिय / %1$s" @@ -1549,7 +1550,7 @@ "GPS लाई सहयोग पुर्‍याउन सर्भरको प्रयोग गर्नुहोस् (सञ्जाल प्रयोग घटाउन अनचेक गर्नुहोस्)" "GPS लाई मद्दत पुर्याउन सर्भर प्रयोग गर्नुहोस् (GPS कार्यसम्पादन सुधार्न अनचेक गर्नुहोस्)" "स्थान; Google खोजी" - "तपाईँको खोज परिणामहरू र अन्य सेवाहरू सुधार्नका लागि गुगललाई तपाईँको स्थान प्रयोग गर्न अनुमति दिनुहोस्" + "तपाईँको खोजका परिणाम र अन्य सेवाहरू सुधार्नका लागि गुगललाई तपाईँको स्थान प्रयोग गर्न अनुमति दिनुहोस्" "मेरो स्थानमा पहुँच गर्नुहोस्" "तपाईंको अनुमतिबाट अनुप्रयोगहरूलाई तपाईंको स्थान जानकारीको उपयोग गर्न दिनुहोस्।" "स्थान स्रोतहरू" @@ -2220,12 +2221,12 @@ %1$d अनुप्रयोगमा प्रतिबन्ध लगाइयो "अनुप्रयोगलाई रोक्ने हो?" - "%1$s ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।" - "%1$s ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।" - "%1$s ले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।" - "%1$sले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको फोनले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं %1$sलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।" - "%1$sले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको ट्याब्लेटले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं %1$sलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।" - "%1$sले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं %1$sलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।" + "%1$s ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।" + "%1$s ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।" + "%1$s ले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।" + "%1$sले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको फोनले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं %1$sलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।" + "%1$sले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको ट्याब्लेटले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं %1$sलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।" + "%1$sले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं %1$sलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।" "अनुप्रयोगलाई रोक्नुहोस्" "पृष्ठभूमिको प्रयोग निष्क्रिय पार्ने र अनुप्रयोगलाई रोक्ने हो?" "%1$s ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको फोनले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयासस्वरूप तपाईं %1$s लाई रोक्न र यसलाई पृष्ठभूमिमा चल्नबाट रोक्न सक्नुहुन्छ।" @@ -3161,7 +3162,7 @@ "म्युट गरिएको छ, तर %1$s र %2$s लाई अनुमति दिनुहोस्" "म्युट गरिएको छ, तर %1$s, %2$s र %3$s लाई अनुमति दिनुहोस्" "सन्देश, कार्यक्रम तथा रिमाइन्डरहरू" - "बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला तपाईंले माथि अनुमति दिनुभएका वस्तुहरूबाहेक सन्देश, रिमाइन्डर तथा कार्यक्रमहरूलाई म्युट गरिने छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सन्देशसम्बन्धी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।" + "बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला तपाईंले माथि अनुमति दिनुभएका वस्तुहरूबाहेक सन्देश, रिमाइन्डर तथा कार्यक्रमहरूलाई म्युट गरिने छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सन्देशसम्बन्धी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।" "सम्पन्न भयो" "सेटिङहरू" "सूचनाहरूको कुनै पनि भिजुअल वा ध्वनि छैन" @@ -3263,8 +3264,8 @@ "कोटिहरू" "अन्य" - %d कोटिहरू - %d कोटि + %d कोटीहरू + %d कोटी "यो अनुप्रयोगले कुनै पनि सूचना पोस्ट गरेको छैन" "अनुप्रयोगका अतिरिक्त सेटिङहरू" @@ -3274,8 +3275,8 @@ %d अनुप्रयोगका लागि निष्क्रिय परिएको छ - %d मेटाइएका कोटिहरू - %d मेटाइएको कोटि + %d मेटाइएका कोटीहरू + %d मेटाइएको कोटी "सक्रिय छ" "निष्क्रिय छ" @@ -3376,7 +3377,7 @@ "हरेक रात" "सप्ताहरात" "सुरु हुने समय" - "समाप्ती समय" + "समाप्ति समय" "%s अर्को दिन" "अलार्महरूलाई अनिश्चितकालीन मात्र परिवर्तन गर्नुहोस्" @@ -3427,7 +3428,7 @@ "यो उपकरण सुरु गर्न जब तपाईँले आफ्नो PIN प्रविष्टि गर्नुहुन्छ, पहुँच सेवा जस्तै %1$s अझै उपलब्ध हुने छैन।" "यो उपकरण सुरु गर्न जब तपाईँले आफ्नो ढाँचा प्रविष्टि गर्नुहुन्छ, पहुँच सेवा जस्तै %1$s अझै उपलब्ध हुने छैन।" "यो उपकरण सुरु गर्न जब तपाईँले आफ्नो पासवर्ड प्रविष्टि गर्नुहुन्छ, पहुँच सेवा %1$s जस्तो अझै उपलब्ध हुने छैन।" - "टिपोट: पुनःबुट पछि तपाईँले आफ्नो फोनलाई अनलक नगरेसम्म यो अनुप्रयोग सुरु हुन सक्दैन" + "टिपोट: तपाईंले आफ्नो फोन पुनः सुरु गर्नुभयो र त्यसमा स्क्रिन लक सेट गरिएको छ भने तपाईंले आफ्नो फोन अनलक नगरून्जेल यो अनुप्रयोग सुरु हुन सक्दैन" "IMEI जानकारी" "IMEI सान्दर्भिक जानकारी" "(घेरा%1$d)" @@ -3458,8 +3459,8 @@ "स्तर %d" "%1$s • %2$s" - %d कोटिहरू निष्क्रिय पारिए - %d कोटि निष्क्रिय पारियो + %d कोटीहरू निष्क्रिय पारिए + %d कोटी निष्क्रिय पारियो %d अनुमतिहरू दिइयो @@ -3635,7 +3636,7 @@ "अनुप्रयोगले बाधा नपुर्याउँनुहोस् सक्रिय/निष्क्रिय गर्न र सम्बन्धित सेटिङहरू परिवर्तन गर्न सक्षम हुनेछ।" "सूचना सम्बन्धी पहुँच सक्रिय हुनाले यसलाई अनिवार्य रूपमा सक्रिय राख्नु पर्छ" "%1$s को बाधा नपुर्याउनुहोस् माथि पहुँच उल्टाउने हो?" - "यस अनुप्रयोगले बनाएका सबै बाधा नपुर्याउनुहोस् नियम हटाइनेछ।" + "यस अनुप्रयोगले बनाएका सबै बाधा नपुर्याउनुहोस् नियम हटाइने छ।" "आफू अनुकूल नगर्नुहोस्" "अनुकुलन गर्नुहोस्" "यसले तपाईंको ब्याट्रीको चार्ज चाँडै घटाउन सक्छ। अनुप्रयोगलाई अब उप्रान्त पृष्ठभूमिमा ब्याट्री प्रयोग गर्न प्रतिबन्ध लगाइने छैन।" diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml index d7d80aef3bb151fd48316f404c8d1227d385ae08..093968ca625fbf910ee8d62ed0e30be1d8c12592 100644 --- a/res/values-nl/arrays.xml +++ b/res/values-nl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Knop indrukken" "Pincode van peerapparaat" @@ -289,7 +283,7 @@ "stemvolume" "beltoonvolume" "mediavolume" - "alarmvolume" + "wekkervolume" "meldingsvolume" "bluetooth-volume" "ingeschakeld houden" @@ -356,7 +350,7 @@ "Stemvolume" "Beltoonvolume" "Mediavolume" - "Alarmvolume" + "Wekkervolume" "Meldingsvolume" "Bluetooth-volume" "Ingeschakeld houden" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 82a69cd0be9492eb617df6255ad1deaec3cf3aef..5ac37ec369d7d9c90275c92c52960013e62fbefb 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -226,7 +226,7 @@ "Ontvangen gegevens:" "Spraakservice:" "Signaalsterkte:" - "Status van spraakoproep:" + "Status van audiogesprek:" "Gegevens verzonden:" "Wachtend bericht:" "Telefoonnummer:" @@ -854,6 +854,7 @@ "Automatisch" "2,4-GHz-frequentieband" "5-GHz-frequentieband" + "Voorkeur voor 5-GHz-frequentieband" "2,4 GHz" "5 GHz" "Kies ten minste één band voor je wifi-hotspot:" @@ -1065,7 +1066,7 @@ "Natuurlijk" "Versterkt" "Verzadigd" - "Automatisch" + "Aanpasbaar" "Uitsluitend nauwkeurige kleuren gebruiken" "Levendige en nauwkeurige kleuren instellen" "Stand automatisch wijzigen als tablet wordt gedraaid" @@ -1114,7 +1115,7 @@ "Wordt automatisch uitgeschakeld bij zonsopgang" "Nu inschakelen" "Nu uitschakelen" - "Inschakelen tot zonsopkomst" + "Inschakelen tot zonsopgang" "Uitschakelen tot zonsondergang" "Inschakelen tot %1$s" "Uitschakelen tot %1$s" @@ -1487,7 +1488,7 @@ "Terugzetten op fabrieksinstellingen is niet beschikbaar voor deze gebruiker" "Wissen" "Even geduld..." - "Oproepinstellingen" + "Gespreksinstellingen" "Voicemail, gesprekken doorschakelen, wisselgesprek, beller-ID instellen" "USB-tethering" "Draagbare hotspot" @@ -2243,7 +2244,7 @@ "Wifi" "Bluetooth" "Mobiel netwerk stand-by" - "Spraakoproepen" + "Audiogesprekken" "Tablet inactief" "Telefoon inactief" "Diversen" @@ -2275,7 +2276,7 @@ "Scherminstellingen" "Wifi-instellingen" "Bluetooth-instellingen" - "Batterij gebruikt door spraakoproepen" + "Batterij gebruikt door audiogesprekken" "Batterij gebruikt wanneer tablet inactief is" "Batterij gebruikt wanneer telefoon inactief is" "Batterij gebruikt door radio" @@ -2849,7 +2850,7 @@ "Beperkingen verwijderen" "Pincode wijzigen" "Meldingen weergeven" - "Help en feedback" + "Hulp en feedback" "Help-artikelen, bel- en chatondersteuning, aan de slag" "Account voor content" "Foto-ID" @@ -2963,7 +2964,7 @@ "wifi, wi-fi, schakelen, inschakelen, uitschakelen, beheren" "sms, sms\'en, sms\'jes, berichten, sms-berichten, standaard" "mobiel, gsm, provider, draadloos, gegevens, data, 4g, 3g, 2g, lte" - "wifi, wi-fi, oproep, gesprek, bellen, gebeld" + "wifi, wi-fi, gesprek, gesprek, bellen, gebeld" "launcher, standaard, apps" "scherm, touchscreen" "scherm dimmen, touchscreen, batterij, helder" @@ -3040,7 +3041,7 @@ "Belvolume op 80%" "Mediavolume" "Belvolume" - "Alarmvolume" + "Wekkervolume" "Beltoonvolume" "Meldingsvolume" "Beltoon telefoon" @@ -3161,7 +3162,7 @@ "Gedempt, maar %1$s en %2$s wel toestaan" "Gedempt, maar %1$s , %2$s en %3$s wel toestaan" "Meldingen, afspraken en herinneringen" - "Wanneer \'Niet storen\' is ingeschakeld, worden berichten, herinneringen en gebeurtenissen gedempt, met uitzondering van de items die je hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken." + "Wanneer \'Niet storen\' is ingeschakeld, worden berichten, herinneringen en afspraken gedempt, met uitzondering van de items die je hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken." "Klaar" "Instellingen" "Geen zichtbare of hoorbare meldingen" @@ -3427,7 +3428,7 @@ "Wanneer je je pincode opgeeft om dit apparaat te starten, zijn toegankelijkheidsservices zoals %1$s nog niet beschikbaar." "Wanneer je je patroon opgeeft om dit apparaat te starten, zijn toegankelijkheidsservices zoals %1$s nog niet beschikbaar." "Wanneer je je wachtwoord opgeeft om dit apparaat te starten, zijn toegankelijkheidsservices zoals %1$s nog niet beschikbaar." - "Opmerking: Wanneer je telefoon opnieuw is opgestart, kan deze app pas worden gestart nadat je je telefoon hebt ontgrendeld" + "Opmerking: Als je de telefoon opnieuw opstart en een schermvergrendeling hebt ingesteld, kan deze app pas worden gestart nadat je de telefoon hebt ontgrendeld" "IMEI-informatie" "Relatieve IMEI-informatie" "(Positie %1$d)" @@ -4137,9 +4138,9 @@ "De batterijduur van het apparaat verbeteren" "De batterijduur van de telefoon verbeteren" - "Beltoon voorkomen" + "Beltoon uitschakelen" "Druk tegelijkertijd op de aan/uit-knop en de knop \'Volume omhoog\'" - "Snelkoppeling om beltoon te voorkomen" + "Snelkoppeling om beltoon uit te schakelen" "Trillen" "Dempen" "Niets doen" diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml index ebcf48c298999ae3bbbab72687f9a4589acd0b3e..b761d26e11bca59491a7bd893cbfe932605d798f 100644 --- a/res/values-pa/arrays.xml +++ b/res/values-pa/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ਪੁਸ਼ ਬਟਨ" "ਪੀਅਰ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 9e1e43e81b68bd726fb5217eebe4b8962062afee..43f185237c68363c014af5ebcd342f94c300189c 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -854,6 +854,7 @@ "ਸਵੈਚਲਿਤ" "2.4 GHz ਬੈਂਡ" "5.0 GHz ਬੈਂਡ" + "5.0 GHz ਬੈਂਡ ਨੂੰ ਤਰਜੀਹ ਦਿੱਤੀ ਗਈ" "2.4 GHz" "5.0 GHz" "ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਬੈਂਡ ਚੁਣੋ:" @@ -1065,7 +1066,7 @@ "ਕੁਦਰਤੀ" "ਵਧਾਇਆ ਗਿਆ" "ਪਰਿਪੂਰਨ ਕੀਤਾ ਗਿਆ" - "ਸਵੈਚਲਿਤ" + "ਅਨੁਕੂਲਨਯੋਗ" "ਸਿਰਫ਼ ਸਟੀਕ ਰੰਗ ਵਰਤੋ" "ਸਪਸ਼ਟ ਅਤੇ ਸਟੀਕ ਰੰਗਾਂ ਵਿਚਕਾਰ ਵਿਵਸਥਿਤ ਕਰੋ" "ਟੈਬਲੈੱਟ ਨੂੰ ਘੁੰਮਾਉਣ ਵੇਲੇ ਆਪਣੇ ਆਪ ਦਿਸ਼ਾਮਾਨ \'ਤੇ ਬਦਲੋ" @@ -1094,11 +1095,11 @@ "ਬੈਟਰੀ ਵਰਤੋਂ ਵਧ ਜਾਵੇਗੀ" "ਉਪਲਬਧ ਲਾਈਟ ਲਈ ਚਮਕ ਦੇ ਪੱਧਰ ਨੂੰ ਸੁਯੋਗ ਬਣਾਓ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ ਵੀ ਤੁਸੀਂ ਚਮਕ ਨੂੰ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।" "ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਦੀ ਚਮਕ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਵਾਤਾਵਰਣ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਕੀਤੀਆਂ ਜਾਣ ਵਾਲੀਆਂ ਸਰਗਰਮੀ ਦੇ ਮੁਤਾਬਕ ਵੱਧ-ਘੱਟ ਹੋਵੇਗੀ। ਢਲਨਹਾਰ ਚਮਕ ਨੂੰ ਤੁਹਾਡੀਆਂ ਤਰਜੀਹਾਂ ਬਾਰੇ ਸਿੱਖਣ ਵਿੱਚ ਮਦਦ ਕਰਨ ਲਈ ਤੁਸੀਂ ਸਲਾਈਡਰ ਨੂੰ ਹੱਥੀਂ ਹਿਲਾ ਸਕਦੇ ਹੋ।" - "ਰਾਤਰੀ ਲਾਈਟ" - "ਰਾਤਰੀ ਲਾਈਟ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਭੂਰੇ ਪੀਲੇ ਰੰਗ ਦੀ ਭਾਹ ਦਿੰਦੀ ਹੈ। ਇਸ ਨਾਲ ਮੱਧਮ ਰੋਸ਼ਨੀ ਵਿੱਚ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਦੇਖਣਾ ਜਾਂ ਪੜ੍ਹਨਾ ਵਧੇਰੇ ਆਸਾਨ ਹੋ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ ਵਧੇਰੇ ਆਸਾਨੀ ਨਾਲ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।" + "ਰਾਤ ਦੀ ਰੋਸ਼ਨੀ" + "\'ਰਾਤ ਦੀ ਰੋਸ਼ਨੀ\' ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਭੂਰੇ ਪੀਲੇ ਰੰਗ ਦੀ ਭਾਹ ਦਿੰਦੀ ਹੈ। ਇਸ ਨਾਲ ਮੱਧਮ ਰੋਸ਼ਨੀ ਵਿੱਚ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਦੇਖਣਾ ਜਾਂ ਪੜ੍ਹਨਾ ਵਧੇਰੇ ਆਸਾਨ ਹੋ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ ਵਧੇਰੇ ਆਸਾਨੀ ਨਾਲ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।" "ਸਮਾਂ-ਸੂਚੀ" "ਕੋਈ ਨਹੀਂ" - "ਵਿਉਂਂਤੀ ਸਮੇਂ ਤੇ ਚਾਲੂ ਹੋ ਜਾਂਦੀ ਹੈ" + "ਵਿਉਂਂਤੇ ਸਮੇਂ \'ਤੇ ਚਾਲੂ ਹੋ ਜਾਂਦੀ ਹੈ" "ਸੂਰਜ ਡੁੱਬਣ ਤੋਂ ਲੈਕੇ ਸੂਰਜ ਚੜ੍ਹਨ ਤੱਕ ਚਾਲੂ ਰਹਿੰਦੀ ਹੈ" "ਸ਼ੁਰੂੂਆਤ ਦਾ ਸਮਾਂ" "ਸਮਾਪਤੀ ਦਾ ਸਮਾਂ" @@ -3161,7 +3162,7 @@ "ਮਿਊਟ ਕੀਤਾ ਗਿਆ, ਪਰ %1$s ਅਤੇ %2$s ਚੱਲਣ ਦਿਓ" "ਮਿਊਟ ਕੀਤਾ ਗਿਆ, ਪਰ %1$s, %2$s ਅਤੇ %3$s ਚੱਲਣ ਦਿਓ" "ਸੁਨੇਹੇ, ਇਵੈਂਟ ਅਤੇ ਯਾਦ-ਸੂਚਨਾਵਾਂ" - "ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਉਪਰੋਕਤ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਆਈਟਮਾਂ ਤੋਂ ਇਲਾਵਾ ਸੁਨੇਹੇ, ਯਾਦ-ਸੂਚਨਾਵਾਂ ਅਤੇ ਇਵੈਂਟ ਮਿਊਟ ਕੀਤੇ ਜਾਣਗੇ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਵੱਲੋਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ ਲਈ ਸੁਨੇਹੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।" + "ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਉਪਰੋਕਤ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਆਈਟਮਾਂ ਤੋਂ ਇਲਾਵਾ ਸੁਨੇਹੇ, ਯਾਦ-ਸੂਚਨਾਵਾਂ ਅਤੇ ਇਵੈਂਟ ਮਿਊਟ ਕੀਤੇ ਜਾਣਗੇ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਵੱਲੋਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ ਲਈ ਸੁਨੇਹੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।" "ਹੋ ਗਿਆ" "ਸੈਟਿੰਗਾਂ" "ਸੂਚਨਾਵਾਂ ਦੇ ਕੋਈ ਦ੍ਰਿਸ਼ਟੀਗਤ ਸੰਕੇਤ ਜਾਂ ਧੁਨੀ ਨਹੀਂ" @@ -3427,7 +3428,7 @@ "ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਿੰਨ ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ %1$s ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।" "ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪੈਟਰਨ ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ %1$s ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।" "ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ %1$s ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।" - "ਨੋਟ ਕਰੋ: ਰੀਬੂਟ ਤੋਂ ਬਾਅਦ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਨਹੀਂ ਕਰਦੇ ਤਦ ਤੱਕ ਇਹ ਐਪ ਚਾਲੂ ਨਹੀਂ ਹੋ ਸਕਦੀ" + "ਨੋਟ-ਕਥਨ: ਜੇਕਰ ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਦੇ ਹੋ ਅਤੇ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਕੀਤਾ ਹੋਇਆ ਹੈ, ਤਾਂ ਇਹ ਐਪਾ ਤੁਹਾਡੇ ਵੱਲੋਂ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤੇ ਨਾ ਹੋਣ ਤੱਕ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋਵੇਗੀ" "IMEI ਜਾਣਕਾਰੀ" "IMEI ਸੰਬੰਧਿਤ ਜਾਣਕਾਰੀ" "(ਸਲੌਟ%1$d)" @@ -3441,7 +3442,7 @@ "ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ" "ਬਾਹਰੀ ਸਟੋਰੇਜ" "ਐਪ ਡਾਟਾ ਵਰਤੋਂ" - "%1$s %2$s ਤੋਂ ਵਰਤਿਆ ਗਿਆ" + "%2$s ਤੋਂ %1$s ਵਰਤਿਆ ਗਿਆ" "ਸਟੋਰੇਜ ਵਰਤੀ" "ਬਦਲੋ" "ਸਟੋਰੇਜ ਬਦਲੋ" @@ -3632,7 +3633,7 @@ "ਅਧਿਕਤਮ ਵਰਤੋਂ" "ਕੋਈ ਡਾਟਾ ਨਹੀਂ ਵਰਤਿਆ" "ਕੀ %1$s ਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?" - "ਐਪ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਨੂੰ ਚਾਲੂ/ਬੰਦ ਕਰਨ ਅਤੇ ਸੰਬੰਧਿਤ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲਾਵ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗਾ।" + "ਐਪ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਚਾਲੂ/ਬੰਦ ਕਰਨ ਅਤੇ ਸੰਬੰਧਿਤ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲਾਵ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗੀ।" "ਸੂਚਨਾ ਪਹੁੰਚ ਦੇ ਚਾਲੂ ਹੋਣ ਕਾਰਨ ਇਸ ਦਾ ਚਾਲੂ ਰਹਿਣਾ ਲਾਜ਼ਮੀ ਹੈ" "ਕੀ %1$s ਲਈ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' \'ਤੇ ਪਹੁੰਚ ਰੱਦ ਕਰਨੀ ਹੈ?" "ਇਸ ਐਪ ਵੱਲੋਂ ਬਣਾਏ ਸਾਰੇ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨਿਯਮ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।" diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml index 8d420a37cfeb30f34018ec54213620a8c000be7d..62d556b9142029258f5c5ead225c9bb264dbc59a 100644 --- a/res/values-pl/arrays.xml +++ b/res/values-pl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Naciśnij przycisk" "Kod PIN z drugiego urządzenia" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 040740eac43a0656af7bb45654400c8d07b1c640..6ad2cf870b8e7ecaa16072f32422bcb78d435fe3 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -876,6 +876,7 @@ "Automatycznie" "Pasmo 2,4 GHz" "Pasmo 5 GHz" + "Wybieraj pasmo 5,0 GHz" "2,4 GHz" "5,0 GHz" "Wybierz co najmniej jedno pasmo dla hotspotu Wi-Fi:" @@ -1089,7 +1090,7 @@ "Naturalne" "Wzmocnione" "Nasycone" - "Automatycznie" + "Adaptacyjny" "Użyj tylko wiernych kolorów" "Wybierz żywe bądź wierne odwzorowanie kolorów" "Automatycznie przełącz orientację przy obracaniu tabletu" @@ -2389,7 +2390,7 @@ "Włącz automatycznie" "Nigdy" "przy %1$s baterii" - "Poziom naładowania baterii w %%" + "Poziom naładowania baterii w procentach" "Pokazuj procentowy poziom naładowania baterii na pasku stanu" "Statystyki procesów" "Rozbudowane statystyki uruchomionych procesów" @@ -3235,7 +3236,7 @@ "Wyciszone, ale zezwól na: %1$s i %2$s" "Wyciszone, ale zezwól na: %1$s, %2$s i %3$s" "Wiadomości, wydarzenia i przypomnienia" - "Gdy włączysz tryb Nie przeszkadzać, wiadomości, przypomnienia i wydarzenia będą wyciszone. Wyciszenie nie będzie dotyczyło elementów, na które zezwolisz powyżej. Możesz dostosować ustawienia wiadomości, by znajomi, rodzina i inne osoby mogli do Ciebie zadzwonić." + "Gdy włączysz tryb Nie przeszkadzać, wiadomości, przypomnienia i wydarzenia będą wyciszone. Wyciszenie nie będzie dotyczyło elementów, na które zezwolisz powyżej. Możesz dostosować ustawienia wiadomości, by znajomi, rodzina i inni mogli do Ciebie zadzwonić." "Gotowe" "Ustawienia" "Brak wizualnego i dźwiękowego sygnalizowania powiadomień" @@ -3414,7 +3415,7 @@ "Brak" "Codziennie" "Alarm może zastąpić godzinę zakończenia" - "Zatrzymaj o godzinie zakończenia lub przy następnym alarmie, w zależności od tego, co nastąpi wcześniej" + "Zatrzymaj o godzinie zakończenia lub przy następnym alarmie, w zależności od tego, co nastąpi wcześniej." ", " "%1$s – %2$s" "Od: %1$s do: %2$s" @@ -3515,7 +3516,7 @@ "Gdy wpiszesz swój kod PIN, by włączyć to urządzenie, usługi ułatwień dostępu takie jak %1$s nie będą jeszcze aktywne." "Gdy narysujesz swój wzór, by włączyć to urządzenie, usługi ułatwień dostępu takie jak %1$s nie będą jeszcze aktywne." "Gdy wpiszesz swoje hasło, by włączyć to urządzenie, usługi ułatwień dostępu takie jak %1$s nie będą jeszcze aktywne." - "Uwaga: po restarcie ta aplikacja będzie mogła uruchomić się dopiero po odblokowaniu telefonu" + "Uwaga: po ponownym uruchomieniu telefonu z ustawioną blokadą ekranu ta aplikacja będzie mogła uruchomić się dopiero wtedy, gdy odblokujesz telefon" "Numer IMEI" "Informacje związane z IMEI" "(Gniazdo %1$d)" @@ -4019,7 +4020,7 @@ "Zarządzaj informacjami wyświetlanymi na ekranie blokady" "Pokaż lub ukryj informacje w powiadomieniach" "Wszystkie" - "Wsparcie i wskazówki" + "Pomoc i wskazówki" "Najmniejsza szerokość" "Żadna z zainstalowanych aplikacji nie prosiła o dostęp do SMS-ów specjalnych" "Za SMS-y specjalne może być pobierana dodatkowa, wyższa opłata, która pojawi się na Twoim rachunku telefonicznym. Po włączeniu tego uprawnienia możliwe będzie wysyłanie SMS-ów specjalnych z wybranej aplikacji." diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml index f0b3c3d7f99ddef9dbd6d34e4a3fd9068f70293c..f301e478e627cfff2cd5d8b7cfe031eaeee61777 100644 --- a/res/values-pt-rBR/arrays.xml +++ b/res/values-pt-rBR/arrays.xml @@ -111,7 +111,7 @@ "TLS" "TTLS" "PWD" - "SIM" + "Chip" "AKA" "AKA\'" @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pressione o botão" "PIN do dispositivo pareado" diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 83113163b86486703e36171be89c400d075236c5..9806ed21dd5d6368903749e1d60057fd53b2541d 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -44,8 +44,8 @@ "Chamadas por Wi-Fi aprovisionadas" "EAB/Presença aprovisionados" "Potência do rádio móvel" - "Ver o catálogo de endereços do SIM" - "Visualizar números de chamada fixa" + "Ver o catálogo de endereços do chip" + "Visualizar números de discagem fixa" "Visualizar números de chamada de serviço" "Status de serviço IMS" "Status IMS" @@ -164,8 +164,8 @@ "Não perguntar novamente" "Solicitação de acesso a mensagens" "%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?" - "Solicitação de acesso ao cartão SIM" - "O %1$s deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao %2$s?" + "Solicitação de acesso ao chip" + "O %1$s deseja acessar seu chip. A concessão de acesso ao chip desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao %2$s?" "Visível como \"^1\" para outros dispositivos" "Ative o Bluetooth para se conectar a outros dispositivos." "Seus dispositivos" @@ -299,7 +299,7 @@ "Concluído" "Aplicar" "Configurações" - "Configurar" + "Configurações" "Atalho para as configurações" "Nenhuma atividade correspondente foi encontrada." "Modo avião" @@ -386,7 +386,7 @@ "Dispositivo criptografado" "Dispositivo não criptografado" "Preferências da tela de bloqueio" - "Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais" + "Definir Meu local, desbloqueio de tela, bloqueio do chip e do armazenamento de credenciais" "Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais" "Privacidade" "Desativada pelo administrador" @@ -854,6 +854,7 @@ "Automático" "Banda de 2,4 GHz" "Banda de 5 GHz" + "Banda de 5 GHz preferencial" "2,4 GHz" "5 GHz" "Escolha pelo menos uma banda para o ponto de acesso Wi-Fi:" @@ -1065,7 +1066,7 @@ "Naturais" "Realçadas" "Saturadas" - "Automática" + "Adaptativo" "Usar apenas cores precisas" "Ajuste entre cores vívidas e precisas" "Alternar orientação automaticamente ao girar o tablet" @@ -1114,8 +1115,8 @@ "Será desativado automaticamente ao amanhecer" "Ativar agora" "Desativar agora" - "Ativar até o nascer do sol" - "Desativar até o pôr do sol" + "Ativar até o amanhecer" + "Desativar até anoitecer" "Ativar até %1$s" "Desativar até %1$s" "Suspensão" @@ -1151,43 +1152,43 @@ "Mostrar horário, ícones de notificação e outras informações. Aumento do uso da bateria." "Tamanho da fonte" "Tornar o texto maior ou menor" - "Bloqueio do SIM" - "Bloqueio do cartão SIM" + "Bloqueio do chip" + "Bloqueio do chip" "Desativado" "Bloqueado" - "Bloqueio do cartão SIM" - "Bloquear cartão SIM" + "Bloqueio do chip" + "Bloquear chip" "Exigir PIN para usar o tablet" "Exigir PIN para usar o telefone" "Exigir PIN para usar o tablet" "Exigir PIN para usar o telefone" - "Alterar PIN do SIM" - "PIN do SIM" - "Bloquear cartão SIM" - "Desbloquear o cartão SIM" - "PIN do SIM antigo" - "Novo PIN do SIM" + "Alterar PIN do chip" + "PIN do chip" + "Bloquear chip" + "Desbloquear o chip" + "PIN do chip antigo" + "Novo PIN do chip" "Digitar novo PIN novamente" - "PIN do SIM" + "PIN do chip" "PIN incorreto" "Os PINs não correspondem" "Não é possível alterar o PIN.\nPIN possivelmente incorreto." - "PIN do SIM alterado" - "Não é possível alterar o estado de bloqueio do cartão SIM.\nPIN possivelmente incorreto." + "PIN do chip alterado" + "Não é possível alterar o estado de bloqueio do chip.\nPIN possivelmente incorreto." "OK" "Cancelar" "Vários SIMs encontrados" - "Escolha o SIM preferencial para dados móveis." - "Alterar SIM de dados?" + "Escolha o chip preferencial para dados móveis." + "Alterar Chip de dados?" "Usar %1$s em vez de %2$s para dados móveis?" - "Atualiz. cartão SIM preferido?" - "O %1$s é o único SIM no seu dispositivo. Quer usá-lo para dados móveis, chamadas e mensagens SMS?" - "Código PIN do SIM incorreto. Entre em contato com a operadora para desbloquear o dispositivo." + "Atualiz. chip preferido?" + "O %1$s é o único chip no seu dispositivo. Quer usá-lo para dados móveis, chamadas e mensagens SMS?" + "Código PIN do chip incorreto. Entre em contato com a operadora para desbloquear o dispositivo." - Código PIN do SIM incorreto. Tentativas restantes: %d. - Código PIN do SIM incorreto. Tentativas restantes: %d. + Código PIN do chip incorreto. Tentativas restantes: %d. + Código PIN do chip incorreto. Tentativas restantes: %d. - "Falha na operação de PIN do SIM." + "Falha na operação de PIN do chip." "Status do tablet" "Status do telefone" "Atualizações do sistema" @@ -1218,8 +1219,8 @@ "Número de telefone" "MDN (slot para SIM %1$d)" "Número de tel. (slot SIM %1$d)" - "MDN no SIM" - "Número de telefone no SIM" + "MDN no chip" + "Número de telefone no chip" "MIN" "MSID" "Versão do PRL" @@ -1521,9 +1522,9 @@ "Alterar o Assistente de Wi-Fi?" "Usar %1$s em vez de %2$s para gerenciar suas conexões de rede?" "Usar %s para gerenciar suas conexões de rede?" - "Operadora do SIM desconhecida" + "Operadora do chip desconhecida" "%1$s não tem um website de aprovisionamento conhecido" - "Insira o cartão SIM e reinicie" + "Insira o chip e reinicie" "Conecte-se à Internet" "Meu Local" "Local do perfil de trabalho" @@ -2584,7 +2585,7 @@ "Ocultar uso da ethernet" "Restrições de rede" "Sincronizar dados automaticamente" - "Cartões SIM" + "Chips" "Redes móveis" "Pausa no limite" "Sincron. dados automaticamente" @@ -2872,7 +2873,7 @@ "Use dados em LTE para melhorar recursos de voz e comunicações (recomendado)" "Tipo de rede preferencial" "LTE (recomendado)" - "SIM de trabalho" + "Chip de trabalho" "Acesso a apps e conteúdo" "RENOMEAR" "Definir restrições do app" @@ -2896,46 +2897,46 @@ "Escolher foto da Galeria" "Selecionar foto" - "Cartões SIM" - "Cartões SIM" + "Chips" + "Chips" "%1$s - %2$s" - "Os cartões SIM foram alterados" + "Os chips foram alterados" "Toque para configurar atividades" "Os dados móveis estão indisponíveis" - "Toque para selecionar um SIM de dados" + "Toque para selecionar um chip de dados" "Sempre usar esta opção para chamadas" - "Selecionar um SIM de dados" - "Trocando SIM de dados. Isso pode demorar um pouco..." + "Selecionar um chip de dados" + "Trocando chip de dados. Isso pode demorar um pouco..." "Ligar com" - "Selecionar um cartão SIM" - "SIM %1$d" - "SIM vazio" - "Nome do SIM" - "Inserir nome do SIM" - "Slot para SIM %1$d" + "Selecionar um chip" + "Chip %1$d" + "Chip vazio" + "Nome do chip" + "Inserir nome do chip" + "Slot para chip %1$d" "Operadora" "Número" - "Cor do SIM" - "Selecionar cartão SIM" + "Cor do chip" + "Selecionar chip" "Laranja" "Roxo" - "Nenhum cartão SIM inserido" - "Status do SIM" - "Status do SIM (slot para SIM %1$d)" - "Retornar chamada com o SIM padrão" - "SIM para chamadas de saída" + "Nenhum chip inserido" + "Status do chip" + "Status do chip (slot para SIM %1$d)" + "Retornar chamada com o chip padrão" + "Chip para fazer chamadas" "Outras configurações de chamada" "Rede pref. p/ descarreg." "Des. transm. nome de rede" "A opção \"Des. transm. nome de rede\" protege contra o acesso de terceiros a suas informações de rede." "A desativação da transmissão de nome de rede impedirá uma conexão automática a redes ocultas." "%1$d dBm %2$d asu" - "Alteração em cartões SIM." + "Alteração em chips." "Toque para configurar" - "SIM preferido para" + "Chip preferido para" "Perguntar sempre" "Seleção necessária" - "Seleção de SIM" + "Seleção de chip" "Configurações" Mostrar %d item oculto @@ -3161,7 +3162,7 @@ "Som desativado, mas permitido para %1$s e %2$s" "Som desativado, mas permitido para %1$s, %2$s e %3$s" "Mensagens, eventos e lembretes" - "Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você." + "Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você." "Concluído" "Configurações" "Sem aviso visual ou sonoro de notificações" @@ -3427,7 +3428,7 @@ "Ao inserir seu PIN para iniciar o dispositivo, serviços de disponibilidade como o %1$s ainda não estarão disponíveis." "Ao inserir seu padrão para iniciar o dispositivo, serviços de disponibilidade como o %1$s ainda não estarão disponíveis." "Ao inserir sua senha para iniciar o dispositivo, serviços de disponibilidade como o %1$s ainda não estarão disponíveis." - "Observação: após uma reinicialização, não é possível iniciar este app até que você desbloqueie seu smartphone" + "Observação: se você reiniciar o smartphone e tiver um bloqueio de tela definido, não será possível iniciar este app até que você desbloqueie o smartphone" "Informações de IMEI" "Informações relativas de IMEI" "(Slot%1$d)" @@ -3631,8 +3632,8 @@ "Frequência" "Uso máximo" "Nenhum dado usado" - "Permitir acesso a \"Não perturbe\" para %1$s?" - "O app poderá ativar/desativar \"Não perturbe\" e fazer alterações nas configurações relacionadas." + "Permitir que %1$s acesse o recurso \"Não perturbe\"?" + "O app poderá ativar/desativar o recurso \"Não perturbe\" e fazer alterações nas configurações relacionadas." "Deve permanecer ativado, pois o acesso a notificações está ativado" "Revogar acesso a \"Não perturbe\" para %1$s?" "Todas as regras \"Não perturbe\" criadas por esse app serão removidas." @@ -3752,7 +3753,7 @@ "O smartphone está configurado para vibrar" "Chamadas e notificações farão o dispositivo vibrar" "Chamadas e notificações farão o smartphone vibrar" - "Definir programação do Modo noturno" + "Definir horário do Modo noturno" "Tinge a tela automaticamente todas as noites" "O modo noturno está ativado" "A cor da tela muda para âmbar. Isso pode ajudar você a adormecer." diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml index dc76eb3413b3df4faaf5003f59b51a84ac533bde..9075f6b39877c3fa2231fcfc9d0ffb6aab6e878f 100644 --- a/res/values-pt-rPT/arrays.xml +++ b/res/values-pt-rPT/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Premir botão" "PIN do aparelho do elemento" @@ -287,7 +281,7 @@ "orientação do áudio" "volume principal" "volume de voz" - "volume de toque" + "volume do toque" "volume de multimédia" "volume de alarme" "volume de notificação" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index cf011efb7dc2148cf87f32324ab4a65cc6b11f2e..803e525ee69fc8de0ec4b31130841c1884415993 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -698,7 +698,7 @@ "Avançadas" "Bluetooth Avançado" "Com o Bluetooth ativado, o dispositivo pode comunicar com dispositivos próximos." - "Quando o Bluetooth está ativado, o dispositivo pode comunicar com outros dispositivos Bluetooth próximos.\n\nPara melhorar a experiência do dispositivo, as aplicações e os serviços podem continuar a procurar dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas ""definições de análise""." + "Quando o Bluetooth está ativado, o dispositivo pode comunicar com outros dispositivos Bluetooth próximos.\n\nPara melhorar a experiência do dispositivo, as aplicações e os serviços podem continuar a procurar dispositivos próximos em qualquer altura, mesmo quando o Bluetooth está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas ""definições de análise""." "Para melhorar a precisão da localização, os serviços e as aplicações do sistema podem continuar a detetar dispositivos Bluetooth. Pode alterar esta opção nas LINK_BEGINdefinições de procuraLINK_END." "Não foi possível ligar. Tente novamente." "Detalhes do disp." @@ -788,7 +788,7 @@ "Para utilizar, selecionar um fornecedor de classificação de rede" "Para utilizar, selecionar um fornecedor de classificação de rede compatível" "Instalar certificados" - "Para melhorar a precisão da localização, as aplicações e os serviços podem continuar a procurar redes Wi-Fi a qualquer momento, mesmo quando o Wi-Fi está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas LINK_BEGINdefinições de análiseLINK_END." + "Para melhorar a precisão da localização, as aplicações e os serviços podem continuar a procurar redes Wi-Fi em qualquer altura, mesmo quando o Wi-Fi está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas LINK_BEGINdefinições de análiseLINK_END." "Para melhorar a precisão da localização, ative a procura de redes Wi-Fi nas LINK_BEGINdefinições de análiseLINK_END." "Não mostrar de novo" "Manter Wi-Fi ligada durante suspensão" @@ -823,7 +823,7 @@ "Config. automática (WPS)" "Pretende ativar a procura de Wi‑Fi?" "Para ativar o Wi‑Fi automaticamente, primeiro tem de ativar a procura de Wi‑Fi." - "A procura de Wi-Fi permite que as aplicações e os serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização." + "A procura de Wi-Fi permite que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização." "Ativar" "Procura de Wi-Fi ativada" "Opções avançadas" @@ -854,6 +854,7 @@ "Automático" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Banda de 5,0 GHz preferida" "2,4 GHz" "5,0 GHz" "Selecione, pelo menos, uma banda para a zona Wi-Fi:" @@ -1065,7 +1066,7 @@ "Naturais" "Amplificadas" "Saturadas" - "Automática" + "Adaptável" "Utilizar apenas cores exatas" "Ajuste entre cores vivas e exatas" "Mudar orientação automaticamente ao rodar o tablet" @@ -1536,9 +1537,9 @@ "Utilização de bateria baixa" "A analisar" "Procurar por Wi‑Fi" - "Permita que as aplicações e os serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização." + "Permita que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização." "Procurar por Bluetooth" - "Permita que as aplicações e os serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização." + "Permita que as aplicações e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização." "Wi-Fi e localização de rede de telemóvel" "Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google." "Localização determinada por Wi-Fi" @@ -1685,7 +1686,7 @@ "Forçar paragem" "Total" "Tamanho da aplicação" - "Aplic. de armazenamento USB" + "Apps de armazenamento USB" "Dados do utilizador" "Dados de armazenamento USB" "Cartão SD" @@ -2458,7 +2459,7 @@ "Desativar esta aplicação de administração do dispositivo" "Desinstalar aplicação" "Desativar e desinstalar" - "Aplic. de gestor do dispositivo" + "Apps de gestor do dispositivo" "Nenhuma aplicação de administração do dispositivo disponível" "Pessoal" "Trabalho" @@ -3043,7 +3044,7 @@ "Volume do alarme" "Volume do toque" "Volume de notificações" - "Toque do telefone" + "Toque do telemóvel" "Som notif. predefinido" "Som fornecido pela aplicação" "Som notif. predefinido" @@ -3161,7 +3162,7 @@ "Desativado, mas permitir %1$s e %2$s." "Desativado, mas permitir %1$s, %2$s e %3$s." "Mensagens, eventos e lembretes" - "Quando o modo Não incomodar está ativo, o som de mensagens, lembretes e eventos é desativado, exceto para os itens que permitir acima. Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem." + "Quando o modo Não incomodar está ativado, o som de mensagens, lembretes e eventos é desativado, exceto para os itens que permitir acima. Pode ajustar as definições de mensagens para permitir que os seus amigos, a sua família ou outras pessoas o contactem." "Concluído" "Definições" "Sem imagens ou som de notificações" @@ -3285,7 +3286,7 @@ "Nunca mostrar notificações no painel ou nos dispositivos periféricos" "Permitir ponto de notificação" "Mostrar ponto de notificação" - "Substituir o modo Não incomodar" + "Ignorar o modo Não incomodar" "Permitir que estas notificações continuem a interrompê-lo quando o modo Não incomodar estiver ativado" "No ecrã de bloqueio" "Bloqueado" @@ -3427,7 +3428,7 @@ "Quando introduzir o seu PIN para iniciar este dispositivo, os serviços de acessibilidade, como o %1$s, ainda não estarão disponíveis." "Quando introduzir a sua sequência para iniciar este dispositivo, os serviços de acessibilidade, como o %1$s, ainda não estarão disponíveis." "Quando introduzir a sua palavra-passe para iniciar este dispositivo, os serviços de acessibilidade, como o %1$s, ainda não estarão disponíveis." - "Nota: após reiniciar, só é possível iniciar esta aplicação quando o telemóvel for desbloqueado." + "Nota: se reiniciar o telemóvel e tiver um bloqueio de ecrã definido, só é possível iniciar esta aplicação quando o telemóvel for desbloqueado." "Informações do IMEI" "Informações relativas do IMEI" "(Slot%1$d)" diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml index f0b3c3d7f99ddef9dbd6d34e4a3fd9068f70293c..f301e478e627cfff2cd5d8b7cfe031eaeee61777 100644 --- a/res/values-pt/arrays.xml +++ b/res/values-pt/arrays.xml @@ -111,7 +111,7 @@ "TLS" "TTLS" "PWD" - "SIM" + "Chip" "AKA" "AKA\'" @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pressione o botão" "PIN do dispositivo pareado" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 83113163b86486703e36171be89c400d075236c5..9806ed21dd5d6368903749e1d60057fd53b2541d 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -44,8 +44,8 @@ "Chamadas por Wi-Fi aprovisionadas" "EAB/Presença aprovisionados" "Potência do rádio móvel" - "Ver o catálogo de endereços do SIM" - "Visualizar números de chamada fixa" + "Ver o catálogo de endereços do chip" + "Visualizar números de discagem fixa" "Visualizar números de chamada de serviço" "Status de serviço IMS" "Status IMS" @@ -164,8 +164,8 @@ "Não perguntar novamente" "Solicitação de acesso a mensagens" "%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?" - "Solicitação de acesso ao cartão SIM" - "O %1$s deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao %2$s?" + "Solicitação de acesso ao chip" + "O %1$s deseja acessar seu chip. A concessão de acesso ao chip desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao %2$s?" "Visível como \"^1\" para outros dispositivos" "Ative o Bluetooth para se conectar a outros dispositivos." "Seus dispositivos" @@ -299,7 +299,7 @@ "Concluído" "Aplicar" "Configurações" - "Configurar" + "Configurações" "Atalho para as configurações" "Nenhuma atividade correspondente foi encontrada." "Modo avião" @@ -386,7 +386,7 @@ "Dispositivo criptografado" "Dispositivo não criptografado" "Preferências da tela de bloqueio" - "Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais" + "Definir Meu local, desbloqueio de tela, bloqueio do chip e do armazenamento de credenciais" "Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais" "Privacidade" "Desativada pelo administrador" @@ -854,6 +854,7 @@ "Automático" "Banda de 2,4 GHz" "Banda de 5 GHz" + "Banda de 5 GHz preferencial" "2,4 GHz" "5 GHz" "Escolha pelo menos uma banda para o ponto de acesso Wi-Fi:" @@ -1065,7 +1066,7 @@ "Naturais" "Realçadas" "Saturadas" - "Automática" + "Adaptativo" "Usar apenas cores precisas" "Ajuste entre cores vívidas e precisas" "Alternar orientação automaticamente ao girar o tablet" @@ -1114,8 +1115,8 @@ "Será desativado automaticamente ao amanhecer" "Ativar agora" "Desativar agora" - "Ativar até o nascer do sol" - "Desativar até o pôr do sol" + "Ativar até o amanhecer" + "Desativar até anoitecer" "Ativar até %1$s" "Desativar até %1$s" "Suspensão" @@ -1151,43 +1152,43 @@ "Mostrar horário, ícones de notificação e outras informações. Aumento do uso da bateria." "Tamanho da fonte" "Tornar o texto maior ou menor" - "Bloqueio do SIM" - "Bloqueio do cartão SIM" + "Bloqueio do chip" + "Bloqueio do chip" "Desativado" "Bloqueado" - "Bloqueio do cartão SIM" - "Bloquear cartão SIM" + "Bloqueio do chip" + "Bloquear chip" "Exigir PIN para usar o tablet" "Exigir PIN para usar o telefone" "Exigir PIN para usar o tablet" "Exigir PIN para usar o telefone" - "Alterar PIN do SIM" - "PIN do SIM" - "Bloquear cartão SIM" - "Desbloquear o cartão SIM" - "PIN do SIM antigo" - "Novo PIN do SIM" + "Alterar PIN do chip" + "PIN do chip" + "Bloquear chip" + "Desbloquear o chip" + "PIN do chip antigo" + "Novo PIN do chip" "Digitar novo PIN novamente" - "PIN do SIM" + "PIN do chip" "PIN incorreto" "Os PINs não correspondem" "Não é possível alterar o PIN.\nPIN possivelmente incorreto." - "PIN do SIM alterado" - "Não é possível alterar o estado de bloqueio do cartão SIM.\nPIN possivelmente incorreto." + "PIN do chip alterado" + "Não é possível alterar o estado de bloqueio do chip.\nPIN possivelmente incorreto." "OK" "Cancelar" "Vários SIMs encontrados" - "Escolha o SIM preferencial para dados móveis." - "Alterar SIM de dados?" + "Escolha o chip preferencial para dados móveis." + "Alterar Chip de dados?" "Usar %1$s em vez de %2$s para dados móveis?" - "Atualiz. cartão SIM preferido?" - "O %1$s é o único SIM no seu dispositivo. Quer usá-lo para dados móveis, chamadas e mensagens SMS?" - "Código PIN do SIM incorreto. Entre em contato com a operadora para desbloquear o dispositivo." + "Atualiz. chip preferido?" + "O %1$s é o único chip no seu dispositivo. Quer usá-lo para dados móveis, chamadas e mensagens SMS?" + "Código PIN do chip incorreto. Entre em contato com a operadora para desbloquear o dispositivo." - Código PIN do SIM incorreto. Tentativas restantes: %d. - Código PIN do SIM incorreto. Tentativas restantes: %d. + Código PIN do chip incorreto. Tentativas restantes: %d. + Código PIN do chip incorreto. Tentativas restantes: %d. - "Falha na operação de PIN do SIM." + "Falha na operação de PIN do chip." "Status do tablet" "Status do telefone" "Atualizações do sistema" @@ -1218,8 +1219,8 @@ "Número de telefone" "MDN (slot para SIM %1$d)" "Número de tel. (slot SIM %1$d)" - "MDN no SIM" - "Número de telefone no SIM" + "MDN no chip" + "Número de telefone no chip" "MIN" "MSID" "Versão do PRL" @@ -1521,9 +1522,9 @@ "Alterar o Assistente de Wi-Fi?" "Usar %1$s em vez de %2$s para gerenciar suas conexões de rede?" "Usar %s para gerenciar suas conexões de rede?" - "Operadora do SIM desconhecida" + "Operadora do chip desconhecida" "%1$s não tem um website de aprovisionamento conhecido" - "Insira o cartão SIM e reinicie" + "Insira o chip e reinicie" "Conecte-se à Internet" "Meu Local" "Local do perfil de trabalho" @@ -2584,7 +2585,7 @@ "Ocultar uso da ethernet" "Restrições de rede" "Sincronizar dados automaticamente" - "Cartões SIM" + "Chips" "Redes móveis" "Pausa no limite" "Sincron. dados automaticamente" @@ -2872,7 +2873,7 @@ "Use dados em LTE para melhorar recursos de voz e comunicações (recomendado)" "Tipo de rede preferencial" "LTE (recomendado)" - "SIM de trabalho" + "Chip de trabalho" "Acesso a apps e conteúdo" "RENOMEAR" "Definir restrições do app" @@ -2896,46 +2897,46 @@ "Escolher foto da Galeria" "Selecionar foto" - "Cartões SIM" - "Cartões SIM" + "Chips" + "Chips" "%1$s - %2$s" - "Os cartões SIM foram alterados" + "Os chips foram alterados" "Toque para configurar atividades" "Os dados móveis estão indisponíveis" - "Toque para selecionar um SIM de dados" + "Toque para selecionar um chip de dados" "Sempre usar esta opção para chamadas" - "Selecionar um SIM de dados" - "Trocando SIM de dados. Isso pode demorar um pouco..." + "Selecionar um chip de dados" + "Trocando chip de dados. Isso pode demorar um pouco..." "Ligar com" - "Selecionar um cartão SIM" - "SIM %1$d" - "SIM vazio" - "Nome do SIM" - "Inserir nome do SIM" - "Slot para SIM %1$d" + "Selecionar um chip" + "Chip %1$d" + "Chip vazio" + "Nome do chip" + "Inserir nome do chip" + "Slot para chip %1$d" "Operadora" "Número" - "Cor do SIM" - "Selecionar cartão SIM" + "Cor do chip" + "Selecionar chip" "Laranja" "Roxo" - "Nenhum cartão SIM inserido" - "Status do SIM" - "Status do SIM (slot para SIM %1$d)" - "Retornar chamada com o SIM padrão" - "SIM para chamadas de saída" + "Nenhum chip inserido" + "Status do chip" + "Status do chip (slot para SIM %1$d)" + "Retornar chamada com o chip padrão" + "Chip para fazer chamadas" "Outras configurações de chamada" "Rede pref. p/ descarreg." "Des. transm. nome de rede" "A opção \"Des. transm. nome de rede\" protege contra o acesso de terceiros a suas informações de rede." "A desativação da transmissão de nome de rede impedirá uma conexão automática a redes ocultas." "%1$d dBm %2$d asu" - "Alteração em cartões SIM." + "Alteração em chips." "Toque para configurar" - "SIM preferido para" + "Chip preferido para" "Perguntar sempre" "Seleção necessária" - "Seleção de SIM" + "Seleção de chip" "Configurações" Mostrar %d item oculto @@ -3161,7 +3162,7 @@ "Som desativado, mas permitido para %1$s e %2$s" "Som desativado, mas permitido para %1$s, %2$s e %3$s" "Mensagens, eventos e lembretes" - "Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você." + "Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você." "Concluído" "Configurações" "Sem aviso visual ou sonoro de notificações" @@ -3427,7 +3428,7 @@ "Ao inserir seu PIN para iniciar o dispositivo, serviços de disponibilidade como o %1$s ainda não estarão disponíveis." "Ao inserir seu padrão para iniciar o dispositivo, serviços de disponibilidade como o %1$s ainda não estarão disponíveis." "Ao inserir sua senha para iniciar o dispositivo, serviços de disponibilidade como o %1$s ainda não estarão disponíveis." - "Observação: após uma reinicialização, não é possível iniciar este app até que você desbloqueie seu smartphone" + "Observação: se você reiniciar o smartphone e tiver um bloqueio de tela definido, não será possível iniciar este app até que você desbloqueie o smartphone" "Informações de IMEI" "Informações relativas de IMEI" "(Slot%1$d)" @@ -3631,8 +3632,8 @@ "Frequência" "Uso máximo" "Nenhum dado usado" - "Permitir acesso a \"Não perturbe\" para %1$s?" - "O app poderá ativar/desativar \"Não perturbe\" e fazer alterações nas configurações relacionadas." + "Permitir que %1$s acesse o recurso \"Não perturbe\"?" + "O app poderá ativar/desativar o recurso \"Não perturbe\" e fazer alterações nas configurações relacionadas." "Deve permanecer ativado, pois o acesso a notificações está ativado" "Revogar acesso a \"Não perturbe\" para %1$s?" "Todas as regras \"Não perturbe\" criadas por esse app serão removidas." @@ -3752,7 +3753,7 @@ "O smartphone está configurado para vibrar" "Chamadas e notificações farão o dispositivo vibrar" "Chamadas e notificações farão o smartphone vibrar" - "Definir programação do Modo noturno" + "Definir horário do Modo noturno" "Tinge a tela automaticamente todas as noites" "O modo noturno está ativado" "A cor da tela muda para âmbar. Isso pode ajudar você a adormecer." diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml index a5137e1813955e0af165f00f4c712afd40815cbd..8d28a2705fffd918346c3bdcc8dd89fbe0ad0364 100644 --- a/res/values-ro/arrays.xml +++ b/res/values-ro/arrays.xml @@ -67,7 +67,7 @@ - "În curs de scanare..." + "Se caută..." "Se conectează..." "În curs de autentificare…" "Se obține adresa IP..." @@ -81,7 +81,7 @@ - "În curs de scanare..." + "Se caută..." "Se conectează la %1$s..." "Se autentifică cu %1$s…" "Se obține adresa IP de la %1$s…" @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Buton WPS" "Codul PIN de la disp. pereche" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 14123be22e12ff2e2e9ab7bd8e653be7a0c4abf3..ba830165b9d9847471a758590b91902c1387e4b8 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -369,7 +369,7 @@ "Mesaj pe ecranul de blocare" "Activați widgeturi" "Dezactivat de administrator" - "Afișați opțiunea de blocare" + "Afișați opțiunea de blocare strictă" "Afișați opțiunea butonului de pornire care dezactivează Smart Lock, deblocarea cu amprentă și notificările pe ecranul de blocare." "Niciunul" "%1$d/%2$d" @@ -502,7 +502,7 @@ - "Alegeți blocarea ecranului" + "Opțiuni blocare ecran" "Alegeți blocarea pentru serviciu" "Protejați tableta" "Protejați dispozitivul" @@ -865,6 +865,7 @@ "Automat" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Se preferă banda de 5,0 GHz" "2,4 GHz" "5,0 GHz" "Alegeți cel puțin o bandă pentru hotspot Wi-Fi:" @@ -1077,7 +1078,7 @@ "Natural" "Intensificat" "Saturat" - "Automat" + "Adaptiv" "Utilizați numai culori exacte" "Ajustați între culorile vii și cele exacte" "Doresc comutarea automată a orientării atunci când se rotește tableta" @@ -1547,10 +1548,10 @@ "Servicii de localizare" "Utilizare intensă a bateriei" "Utilizare redusă a bateriei" - "Scanare" - "Căutare de rețele Wi-Fi" + "Căutare" + "Căutare Wi-Fi" "Permiteți aplicațiilor și serviciilor să caute permanent rețele Wi-Fi, chiar și atunci când setarea Wi-Fi este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație." - "Căutare de dispozitive Bluetooth" + "Căutare Bluetooth" "Permiteți aplicațiilor și serviciilor să caute permanent dispozitive din apropiere, chiar și atunci când setarea Bluetooth este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație." "Localizare prin Wi-Fi și mobil" "Aplicațiile estimează mai rapid locația cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare." @@ -2966,7 +2967,7 @@ "Cardurile SIM au fost schimbate." "Atingeți pentru a configura" "Cartelă SIM preferată pentru" - "Întreabă mereu" + "Întreabă de fiecare dată" "Selectați o opțiune" "Selectare SIM" "Setări" @@ -3198,7 +3199,7 @@ "Sunetul este dezactivat, dar permiteți %1$s și %2$s" "Sunetul este dezactivat, dar permiteți %1$s, %2$s și %3$s" "Mesaje, evenimente și mementouri" - "Când este activată funcția Nu deranja, sunetele pentru mesaje, mementouri și evenimente vor fi dezactivate, cu excepția elementelor pe care le permiteți mai sus. Puteți să modificați setările pentru mesaje ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze." + "Când este activat modul Nu deranja, sunetele pentru mesaje, mementouri și evenimente vor fi dezactivate, cu excepția elementelor pe care le permiteți mai sus. Puteți să modificați setările pentru mesaje ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze." "Gata" "Setări" "Fără imagini sau sunet de la notificări" @@ -3335,7 +3336,7 @@ "Terminat" "Importanță" "Lumină intermitentă" - "Vibrații" + "Vibrează" "Sunet" "Ștergeți" "Redenumiți" @@ -3471,7 +3472,7 @@ "Când introduceți codul PIN pentru a porni acest dispozitiv, serviciile de accesibilitate, cum ar fi %1$s, nu vor fi disponibile." "Când introduceți modelul pentru a porni acest dispozitiv, serviciile de accesibilitate, cum ar fi %1$s, nu vor fi disponibile." "Când introduceți parola pentru a porni acest dispozitiv, serviciile de accesibilitate, cum ar fi %1$s, nu vor fi disponibile." - "Notă: după repornire, această aplicație nu poate porni până nu deblocați telefonul" + "Notă: dacă reporniți telefonul și aveți activată blocarea ecranului, această aplicație nu poate porni până nu deblocați telefonul." "Informații despre IMEI" "Informații referitoare la IMEI" "(Slotul%1$d)" @@ -3939,7 +3940,7 @@ "dimensiune pachet" "ashmem" "sunet" - "vibrare" + "vibrează" "prestabilit" "niciunul" "Obiectul clasificării lipsește." @@ -4209,7 +4210,7 @@ "Dezactivați soneria" "Apăsați în același timp pe butonul de pornire și pe creșterea volumului" "Comandă rapidă pentru dezactivarea soneriei" - "Vibrații" + "Vibrează" "Dezactivați sunetul" "Nicio acțiune" "Activată (vibrații)" diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml index 7c97a24caca85984b221f8d319a600fa66c534a7..ad3dc9e1f786c29f3ed0768718e7b7384b47d1de 100644 --- a/res/values-ru/arrays.xml +++ b/res/values-ru/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push-кнопка" "PIN-код с обнаруженного устройства" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index da007ce72dc68dae75bb2dde03beecfc36626ae9..b0ebdec308cde42bbebdc807f5b350b0138c3bd5 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -876,6 +876,7 @@ "Авто" "2,4 ГГц" "5,0 ГГц" + "5,0 ГГц (рекомендуется)" "2,4 ГГц" "5,0 ГГц" "Выберите хотя бы один диапазон частот для точек доступа Wi-Fi." @@ -1089,7 +1090,7 @@ "Натуральные" "Яркие" "Насыщенные" - "Автоматически" + "Адаптивная регулировка" "Только натуральные цвета" "Среднее между насыщенными и натуральными цветами" "Автоматически изменять ориентацию экрана при повороте планшетного ПК" @@ -1120,7 +1121,7 @@ "Яркость экрана будет автоматически регулироваться в зависимости от окружающих условий и ваших действий. Вы можете вручную перемещать ползунок, чтобы помочь адаптивной яркости запомнить ваши предпочтения." "Ночной режим" "В ночном режиме экран приобретает желтоватый оттенок. Это снижает напряжение глаз при тусклом свете и может помочь вам быстрее заснуть." - "По расписанию" + "Расписание" "Никогда" "В выбранное время" "От заката до рассвета" @@ -1138,7 +1139,7 @@ "Выключится автоматически на рассвете" "Включить" "Отключить" - "Включить до восхода" + "Включить до рассвета" "Отключить до заката" "Включить до %1$s" "Отключить до %1$s" @@ -2493,7 +2494,7 @@ "Хранилище регистрационных данных включено." "Чтобы использовать хранилище учетных данных, необходимо сначала настроить блокировку экрана на устройстве." "НАСТРОИТЬ БЛОКИРОВКУ" - "Приложения с доступом к данным" + "Доступ к данным" "Сигнал набора номера при экстренных вызовах" "Настроить режим работы при экстренном вызове" "Резервное копирование" @@ -3235,7 +3236,7 @@ "Без звука, кроме: %1$s и %2$s" "Без звука, кроме: %1$s, %2$s и %3$s" "Сообщения, напоминания и уведомления о мероприятиях" - "В режиме \"Не беспокоить\" сообщения, напоминания и уведомления о мероприятиях будут приходить без звука, за исключением тех, для которых вы задали разрешения выше. Вы можете изменить настройки, чтобы сообщения от друзей, членов семьи и других контактов приходили со звуком." + "В режиме \"Не беспокоить\" сообщения, напоминания и уведомления о мероприятиях будут приходить без звука (за исключением тех, для которых вы задали разрешения выше). Вы можете изменить настройки, чтобы сообщения от членов семьи, друзей и других контактов приходили со звуком." "ОК" "Настройки" "Полностью отключить уведомления" @@ -3515,7 +3516,7 @@ "При вводе PIN-кода для запуска устройства службы специальных возможностей, такие как %1$s, не будут включаться автоматически." "При вводе графического ключа для запуска устройства службы специальных возможностей, такие как %1$s, не будут включаться автоматически." "При вводе пароля для запуска устройства службы специальных возможностей, такие как %1$s, не будут включаться автоматически." - "Примечание. Чтобы запустить это приложение после перезагрузки, разблокируйте экран." + "Примечание. Если у вас установлена блокировка экрана, после перезагрузки разблокируйте экран, чтобы запустить приложение." "Данные IMEI-кода" "Сведения, касающиеся IMEI-кода" "(разъем %1$d)" diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml index c9d7d948b992a6087184abfdc466e26f932e9249..3f6c1379b6a83a453f7496378019e32b1dec66ad 100644 --- a/res/values-si/arrays.xml +++ b/res/values-si/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ඔබන බොත්තම" "සමයන්ගේ උපාංග වෙතින් PIN" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index fd701bf53a26b6e151dc56a719175b5baddb66a7..9566a3b7c7a28a1bfd11ebe5de5c0a2d4e05088c 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -854,6 +854,7 @@ "ස්වයං" "2.4 GHz කලාපය" "5.0 GHz කලාපය" + "5.0 GHz කලාපය වඩාත් කැමතිය" "2.4 GHz" "5.0 GHz" "Wi-Fi හොට්ස්පොට් සඳහා අවම වශයෙන් එක් කලාපයක් තෝරන්න:" @@ -1065,7 +1066,7 @@ "ස්වභාවික" "වැඩි කළ" "සන්තෘප්ත" - "ස්වයංක්‍රිය" + "අනුවර්තී" "නිවැරදි වර්ණ පමණක් භාවිත කරන්න" "විචිත්‍ර සහ නිවැරදි වර්ණ අතර සීරුමාරු කරන්න" "ටැබ්ලටය කරකැවීමේදී ස්වයංක්‍රියව දිශානතිය වෙනස් කරන්න" @@ -3161,7 +3162,7 @@ "නිහඬයි, නමුත් %1$s සහ %2$s හට ඉඩ දෙන්න" "නිහඬයි, නමුත් %1$s, %2$s, සහ %3$s හට ඉඩ දෙන්න" "පණිවිඩ, සිදුවීම් සහ සිහිැඳවීම්" - "බාධා නොකරන්න ක්‍රියාත්ම විට, ඔබ ඉහත අවසර දෙනු ලබන අයිතම හැරුණු විට, පණිවිඩ, සිහි කැඳවීම් සහ සිදුවීම් අවහිර කරනු ඇත. ඔබගේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ සමග සම්බන්ධ වීමට ඉඩ දීමට පණිවිඩ සැකසීම් සකස් කිරීමට ඔබට හැකිය." + "බාධා නොකරන්න ක්‍රියාත්ම විට, ඔබ ඉහත අවසර දෙනු ලබන අයිතම හැරුණු විට, පණිවිඩ, සිහි කැඳවීම් සහ සිදුවීම් අවහිර කරනු ඇත. ඔබගේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ සමග සම්බන්ධ වීමට ඉඩ දීමට පණිවිඩ සැකසීම් සකස් කිරීමට ඔබට හැකිය." "නිමයි" "සැකසීම්" "දැනුම්දීම්වලින් දෘශ්‍ය හෝ හඬ නැත" @@ -3427,7 +3428,7 @@ "මෙම උපාංගය ආරම්භ කිරීමට ඔබගේ PIN එක ඔබ ඇතුළු කරන විට, ප්‍රවේශතා සේවාව වැනි %1$s තවම තිබිය නොහැක." "මෙම උපාංගය ආරම්භ කිරීමට ඔබගේ රටාව ඔබ ඇතුළු කරන විට, ප්‍රවේශතා සේවාව වැනි %1$s තවම තිබිය නොහැක." "මෙම උපාංගය ආරම්භ කිරීමට ඔබගේ මුරපදය ඔබ ඇතුළු කරන විට, ප්‍රවේශතා සේවාව වැනි %1$s තවම තිබිය නොහැක." - "සටහන: නැවත පණ ගැන්වීමකට පසුව, ඔබ ඔබේ දුරකථනය අගුලු හරින තෙක් මෙම යෙදුම ආරම්භ කළ නොහැකිය" + "සටහන: ඔබ ඔබගේ දුරකථනය යළි අරඹා තිර අගුලක් සකසා තිබේ නම්, ඔබ ඔබගේ දුරකථනය අගුලු හරින තෙක් මෙම යෙදුම ආරම්භ කළ නොහැකිය" "IMEI තොරතුරු" "IMEI සාපේක්ෂ තොරතුරු" "(විවර%1$d)" diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml index d158ba50faf8642f8fd0e93654dff163c9faf9f0..b25816617a4f951435dea938e2ee035ff3e138f8 100644 --- a/res/values-sk/arrays.xml +++ b/res/values-sk/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Stlačenie tlačidla" "PIN zo zdieľaného zariadenia" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 906b0f843bcba4066c1219e029eb23bf2e07c895..69fa877b0eec997cec1a791bc381c901d7f809fb 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -876,6 +876,7 @@ "Automaticky" "Pásmo 2,4 GHz" "Pásmo 5 GHz" + "Preferuje sa pásmo 5 GHz" "2,4 GHz" "5 GHz" "Vyberte aspoň jedno pásmo pre hotspot Wi-Fi:" @@ -996,8 +997,8 @@ "Predvoľby roamingu" - "Uprednostniť Wi‑Fi" - "Preferujem mobilné dáta" + "Preferovať Wi‑Fi" + "Preferovať mobilné spojenie" "Len Wi‑Fi" @@ -1011,8 +1012,8 @@ "0" - "Uprednostniť Wi‑Fi" - "Preferujem mobilné dáta" + "Preferovať Wi‑Fi" + "Preferovať mobilné spojenie" "Wi‑Fi" @@ -1089,7 +1090,7 @@ "Prirodzené" "Zosilnené" "Sýte" - "Automatické" + "Adaptívna" "Používať iba presné farby" "Vyberte si medzi živými a presnými farbami" "Pri otáčaní tabletu automaticky prepínať orientáciu" @@ -3235,7 +3236,7 @@ "Zvuk je vypnutý, ale povoľte %1$s a %2$s" "Zvuk je vypnutý, ale povoľte %1$s, %2$s a %3$s" "Správy, udalosti a pripomenutia" - "Keď je zapnutý režim Nerušiť, zvuky správ, pripomenutí a udalostí budú vypnuté. Výnimku predstavujú položky, ktoré povolíte vyššie. Môžete upraviť nastavenia správ a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami." + "Keď je zapnutý režim Nerušiť, zvuky správ, pripomenutí a udalostí budú vypnuté. Výnimku predstavujú položky, ktoré povolíte vyššie. Môžete upraviť nastavenia správ a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami." "Hotovo" "Nastavenia" "Upozornenia sa nebudú zobrazovať ani vydávať zvuky" @@ -3515,7 +3516,7 @@ "Pri zadávaní kódu PIN na spustenie zariadenia ešte nebudú k dispozícii služby dostupnosti, ako napríklad %1$s." "Pri zadávaní vzoru na spustenie zariadenia ešte nebudú k dispozícii služby dostupnosti, ako napríklad %1$s." "Pri zadávaní hesla na spustenie zariadenia ešte nebudú k dispozícii služby dostupnosti, ako napríklad %1$s." - "Poznámka: Po reštartovaní sa táto aplikácia spustí až vtedy, keď odomknete telefón" + "Poznámka: Ak reštartujete telefón a máte nastavenú zámku obrazovky, táto aplikácia sa spustí až po odomknutí telefónu" "Informácie o kóde IMEI" "Informácie súvisiace s kódom IMEI" "(Slot %1$d)" @@ -3735,8 +3736,8 @@ "Frekvencia" "Maximálne využitie" "Neboli využité žiadne údaje" - "Povoliť prístup k nastaveniu Nerušiť pre aplikáciu %1$s?" - "Aplikácia bude môcť vypnúť alebo zapnúť nastavenie Nerušiť a meniť súvisiace nastavenia." + "Povoliť aplikácii %1$s prístup k režimu Nerušiť?" + "Aplikácia bude môcť vypínať a zapínať režim Nerušiť a meniť súvisiace nastavenia." "Musí zostať zapnuté, pretože je zapnutý prístup k upozorneniam" "Odvolať prístup k nastaveniu Nerušiť pre aplikáciu %1$s?" "Všetky pravidlá typu Nerušiť vytvorené touto aplikáciou budú odstránené." diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml index 09e41a8b6b6e9f4cbd36dd375eb7a3574d057e9e..53162f12daa886ee2f1963284d06b7b12aad0c8c 100644 --- a/res/values-sl/arrays.xml +++ b/res/values-sl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pritisnite gumb" "PIN iz enakovredne naprave" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 31cfefdacf0023a442d0412440fdf968551d20b8..79d2715a15101aa76cc9d485f05fcb685d5e4c77 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -876,6 +876,7 @@ "Samodejno" "2,4-GHz pas" "5,0-GHz pas" + "Prednostno 5,0-GHz pas" "2,4 GHz" "5,0 GHz" "Izberite vsaj en pas za dostopno točko Wi‑Fi:" @@ -996,7 +997,7 @@ "Prednostna izbira za gostovanje" - "Prednostno – Wi-Fi" + "Prednostno Wi-Fi" "Prednostno mobilno" "Samo Wi-Fi" @@ -1011,7 +1012,7 @@ "0" - "Prednostno – Wi-Fi" + "Prednostno Wi-Fi" "Prednostno mobilno" @@ -1089,7 +1090,7 @@ "Naravne" "Poudarjene" "Nasičene" - "Samodejno" + "Prilagodljivo" "Uporaba samo natančnih barv" "Prilagoditev med živimi in natančnimi barvami" "Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika" @@ -3235,7 +3236,7 @@ "Prezrto; dovoljena zvoka: %1$s in %2$s" "Prezrto; dovoljeni zvoki: %1$s, %2$s in %3$s" "Sporočila, dogodki in opomniki" - "Pri vklopljenem načinu »ne moti« bodo prezrta vsa sporočila, opomniki in dogodki razen za zgoraj omogočene elemente. Nastavitve sporočil lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike." + "Pri vklopljenem načinu »ne moti« bodo prezrta vsa sporočila, opomniki in dogodki razen za zgoraj omogočene elemente. Nastavitve sporočil lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike." "Končano" "Nastavitve" "Brez vidnega in zvočnega opozarjanja na obvestila" @@ -3515,7 +3516,7 @@ "Ko vnesete kodo PIN za zagon te naprave, storitve za osebe s posebnimi potrebami, kot je %1$s, še ne bodo na voljo." "Ko vnesete vzorec za zagon te naprave, storitve za osebe s posebnimi potrebami, kot je %1$s, še ne bodo na voljo." "Ko vnesete geslo za zagon te naprave, storitve za osebe s posebnimi potrebami, kot je %1$s, še ne bodo na voljo." - "Opomba: po vnovičnem zagonu te aplikacije ni mogoče zagnati, če ne odklenete telefona." + "Opomba: po vnovičnem zagonu telefona z nastavljenim zaklepanjem zaslona se ta aplikacija ne more zagnati, dokler ne odklenete telefona." "Podatki o IMEI" "Relativni podatki o IMEI" "(Reža %1$d)" @@ -3735,7 +3736,7 @@ "Frekvenca" "Največja uporaba" "Ni bilo uporabe podatkov" - "Želite aplikaciji %1$s dovoliti dostop do načina »ne moti«?" + "Dovolite aplikaciji %1$s dostop do funkcije »ne moti«?" "Aplikacija bo lahko vklopila/izklopila način »ne moti« in spreminjala povezane nastavitve." "Mora biti vklopljeno, ker je vklopljen dostop do obvestil" "Želite aplikaciji %1$s preklicati dostop do načina »ne moti«?" @@ -4077,8 +4078,8 @@ "Preskus novega gumba za začetni zaslon" "Vklop nove poteze za preklop aplikacij" "Preverjanje telefona z dvojnim dotikom" - "Dvakrat se dotaknite, da preverite tablični računalnik" - "Dvakrat se dotaknite, da preverite napravo" + "Dvakratni dotik za preverjanje tabličnega računalnika" + "Dvakratni dotik za preverjanje naprave" "Če želite preveriti uro, ikone obvestil in druge informacije, se dvakrat dotaknite zaslona." "Preverjanje telefona z dvigom" "Primite tablični računalnik, da ga preverite" diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml index 0c13676f7363f4566b37fe1d7bdf9f5ab973f3a3..f51e15a763f8649bea38d62df4ce056e58b74b3f 100644 --- a/res/values-sq/arrays.xml +++ b/res/values-sq/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Shtyp butonin" "Kodi PIN nga pajisja homologe" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index df14af0cef5a78f5360b8ebda2e44aea461c476d..a2c5e2780c417099838533e071d4bac5c0cacd47 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -854,6 +854,7 @@ "Automatik" "Bandë 2,4 GHz" "Banda 5,0 GHz" + "Preferohet banda 5,0 GHz" "2,4 GHz" "5,0 GHz" "Zgjidh të paktën një brez për zonën e qasjes për internet për Wi‑Fi:" @@ -1065,7 +1066,7 @@ "Natyrale" "Të theksuara" "E gjallë" - "Automatike" + "Me përshtatje" "Përdor vetëm ngjyrat e sakta" "Rregullo mes ngjyrave të gjalla dhe të sakta" "Ndërro orientimin automatikisht kur rrotullon tabletin" @@ -1115,7 +1116,7 @@ "Aktivizo tani" "Çaktivizo tani" "Aktivizo deri në lindjen e diellit" - "Çaktivizo deri në perëndimin e diellit" + "Çaktivizo deri në perëndim të diellit" "Çaktivizo deri në %1$s" "Çaktivizo deri në %1$s" "Në gjendje gjumi" @@ -1923,7 +1924,7 @@ "Koha e përdorimit" "Qasshmëria" "Cilësimet e qasjes" - "Lexues ekrani, ekran, kontrolle interaktive" + "Lexues ekrani, ekran, kontrolle ndërveprimi" "Cilësimet e shikimit" "Mund ta personalizosh këtë pajisje për t\'iu përshtatur nevojave të tua. Këto funksione të qasjes mund të ndryshohen më vonë te \"Cilësimet\"." "Ndrysho madhësinë e shkrimit" @@ -3161,7 +3162,7 @@ "Pa zë, por lejo %1$s dhe %2$s" "Pa zë, por lejo %1$s, %2$s dhe %3$s" "Mesazhet, ngjarjet dhe alarmet rikujtuese" - "Kur modaliteti \"Mos shqetëso\" është aktiv, mesazhet, alarmet rikujtuese dhe ngjarjet do të jenë në heshtje, përveçse për artikujt që lejon më sipër. Mund t\'i përshtatësh cilësimet e mesazheve për të lejuar shokët, familjen ose kontakte të tjera që të lidhen me ty." + "Kur modaliteti \"Mos shqetëso\" është aktiv, mesazhet, alarmet rikujtuese dhe ngjarjet do të jenë në heshtje, përveçse për artikujt që lejon më sipër. Mund t\'i përshtatësh cilësimet e mesazheve për të lejuar shokët, familjen ose kontakte të tjera që të lidhen me ty." "U krye" "Cilësimet" "Asnjë pamje apo tingull nga njoftimet" @@ -3427,7 +3428,7 @@ "Kur fut kodin PIN për të nisur këtë pajisje, nuk do të ofrohen ende shërbimet e qasshmërisë si %1$s." "Kur fut motivin për të nisur këtë pajisje, shërbimet e qasjes si %1$s nuk do të jenë ende të gatshme." "Kur fut fjalëkalimin tënd për të nisur këtë pajisje, shërbimet si %1$s nuk do të jenë ende të disponueshëm." - "Shënim: Pas një rinisjeje, ky aplikacion nuk mund të niset derisa të shkyçësh telefonin" + "Shënim: Nëse e rinis telefonin dhe ke caktuar një kyçje të ekranit, ky aplikacion nuk mund të niset derisa të shkyçësh telefonin" "Informacioni i IMEI-t" "Informacioni përkatës i IMEI-t" "(Foleja %1$d)" @@ -3631,7 +3632,7 @@ "Frekuenca" "Përdorimi maksimal" "Nuk janë përdorur të dhëna" - "Të lejohet qasja te \"Mos shqetëso\" për %1$s?" + "Të lejohet qasja te \"Mos shqetëso\" për \"%1$s\"?" "Aplikacioni do të jetë në gjendje të aktivizojë/çaktivizojë opsionin \"Mos shqetëso\", si dhe të bëjë ndryshimet në cilësimet përkatëse." "Duhet të qëndrojë e aktivizuar sepse qasja e njoftimeve është e aktivizuar" "Të anulohet qasja te \"Mos shqetëso\" për %1$s?" diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml index e938dd7645a781b3370fe729a666ed4e185ec0a2..94c0d18f3f2fa39b005cb323aa2e66afc03bc39f 100644 --- a/res/values-sr/arrays.xml +++ b/res/values-sr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Притискање дугмета" "PIN са равноправног уређаја" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 46d43faf17f604af325e683b373f6f524d22fb0e..28782185d2b90ad7ef061ec2959d6fbc0f8a3608 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -865,6 +865,7 @@ "Аутоматски" "Опсег од 2,4 GHz" "Опсег од 5,0 GHz" + "Предност се даје опсегу од 5.0 GHz" "2,4 GHz" "5,0 GHz" "Изаберите барем један опсег за Wi‑Fi хотспот:" @@ -1077,7 +1078,7 @@ "Природне" "Појачане" "Засићене" - "Аутоматски" + "Прилагодљив" "Користите само тачне боје" "Бирајте између живописних и тачних боја" "Промени положај аутоматски приликом ротирања таблета" @@ -3198,7 +3199,7 @@ "Звук је искључен, али дозволи за: %1$s и %2$s" "Звук је искључен, али дозволи за: %1$s, %2$s и %3$s" "Поруке, догађаји и подсетници" - "Када је укључен режим Не узнемиравај, звукови обавештења за поруке, подсетнике и догађаје ће бити искључени, осим за ставке које сте дозволили изнад. Можете да прилагодите подешавања да бисте дозволили пријатељима, члановима породице или другим контактима да вас контактирају." + "Када је укључен режим Не узнемиравај, звукови обавештења за поруке, подсетнике и догађаје ће бити искључени, осим за ставке које сте дозволили изнад. Можете да прилагодите подешавања да бисте дозволили пријатељима, члановима породице или другим контактима да вас контактирају." "Готово" "Подешавања" "Без звучног сигнала или визуелног обавештења" @@ -3471,7 +3472,7 @@ "Када унесете PIN да бисте покренули овај уређај, услуге приступачности, као што је %1$s, неће још увек бити доступне." "Када унесете шаблон да бисте покренули овај уређај, услуге приступачности, као што је %1$s, неће још увек бити доступне." "Када унесете лозинку да бисте покренули овај уређај, услуге приступачности, као што је %1$s, неће још увек бити доступне." - "Напомена: После рестартовања ова апликација не може да се покрене док не откључате телефон" + "Напомена: Ако рестартујете телефон и подесили сте закључавање екрана, ова апликација не може да се покрене док не откључате телефон" "Информације за IMEI" "Релативне информације за IMEI" "(Отвор %1$d)" @@ -3534,7 +3535,7 @@ "Категорије: низак приоритет" "Категорије: искључено" "Категорије: мења режим „Не узнемиравај“" - "Напредна" + "Напредно" "Конфигуришите апликације" "Непозната апликација" "Дозволе за апликације" diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml index d4cc02cd4aec6e0bf7ddcee73122b832e7f83cab..778d906e5e323049e2135e56975b989d951aeb76 100644 --- a/res/values-sv/arrays.xml +++ b/res/values-sv/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Tryckknapp" "PIN-kod från den andra enheten" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index e877796b1c7e684123f333bde4c268df0efa95d5..b24a89334839c90a6a7316ec0eb491a4217b0e8f 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -854,6 +854,7 @@ "Automatiskt" "2,4 GHz-bandet" "5,0 GHz-bandet" + "5,0 GHz-bandet föredras" "2,4 GHz" "5,0 GHz" "Välj minst ett band för Wi‑Fi-surfzon:" @@ -973,7 +974,7 @@ "Inställning för roaming" "Wi-Fi i första hand" - "Mobilanpassad" + "Mobilnät i första hand" "Endast Wi-Fi" @@ -988,7 +989,7 @@ "Wi-Fi i första hand" - "Mobilanpassad" + "Mobilnät i första hand" "Wi-Fi" @@ -1065,7 +1066,7 @@ "Naturliga" "Förstärkta" "Mättade" - "Automatisk" + "Anpassad" "Använd bara naturtrogna färger" "Ändra mellan intensiva och naturtrogna färger" "Växla riktning automatiskt när du roterar surfplattan" @@ -1636,7 +1637,7 @@ "Gör grafiskt lösenord synligt" "Gör det grafiska lösenordet för profilen synligt" "Vibrera vid tryck" - "Avstängningsknappen låser direkt" + "Strömbrytaren låser direkt" "Utom när den hålls olåst av %1$s" "Ange grafiskt lösenord" "Byt grafiskt lösenord" @@ -3161,7 +3162,7 @@ "Stäng av ljudet men tillåt %1$s och %2$s" "Stäng av ljudet men tillåt %1$s, %2$s och %3$s" "Meddelanden, händelser och påminnelser" - "Meddelanden, påminnelser och händelser döljs när Stör ej har aktiverats, utom objekten du har tillåtit ovan. Du kan anpassa inställningarna så att dina vänner, familj eller andra kontakter ändå kan nå dig." + "Meddelanden, påminnelser och händelser döljs när Stör ej har aktiverats, utom det som du har tillåtit ovan. Du kan anpassa inställningarna så att dina vänner, familj eller andra kontakter kan nå dig." "Klar" "Inställningar" "Inga synliga eller hörbara aviseringar" @@ -3427,7 +3428,7 @@ "Tillgänglighetstjänster som %1$s kommer inte att vara tillgängliga när du anger pinkoden och startar enheten." "Tillgänglighetstjänster som %1$s kommer inte att vara tillgängliga när du ritar ditt mönster och startar enheten." "Tillgänglighetstjänster som %1$s kommer inte att vara tillgängliga när du anger lösenordet och startar enheten." - "Obs! När du har startat om enheten måste du låsa upp mobilen innan du kan starta den här appen" + "Obs! Om du startar om mobilen och har ställt in ett skärmlås kan appen inte startas förrän du låser upp mobilen." "Information om IMEI-kod" "Relativ information om IMEI-kod" "(Plats %1$d)" @@ -3901,7 +3902,7 @@ "Kontrolluppgifter på låsskärm" "Visa eller dölja innehåll i aviseringar" "Alla" - "Support och tips" + "Tips och support" "Minsta bredd" "Inga installerade appar har begärt åtkomst till premium-sms" "Det kan hända att premium-sms kostar pengar och läggs till på dina fakturor från operatören. Om du ger en app åtkomst kan du skicka premium-sms med den appen." diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml index 7cf9b4a8b99e529c71ceaba57c3b9f4ebfa2241f..0a1630e631bf3fa5c4016a2e4f70aec30132a4b4 100644 --- a/res/values-sw/arrays.xml +++ b/res/values-sw/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Kichupo cha kusukuma" "PIN kutoka kwa kifaa cha rika" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index f549afedfecb1b7d5567897781484a0aad0612f1..5affe9af795bb8a264a35b0fba1c7b8ebc60b0ab 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -20,7 +20,7 @@ "Hapana" "Unda" "Ruhusu" - "Kana" + "Kataa" "Funga" "Swichi" "Haijulikani" @@ -275,7 +275,7 @@ Ungependa kuondoa lugha zilizochaguliwa? Ungependa kuondoa lugha iliyochaguliwa? - "Itaonyesha maandishi katika lugha nyingine." + "Maandishi yataonyeshwa katika lugha nyingine." "Haiwezi kuondoa lugha zote" "Hifadhi angalau lugha moja unayopendelea" "Huenda isipatikane katika baadhi ya programu" @@ -854,6 +854,7 @@ "Otomatiki" "Bendi ya GHz 2.4" "Bendi ya GHz 5.0" + "Imechagua Bendi ya GHz 5.0" "GHz 2.4" "GHz 5.0" "Chagua angalau bendi moja ya mtandao-hewa wa Wi‑Fi:" @@ -1065,7 +1066,7 @@ "Asili" "Imeongezwa Rangi" "Imekolezwa" - "Otomatiki" + "Inayojirekebisha" "Tumia rangi bayana pekee" "Badilisha kati ya rangi zinazong\'aa na rangi bayana" "Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo" @@ -1095,7 +1096,7 @@ "Imarisha kiwango cha ung\'avu kulingana na mwangaza uliopo. Kipengele hiki kikiwa kimewashwa, bado unaweza kubadilisha ung\'avu kwa muda." "Itarekebisha mwangaza wa skrini kiotomatiki ili uendane na mazingira na shughuli zako. Unaweza kusogeza kitelezi mwenyewe ili kusaidia kipengele cha mwangaza unaojirekebisha kijifunze mapendeleo yako." "Mwanga wa Usiku" - "Mwanga wa Usiku hugeuza rangi ya skrini yako kuwa manjano. Hali hii hufanya iwa rahisi kuangalia skrini yako au kusoma katika mwangaza hafifu na inaweza kukusaidia ulale kwa urahisi sana." + "Mwanga wa Usiku hugeuza rangi ya skrini yako kuwa manjano. Hali hii hufanya iwe rahisi kuangalia skrini yako au kusoma katika mwangaza hafifu na inaweza kukusaidia ulale kwa urahisi zaidi." "Ratiba" "Hamna" "Huwashwa wakati maalum" @@ -2954,7 +2955,7 @@ "Programu na arifa" "Ruhusa, programu chaguomsingi" "Akaunti" - "Hakuna akaunti zilizizoongezwa" + "Hakuna akaunti zilizoongezwa" "Programu chaguomsingi" "Lugha, saa, hifadhi rudufu, masasisho" "Mipangilio" @@ -3161,7 +3162,7 @@ "Imezimwa, lakini ruhusu %1$s na %2$s" "Imezimwa, lakini ruhusu %1$s, %2$s na %3$s" "Ujumbe, matukio na vikumbusho" - "Wakati umewasha mipangilio ya Usinisumbue, ujumbe, vikumbusho na matukio yatakomeshwa, isipokuwa yanayotoka kwenye vipengee unavyoruhusu hapo juu. Unaweza kubadilisha mipangilio ya ujumbe ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe." + "Ukiwasha kipengele cha Usinisumbue, ujumbe, vikumbusho na matukio yatakomeshwa, isipokuwa yanayotoka kwenye vipengee unavyoruhusu hapo juu. Unaweza kubadilisha mipangilio ya ujumbe ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe." "Nimemaliza" "Mipangilio" "Arifa zisionekane wala zisitoe sauti" @@ -3427,7 +3428,7 @@ "Unapoweka PIN ili uanzishe kifaa hiki, huduma za ufikiaji kama %1$s hazitapatikana." "Unapoweka mchoro ili uanzishe kifaa hiki, huduma za ufikiaji kama %1$s hazitapatikana." "Unapoweka nenosiri ili uanzishe kifaa hiki, huduma za ufikiaji kama %1$s hazitapatikana." - "Kumbuka: Baada ya kuwasha tena programu hii, hutaweza kuitumia hadi utakapofungua simu yako" + "Kumbuka: Kama utazima kisha uwashe simu yako na uwe umeweka njia ya kufunga skrini, hutaweza kutumia programu hii hadi utakapofungua simu yako" "Maelezo ya IMEI" "Maelezo ya IMEI yanayohusiana" "(Nafasi%1$d )" @@ -3631,7 +3632,7 @@ "Masafa" "Upeo wa matumizi" "Hakuna data iliyotumika" - "Je, ungependa kuruhusu ufikiaji kwa Usinisumbue kwenye %1$s?" + "Je, programu ya %1$s ifikie kipengele cha Usinisumbue?" "Programu itaweza kuzima na kuwasha kipengee cha Usinisumbue na kufanya mabadiliko katika mipangilio inayohusiana." "Lazima kiwe kimewashwa kwa sababu kipengele cha ufikiaji wa arifa kimewashwa" "Ungependa kubatilisha idhini ya %1$s ya kufikia kipengele cha Usinisumbue?" diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml index 202da3a8ebdd65d4df402e73e663f09a46d19c3d..d9f8b001a217a0460a1d1a7e85626c7d1cffc1db 100644 --- a/res/values-ta/arrays.xml +++ b/res/values-ta/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "புஷ் பொத்தான்" "பியர் சாதனத்திலிருந்து பின்" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index bf33f7ba8319e1c02a2047dcb3d1fbd9f5688df5..c9a7ccde5d384ee3b7d7d5d057853348df5c874c 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -854,6 +854,7 @@ "தானியங்கு" "2.4 GHz அலைவரிசை" "5.0 GHz அலைவரிசை" + "5.0 GHz அலைவரிசைக்கு முன்னுரிமை" "2.4 GHz" "5.0 GHz" "வைஃபை ஹாட்ஸ்பாட்டிற்கு, குறைந்தது ஒரு பேண்ட்டைத் தேர்வுசெய்யவும்:" @@ -1065,7 +1066,7 @@ "இயற்கை வண்ணம்" "பூஸ்ட் செய்யப்பட்டது" "சாச்சுரேட் ஆனது" - "தானியங்கு" + "அடாப்டிவ்" "துல்லியமான வண்ணங்களை மட்டும் பயன்படுத்து" "பளிச்சென்ற மற்றும் துல்லியமான வண்ணங்களுக்கு இடையே சரிசெய்யும்" "டேப்லெட்டைச் சுழற்றும்போது திசையமைவையும் தானாக மாற்று" @@ -1094,12 +1095,12 @@ "பேட்டரியை அதிகமாகப் பயன்படுத்தும்" "கிடைக்கும் ஒளிக்கேற்ப ஒளிர்வை மேம்படுத்து. இதை இயக்கியிருந்தால், தற்காலிகமாக ஒளிர்வைச் சரிசெய்யலாம்." "நீங்கள் இருக்கும் சூழலுக்கும், செய்யும் வேலைகளுக்கும் ஏற்றவாறு, தானாகவே உங்களின் திரை ஒளிர்வு கூடும், குறையும். நீங்கள் எவ்வளவு வெளிச்சத்தை விரும்புகிறீர்கள் என்பதைச் சூழலுக்கேற்ற ஒளிர்வு தெரிந்துகொள்ள, ஸ்லைடரைக் கைமுறையாக நகர்த்தலாம்." - "இரவு ஒளி" - "இரவு ஒளி அம்சமானது உங்கள் திரையை மஞ்சளும் ஆரஞ்சும் கலந்த நிறத்திற்கு மாற்றும். இது மங்கலான ஒளியில் திரையைப் பார்ப்பதை அல்லது படிப்பதை எளிதாக்குவதோடு, விரைவாக உறங்க உதவக்கூடும்." + "நைட் லைட்" + "நைட் லைட் அம்சமானது உங்கள் திரையை மஞ்சளும் ஆரஞ்சும் கலந்த நிறத்திற்கு மாற்றும். இது மங்கலான ஒளியில் திரையைப் பார்ப்பதை அல்லது படிப்பதை எளிதாக்குவதோடு, விரைவாக உறங்க உதவக்கூடும்." "திட்டமிடு" "ஏதுமில்லை" "தனிப்பயன் நேரத்தில் இயக்கும்" - "இயக்கும்: சூரிய அஸ்தமனம் - உதயம்" + "மாலை முதல் காலை வரை ஆன் செய்யும்" "தொடக்க நேரம்" "முடிவு நேரம்" "நிலை" @@ -1114,8 +1115,8 @@ "சூரிய உதயத்தின் போது தானாக முடக்கப்படும்" "இப்போது ஆன் செய்" "இப்போது ஆஃப் செய்" - "சூரிய உதயம் வரை ஆன் செய்" - "சூரிய அஸ்தமனம் வரை ஆஃப் செய்" + "காலை வரை ஆன் செய்" + "மாலை வரை ஆஃப் செய்" "%1$s வரை ஆஃப் செய்" "%1$s வரை ஆஃப் செய்" "உறங்கு" @@ -3161,7 +3162,7 @@ "ஒலியடக்கப்பட்டது, ஆனால் %1$s மற்றும் %2$s அனுமதிக்கப்பட்டுள்ளன" "ஒலியடக்கப்பட்டது, ஆனால் %1$s, %2$s மற்றும் %3$s அனுமதிக்கப்பட்டுள்ளன" "மெசேஜஸ், நிகழ்வுகள் & நினைவூட்டல்கள்" - "\'தொந்தரவு செய்ய வேண்டாம்\' ஆன் செய்யப்பட்டிருக்கும் போது நீங்கள் அனுமதித்தவை தவிர்த்து, மெசேஜஸ், நினைவூட்டல்கள், நிகழ்வுகள் ஆகியவை ஒலியடக்கப்படும். நண்பர்கள், குடும்பத்தினர் அல்லது வேறு தொடர்புகள் உங்களைத் தொடர்புகொள்வதை அனுமதிக்க, நீங்கள் மெசேஜஸ் அமைப்புகளை மாற்றிக்கொள்ளலாம்." + "\'தொந்தரவு செய்ய வேண்டாம்\' ஆன் செய்யப்பட்டிருக்கும்போது நீங்கள் அனுமதித்தவை தவிர்த்து, மெசேஜஸ், நினைவூட்டல்கள், நிகழ்வுகள் ஆகியவை ஒலியடக்கப்படும். உங்களை நண்பர்களோ, குடும்பத்தினரோ, வேறு தொடர்புகளோ தொடர்புகொள்வதற்கு அனுமதிக்க, நீங்கள் மெசேஜஸ் அமைப்புகளை மாற்றிக்கொள்ளலாம்." "முடிந்தது" "அமைப்புகள்" "அறிவிப்புகள் வரும்போது காட்டவோ ஒலியெழுப்பவோ வேண்டாம்" @@ -3427,7 +3428,7 @@ "இந்தச் சாதனத்தைத் துவக்க பின்னை நீங்கள் பயன்படுத்தினால், %1$s போன்ற அணுகல்தன்மை சேவைகள் கிடைக்காது." "இந்தச் சாதனத்தைத் துவக்க வடிவத்தை நீங்கள் பயன்படுத்தினால், %1$s போன்ற அணுகல்தன்மை சேவைகள் கிடைக்காது." "இந்தச் சாதனத்தைத் துவக்க கடவுச்சொல்லை நீங்கள் பயன்படுத்தினால், %1$s போன்ற அணுகல்தன்மை சேவைகள் கிடைக்காது." - "குறிப்பு: மறுதொடக்கம் செய்த பிறகு, மொபைலைத் திறக்கும் வரை இந்தப் பயன்பாட்டால் தொடங்க முடியாது" + "கவனத்திற்கு: உங்கள் மொபைலை மீண்டும் தொடங்கும்போது அதில் திரைப் பூட்டு அமைக்கப்பட்டிருந்தால், மொபைலைத் திறக்கும் வரை இந்த ஆப்ஸால் செயல்பட முடியாது" "IMEI தகவல்" "IMEI தொடர்புடைய தகவல்" "(ஸ்லாட்%1$d)" @@ -3526,7 +3527,7 @@ "உபயோக அணுகல் அனுமதி" "பயன்பாட்டு உபயோக விருப்பத்தேர்வுகள்" "பயன்பாட்டில் செலவிட்ட நேரம்" - "உபயோக அணுகலானது, நீங்கள் பயன்படுத்தும் பிற ஆப்ஸ் மற்றும் அவற்றை எவ்வளவு அடிக்கடி பயன்படுத்துகிறீர்கள் என்பவற்றையும், உங்கள் மொபைல் நிறுவனம், மொழி அமைப்புகள் மற்றும் பிற விவரங்களையும் கண்காணிக்க, பயன்பாட்டை அனுமதிக்கும்." + "உபயோக அணுகலானது, நீங்கள் வேறு எந்தெந்த ஆப்ஸை எவ்வளவு அடிக்கடி பயன்படுத்துகிறீர்கள் என்று அறியும் அனுமதியை ஒரு ஆப்ஸுக்கு வழங்குகிறது. உங்கள் மொபைல் நிறுவனம், மொழி அமைப்புகள் மற்றும் பிற விவரங்களையும் அறிந்து கொள்ளும் அனுமதியும் இதில் அடங்கும்." "நினைவகம்" "நினைவக விவரங்கள்" "எப்போதும் இயங்குபவை (%s)" @@ -3649,7 +3650,7 @@ "ஆப்ஸ்" "பிற ஆப்ஸின் மேலே காட்டு" "பிற ஆப்ஸின் மேலே காட்டுவதை அனுமதி" - "நீங்கள் பயன்படுத்தும் பிற ஆப்ஸின் மேலே உள்ளடக்கத்தைக் காட்ட, இந்தப் பயன்பாட்டை அனுமதிக்கும். மேலும், அந்த ஆப்ஸை நீங்கள் பயன்படுத்தும் போது இது குறுக்கிடக்கூடும் அல்லது அவை தோன்றும் அல்லது செயல்படும் விதத்தை மாற்றக்கூடும்." + "நீங்கள் பயன்படுத்தும் பிற ஆப்ஸின் மேலே உள்ளடக்கத்தைக் காட்ட, இந்த ஆப்ஸை அனுமதிக்கும். மேலும், அவற்றை நீங்கள் பயன்படுத்தும் போது இது குறுக்கிடக்கூடும் அல்லது அவை தோன்றும் விதத்தையோ, செயல்படும் விதத்தையோ மாற்றக்கூடும்." "vr விர்ச்சுவல் ரியாலிட்டி லிஷனர் ஸ்டீரியோ உதவிச் சேவை" "சாதனம் விழிப்பூட்டல் சாளரம் உரையாடல் காட்டு பிற பயன்பாடுகளின் மேல்" "பிற ஆப்ஸின் மேலே காட்டு" @@ -3942,7 +3943,7 @@ "உங்கள் மொபைலைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்" "டேப்லெட்டைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்" "சாதனத்தைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்" - "கேமராவிற்குச் செல்" + "கேமராவிற்குச் செல்லுதல்" "கேமராவை விரைவாகத் திறக்க, பவர் பட்டனை இருமுறை அழுத்தவும். எந்தத் திரையிலும் கேமரா இயங்கும்." "கேமராவை உடனடியாகத் திறக்கவும்" "கேமராவை மாற்றுதல்" diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml index 9c71380ca4b7f284b61bc1301bcafeaaee9ff5d1..8837d8334f8c48c2214acad652c4e71d960b3ba1 100644 --- a/res/values-te/arrays.xml +++ b/res/values-te/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "పుష్ బటన్" "పీర్ డివైజ్ నుండి పిన్‌" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 14b696d845d1d29bf4b76c54e949215b7e3ee86a..1b7f9fa329deb0f52f0f9d4931cd433d4fb3d64d 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -854,6 +854,7 @@ "స్వీయ" "2.4 GHz బ్యాండ్" "5.0 GHz బ్యాండ్" + "5.0 GHz బ్యాండ్‌కి ప్రాధాన్యత" "2.4 GHz" "5.0 GHz" "Wi-Fi హాట్‌స్పాట్ కోసం కనీసం ఒక బ్యాండ్‌ను ఎంచుకోండి:" @@ -1065,7 +1066,7 @@ "సహజం" "అభివృద్ధిపరచబడింది" "స్యాచురేటేడ్" - "ఆటోమేటిక్" + "అనుకూల" "ఖచ్చితమైన రంగులను మాత్రమే ఎంచుకోండి" "ప్రకాశవంతమైన మరియు ఖచ్చితమైన రంగులలో నచ్చినది ఎంచుకోండి" "టాబ్లెట్ తిప్పుతున్నప్పుడు దృగ్విన్యాసాన్ని స్వయంచాలకంగా మార్చు" @@ -3161,7 +3162,7 @@ "మ్యూట్ చేయబడింది, కాని %1$s మరియు %2$sను అనుమతించు" "మ్యూట్ చేయబడింది, కాని %1$s, %2$s మరియు %3$sను అనుమతించు" "సందేశాలు, ఈవెంట్‌లు & రిమైండర్‌లు" - "అంఅంతరాయం కలిగించవద్దు ఆన్‌లో ఉన్నప్పుడు, మీరు పైన అనుమతించే అంశాలు మినహా, సందేశాలు, రిమైండర్‌లు మరియు ఈవెంట్‌లు మ్యూట్ చేయబడతాయి. మీ స్నేహితులు, కుటుంబం లేదా ఇతర పరిచయాలు మిమ్మల్ని చేరుకోవడానికి అనుమతించడానికి సందేశాలు అమర్పులను మీరు సర్దుబాటు చేయవచ్చు." + "అంతరాయం కలిగించవద్దు మోడ్ ఆన్‌లో ఉన్నప్పుడు, మీరు పైన అనుమతించే అంశాలు మినహా, సందేశాలు, రిమైండర్‌లు మరియు ఈవెంట్‌లు మ్యూట్ చేయబడతాయి. మీ స్నేహితులు, కుటుంబ సభ్యులు లేదా ఇతర పరిచయస్తులు మిమ్మల్ని సంప్రదించడానికి అనుమతించేలా సందేశాల సెట్టింగ్‌లను మీరు సర్దుబాటు చేయవచ్చు." "పూర్తయింది" "సెట్టింగ్‌లు" "నోటిఫికేషన్‌ల నుండి దృశ్య జాబితాలు లేదా శబ్దం లేవు" @@ -3428,7 +3429,7 @@ "మీరు ఈ డివైజ్‌ను ప్రారంభించడానికి మీ పిన్‌ను నమోదు చేసినప్పుడు, %1$s వంటి యాక్సెస్ సేవలు అప్పటికి అందుబాటులో ఉండవు." "మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ నమూనాను నమోదు చేసినప్పుడు, %1$s వంటి యాక్సెస్ సేవలు అప్పటికి అందుబాటులో ఉండవు." "మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ పాస్‌వర్డ్‌ను నమోదు చేసినప్పుడు, %1$s వంటి యాక్సెస్ సేవలు అప్పటికి అందుబాటులో ఉండవు." - "గమనిక: రీబూట్ చేసాక, మీరు మీ ఫోన్‌ను అన్‌లాక్ చేసే వరకు ఈ యాప్ ప్రారంభం కాదు" + "గమనిక: మీరు మీ ఫోన్‌ని మళ్లీ ప్రారంభించి, దానికి స్క్రీన్ లాక్ సెట్ చేస్తే, మీ ఫోన్‌ని అన్‌లాక్ చేసేవరకూ ఈ యాప్ ప్రారంభం కాదు" "IMEI సమాచారం" "IMEI సంబంధిత సమాచారం" "(స్లాట్%1$d)" diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml index fe7208c8e6689db2fb37a00ecae5946057afebd5..182c20659f00a5d54ef1af68edd059021c4b68fa 100644 --- a/res/values-th/arrays.xml +++ b/res/values-th/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ปุ่มกด" "PIN จากอุปกรณ์เพียร์" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index fe194afc5f933c384b5cff4e84879c2f279adc52..9847eb75201c4e090fda6a2432163832d23cb041 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -854,6 +854,7 @@ "อัตโนมัติ" "ย่านความถี่ 2.4 GHz" "ย่านความถี่ 5 GHz" + "ต้องการใช้ย่านความถี่ 5.0 GHz" "2.4 GHz" "5.0 GHz" "เลือกอย่างน้อยหนึ่งย่านความถี่สำหรับฮอตสปอต Wi‑Fi:" @@ -949,7 +950,7 @@ "อุปกรณ์อื่นๆ สามารถเชื่อมต่อกับ %1$s" "รหัสผ่านฮอตสปอต" "ย่านความถี่ AP" - "ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ฮอตสปอตจะแชร์อินเทอร์เน็ตโดยใช้การเชื่อมต่อข้อมูลผ่านมือถือ อาจมีค่าบริการเน็ตมือถือเพิ่มเติม" + "ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ฮอตสปอตจะแชร์อินเทอร์เน็ตโดยใช้การเชื่อมต่อเน็ตมือถือ อาจมีค่าบริการเน็ตมือถือเพิ่มเติม" "แอปสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้" "ปิดฮอตสปอตโดยอัตโนมัติ" "ฮอตสปอต Wi‑Fi จะปิดถ้าไม่มีอุปกรณ์ที่เชื่อมต่อ" @@ -1065,7 +1066,7 @@ "ธรรมชาติ" "บูสต์" "อิ่มตัว" - "อัตโนมัติ" + "ปรับอัตโนมัติ" "ใช้สีที่ตรงตามจริงเท่านั้น" "ปรับระหว่างสีที่สดใสและสีที่ตรงตามจริง" "เปลี่ยนการวางแนวโดยอัตโนมัติเมื่อหมุนแท็บเล็ต" @@ -1099,7 +1100,7 @@ "กำหนดการ" "ไม่มี" "เปิดในเวลาที่กำหนด" - "เปิดจากอาทิตย์ตกจนอาทิตย์ขึ้น" + "เปิดตั้งแต่อาทิตย์ตกจนขึ้น" "เวลาเริ่มต้น" "เวลาสิ้นสุด" "สถานะ" @@ -1508,7 +1509,7 @@ "กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของ %1$d นี้ผ่านบลูทูธ" "ไม่สามารถปล่อยการเชื่อมต่อมากกว่า %1$d อุปกรณ์" "%1$s จะถูกยกเลิกการปล่อยสัญญาณ" - "ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ เพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจากการเชื่อมต่อข้อมูลผ่านมือถือได้ และแอปยังสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย" + "ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ เพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจากการเชื่อมต่อเน็ตมือถือได้ และแอปยังสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย" "ความช่วยเหลือ" "เครือข่ายมือถือ" "แพ็กเกจอินเทอร์เน็ต" @@ -2520,8 +2521,8 @@ "นำโปรไฟล์งานออก" "ข้อมูลพื้นหลัง" "แอปพลิเคชันสามารถซิงค์ ส่ง และรับข้อมูลได้ตลอดเวลา" - "ปิดข้อมูลแบ็กกราวด์" - "การปิดใช้งานข้อมูลแบ็กกราวด์จะทำให้แบตเตอรี่ใช้งานได้ยาวนานขึ้นและลดการใช้ข้อมูลลง แอปพลิเคชันบางอย่างอาจยังคงใช้การเชื่อมต่อข้อมูลแบ็กกราวด์อยู่" + "ปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง" + "การปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังจะทำให้แบตเตอรี่ใช้งานได้ยาวนานขึ้นและลดการใช้ข้อมูลลง แอปพลิเคชันบางอย่างอาจยังคงใช้การเชื่อมต่ออินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังอยู่" "ซิงค์ข้อมูลแอปพลิเคชันโดยอัตโนมัติ" "เปิดใช้การซิงค์" "ปิดการซิงค์" @@ -2551,7 +2552,7 @@ "การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดออกจากอุปกรณ์!" "ผู้ดูแลระบบไม่อนุญาตให้ทำการเปลี่ยนแปลงนี้" "ซิงค์ด้วยตนเองไม่ได้" - "รายการนี้ถูกปิดใช้งานการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดใช้งานข้อมูลแบ็กกราวด์และการซิงค์อัตโนมัติชั่วคราว" + "รายการนี้ปิดการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังและการซิงค์อัตโนมัติชั่วคราว" "ป้อนรหัสผ่านเพื่อเริ่มต้นใช้งาน Android" "ป้อน PIN เพื่อเริ่มต้นใช้งาน Android" "วาดรูปแบบเพื่อเริ่มต้นใช้งาน Android" @@ -2575,8 +2576,8 @@ "รอบการใช้ข้อมูล" "การใช้งานแอป" "การโรมมิ่งอินเทอร์เน็ต" - "จำกัดข้อมูลแบ็กกราวด์" - "อนุญาตข้อมูลแบ็กกราวด์" + "จำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง" + "อนุญาตอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง" "แยกการใช้งาน 4G" "แสดง Wi-Fi" "ซ่อน Wi‑Fi" @@ -2618,8 +2619,8 @@ "ข้อมูลพื้นหลัง" "เปิดใช้อินเทอร์เน็ตมือถือในเบื้องหลัง" "ก่อนอื่นให้ตั้งค่าขีดจำกัดในการใช้เน็ตมือถือก่อน เพื่อจำกัดอินเทอร์เน็ตที่แอปนี้ใช้งานอยู่เบื้องหลัง" - "ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่" - "ฟีเจอร์นี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน" + "ต้องการจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหรือไม่" + "ฟีเจอร์นี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน" "คุณสามารถจำกัดอินเทอร์เน็ตในพื้นหลังได้เมื่อคุณได้ตั้งค่าขีดจำกัดอินเทอร์เน็ตมือถือไว้เท่านั้น" "เปิดซิงค์ข้อมูลอัตโนมัติหรือไม่" "การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะมีการคัดลอกไปยังแท็บเล็ตโดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงที่คุณทำบนแท็บเล็ตไปยังเว็บโดยอัตโนมัติ นี่คือการทำงานของบัญชี Google" @@ -2634,7 +2635,7 @@ "การจำกัดการใช้อินเทอร์เน็ต" "แท็บเล็ตจะปิดอินเทอร์เน็ตมือถือเมื่อถึงขีดจำกัดที่คุณตั้งไว้\n\nเนื่องจากว่าปริมาณการใช้อินเทอร์เน็ตนั้นวัดโดยแท็บเล็ตของคุณ ผู้ให้บริการอาจมีวิธีบันทึกการใช้ที่แตกต่างออกไป ดังนั้น โปรดกำหนดขีดจำกัดอย่างระมัดระวัง" "โทรศัพท์ของคุณจะปิดอินเทอร์เน็ตมือถือเมื่อถึงขีดจำกัดที่คุณตั้งไว้\n\nเนื่องจากว่าปริมาณการใช้อินเทอร์เน็ตนั้นวัดโดยโทรศัพท์ของคุณ ผู้ให้บริการอาจมีวิธีบันทึกการใช้ที่แตกต่างออกไป ดังนั้น โปรดกำหนดขีดจำกัดอย่างระมัดระวัง" - "ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่" + "ต้องการจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหรือไม่" "หากคุณจำกัดอินเทอร์เน็ตมือถือในพื้นหลัง แอปและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อ Wi-Fi" "หากคุณจำกัดอินเทอร์เน็ตมือถือในพื้นหลัง แอปและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อ Wi-Fi\n\nการตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย" "หากคุณจำกัดอินเทอร์เน็ตมือถือในพื้นหลัง แอปและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อ Wi-Fi\n\nการตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย" @@ -3161,7 +3162,7 @@ "ปิดเสียงแล้ว แต่อนุญาตให้ %1$s และ %2$s" "ปิดเสียงแล้ว แต่อนุญาตให้ %1$s, %2$s และ %3$s" "ข้อความ เหตุการณ์ และการช่วยเตือน" - "เมื่อเปิด \"ห้ามรบกวน\" ข้อความ การช่วยเตือน และเหตุการณ์ต่างๆ จะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้" + "เมื่อเปิด \"ห้ามรบกวน\" ข้อความ การช่วยเตือน และเหตุการณ์ต่างๆ จะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้" "เสร็จ" "การตั้งค่า" "ไม่มีภาพหรือเสียงจากการแจ้งเตือน" @@ -3427,7 +3428,7 @@ "เมื่อคุณป้อน PIN เพื่อเริ่มใช้งานอุปกรณ์นี้ บริการความสามารถในการเข้าถึงอย่างเช่น %1$s จะยังไม่พร้อมใช้งาน" "เมื่อคุณป้อนรูปแบบเพื่อเริ่มใช้งานอุปกรณ์นี้ บริการความสามารถในการเข้าถึงอย่างเช่น %1$s จะยังไม่พร้อมใช้งาน" "เมื่อคุณป้อนรหัสผ่านเพื่อเริ่มใช้งานอุปกรณ์นี้ บริการความสามารถในการเข้าถึงอย่างเช่น %1$s จะยังไม่พร้อมใช้งาน" - "หมายเหตุ: หลังจากเริ่มต้นใหม่ แอปนี้จะไม่สามารถเริ่มการทำงานได้จนกว่าคุณจะปลดล็อกโทรศัพท์" + "หมายเหตุ: หากคุณรีสตาร์ทโทรศัพท์และตั้งการล็อกหน้าจอไว้ แอปนี้จะเริ่มทำงานไม่ได้จนกว่าคุณจะปลดล็อกโทรศัพท์" "ข้อมูล IMEI" "ข้อมูลที่เกี่ยวข้องกับ IMEI" "(ช่อง%1$d)" @@ -3741,7 +3742,7 @@ "อินเทอร์เน็ตมือถือปิดอยู่" "สามารถใช้อินเทอร์เน็ตผ่าน Wi-Fi ได้เท่านั้น" "โปรแกรมประหยัดอินเทอร์เน็ตเปิดอยู่" - "สามารถใช้ข้อมูลแบ็กกราวด์ผ่าน Wi-Fi ได้เท่านั้น ซึ่งอาจส่งผลกระทบต่อแอปหรือบริการบางอย่างเมื่อไม่มี Wi-Fi" + "สามารถใช้อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังผ่าน Wi-Fi ได้เท่านั้น ซึ่งอาจส่งผลกระทบต่อแอปหรือบริการบางอย่างเมื่อไม่มี Wi-Fi" "โปรไฟล์งานปิดอยู่" "ปิดใช้แอป การซิงค์ในแบ็กกราวด์ และฟีเจอร์อื่นๆ เกี่ยวกับโปรไฟล์งานของคุณอยู่" "เปิดเสียง" @@ -3832,7 +3833,7 @@ "ดูรายละเอียด" "การประหยัดอินเทอร์เน็ต" "ไม่จำกัดการใช้อินเทอร์เน็ต" - "ปิดใช้ข้อมูลแบ็กกราวด์" + "ปิดใช้อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง" "เปิด" "ปิด" "ใช้โปรแกรมประหยัดอินเทอร์เน็ต" @@ -3952,7 +3953,7 @@ "หากต้องการสลับแอป ให้เลื่อนนิ้วขึ้นบนปุ่มหน้าแรก จากนั้นเลื่อนขึ้นอีกครั้งเพื่อดูแอปทั้งหมดจากหน้าจอใดก็ได้ คุณจะไม่มีปุ่มภาพรวมที่ด้านขวาล่างของหน้าจออีกต่อไป" "ลองใช้ปุ่มหน้าแรกใหม่" "เปิดท่าทางสัมผัสใหม่เพื่อสลับแอป" - "แตะ 2 ครั้งเพื่อตรวจสอบโทรศัพท์" + "แตะ 2 ครั้งเพื่อดูโทรศัพท์" "แตะ 2 ครั้งเพื่อตรวจสอบแท็บเล็ต" "แตะ 2 ครั้งเพื่อตรวจสอบอุปกรณ์" "หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้แตะหน้าจอ 2 ครั้ง" @@ -4053,8 +4054,8 @@ "แอปปฏิทิน" "แอปรายชื่อติดต่อ" - แอปโปรแกรมรับส่งเมล - แอปโปรแกรมรับส่งเมล + แอปโปรแกรมรับส่งอีเมล + แอปโปรแกรมรับส่งอีเมล "แอปแผนที่" diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml index f235229fe52f1e475307d52c8544255402c962aa..4258932724b0085e2bf8aadb45cd586dcf524470 100644 --- a/res/values-tl/arrays.xml +++ b/res/values-tl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "button na Push" "PIN mula sa device ng kaibigan" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index b44298f7d2841e23d99baa27ccacc738aeebc14c..47829ae255b24b9f9df2b2d9e36ca7d8361b78bc 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -854,6 +854,7 @@ "Awtomatiko" "2.4 GHz Band" "5.0 GHz Band" + "Mas gusto ang 5.0 GHz Band" "2.4 GHz" "5.0 GHz" "Pumili ng kahit isang band para sa Wi‑Fi hotspot:" @@ -1065,7 +1066,7 @@ "Natural" "Naka-boost" "Saturated" - "Awtomatiko" + "Adaptive" "Gumamit lang ng mga tumpak na kulay" "I-adjust sa pagitan ng mga matingkad at tumpak na kulay" "Awtomatikong ilipat ang oryentasyon kapag iniikot ang tablet" @@ -1107,15 +1108,15 @@ "Naka-off / %1$s" "Hindi awtomatikong mag-o-on kailanman" "Awtomatikong mag-o-on nang %1$s" - "Awtomatikong mag-o-on sa paglubog ng araw" + "Awtomatikong mag-o-on sa sunset" "Naka-on / %1$s" "Hindi awtomatikong mag-o-off kailanman" "Awtomatikong mag-o-off nang %1$s" - "Awtomatikong mag-o-off sa pagsikat ng araw" + "Awtomatikong mag-o-off sa sunrise" "I-on ngayon" "I-off ngayon" - "I-on hanggang pagsikat ng araw" - "I-off hanggang paglubog ng araw" + "I-on hanggang sunrise" + "I-off hanggang sunset" "I-on hanggang %1$s" "I-off hanggang %1$s" "Sleep" @@ -3161,7 +3162,7 @@ "Naka-mute, pero payagan ang %1$s at %2$s" "Naka-mute, pero payagan ang %1$s, %2$s, at %3$s" "Mga mensahe, event, at paalala" - "Kapag naka-on ang Huwag Istorbohin, mamu-mute ang mga mensahe, paalala, at event, maliban sa mga item na pinapayagan mo sa itaas. Maaari mong isaayos ang mga setting ng mensahe para payagan ang iyong mga kaibigan, pamilya, o iba pang contact na makipag-ugnayan sa iyo." + "Kapag naka-on ang Huwag Istorbohin, mamu-mute ang mga mensahe, paalala, at event, maliban sa mga item na pinapayagan mo sa itaas. Maaari mong isaayos ang mga setting ng mga mensahe para payagan ang iyong mga kaibigan, pamilya, o iba pang contact na makipag-ugnayan sa iyo." "Tapos na" "Mga Setting" "Walang visual o tunog mula sa mga notification" @@ -3210,7 +3211,7 @@ "Huwag kailanman magpakita ng mga notification" "Ipakita nang tahimik at i-minimize" "Ipakita nang tahimik" - "Gumawa ng tunog" + "Tumunog" "Gumawa ng tunog at mag-pop up sa screen" "Mag-pop sa screen" "Mababa" @@ -3427,7 +3428,7 @@ "Kapag inilagay mo ang PIN upang buksan ang device na ito, hindi pa magiging available ang mga serbisyo sa pagiging naa-access tulad ng %1$s." "Kapag inilagay mo ang pattern upang buksan ang device na ito, hindi pa magiging available ang mga serbisyo sa pagiging naa-access tulad ng %1$s ." "Kapag inilagay mo ang iyong password upang buksan ang device na ito, hindi pa magiging available ang mga serbisyo sa pagiging naa-access tulad ng %1$s." - "Tandaan: Pagkatapos ng pag-reboot, hindi makakapagsimula ang app na ito hangga\'t hindi mo ina-unlock ang iyong telepono" + "Tandaan: Kung ire-restart mo ang iyong telepono at may nakatakdang lock ng screen, hindi makakapagsimula ang app na ito hanggang sa i-unlock mo ang telepono mo" "Impormasyon ng IMEI" "Kaugnay na impormasyon ng IMEI" "(Slot%1$d)" diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml index 5a3cef5734619c5ef13b8a45da216a7c756f2c75..39517daad0328b048dc32776d6857e26533b23e5 100644 --- a/res/values-tr/arrays.xml +++ b/res/values-tr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Düğme" "Eş cihazın PIN\'i" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 8c1079206e90ab74c774e93eecbab75d2871f437..b63e692c8058fc23a584fc4c02a77720120170f6 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -854,6 +854,7 @@ "Otomatik" "2,4 GHz Bandı" "5,0 GHz Bandı" + "5,0 GHz Bandı tercih edilir" "2,4 GHz" "5,0 GHz" "Kablosuz hotspot için en az bir grup seçin:" @@ -972,7 +973,7 @@ "Dolaşım tercihi" - "Kablosuz bağlantı tercih edildi" + "Kablosuz bağlantı tercihli" "Mobil tercihli" "Yalnızca kablosuz" @@ -987,7 +988,7 @@ "0" - "Kablosuz bağlantı tercih edildi" + "Kablosuz bağlantı tercihli" "Mobil tercihli" @@ -1065,7 +1066,7 @@ "Doğal" "Zenginleştirilmiş" "Doygunluğu Artırılmış" - "Otomatik" + "Uyarlanan" "Yalnızca doğru renkleri kullan" "Canlı ve doğru renkler arasında ayarlama yapın" "Tableti döndürürken yönü otomatik değiştir" @@ -3095,7 +3096,7 @@ "Bildirimlerden sesli uyarı yok" "Bildirimleri ekranınızda göreceksiniz" "Bildirim geldiğinde telefonunuz ses çıkartmaz veya titreşmez." - "Bildirimlerden görsel veya ses yok" + "Bildirimlerden görsel veya sesli uyarı yok" "Bildirimleri görmeyecek ve duymayacaksınız" "Telefonunuz yeni veya mevcut bildirimleri göstermez, ses çıkartmaz ve titreşmez. Parmağınızı ekranınızın üst kısmından aşağı doğru kaydırdığınızda bildirimler görünmez.\n\nTelefon işlemleri ve durumu ile ilgili önemli bildirimlerin gösterilmeye devam edeceğini unutmayın." "Özel" @@ -3110,7 +3111,7 @@ "Ses ve titreşimi kapat" "Ekranı açma" "Işığı yakıp söndürme" - "Ekranda bildirimler gösterme" + "Ekranda bildirim gösterme" "Durum çubuğu simgelerini gizle" "Bildirim noktalarını gizle" "Bildirimler için uyanma" @@ -3161,7 +3162,7 @@ "Ses kapatıldı, ancak %1$s ve %2$s seslerine izin ver" "Ses kapatıldı, ancak %1$s, %2$s ve %3$s seslerine izin ver" "Mesajlar, etkinlikler ve hatırlatıcılar" - "Rahatsız Etmeyin ayarı açık olduğunda mesajların, hatırlatıcıların ve etkinliklerin sesi kapatılır (yukarıda izin verdiğiniz öğeler hariç). Mesaj ayarlarını arkadaşlarınızın, ailenizin veya diğer kişilerin size ulaşmasına izin verecek şekilde düzenleyebilirsiniz." + "Rahatsız Etmeyin ayarı açık olduğunda mesajların, hatırlatıcıların ve etkinliklerin sesi kapatılır (yukarıda izin verdiğiniz öğeler hariç). Mesaj ayarlarını arkadaşlarınızın, ailenizin veya diğer kişilerin size ulaşmasına izin verecek şekilde düzenleyebilirsiniz." "Bitti" "Ayarlar" "Bildirimlerden görsel veya sesli uyarı yok" @@ -3427,7 +3428,7 @@ "Bu cihazı başlatmak için PIN\'inizi girdiğinizde %1$s gibi erişilebilirlik hizmetleri henüz kullanılabilir olmayacaktır." "Bu cihazı başlatmak için deseninizi girdiğinizde %1$s gibi erişilebilirlik hizmetleri henüz kullanılabilir olmayacaktır." "Bu cihazı başlatmak için şifrenizi girdiğinizde %1$s gibi erişilebilirlik hizmetleri henüz kullanılabilir olmayacaktır." - "Not: Yeniden başlatma sonrasında, telefonunuzun kilidi açılıncaya kadar bu uygulama başlatılamaz" + "Not: Telefonunuzu yeniden başlatırsanız ve ekran kilidi ayarlanmışsa siz telefonunuzun kilidini açana kadar bu uygulama başlayamaz." "IMEI bilgileri" "IMEI göreli bilgileri" "(Yuva%1$d)" @@ -3486,7 +3487,7 @@ "Kategoriler: Önem düzeyi düşük" "Kategoriler: Kapalı" "Kategoriler: Rahatsız Etmeyin\'i geçersiz kılar" - "İleri düzey" + "Gelişmiş" "Uygulamaları yapılandır" "Bilinmeyen uygulama" "Uygulama izinleri" diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml index 1ed0756bee39ab050c4ccae1b682993c13804cde..b14d55a3a7a60e339b8d25629d718268f8f58879 100644 --- a/res/values-uk/arrays.xml +++ b/res/values-uk/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Кнопка Push" "PIN з однорангового пристрою" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 5a4fb42349ed323d74fb3be1525b584e5561bd7e..b9b88c310a58ba294b04c8c661b2a777fe674747 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -876,6 +876,7 @@ "Автоматично" "Діапазон 2,4 ГГц" "Діапазон 5 ГГц" + "Бажано використовувати діапазон 5,0 ГГц" "2,4 ГГц" "5 ГГц" "Виберіть принаймні один діапазон для точки доступу Wi-Fi:" @@ -996,8 +997,8 @@ "Параметри роумінгу" - "Wi-Fi за умовчанням" - "Мобільна мережа за умовчанням" + "Пріоритет Wi-Fi" + "Пріоритет мобільної мережі" "Лише Wi-Fi" @@ -1011,8 +1012,8 @@ "0" - "Wi-Fi за умовчанням" - "Мобільна мережа за умовчанням" + "Пріоритет Wi-Fi" + "Пріоритет мобільної мережі" "Wi-Fi" @@ -1089,7 +1090,7 @@ "Природний" "Насичений" "Яскравий" - "Автоматично" + "Адаптивний колір" "Використовувати лише точно відтворені кольори" "Налаштуйте яскравість і точність відтворення кольорів" "Автомат. переключ. орієнтацію під час обертання пристрою" @@ -1119,7 +1120,7 @@ "Оптимізація яскравості з урахуванням освітлення. Якщо цю функцію ввімкнено, ви все одно можете тимчасово змінювати яскравість." "Яскравість екрана автоматично пристосовується до середовища й ваших дій. Ви можете пересунути повзунок вручну, щоб ваш вибір зберігся в налаштуваннях адаптивної яскравості." "Нічний режим" - "Коли ввімкнено Нічний режим, екран набуває бурштинового відтінку. Так зручніше дивитися на екран при тьмяному освітленні та легше заснути." + "У нічному режимі екран набуває бурштинового відтінку. Це знімає напруження очей при тьмяному освітленні та допомагає легше заснути." "Розклад" "Ніколи" "Вмикається в установлений час" @@ -1951,7 +1952,7 @@ "Час використ." "Спеціальні можливості" "Налаштування доступності" - "Програма зчитування з екрана, дисплей і елементи керування взаємодією" + "Програми зчитування з екрана, екран, елементи керування взаємодією" "Спеціальні можливості" "Ви можете налаштувати цей пристрій для своїх потреб. Ці спеціальні можливості можна пізніше змінити в налаштуваннях." "Змінити розмір шрифту" @@ -3235,7 +3236,7 @@ "Звук вимкнено. Дозволити лише %1$s та %2$s" "Звук вимкнено. Дозволити лише %1$s, %2$s та %3$s" "Повідомлення, події й нагадування" - "У режимі \"Не турбувати\" звук для повідомлень, нагадувань і подій вимикатиметься (окрім дозволених елементів вище). Можна змінити налаштування повідомлень, щоб ваші друзі, члени сім’ї та інші контакти могли зв’язатися з вами." + "У режимі \"Не турбувати\" сигнали повідомлень, нагадувань і подій буде вимкнено (окрім дозволених вище). Можна змінити налаштування повідомлень, щоб ваші друзі, члени сім’ї й інші контакти могли зв’язатися з вами." "Готово" "Налаштування" "Вимкнути зображення та звук сповіщень" @@ -3367,7 +3368,7 @@ "Ніколи не показувати сповіщення на панелі та периферійних пристроях" "Дозволити значок сповіщення" "Показувати значок сповіщення" - "Заміна режиму \"Не турбувати\"" + "Дозволити в режимі \"Не турбувати\"" "Показувати ці сповіщення, коли ввімкнено режим \"Не турбувати\"" "На заблокованому екрані" "Заблоковано" @@ -3515,7 +3516,7 @@ "Коли ви введете PIN-код і запустите пристрій, служби доступності (як-от %1$s) ще не ввімкнуться." "Коли ви введете ключ і запустите пристрій, служби доступності (як-от %1$s) ще не ввімкнуться." "Коли ви введете пароль і запустите пристрій, служби доступності (як-от %1$s) ще не ввімкнуться." - "Примітка: щоб запустити цей додаток після перезавантаження, спершу потрібно буде розблокувати телефон" + "Примітка. Якщо ви перезапустите телефон, коли налаштовано блокування екрана, додаток не відкриється, доки ви не розблокуєте його" "Інформація про IMEI" "Інформація про IMEI" "(Гніздо %1$d)" diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml index f34cc0097499f01b15dfdfa5621d931323565fd3..abd06dc1f5bb676de9696d672732ae57982330a7 100644 --- a/res/values-ur/arrays.xml +++ b/res/values-ur/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "پش بٹن" "‏ہمسر آلہ سے PIN" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 1807e79f0923f6cf43b82965a122eb6e74830143..3751c1fe2d92d7a5e5ebbbeb95f4c3d94b5ebb26 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -854,6 +854,7 @@ "خودکار" "‏2.4 GHz بینڈ" "‏‎‎5.0 GHz بینڈ" + "‏5.0 GHz بینڈ کو ترجیح دی جاتی ہے" "2.4‎ GHz" "‎5.0 GHz" "‏Wi‑Fi ہاٹ اسپاٹ کیلئے کم از کم ایک بینڈ منتخب کریں:" @@ -1065,7 +1066,7 @@ "قدرتی" "بڑھایا گیا" "سیچوریٹ کردہ" - "خودکار" + "تغیر پذیر" "صرف درست رنگوں کا استعمال کریں" "بھڑکیلے اور درست رنگوں کے بیچ ایڈجسٹ کریں" "ٹیبلٹ گھماتے وقت سمت بندی کو خود کار طور پر سوئچ کریں" @@ -1116,8 +1117,8 @@ "ابھی آف کریں" "طلوع آفتاب تک آن کریں" "غروب آفتاب تک بند کریں" - "%1$s تک آن کریں" - "%1$s تک بند کریں" + "‫%1$s تک آن کریں" + "‫%1$s تک بند کریں" "سلیپ" "اسکرین آف ہوجاتی ہے" "غیر فعالیت کے %1$s بعد" @@ -3159,7 +3160,7 @@ "خاموش کردہ، لیکن %1$s اور %2$s کو اجازت دیں" "خاموش کردہ، لیکن %1$s، %2$s اور %3$s کو اجازت دیں" "پیغامات، ایونٹس اور یاد دہانیاں" - "\'ڈسٹرب نہ کریں\' آن ہونے پر، پیغامات، یاد دہانیاں اور ایونٹس خاموش کر دئے جائیں گے، ماسوا ان آئٹمز کے جن کی آپ نے اوپر اجازت دی ہے۔ اپنے دوستوں، اہل خانہ اور دیگر رابطوں کو آپ تک پہنچنے کی اجازت دینے کیلئے، آپ پیغامات کی ترتیبات ایڈجسٹ کر سکتے ہیں۔" + "\'ڈسٹرب نہ کریں\' آن ہونے پر، پیغامات، یاد دہانیاں اور ایونٹس خاموش کر دئے جائیں گے، سوائے ان آئٹمز کے جن کی آپ نے اوپر اجازت دی ہے۔ اپنے دوستوں، فیملی اور دیگر رابطوں کو آپ سے رابطہ کرنے کی اجازت دینے کیلئے، آپ پیغامات کی ترتیبات کو ایڈجسٹ کر سکتے ہیں۔" "ہو گیا" "ترتیبات" "اطلاعات کی کوئی ویزوئل یا آواز نہیں" @@ -3425,7 +3426,7 @@ "‏جب آپ یہ آلہ شروع کرنے کیلئے اپنا PIN داخل کریں گے تو %1$s جیسی ایکسیسبیلٹی سروسز اس وقت ابھی دستیاب نہیں ہوں گی۔" "یہ آلہ شروع کرنے کیلئے جب آپ اپنا پیٹرن داخل کریں گے تو %1$s جیسی ایکسیسبیلٹی سروسز اس وقت ابھی دستیاب نہیں ہوں گی۔" "اس آلہ کو شروع کرنے کیلئے جب آپ اپنا پاس ورڈ درج کریں گے تو %1$s جیسی ایکسیسبیلٹی سروسز اس وقت ابھی دستیاب نہیں ہوں گی۔" - "نوٹ: ریبوٹ کرنے کے بعد یہ ایپ تب تک شروع نہیں ہو سکتی جب تک آپ اپنا فون غیر مقفل نہ کر لیں" + "نوٹ: اگر آپ اپنے فون کو دوبارہ شروع کرتے ہیں اور آپ کے پاس اسکرین لاک کا سیٹ ہے تو یہ ایپ تب تک شروع نہیں ہو سکتی جب تک آپ اپنا فون غیر مقفل نہ کر لیں" "‏IMEI کی معلومات" "‏IMEI سے متعلق معلومات" "(سلاٹ%1$d)" diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml index 7295244278c36300720eb856c699b08d7f8184ea..e08ed6f4378a4cbec8924506e4fb44e74accade1 100644 --- a/res/values-uz/arrays.xml +++ b/res/values-uz/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Bog‘lash tugmasi" "ulashma qurilmadagi PIN-kod" @@ -288,7 +282,7 @@ "umumiy tovush balandligi" "ovoz balandligi" "qo‘ng‘iroq ovozi" - "multimedia ovozi" + "multimedia tovushi" "Signal tovushi balandligi" "xabarnoma tovush balandligi" "bluetooth tovush balandligi" @@ -355,7 +349,7 @@ "Umumiy tovush balandligi" "Ovoz balandligi" "Qo‘ng‘iroq ovozi" - "Multimedia ovozi" + "Multimedia tovushi" "Signal tovushi balandligi" "Xabarnoma tovush balandligi" "Bluetooth tovush balandligi" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 9327da38cb5c779a4c70629b52634b45d90332b6..315c415fa78c10bc23ce0bc904b27cdd13613836 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -854,6 +854,7 @@ "Avtomatik" "2,4 GGs" "5,0 GGs" + "5,0 GGs (tavsiya etiladi)" "2,4 GGs" "5,0 GGs" "Wi‑Fi hotspot uchun kamida bitta chastota tanlang:" @@ -965,8 +966,8 @@ "Wi-Fi qo‘ng‘iroq" "Wi‑Fi orqali chaqiruv qamrovini kengaytiring" "Qamrovni kengaytirish uchun Wi-Fi chaqiruvni yoqing" - "Qo‘ng‘iroqlar sozlamalari" - "Wi-Fi qo‘ng‘iroq rejimi" + "Afzal tarmoq" + "Wi-Fi chaqiruv rejimi" "Rouming sozlamalari" @@ -1065,7 +1066,7 @@ "Tabiiy" "Yorqin" "To‘yingan" - "Avtomatik" + "Moslashuvchan" "Faqat tabiiy ranglar" "To‘yingan va tabiiy ranglar orasidagi o‘rtaliq" "Planshet aylantirilganda ekran joylashuvini avtomatik almashtirish" @@ -1099,11 +1100,11 @@ "Jadval" "Hech qachon" "Muayyan vaqtda yoqiladi" - "Quyosh chiqishidan botishigacha" + "Quyosh botishidan to chiqishigacha" "Boshlanish vaqti" "Tugash vaqti" "Holati" - "Yorqinlik" + "Intensivlik" "O‘chiq / %1$s" "Hech qachon avtomatik yoqilmaydi" "%1$s da avtomatik yoqiladi" @@ -1114,10 +1115,10 @@ "Quyosh chiqishi bilan avtomatik tugaydi" "Yoqish" "O‘chirish" - "Quyosh chiqqunicha yoqish" - "Quyosh botguncha o‘chirish" - "%1$s gacha yoqish" - "%1$s gacha o‘chirish" + "Quyosh chiqqunicha yoniq tursin" + "Quyosh botguncha yoqilmasin" + "%1$s gacha yoniq tursin" + "%1$s gacha yoqilmasin" "Uyqu rejimi" "Ekranning o‘chishi" "%1$s harakatsizlikdan keyin" @@ -1478,7 +1479,7 @@ "eSIM kartani tozalash" "Telefondan barcha eSIM kartalarni tozalash. Bunda mobil xizmat tarif rejalari bekor qilinmaydi." "Planshetdan barcha eSIM kartalarni tozalash. Bunda mobil xizmat tarif rejalari bekor qilinmaydi." - "Planshetni dastlabki sozlamarga qaytarish" + "Planshet sozlamalarini asliga qaytarish" "Telefon sozlamalarini tiklash" "Barcha shaxsiy ma’lumotlaringiz va yuklab olingan ilovalar o‘chirib tashlansinmi? Ularni keyin qayta tiklab bo‘lmaydi." "Barchasini o‘chirish" @@ -1669,7 +1670,7 @@ "Qo‘shimcha sozlamalar tanlamalarini yoqib qo‘yish" "Ilova haqida" "Xotira" - "Birlamchi ilova" + "Odatiy tarzda ochish" "Birlamchi" "Ekrandagi moslashuv" "Ruxsatlar" @@ -2970,7 +2971,7 @@ "Ilovalar va bildirishnomalar" "Ruxsatlar, birlamchi ilovalar" "Hisoblar" - "Hech qanday hisob qo‘shilmagan" + "Hech qanday hisobga kirilmagan" "Birlamchi ilovalar" "Tillar, vaqt, zaxira, yangilanishlar" "Sozlamalar" @@ -3054,7 +3055,7 @@ "Qo‘ng‘iroq vaqti tebranish yoqilgan" "Qo‘ng‘iroq ovozi o‘chirilgan" "Qo‘ng‘iroq ovozi balandligi: 80%" - "Multimedia ovozi" + "Multimedia tovushi" "Chaqiruv tovushi" "Signal tovushi balandligi" "Rington" @@ -3177,7 +3178,7 @@ "Ovozsiz, lekin %1$s va %2$s uchun ruxsat berilgan" "Ovozsiz, lekin %1$s, %2$s va %3$s uchun ruxsat berilgan" "Xabarlar, tadbirlar va eslatmalar" - "Bezovta qilinmasin rejimi yoniqligida yuqorida ruxsat berilganlardan tashqari xabarlar, eslatmalar va tadbirlar ovozsiz qilinadi. Sizga bog‘lana olishlari uchun muayyan tanishlar, oila a’zolari yoki boshqa kontaktlarga sozlamalarni o‘zgartirish orqali ruxsat berishingiz mumkin." + "Bezovta qilinmasin rejimi yoniqligida yuqorida ruxsat berilganlardan tashqari xabarlar, eslatmalar va tadbirlar ovozsiz qilinadi. Sizga bog‘lana olishlari uchun muayyan tanishlar, oila a’zolari yoki boshqa kontaktlarga sozlamalarni o‘zgartirish orqali ruxsat berishingiz mumkin." "Tayyor" "Sozlamalar" "Bildirishnomalar chiqarilmaydi yoki ovozsiz keladi" @@ -3300,7 +3301,7 @@ "Bildirishnomalar ko‘rsatilsin" "Fonda yoki tashqi qurilmalarda bildirishnomalar hech qachon ko‘rsatilmasin" "Nuqtali bildirishnoma belgisi" - "Bildirishnoma belgisini ko‘rsatish" + "Bildirishnoma belgisining chiqishi" "Bezovta qilinmasin rejimi ustidan yozish" "Bezovta qilinmasin rejimi yoniqligida mazkur bildirishnomalarning qalqib chiqishiga ruxsat berish" "Ekran qulfida" @@ -3443,13 +3444,13 @@ "Ushbu qurilmani ishga tushirish uchun PIN-kodni kiritganingizda, “%1$s” kabi maxsus xizmatlar hali yoqilmagan bo‘ladi." "Ushbu qurilmani ishga tushirish uchun chizmali parolni kiritganingizda, “%1$s” kabi maxsus xizmatlar hali yoqilmagan bo‘ladi." "Ushbu qurilmani ishga tushirish uchun parolni kiritganingizda, “%1$s” kabi maxsus xizmatlar hali yoqilmagan bo‘ladi." - "Eslatma: O‘chirib-yoqilgandan so‘ng, bu ilova to telefoningiz qulfdan chiqarilmaguncha ishga tushmaydi" + "Eslatma: Agar telefonni qayta ishga tushirsangiz va ekran qulfi sozlangan bo‘lsa, bu ilova to telefoningiz qulfdan chiqarilmaguncha ishga tushmaydi" "IMEI kod ma’lumotlari" "IMEI raqamiga aloqador ma’lumotlar" "(%1$d-uya)" - "Birlamchi ilova" + "Odatiy tarzda ochish" "Havolalarni ochish" - "Mos havolalar ochilsin" + "Mos havolalarni ochish" "Avtomatik ochilsin" "Mos havolalar" "Boshqa birlamchi sozlamalar" @@ -3518,7 +3519,7 @@ Mos havolalarni %d ta ilovada ochish mumkin Mos havolalarni bitta ilovada ochish mumkin - "Ushbu ilovada ochilsin" + "Shu ilovada ochish" "Har safar so‘ralsin" "Bu ilovada ochilmasin" "Barmoq izi aniqlanmadi" @@ -3647,8 +3648,8 @@ "Yuz berish oralig‘i" "Maksimal foydalanish" "Trafik sarflanmagan" - "%1$s ilovasiga “Bezovta qilinmasin” rejimidan foydalanishga ruxsat berilsinmi?" - "Bu ilova “Bezovta qilinmasin” rejimini yoqishi/o‘chirishi hamda unga aloqador sozlamalarni o‘zgartirishi mumkin." + "%1$s uchun Bezovta qilinmasin rejimiga ruxsat berilsinmi?" + "Bu ilova Bezovta qilinmasin rejimini yoqishi/o‘chirishi hamda unga aloqador sozlamalarni o‘zgartirish imkoniga ega bo‘ladi." "Yoniq turishi shart, sababi bildirishnomalardan foydalanishga ruxsat berilgan" "%1$s ilovasi uchun “Bezovta qilinmasin” rejimiga ruxsati bekor qilinsinmi?" "Ushbu ilova tomonidan yaratilgan barcha “Bezovta qilinmasin” rejimi qoidalari o‘chirib tashlanadi." @@ -3958,7 +3959,7 @@ "Telefonni boshqarish uchun tezkor imo-ishoralar" "Planshetni boshqarish uchun tezkor imo-ishoralar" "Qurilmani boshqarish uchun tezkor imo-ishoralar" - "Kameraga o‘tish" + "Kamerani tezkor ochish" "Kamerani tezda ochish uchun quvvat tugmasini ikki marta bosing. Har qanday ekranda ishlaydi." "Kamerani tezkor ochish" "Kamerani almashtirish" @@ -3978,7 +3979,7 @@ "Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun telefonni qo‘lingizga oling." "Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun planshetni qo‘lingizga oling." "Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun qurilmani qo‘lingizga oling." - "Barmoq izi skaneridan foydalanish" + "Bildirishnomalarni ochish uchun barmoq izi skaneridan foydalanish" "Barmoq izi skaneri" "Bildirishnomalarni tekshirish uchun telefon orqasidagi barmoq izi skaneri ustida pastga suring" "Bildirishnomalarni tekshirish uchun planshet orqasidagi barmoq izi skaneri ustida pastga suring" diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml index 2e380262c023484cddadded0a7a0d991f3fd5f7e..f09c349cec066b082900ba76e806611ad1995130 100644 --- a/res/values-vi/arrays.xml +++ b/res/values-vi/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Nút bấm" "Mã PIN từ thiết bị ngang hàng" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 0bd7b1cb361640a631c6cff67fb9d89b4dc69a70..735428d5514e17dab62c770122ea3d80a2eec132 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -854,6 +854,7 @@ "Tự động" "Băng tần 2,4 GHz" "Băng tần 5 GHz" + "Ưu tiên băng tần 5 GHz" "2,4 GHz" "5 GHz" "Chọn ít nhất một băng tần cho điểm phát sóng Wi‑Fi:" @@ -1065,7 +1066,7 @@ "Tự nhiên" "Tăng độ nét" "Bão hòa" - "Tự động" + "Thích ứng" "Chỉ sử dụng màu chính xác" "Điều chỉnh giữa màu rực rỡ và màu chính xác" "Tự động chuyển hướng khi xoay máy tính bảng" @@ -2373,7 +2374,7 @@ "Nhập bằng giọng nói" "Dịch vụ nhập bằng giọng nói" "Tương tác và từ nóng đầy đủ" - "Ngôn từ đơn giản dễ nhắn tin" + "Lời nói thành văn bản đơn giản" "Dịch vụ nhập bằng giọng nói này có thể thực hiện theo dõi bằng giọng nói luôn bật và kiểm soát các ứng dụng hỗ trợ giọng nói thay mặt cho bạn. Dịch vụ này đến từ %s. Cho phép sử dụng dịch vụ này?" "Công cụ ưu tiên" "Cài đặt công cụ" @@ -3161,7 +3162,7 @@ "Đã tắt tiếng nhưng cho phép %1$s và %2$s" "Đã tắt tiếng nhưng cho phép %1$s, %2$s và %3$s" "Tin nhắn, sự kiện và lời nhắc" - "Khi chế độ Không làm phiền đang bật, tin nhắn, lời nhắc và sự kiện sẽ bị ẩn trừ các mục mà bạn cho phép ở trên. Bạn có thể điều chỉnh mục cài đặt tin nhắn để cho phép bạn bè, gia đình hoặc những người khác liên hệ với bạn." + "Khi chế độ Không làm phiền đang bật, tin nhắn, lời nhắc và sự kiện sẽ bị ẩn trừ các mục mà bạn cho phép ở trên. Bạn có thể điều chỉnh mục cài đặt tin nhắn để cho phép bạn bè, gia đình hoặc những người khác liên hệ với mình." "Xong" "Cài đặt" "Không có hình ảnh hoặc âm thanh khi có thông báo" @@ -3427,7 +3428,7 @@ "Khi bạn nhập mã PIN để khởi động thiết bị này, các dịch vụ hỗ trợ tiếp cận như %1$s sẽ chưa sẵn sàng để sử dụng." "Khi bạn nhập hình mở khóa để khởi động thiết bị này, các dịch vụ hỗ trợ tiếp cận như %1$s sẽ chưa sẵn sàng để sử dụng." "Khi bạn nhập mật khẩu để khởi động thiết bị này, các dịch vụ hỗ trợ tiếp cận như %1$s sẽ chưa sẵn sàng để sử dụng." - "Lưu ý: Sau khi khởi động lại, ứng dụng này không thể khởi động cho đến khi bạn mở khóa điện thoại" + "Lưu ý: Nếu bạn khởi động lại điện thoại và đặt khóa màn hình, thì ứng dụng này không thể khởi động cho đến khi bạn mở khóa điện thoại." "Thông tin IMEI" "Thông tin liên quan đến IMEI" "(Khe cắm%1$d)" @@ -3631,8 +3632,8 @@ "Tần suất" "Mức sử dụng tối đa" "Không có dữ liệu nào được sử dụng" - "Cho phép truy cập vào Không làm phiền cho %1$s?" - "Ứng dụng có thể bật/tắt Không làm phiền và thực hiện thay đổi đối với các cài đặt liên quan." + "Cho phép %1$s truy cập chế độ Không làm phiền?" + "Ứng dụng có thể bật/tắt chế độ Không làm phiền và thay đổi các mục cài đặt liên quan." "Phải luôn bật vì quyền truy cập thông báo được bật" "Thu hồi quyền truy cập vào chế độ Không làm phiền của %1$s?" "Mọi quy tắc Không làm phiền do ứng dụng này tạo sẽ đều bị xóa." @@ -3740,7 +3741,7 @@ "Trình tiết kiệm pin sẽ tắt một số tính năng của thiết bị và hạn chế ứng dụng" "Dữ liệu di động đang tắt" "Internet chỉ khả dụng qua Wi-Fi" - "Trình tiết kiệm dữ liệu bật" + "Trình tiết kiệm dữ liệu đang bật" "Dữ liệu nền chỉ khả dụng qua Wi-Fi. Điều này có thể ảnh hưởng đến một số ứng dụng hoặc dịch vụ khi không có Wi-Fi." "Hồ sơ công việc đã tắt" "Ứng dụng, đồng bộ hóa dưới nền và các tính năng khác có liên quan đến hồ sơ công việc của bạn bị tắt." diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml index 7d921cce7428cde9c4f9f9f6b8aa6af06be63a57..e8e5a137a1fc8a37949b330fd6d674e8a54303f1 100644 --- a/res/values-zh-rCN/arrays.xml +++ b/res/values-zh-rCN/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "按钮" "从对等设备获取的 PIN 码" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 255d4a0dfb3601ded145340b00f5c69ead8b9564..67798af088d95ec56ab5f4d5e6ad9681aa3465fb 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -854,6 +854,7 @@ "自动" "2.4 GHz 频段" "5.0 GHz 频段" + "首选 5.0 GHz 频段" "2.4 GHz" "5.0 GHz" "请为 WLAN 热点至少选择一个频段：" @@ -1065,7 +1066,7 @@ "自然色" "效果增强" "饱和色" - "自动" + "自动调节" "仅使用准确色彩" "在鲜明和准确色彩之间进行调整" "旋转平板电脑时自动改变浏览模式" @@ -3161,7 +3162,7 @@ "已设为静音（但%1$s和%2$s除外）" "已设为静音（但%1$s、%2$s和%3$s除外）" "信息、活动和提醒" - "开启勿扰模式后，系统会忽略信息、提醒和活动。您可以调整相应信息设置（您在上访允许的项目除外），以便允许您的好友、家人或其他联系人与您联系。" + "开启勿扰模式后，系统会忽略信息、提醒和活动（您在上方允许的几项内容除外）。您可以调整相应信息设置，以便允许您的好友、家人或其他联系人与您联系。" "完成" "设置" "不显示通知，也不发出通知提示音" @@ -3337,7 +3338,7 @@ "%1$s - %2$s" "%1$s到%2$s" "来电" - "允许进行通话" + "允许通话" "开启勿扰模式后，系统会屏蔽来电。您可以调整相应设置，以便允许您的好友、家人或其他联系人与您联系。" "已加星标的联系人" @@ -3427,7 +3428,7 @@ "当您输入 PIN 码以启动此设备时，%1$s等无障碍服务还未开启。" "当您绘制解锁图案以启动此设备时，%1$s等无障碍服务还未开启。" "当您输入密码以启动此设备时，%1$s等无障碍服务还未开启。" - "注意：重新启动后，您必须将手机解锁才能运行此应用" + "注意：如果您重启手机并设置了屏幕锁定，则必须将手机解锁才能运行此应用" "IMEI 信息" "IMEI相关信息" "（插槽%1$d）" @@ -3887,7 +3888,7 @@ "缺少排名对象。" "排名对象不包含此键。" "模拟“刘海屏”" - "显示屏凹口, 凹口" + "刘海屏, 缺口" "无" "特殊应用权限" @@ -4149,5 +4150,4 @@ "网络详情" "您的设备名称会显示在手机上的应用中。此外，当您连接到蓝牙设备或设置 WLAN 热点时，其他人可能也会看到您的设备名称。" "设备" - "%1$s、%2$s" diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml index 65218239016babdc9d98136361b3acfd04c748a6..63ac8b650153ae2854b6174148376662b6c71fcb 100644 --- a/res/values-zh-rHK/arrays.xml +++ b/res/values-zh-rHK/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "按鈕" "來自對端裝置的 PIN" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 884f5674875db5302f51feb39271c21857630438..203b40bebc317de32dedf1134742d5d2fad6863b 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -854,6 +854,7 @@ "自動" "2.4 GHz 頻段" "5.0 GHz 頻段" + "首選 5.0 GHz 頻段" "2.4 GHz" "5.0 GHz" "請為 Wi-Fi 熱點至少選擇一個頻段：" @@ -1065,7 +1066,7 @@ "自然" "強化" "飽和" - "自動" + "自動調整" "僅使用準確的色彩" "在鮮明與準確的色彩之間作出調整" "旋轉平板電腦時自動切換瀏覽模式" @@ -3164,7 +3165,7 @@ "已設為靜音 (%1$s和%2$s除外)" "已設為靜音 (%1$s、%2$s和%3$s除外)" "訊息、活動和提醒" - "開啟「請勿騷擾」模式時，除了您在上方允許的項目外，所有訊息、提醒和活動會設為靜音。您可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡您。" + "開啟「請勿騷擾」模式時，除了您在上方允許的項目外，所有訊息、提醒和活動均會設為靜音。您可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡您。" "完成" "設定" "無顯示或音效通知" @@ -3430,7 +3431,7 @@ "輸入您的 PIN 碼以啟動裝置後，您將無法直接使用 %1$s 等協助工具服務。" "輸入您的解鎖圖案以啟動裝置後，您將無法直接使用 %1$s 等協助工具服務。" "輸入您的密碼以啟動裝置後，您將無法直接使用 %1$s 等協助工具服務。" - "注意：重新啟動後，您必須解鎖手機，才可開始使用此應用程式" + "請注意：如果您重新啟動手機並設定了螢幕鎖定，就必須先將手機解鎖，才可執行這個應用程式" "IMEI 資料" "IMEI 相對資料" "(插槽 %1$d)" @@ -3634,7 +3635,7 @@ "頻率" "最高用量" "並未使用數據" - "允許「%1$s」存取「請勿騷擾」？" + "允許「%1$s」存取「請勿騷擾」嗎？" "應用程式能開啟或關閉「請勿騷擾」，並變更有關設定。" "請啟用功能，通知存取權已開放" "要撤銷「%1$s」存取「請勿騷擾」的權限嗎？" diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml index c4da95a7da4e49761a068e2c038f96835064b733..741964cabbfefa4f16e877ec7e815b3562024965 100644 --- a/res/values-zh-rTW/arrays.xml +++ b/res/values-zh-rTW/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "按鈕" "來自對端裝置的 PIN" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index a730c6edcc128df3167cd64fbe39031b909c6cd6..491f06ec0b9831b4a066f555a023f455cc51f96f 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -854,6 +854,7 @@ "自動" "2.4 GHz 頻帶" "5.0 GHz 頻帶" + "5.0 GHz 頻帶優先" "2.4 GHz" "5.0 GHz" "請至少選擇一個用於 Wi‑Fi 無線基地台的頻帶：" @@ -1065,7 +1066,7 @@ "自然" "增強" "飽和" - "自動" + "自動調整" "僅使用準確的色彩" "在鮮明與準確的色彩間進行調整" "旋轉平板電腦時自動切換瀏覽模式" @@ -3165,7 +3166,7 @@ "已設為靜音 (%1$s和%2$s除外)" "已設為靜音 (%1$s、%2$s和%3$s除外)" "訊息、活動和提醒" - "開啟「零打擾」模式時，系統會將訊息、提醒和活動設為靜音 (你在上方允許的項目除外)。你可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡你。" + "開啟「零打擾」模式時，系統會將訊息、提醒和活動設為靜音 (你在上方允許的項目除外)。你可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡你。" "完成" "設定" "不顯示通知或不發出通知音效" @@ -3431,7 +3432,7 @@ "輸入你的 PIN 啟動裝置後，你將無法使用 %1$s 等各項協助工具服務。" "畫出解鎖圖案啟動裝置後，你將無法使用 %1$s 等各項協助工具服務。" "輸入你的密碼啟動裝置後，你將無法使用 %1$s 等各項協助工具服務。" - "注意：重新啟動後，你必須將手機解鎖，才能執行這個應用程式" + "注意：如果你重新啟動手機並設定了螢幕鎖定，你必須先將手機解鎖，才能執行這個應用程式" "IMEI 資訊" "IMEI 相關資訊" "(插槽 %1$d)" @@ -3873,9 +3874,9 @@ "重要性" "說明" "可顯示徽章" - "調用請求" - "刪除調用請求" - "全螢幕調用請求" + "意圖" + "刪除意圖" + "全螢幕意圖" "動作" "標題" "遠端輸入裝置" diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml index cf98e0f0b203968be08b6a6974c6082f83e4dbfb..0e056f865f4c8080615771ee5a7fc7fe4569da49 100644 --- a/res/values-zu/arrays.xml +++ b/res/values-zu/arrays.xml @@ -121,12 +121,6 @@ "I-TTLS" "I-PWD" - - - - - - "Cindezela inkinobho" "Iphinikhodi kusuka kudivaysisi yabangani" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 45ded50247726a5cfdc1eb2aa6dfdd50008452a2..ae109ddeee64f9d15977dacd78b3c8c1c981017f 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -854,6 +854,7 @@ "Okuzenzakalelayo" "2.4 GHz Ibhendi" "5.0 GHz Band" + "5.0 GHz Band ekhethwayo" "2.4 GHz" "5.0 GHz" "Khetha okungenani ibhendi eyodwa ye-Wi‑Fi hotspot:" @@ -1065,7 +1066,7 @@ "Kwemvelo" "I-Boost" "Ukugcwaliswa kwesikhala" - "Okuzenzekelayo" + "Okungaguqula" "Sebenzisa imibala enembile kuphela" "Lungisa phakathi kwemibala ekhanya kakhulu nenembile" "Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ithebhulethi" @@ -3162,7 +3163,7 @@ "Kuthulisiwe, kodwa vumela i-%1$s ne-%2$s" "Kuthulisiwe, kodwa vumela i-%1$s, %2$s, ne-%3$s" "Imilayezo, imicimbi nezikhumbuzi" - "Uma kuvulwe ukungaphazamisi, imilayezo, izikhumbuzi, nemicimbi izothuliswa ngaphandle kwezinto ozivumela ngaphezulu. Ungalungisa izilungiselelo zemilayezo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo bafinyelele kuwe." + "Uma kuvulwe ukungaphazamisi, imilayezo, izikhumbuzi, nemicimbi izothuliswa ngaphandle kwezinto ozivumela ngaphezulu. Ungalungisa izilungiselelo zemilayezo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo bafinyelele kuwe." "Kwenziwe" "Izilungiselelo" "Akukho okubonakalayo noma umsindo kusukela kuzaziso" @@ -3428,7 +3429,7 @@ "Uma ufaka iphinikhodi yakho ukuqala le divayisi, amasevisi wokufinyelela njenge-%1$s ngeke atholakale okwamanje." "Uma ufaka iphethini yakho ukuqala le divayisi, amasevisi wokufinyelela njenge-%1$s ngeke atholakale okwamanje." "Uma ufaka phasiwedi yakho ukuqala le divayisi, amasevisi wokufinyelela njenge-%1$s ngeke atholakale okwamanje." - "Yazi: Ngemuva kokuqalisa, lolu hlelo lokusebenza alukwazi ukuqala uze uvule ifoni yakho" + "Inothi: Uma uqalisa kabusha ifoni yakho futhi usethe ukukhiya kwesikrini, lolu hlelo lokusebenza alikwazi uze uvule ifoni yakho" "Ulwazi le-IMEI" "Ulwazi oluhlobene lwe-IMEI" "(Isilothi%1$d)" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 5f39738a8afa52faeb7c67af6d634d300c82b623..be7a0ca50b6ccc960d86993317e26fd662f0262f 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -284,17 +284,27 @@ - + + 0 + 1 + + + @string/wifi_ap_choose_2G @string/wifi_ap_choose_5G - - @string/wifi_ap_2G - @string/wifi_ap_5G + + 0 + -1 + + + + @string/wifi_ap_choose_2G + @string/wifi_ap_prefer_5G - + @string/wifi_ap_choose_auto @string/wifi_ap_choose_2G diff --git a/res/values/bools.xml b/res/values/bools.xml index 9e039c93261a8ac6adde49c49fc043e2a00ea400..29de06bceae081ce1134e61f10cdbaef7cbdb435 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -174,9 +174,6 @@ true - + false - - - true diff --git a/res/values/strings.xml b/res/values/strings.xml index 179ea3c82ee7d9bae426f482165da6670cd7581f..34b23e79c12c49f16a76c26d5985ac36af9245fb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1986,8 +1986,10 @@ Auto 2.4 GHz Band - + 5.0 GHz Band + + 5.0 GHz Band preferred 2.4 GHz @@ -2491,11 +2493,11 @@ Boosted Saturated - - Automatic + + Adaptive Use accurate colors only - + Adjust between vivid and accurate colors @@ -7421,7 +7423,7 @@ Messages, events & reminders - When Do Not Disturb is on, messages, reminders, and events will muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you. + When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you. Done @@ -9926,6 +9928,9 @@ + + + Update Do Not Disturb diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index c192faa4ad681b338b7000b7a5bc19d8b1e1622e..060868e37fcee5e62fa4437a79c2d5c1e5500cc8 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -44,7 +44,7 @@ android:title="@string/display_category_title"> diff --git a/res/xml/accessibility_settings_for_setup_wizard.xml b/res/xml/accessibility_settings_for_setup_wizard.xml index 738bb8e3cc203b3a7a3fc860da0d3c8787c0851c..c1141abc4a9f0d3383c413b0d0ae962b0306d14a 100644 --- a/res/xml/accessibility_settings_for_setup_wizard.xml +++ b/res/xml/accessibility_settings_for_setup_wizard.xml @@ -33,7 +33,7 @@ diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 9e1ee4cba86b3f1bb3ace1e7d36621a31246514c..c75b90ce46cdde41be9f5b2672d764cd7b96daf7 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -80,8 +80,9 @@ + android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment" + settings:controller="com.android.settings.display.FontSizePreferenceController" + settings:keywords="@string/keywords_display_font_size" /> - + android:title="@string/wifi_hotspot_ap_band_title" /> \ No newline at end of file diff --git a/src/com/android/settings/AccessiblePreferenceCategory.java b/src/com/android/settings/AccessiblePreferenceCategory.java index 6e1a3d5f408901480e7b01f6737cf3a8caca1c1b..494dee5b933753c423d679979d17e9e08ecf13be 100644 --- a/src/com/android/settings/AccessiblePreferenceCategory.java +++ b/src/com/android/settings/AccessiblePreferenceCategory.java @@ -17,7 +17,6 @@ package com.android.settings; import android.content.Context; - import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceViewHolder; diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java index b3cf43357890a829fe380857d5e20a69d19389f0..86d8336d2558b7bb57e8648107e479ebbf788736 100644 --- a/src/com/android/settings/BrightnessPreference.java +++ b/src/com/android/settings/BrightnessPreference.java @@ -19,9 +19,8 @@ package com.android.settings; import android.content.Context; import android.content.Intent; import android.os.UserHandle; -import android.util.AttributeSet; - import androidx.preference.Preference; +import android.util.AttributeSet; public class BrightnessPreference extends Preference { diff --git a/src/com/android/settings/CancellablePreference.java b/src/com/android/settings/CancellablePreference.java index 4288e8b60f8e948bda8e596ade8b82b3faf27d95..92c100327cfb1c5c2890f2233410e8617e0f62d6 100644 --- a/src/com/android/settings/CancellablePreference.java +++ b/src/com/android/settings/CancellablePreference.java @@ -16,14 +16,13 @@ package com.android.settings; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - public class CancellablePreference extends Preference implements OnClickListener { private boolean mCancellable; diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java index 97910ec9420105bda5a31b74ea242e2b9ce7ab56..cb87440f7a65b4a30f7520695eb197878028a8d8 100644 --- a/src/com/android/settings/CustomListPreference.java +++ b/src/com/android/settings/CustomListPreference.java @@ -25,10 +25,9 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.Bundle; -import android.util.AttributeSet; - -import androidx.preference.ListPreference; import androidx.preference.ListPreferenceDialogFragment; +import androidx.preference.ListPreference; +import android.util.AttributeSet; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java index 0ad882df9a25e0593a904dcd3460a9323b1c6dd2..72f4aa32cadde80f35e18166d2daf9614728065c 100644 --- a/src/com/android/settings/DeviceAdminAdd.java +++ b/src/com/android/settings/DeviceAdminAdd.java @@ -59,6 +59,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.overlay.FeatureFactory; import com.android.settings.users.UserDialogs; import com.android.settingslib.RestrictedLockUtils; @@ -425,6 +426,9 @@ public class DeviceAdminAdd extends Activity { mDPM.setActiveAdmin(mDeviceAdmin.getComponent(), mRefreshing); EventLog.writeEvent(EventLogTags.EXP_DET_DEVICE_ADMIN_ACTIVATED_BY_USER, mDeviceAdmin.getActivityInfo().applicationInfo.uid); + + unrestrictAppIfPossible(BatteryUtils.getInstance(this)); + setResult(Activity.RESULT_OK); } catch (RuntimeException e) { // Something bad happened... could be that it was @@ -446,6 +450,15 @@ public class DeviceAdminAdd extends Activity { finish(); } + void unrestrictAppIfPossible(BatteryUtils batteryUtils) { + // Unrestrict admin app if it is already been restricted + final String packageName = mDeviceAdmin.getComponent().getPackageName(); + final int uid = batteryUtils.getPackageUid(packageName); + if (batteryUtils.isForceAppStandbyEnabled(uid, packageName)) { + batteryUtils.setForceAppStandby(uid, packageName, AppOpsManager.MODE_ALLOWED); + } + } + void continueRemoveAction(CharSequence msg) { if (!mWaitingForRemoveMsg) { return; diff --git a/src/com/android/settings/FallbackHome.java b/src/com/android/settings/FallbackHome.java index 9207dc869adeb8014c9ed206e4a2c9bd58141fa1..5f7b6392369f87def41821d139ff30fc870d54f3 100644 --- a/src/com/android/settings/FallbackHome.java +++ b/src/com/android/settings/FallbackHome.java @@ -17,21 +17,24 @@ package com.android.settings; import android.app.Activity; +import android.app.ProgressDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.os.UserHandle; import android.os.PowerManager; import android.os.SystemClock; -import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.util.Log; import android.view.View; +import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import android.view.animation.AnimationUtils; diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 2cb490411363811dcee6fc027cfcb296118dbc29..2ff693101e4956630a22678c9095b37c90156344 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -25,6 +25,8 @@ import android.os.AsyncResult; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -41,10 +43,6 @@ import android.widget.TabHost.TabContentFactory; import android.widget.TabHost.TabSpec; import android.widget.TabWidget; import android.widget.Toast; - -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.CommandException; import com.android.internal.telephony.Phone; diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index 9cb62434498b0f3780b7404cc27b9d314021146c..2bdfa3b23fb9eee55e0bda7aa8d4afde691a60e4 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -24,11 +24,11 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.provider.SearchIndexableResource; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index 6299217b9431b7f7fb85e4598c9259a9dc38ac8d..a7da41692fa921f9012404975e35d3b890f82d20 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -38,6 +38,7 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; import android.telephony.euicc.EuiccManager; import android.text.TextUtils; import android.util.Log; @@ -53,8 +54,6 @@ import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index 0ea7250736453fc9410d1d523b95b0efbc15593a..a92c8f85c7e18ad9f410531a9438f613f2e0e581 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -16,8 +16,6 @@ package com.android.settings; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; @@ -39,6 +37,8 @@ import com.android.settings.core.InstrumentedFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + /** * Confirm and execute a reset of the device to a clean "just out of the box" * state. Multiple confirmations are required: first, a general "are you sure diff --git a/src/com/android/settings/display/PreviewPagerAdapter.java b/src/com/android/settings/PreviewPagerAdapter.java similarity index 82% rename from src/com/android/settings/display/PreviewPagerAdapter.java rename to src/com/android/settings/PreviewPagerAdapter.java index 4d5b47a799e1a90de7d105f09703471e267c8858..b98ffcb1a115942227226aa88fd16367d1e5c7f1 100644 --- a/src/com/android/settings/display/PreviewPagerAdapter.java +++ b/src/com/android/settings/PreviewPagerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * Copyright (C) 2016 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. @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.settings.display; +package com.android.settings; import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.content.Context; import android.content.res.Configuration; +import androidx.viewpager.widget.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -29,10 +30,7 @@ import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.LinearLayout; - -import androidx.viewpager.widget.PagerAdapter; - -import com.android.settings.support.actionbar.HelpResourceProvider; +import android.widget.ScrollView; /** * A PagerAdapter used by PreviewSeekBarPreferenceFragment that for showing multiple preview screen @@ -78,12 +76,16 @@ public class PreviewPagerAdapter extends PagerAdapter { final Context configContext = context.createConfigurationContext(configurations[j]); configContext.getTheme().setTo(context.getTheme()); + final LayoutInflater configInflater = LayoutInflater.from(configContext); final ViewStub sampleViewStub = new ViewStub(configContext); sampleViewStub.setLayoutResource(previewSampleResIds[i]); final int fi = i, fj = j; - sampleViewStub.setOnInflateListener((stub, inflated) -> { - inflated.setVisibility(stub.getVisibility()); - mViewStubInflated[fi][fj] = true; + sampleViewStub.setOnInflateListener(new OnInflateListener() { + @Override + public void onInflate(ViewStub stub, View inflated) { + inflated.setVisibility(stub.getVisibility()); + mViewStubInflated[fi][fj] = true; + } }); mPreviewFrames[p].addView(sampleViewStub); @@ -92,7 +94,7 @@ public class PreviewPagerAdapter extends PagerAdapter { } @Override - public void destroyItem(ViewGroup container, int position, Object object) { + public void destroyItem (ViewGroup container, int position, Object object) { container.removeView((View) object); } @@ -162,29 +164,29 @@ public class PreviewPagerAdapter extends PagerAdapter { if (visibility == View.VISIBLE) { // Fade in animation. view.animate() - .alpha(alpha) - .setInterpolator(FADE_IN_INTERPOLATOR) - .setDuration(CROSS_FADE_DURATION_MS) - .setListener(new PreviewFrameAnimatorListener()) - .withStartAction(new Runnable() { - @Override - public void run() { - view.setVisibility(visibility); - } - }); + .alpha(alpha) + .setInterpolator(FADE_IN_INTERPOLATOR) + .setDuration(CROSS_FADE_DURATION_MS) + .setListener(new PreviewFrameAnimatorListener()) + .withStartAction(new Runnable() { + @Override + public void run() { + view.setVisibility(visibility); + } + }); } else { // Fade out animation. view.animate() - .alpha(alpha) - .setInterpolator(FADE_OUT_INTERPOLATOR) - .setDuration(CROSS_FADE_DURATION_MS) - .setListener(new PreviewFrameAnimatorListener()) - .withEndAction(new Runnable() { - @Override - public void run() { - view.setVisibility(visibility); - } - }); + .alpha(alpha) + .setInterpolator(FADE_OUT_INTERPOLATOR) + .setDuration(CROSS_FADE_DURATION_MS) + .setListener(new PreviewFrameAnimatorListener()) + .withEndAction(new Runnable() { + @Override + public void run() { + view.setVisibility(visibility); + } + }); } } } diff --git a/src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java similarity index 80% rename from src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java rename to src/com/android/settings/PreviewSeekBarPreferenceFragment.java index 36691186798a5288c5022bb9461793825132cef2..e031edb26c3e07dbbec3fb955d91195894320df0 100644 --- a/src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java +++ b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * Copyright (C) 2015 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. @@ -14,24 +14,22 @@ * limitations under the License. */ -package com.android.settings.display; +package com.android.settings; import android.content.Context; import android.content.res.Configuration; import android.os.Bundle; +import androidx.viewpager.widget.ViewPager; +import androidx.viewpager.widget.ViewPager.OnPageChangeListener; import android.view.LayoutInflater; import android.view.View; +import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -import androidx.viewpager.widget.ViewPager; -import androidx.viewpager.widget.ViewPager.OnPageChangeListener; - -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.DotsPageIndicator; import com.android.settings.widget.LabeledSeekBar; @@ -49,6 +47,12 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc /** Index of the entry corresponding to current value of the settings. */ protected int mCurrentIndex; + /** Resource id of the layout for this preference fragment. */ + protected int mActivityLayoutResId; + + /** Resource id of the layout that defines the contents inside preview screen. */ + protected int[] mPreviewSampleResIds; + private ViewPager mPreviewPager; private PreviewPagerAdapter mPreviewPagerAdapter; private DotsPageIndicator mPageIndicator; @@ -77,7 +81,12 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc @Override public void onStopTrackingTouch(SeekBar seekBar) { if (mPreviewPagerAdapter.isAnimating()) { - mPreviewPagerAdapter.setAnimationEndAction(() -> commit()); + mPreviewPagerAdapter.setAnimationEndAction(new Runnable() { + @Override + public void run() { + commit(); + } + }); } else { commit(); } @@ -92,33 +101,39 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc final ViewGroup listContainer = (ViewGroup) root.findViewById(android.R.id.list_container); listContainer.removeAllViews(); - final View content = inflater.inflate(getActivityLayoutResId(), listContainer, false); + final View content = inflater.inflate(mActivityLayoutResId, listContainer, false); listContainer.addView(content); - mLabel = content.findViewById(R.id.current_label); + mLabel = (TextView) content.findViewById(R.id.current_label); // The maximum SeekBar value always needs to be non-zero. If there's // only one available value, we'll handle this by disabling the // seek bar. final int max = Math.max(1, mEntries.length - 1); - mSeekBar = content.findViewById(R.id.seek_bar); + mSeekBar = (LabeledSeekBar) content.findViewById(R.id.seek_bar); mSeekBar.setLabels(mEntries); mSeekBar.setMax(max); mSmaller = content.findViewById(R.id.smaller); - mSmaller.setOnClickListener(v -> { - final int progress = mSeekBar.getProgress(); - if (progress > 0) { - mSeekBar.setProgress(progress - 1, true); + mSmaller.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + final int progress = mSeekBar.getProgress(); + if (progress > 0) { + mSeekBar.setProgress(progress - 1, true); + } } }); mLarger = content.findViewById(R.id.larger); - mLarger.setOnClickListener(v -> { - final int progress = mSeekBar.getProgress(); - if (progress < mSeekBar.getMax()) { - mSeekBar.setProgress(progress + 1, true); + mLarger.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + final int progress = mSeekBar.getProgress(); + if (progress < mSeekBar.getMax()) { + mSeekBar.setProgress(progress + 1, true); + } } }); @@ -136,16 +151,15 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc configurations[i] = createConfig(origConfig, i); } - final int[] previews = getPreviewSampleResIds(); - mPreviewPager = content.findViewById(R.id.preview_pager); + mPreviewPager = (ViewPager) content.findViewById(R.id.preview_pager); mPreviewPagerAdapter = new PreviewPagerAdapter(context, isLayoutRtl, - previews, configurations); + mPreviewSampleResIds, configurations); mPreviewPager.setAdapter(mPreviewPagerAdapter); - mPreviewPager.setCurrentItem(isLayoutRtl ? previews.length - 1 : 0); + mPreviewPager.setCurrentItem(isLayoutRtl ? mPreviewSampleResIds.length - 1 : 0); mPreviewPager.addOnPageChangeListener(mPreviewPageChangeListener); - mPageIndicator = content.findViewById(R.id.page_indicator); - if (previews.length > 1) { + mPageIndicator = (DotsPageIndicator) content.findViewById(R.id.page_indicator); + if (mPreviewSampleResIds.length > 1) { mPageIndicator.setViewPager(mPreviewPager); mPageIndicator.setVisibility(View.VISIBLE); mPageIndicator.setOnPageChangeListener(mPageIndicatorPageChangeListener); @@ -172,12 +186,6 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc mSeekBar.setOnSeekBarChangeListener(null); } - /** Resource id of the layout for this preference fragment. */ - protected abstract int getActivityLayoutResId(); - - /** Resource id of the layout that defines the contents inside preview screen. */ - protected abstract int[] getPreviewSampleResIds(); - /** * Creates new configuration based on the current position of the SeekBar. */ @@ -201,8 +209,8 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc private void setPagerIndicatorContentDescription(int position) { mPageIndicator.setContentDescription( - getString(R.string.preview_page_indicator_content_description, - position + 1, getPreviewSampleResIds().length)); + getPrefContext().getString(R.string.preview_page_indicator_content_description, + position + 1, mPreviewSampleResIds.length)); } private OnPageChangeListener mPreviewPageChangeListener = new OnPageChangeListener() { diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index cfb95a44869a6e1f7f418a3b86656e957c832b46..0ae9cb135f983c49a51e6a3fc732f00e80540151 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -27,17 +27,21 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; +import android.provider.SearchIndexableResource; import android.provider.Settings; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settings.search.Indexable; +import com.android.settingslib.RestrictedLockUtils; +import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java index 804d48b30b7e8bdaf53d90a1426934dc0e3a2b10..eeb7bfe033fe7b480e5b399665a7e1a2897393cf 100644 --- a/src/com/android/settings/ProgressCategory.java +++ b/src/com/android/settings/ProgressCategory.java @@ -17,11 +17,10 @@ package com.android.settings; import android.content.Context; -import android.util.AttributeSet; -import android.view.View; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import android.util.AttributeSet; +import android.view.View; /** * A category with a progress spinner diff --git a/src/com/android/settings/ProgressCategoryBase.java b/src/com/android/settings/ProgressCategoryBase.java index 1b06e07be5d52927a0b2a39d9ecc1e549d617ab7..89ded4ba01e28669d276086372cb69c094eb04bc 100644 --- a/src/com/android/settings/ProgressCategoryBase.java +++ b/src/com/android/settings/ProgressCategoryBase.java @@ -17,9 +17,8 @@ package com.android.settings; import android.content.Context; -import android.util.AttributeSet; - import androidx.preference.PreferenceCategory; +import android.util.AttributeSet; public abstract class ProgressCategoryBase extends PreferenceCategory { public ProgressCategoryBase(Context context) { diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java index 5101fe8ec547313f9c2d654b2d6e81fcff128178..1f528e3540735367464b538421ab713b15d8cceb 100644 --- a/src/com/android/settings/RadioInfo.java +++ b/src/com/android/settings/RadioInfo.java @@ -21,6 +21,7 @@ import static android.provider.Settings.Global.PREFERRED_NETWORK_MODE; import android.app.Activity; import android.app.AlertDialog; +import android.app.Dialog; import android.app.QueuedWork; import android.content.ComponentName; import android.content.Context; @@ -42,23 +43,23 @@ import android.os.Handler; import android.os.Message; import android.provider.Settings; import android.telephony.CarrierConfigManager; -import android.telephony.CellIdentityCdma; -import android.telephony.CellIdentityGsm; -import android.telephony.CellIdentityLte; -import android.telephony.CellIdentityWcdma; import android.telephony.CellInfo; import android.telephony.CellInfoCdma; import android.telephony.CellInfoGsm; import android.telephony.CellInfoLte; import android.telephony.CellInfoWcdma; +import android.telephony.CellIdentityCdma; +import android.telephony.CellIdentityGsm; +import android.telephony.CellIdentityLte; +import android.telephony.CellIdentityWcdma; import android.telephony.CellLocation; import android.telephony.CellSignalStrengthCdma; import android.telephony.CellSignalStrengthGsm; import android.telephony.CellSignalStrengthLte; import android.telephony.CellSignalStrengthWcdma; +import android.telephony.PreciseCallState; import android.telephony.PhoneStateListener; import android.telephony.PhysicalChannelConfig; -import android.telephony.PreciseCallState; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.SubscriptionManager; @@ -85,11 +86,16 @@ import com.android.ims.ImsConfig; import com.android.ims.ImsException; import com.android.ims.ImsManager; import com.android.internal.telephony.Phone; +import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneFactory; +import com.android.internal.telephony.RILConstants; +import com.android.internal.telephony.TelephonyProperties; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; +import java.net.UnknownHostException; +import java.util.ArrayList; import java.util.List; public class RadioInfo extends Activity { diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java index fc87efdb62bfe1180015a10af1c989f5dae253f7..2f35221294f3de8055b4557b5db22d87d45e3f49 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java @@ -25,14 +25,13 @@ import android.graphics.BitmapFactory; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.SystemProperties; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import java.util.Locale; /** diff --git a/src/com/android/settings/RemoteBugreportActivity.java b/src/com/android/settings/RemoteBugreportActivity.java index 7069175bfcc02a204dd704c461fd3dfc55e85d65..0589a24c50b40a966655d1a71b2dc612cf40cd8b 100644 --- a/src/com/android/settings/RemoteBugreportActivity.java +++ b/src/com/android/settings/RemoteBugreportActivity.java @@ -24,6 +24,9 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.util.Log; +import android.widget.LinearLayout; + +import com.android.settings.R; /** * UI for the remote bugreport dialog. Shows one of 3 possible dialogs: diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index 8ab6dc397ab1d690571da017f6d9d549d0dc310d..99f2df63e0a7a1a64e9cc71c654dc3ddb38ffb14 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -33,16 +33,16 @@ import android.os.RecoverySystem; import android.os.UserHandle; import android.os.UserManager; import android.provider.Telephony; +import androidx.annotation.VisibleForTesting; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.Toast; -import androidx.annotation.VisibleForTesting; - import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; diff --git a/src/com/android/settings/RestrictedCheckBox.java b/src/com/android/settings/RestrictedCheckBox.java index 2d45880076f8ac12b1bb631f7de0c89fb775fe38..476df29bf045dc3ec5526c8e9220f9bf8e29a360 100644 --- a/src/com/android/settings/RestrictedCheckBox.java +++ b/src/com/android/settings/RestrictedCheckBox.java @@ -22,6 +22,8 @@ import android.content.Context; import android.graphics.PorterDuff; import android.util.AttributeSet; import android.widget.CheckBox; +import android.widget.RadioButton; +import android.widget.TextView; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/RestrictedListPreference.java b/src/com/android/settings/RestrictedListPreference.java index d4315878156df07942a881c14f35a8d31b6e3991..4cfb2cf1510191cceec2b913a8bcf40e16ae3bb9 100644 --- a/src/com/android/settings/RestrictedListPreference.java +++ b/src/com/android/settings/RestrictedListPreference.java @@ -16,15 +16,18 @@ package com.android.settings; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - +import android.app.ActivityManager; import android.app.AlertDialog; import android.app.KeyguardManager; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; +import android.os.RemoteException; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreferenceDialogFragment; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; @@ -35,15 +38,15 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ListView; -import androidx.preference.ListPreferenceDialogFragment; -import androidx.preference.PreferenceViewHolder; - +import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; import java.util.ArrayList; import java.util.List; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + public class RestrictedListPreference extends CustomListPreference { private final RestrictedPreferenceHelper mHelper; private final List mRestrictedItems = new ArrayList<>(); diff --git a/src/com/android/settings/RestrictedRadioButton.java b/src/com/android/settings/RestrictedRadioButton.java index 7efba4fbaf9346dd22f1e7be6de05aeaf27b4d20..6ff66ba50fa2d386458490a9a9ba58dbdbb1f585 100644 --- a/src/com/android/settings/RestrictedRadioButton.java +++ b/src/com/android/settings/RestrictedRadioButton.java @@ -16,16 +16,18 @@ package com.android.settings; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - import android.content.Context; import android.graphics.PorterDuff; import android.util.AttributeSet; import android.widget.RadioButton; import android.widget.TextView; +import java.util.List; + import com.android.settingslib.RestrictedLockUtils; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + public class RestrictedRadioButton extends RadioButton { private Context mContext; private boolean mDisabledByAdmin; diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java index 68bf4e8d13477a675407fc7cc23aa162e6c495e0..3392d8c3bcb74bd25982e7bd74d01a85e6a8d270 100644 --- a/src/com/android/settings/RestrictedSettingsFragment.java +++ b/src/com/android/settings/RestrictedSettingsFragment.java @@ -16,8 +16,6 @@ package com.android.settings; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - import android.app.Activity; import android.app.AlertDialog; import android.content.BroadcastReceiver; @@ -29,15 +27,16 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; import android.view.View; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + /** * Base class for settings screens that should be pin protected when in restricted mode or * that will display an admin support message in case an admin has disabled the options. diff --git a/src/com/android/settings/RingtonePreference.java b/src/com/android/settings/RingtonePreference.java index 8f9c618d5e894bb096182dc0035c35c7b120274f..98f0579d6610a13f7a8b50d899a5fcaa5c9ce9e8 100644 --- a/src/com/android/settings/RingtonePreference.java +++ b/src/com/android/settings/RingtonePreference.java @@ -24,11 +24,10 @@ import android.media.RingtoneManager; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings.System; -import android.text.TextUtils; -import android.util.AttributeSet; - import androidx.preference.Preference; import androidx.preference.PreferenceManager; +import android.text.TextUtils; +import android.util.AttributeSet; /** * A {@link Preference} that allows the user to choose a ringtone from those on the device. diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 0ad964b65b3974decd8f6e6746b1cea69762c47f..cd5a9082c957276c1ae81eb3e9d76a01d433a6cc 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -32,6 +32,7 @@ public class Settings extends SettingsActivity { public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ } public static class SimSettingsActivity extends SettingsActivity { /* empty */ } public static class TetherSettingsActivity extends SettingsActivity { /* empty */ } + public static class WifiTetherSettingsActivity extends SettingsActivity { /* empty */ } public static class VpnSettingsActivity extends SettingsActivity { /* empty */ } public static class DateTimeSettingsActivity extends SettingsActivity { /* empty */ } public static class PrivateVolumeForgetActivity extends SettingsActivity { /* empty */ } diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index abe48d68ed94d3b555a95a599d9a0f4720432f04..7e77047cfbcd8fb44cfeba1e6d0a5f983a054333 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -39,6 +39,11 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceFragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; import android.text.TextUtils; import android.transition.TransitionManager; import android.util.FeatureFlagUtils; @@ -49,12 +54,6 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.Toolbar; -import androidx.annotation.VisibleForTesting; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceManager; - import com.android.internal.util.ArrayUtils; import com.android.settings.Settings.WifiSettingsActivity; import com.android.settings.applications.manageapplications.ManageApplications; diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java index 141d16b95a218e5a6dfc760e2d1aa5da1968a3f2..7272399247f3b46e544d4604020e5b5407fa529a 100644 --- a/src/com/android/settings/SettingsInitialize.java +++ b/src/com/android/settings/SettingsInitialize.java @@ -16,11 +16,6 @@ package com.android.settings; -import static android.content.pm.PackageManager.GET_ACTIVITIES; -import static android.content.pm.PackageManager.GET_META_DATA; -import static android.content.pm.PackageManager.GET_RESOLVED_FILTER; -import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS; - import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -32,15 +27,19 @@ import android.content.pm.ShortcutManager; import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import android.util.Log; - import androidx.annotation.VisibleForTesting; - -import com.android.settings.shortcut.CreateShortcut; +import android.util.Log; import java.util.ArrayList; import java.util.List; +import static android.content.pm.PackageManager.GET_ACTIVITIES; +import static android.content.pm.PackageManager.GET_META_DATA; +import static android.content.pm.PackageManager.GET_RESOLVED_FILTER; +import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS; + +import com.android.settings.shortcut.CreateShortcut; + /** * Listens to {@link Intent.ACTION_PRE_BOOT_COMPLETED} and {@link Intent.ACTION_USER_INITIALIZED} * performs setup steps for a managed profile (disables the launcher icon of the Settings app, diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java index 8399f6420ffdfaad10ccbd57eb2cc2453da6c7c4..c1489b033724db517d097994c727506265fe2395 100644 --- a/src/com/android/settings/SettingsLicenseActivity.java +++ b/src/com/android/settings/SettingsLicenseActivity.java @@ -25,13 +25,12 @@ import android.content.Loader; import android.net.Uri; import android.os.Bundle; import android.os.SystemProperties; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.FileProvider; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.FileProvider; - import com.android.settings.users.RestrictedProfileSettings; import com.android.settingslib.license.LicenseHtmlLoader; diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index af88c2d7820d1a3cb1a989814aff57297d3ce898..4a8a6e228b2d7ce90c90c3faed9722a9eca1e914 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -26,14 +26,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; -import android.text.TextUtils; -import android.util.ArrayMap; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; - import androidx.annotation.VisibleForTesting; import androidx.annotation.XmlRes; import androidx.preference.Preference; @@ -41,6 +33,13 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import android.text.TextUtils; +import android.util.ArrayMap; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.InstrumentedPreferenceFragment; diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java index 90f6c21dab73040018937fde13b312337026e1e4..ac1db15bdc83d8dac06b4555a10a8187a80ed49f 100644 --- a/src/com/android/settings/SetupRedactionInterstitial.java +++ b/src/com/android/settings/SetupRedactionInterstitial.java @@ -20,6 +20,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.res.Resources; import com.android.settings.notification.RedactionInterstitial; diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index 27cdb691d2bc8cd71d4b238567f5749502692d08..e449d52813d0dcc0956baf7c076cd2ada0d01832 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -18,7 +18,6 @@ package com.android.settings; import android.content.Intent; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; import com.android.setupwizardlib.util.WizardManagerHelper; diff --git a/src/com/android/settings/SummaryPreference.java b/src/com/android/settings/SummaryPreference.java index ced5cd75621f104e832a38e1249a7b758a20cc30..882302786470c62409ec6df8f2a464d78b294533 100644 --- a/src/com/android/settings/SummaryPreference.java +++ b/src/com/android/settings/SummaryPreference.java @@ -15,15 +15,14 @@ package com.android.settings; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - /** * Provides a summary of a setting page in a preference. Such as memory or data usage. */ diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java index ff58f11ede9377fe120257218cb0ecc926308031..b630685cf52e0b79fed774ebe7fb10de7b20fc87 100644 --- a/src/com/android/settings/TestingSettings.java +++ b/src/com/android/settings/TestingSettings.java @@ -18,7 +18,6 @@ package com.android.settings; import android.os.Bundle; import android.os.UserManager; - import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java index 2172cd07d6006f85fc572d31479685bcb4a589f1..a66f20899622654bd5825d1226a047cc5ec7a05e 100644 --- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java +++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java @@ -1,11 +1,11 @@ package com.android.settings; -import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION; + import com.android.settings.Settings.TestingSettingsActivity; diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index 19f0ab06b28f4f0f088432c587b3639870b19dcc..e7dc952309c09f7432b2d7542764c8ab492b6ec1 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -34,9 +34,8 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.UserManager; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.datausage.DataSaverBackend; diff --git a/src/com/android/settings/TimeoutListPreference.java b/src/com/android/settings/TimeoutListPreference.java index a0e59068f5f5ab11819df9a95acb7cb65d7f6c79..4b0fd9d04518a6d7205efa8997fe1abee7fd1424 100644 --- a/src/com/android/settings/TimeoutListPreference.java +++ b/src/com/android/settings/TimeoutListPreference.java @@ -16,8 +16,6 @@ package com.android.settings; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - import android.app.AlertDialog; import android.app.Dialog; import android.app.admin.DevicePolicyManager; @@ -30,6 +28,8 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + public class TimeoutListPreference extends RestrictedListPreference { private EnforcedAdmin mAdmin; private final CharSequence[] mInitialEntries; diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index ff217f6be9c3ebbde8743050b5b9fb8f006af87d..86340be98f632a3559b27e1f03cddd6d9189f27f 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -42,9 +42,9 @@ import android.os.UserManager; import android.security.IKeyChainService; import android.security.KeyChain; import android.security.KeyChain.KeyChainConnection; -import android.util.ArraySet; import android.util.Log; import android.util.SparseArray; +import android.util.ArraySet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java index ada3fa52e98ed1e51e3dbb136718d7d5283ace05..571a32c41ea078dbc5276e2fa0d57aa61935ff2f 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -39,6 +39,7 @@ import android.security.KeyChain.KeyChainConnection; import android.security.KeyStore; import android.security.keymaster.KeyCharacteristics; import android.security.keymaster.KeymasterDefs; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.util.SparseArray; import android.view.LayoutInflater; @@ -46,14 +47,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - import java.security.UnrecoverableKeyException; import java.util.ArrayList; import java.util.EnumSet; diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 04b7843e928331dd09ff97e5a62dd0aa33de3eb4..938f5b7b31641904d7374daf4616c728e0407414 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -71,6 +71,9 @@ import android.provider.ContactsContract.Data; import android.provider.ContactsContract.Profile; import android.provider.ContactsContract.RawContacts; import android.provider.Settings; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; import android.telephony.TelephonyManager; import android.text.Spannable; import android.text.SpannableString; @@ -87,10 +90,6 @@ import android.widget.EditText; import android.widget.ListView; import android.widget.TabWidget; -import androidx.annotation.StringRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - import com.android.internal.app.UnlaunchableAppActivity; import com.android.internal.util.ArrayUtils; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java index 4890011d2ff0cc07b35b5242ebe2ac3786961884..c1c8a64c5088433bf786c37e4613808d60de8558 100644 --- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java +++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java @@ -16,8 +16,6 @@ package com.android.settings.accessibility; -import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; - import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; import android.app.AlertDialog; @@ -41,6 +39,8 @@ import com.android.settings.R; import java.util.List; import java.util.Locale; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + /** * Utility class for creating the dialog that asks users for explicit permission to grant * all of the requested capabilities to an accessibility service before the service is enabled diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 528f52e7af67b05f96bbbbbc4dadf67660e7e0fd..d9479bbd74a32e8a5081db458a2c82e8ddd52c44 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -33,19 +33,18 @@ import android.os.UserHandle; import android.os.Vibrator; import android.provider.SearchIndexableResource; import android.provider.Settings; -import android.text.TextUtils; -import android.util.ArrayMap; -import android.view.KeyCharacterMap; -import android.view.KeyEvent; -import android.view.accessibility.AccessibilityManager; - import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.core.content.ContextCompat; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; +import android.util.ArrayMap; +import android.view.KeyCharacterMap; +import android.view.KeyEvent; +import android.view.accessibility.AccessibilityManager; import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.content.PackageMonitor; @@ -55,7 +54,6 @@ import com.android.internal.view.RotationPolicy.RotationPolicyListener; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; -import com.android.settings.display.ToggleFontSizePreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 9ee155f97b7024dbe35b3bb6548f1c0c2a5038fe..3500ba29d5e1e5d4f837c0a951d6f6e37805795a 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -21,11 +21,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.ServiceInfo; import android.os.Bundle; +import androidx.preference.Preference; import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java index 598e94cbf0df3d3e0157effdb7d36446f7694b08..37b1018ffe47fdf7e64edf4826e4273e6697001f 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java @@ -17,12 +17,11 @@ package com.android.settings.accessibility; import android.os.Bundle; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; import android.view.Menu; import android.view.accessibility.AccessibilityEvent; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; - import com.android.settings.SettingsActivity; import com.android.settings.core.SubSettingLauncher; import com.android.settings.search.actionbar.SearchMenuController; diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 69910bd33da7d3b67404452f5eee178aa988fabf..e9321c67b43e5ac303fa6f1151b5706891259f4d 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -25,12 +25,11 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index 33cb95ec3191efd9d1469802cb7503264e5f78db..a5e02c5cc57f17c1db8faf514b8c0180a08df05f 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -23,6 +23,10 @@ import android.graphics.Color; import android.os.Bundle; import android.preference.PreferenceFrameLayout; import android.provider.Settings; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnLayoutChangeListener; @@ -31,11 +35,6 @@ import android.view.ViewGroup.LayoutParams; import android.view.accessibility.CaptioningManager; import android.view.accessibility.CaptioningManager.CaptionStyle; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.SubtitleView; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/ColorPreference.java b/src/com/android/settings/accessibility/ColorPreference.java index e360a9ebce8b7267568b26634c3dc64f9fa911b0..7a7b7fc645707524c53e12dc1e4767e2a66b2086 100644 --- a/src/com/android/settings/accessibility/ColorPreference.java +++ b/src/com/android/settings/accessibility/ColorPreference.java @@ -20,14 +20,13 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; /** diff --git a/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java b/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java index 1be281f614b114d5aa342d83fdb1771ac405e740..53a2dda5b2618a4f4d1e4bedd41231dce804917b 100644 --- a/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java +++ b/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java @@ -17,10 +17,9 @@ package com.android.settings.accessibility; import android.content.Context; -import android.util.AttributeSet; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import android.util.AttributeSet; /* * Preference that always has a divider below. Used for SUW Accessibility Settings Summary text. diff --git a/src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java similarity index 92% rename from src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java rename to src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java index 703ec9c76a0ddcb2230a7e9dc08e2cbe7ed95834..8dfb2b49928080405876a9ddc20cc76d7edd4012 100644 --- a/src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * Copyright (C) 2016 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.display; +package com.android.settings.accessibility; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java b/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java index 343ebb1407475ae79870c7aa858dbe7cf7060e5e..090c3de1e9a24365b4fe6402b284918daea83a3b 100644 --- a/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.accessibility; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; public class HapticFeedbackIntensityPreferenceController diff --git a/src/com/android/settings/accessibility/LocalePreference.java b/src/com/android/settings/accessibility/LocalePreference.java index a3723fd4eab43441bd50e6bb8ef1f353592dd5de..4d3497d73fe8e42014f0cf80bfb304beca662a8c 100644 --- a/src/com/android/settings/accessibility/LocalePreference.java +++ b/src/com/android/settings/accessibility/LocalePreference.java @@ -17,9 +17,8 @@ package com.android.settings.accessibility; import android.content.Context; -import android.util.AttributeSet; - import androidx.preference.ListPreference; +import android.util.AttributeSet; import com.android.internal.app.LocalePicker; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java index f613c69e1b5d057447c07e7f8b06e98abc04a3cb..16c354c301853172b44a43ff38d0bb991576b04c 100644 --- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java @@ -16,9 +16,8 @@ package com.android.settings.accessibility; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java index 5af5d9305611f339a30db10c005fc90a5a5b9d72..ff12e27ff60c10388782e677a928bed2e7780d09 100644 --- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java @@ -16,9 +16,8 @@ package com.android.settings.accessibility; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index 1b20ec63037ee61d6a9ad5047765d58520ed2949..e6875e479b320e614fb8b39af2e6dbba509922f9 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -24,11 +24,10 @@ import android.content.res.Resources; import android.os.Bundle; import android.provider.SearchIndexableResource; import android.provider.Settings; -import android.text.TextUtils; -import android.view.accessibility.AccessibilityManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.text.TextUtils; +import android.view.accessibility.AccessibilityManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java index 4aff5139233db99c15db56f5913db35f5d44e624..362b59cffc77f175d898b3af96c033eff7f4388d 100644 --- a/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.accessibility; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; public class NotificationVibrationIntensityPreferenceController diff --git a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java index 6804abcb78a15b98b2a8ad5b53bb037ed38d4132..5f43c2d346f6c8ee4972074f3c876d9e29b2eb80 100644 --- a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import android.media.AudioAttributes; import android.os.Vibrator; +import android.os.VibrationEffect; import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java index e3be4a96d2ed2b32de8cf7237e2f8318ceaa62dc..a8a960f7671b41ba41992c266ae49ac06126be05 100644 --- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java +++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java @@ -16,11 +16,8 @@ package com.android.settings.accessibility; import static android.content.DialogInterface.BUTTON_POSITIVE; - -import static com.android.internal.accessibility.AccessibilityShortcutController - .COLOR_INVERSION_COMPONENT_NAME; -import static com.android.internal.accessibility.AccessibilityShortcutController - .DALTONIZER_COMPONENT_NAME; +import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME; +import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; @@ -42,9 +39,8 @@ import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; import com.android.internal.accessibility.AccessibilityShortcutController; -import com.android.internal.accessibility.AccessibilityShortcutController - .ToggleableFrameworkFeatureInfo; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.accessibility.AccessibilityShortcutController.ToggleableFrameworkFeatureInfo; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.widget.RadioButtonPickerFragment; diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index b345e05e9cc5f5b24331371055783d8c51725453..53f7fb51ccf4741669bb9a1647ec58f379b7f04d 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -26,8 +26,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ResolveInfo; import android.net.Uri; +import android.os.Binder; import android.os.Bundle; import android.os.Handler; +import android.os.IBinder; import android.os.UserHandle; import android.os.storage.StorageManager; import android.provider.Settings; diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index fb6286279ad3bf08257a1dff540921f91d205c1f..3f0fe0ce3cd260bbf696c7eff79a255fbf7d1163 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -19,11 +19,10 @@ package com.android.settings.accessibility; import android.content.res.Resources; import android.os.Bundle; import android.provider.Settings; +import androidx.preference.Preference; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SeekBarPreference; diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 15714527244480e7219ef35a722af7e377303a1b..a38fd275377506b766c69bfd522779f671fe9795 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -18,11 +18,10 @@ package com.android.settings.accessibility; import android.os.Bundle; import android.provider.Settings; -import android.view.accessibility.AccessibilityManager; -import android.widget.Switch; - import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.view.accessibility.AccessibilityManager; +import android.widget.Switch; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index fba5ddb31123258b84889d82246fc7a40fb7e3d4..94a26b9d5a89870298bd52e790facbfa1ad5d17f 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -19,10 +19,9 @@ package com.android.settings.accessibility; import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.Bundle; -import android.view.View; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.view.View; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java similarity index 89% rename from src/com/android/settings/display/ToggleFontSizePreferenceFragment.java rename to src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java index c87d29d38dd61ae3bd4a79347556141676f0dfca..8c15e5ba63a21f22259d793fbda53d33a2bddd42 100644 --- a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 The Android Open Source Project + * Copyright (C) 2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.display; +package com.android.settings.accessibility; import android.annotation.Nullable; import android.content.ContentResolver; @@ -22,8 +22,8 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.provider.Settings; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.PreviewSeekBarPreferenceFragment; import com.android.settings.R; /** @@ -33,21 +33,14 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr private float[] mValues; - @Override - protected int getActivityLayoutResId() { - return R.layout.font_size_activity; - } - - @Override - protected int[] getPreviewSampleResIds() { - return new int[]{R.layout.font_size_preview}; - } - @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - final Resources res = getContext().getResources(); + mActivityLayoutResId = R.layout.font_size_activity; + mPreviewSampleResIds = new int[]{R.layout.font_size_preview}; + + Resources res = getContext().getResources(); final ContentResolver resolver = getContext().getContentResolver(); // Mark the appropriate item in the preferences list. mEntries = res.getStringArray(R.array.entries_font_size); diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 99ed7a1494f98f7cd9dc6d18e542cd1351b91ed2..3e5af894a80a0391d6ef3ff2e4d7006e64293284 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -25,6 +25,9 @@ import android.media.MediaPlayer; import android.media.MediaPlayer.OnPreparedListener; import android.net.Uri; import android.os.Bundle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; import android.view.Display; import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.WindowManager; @@ -33,10 +36,6 @@ import android.widget.RelativeLayout.LayoutParams; import android.widget.Switch; import android.widget.VideoView; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java index 48a05694c3a33c73666570601468460ca126eca9..433817286768818ffd02cc656ed6245e2b053edc 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import android.os.Bundle; +import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard diff --git a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java index ba08a4313fd53af3f4801152319c688c46d4ff77..1d2012452a6d61108332919f99ef74d2f837614c 100644 --- a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java @@ -15,8 +15,10 @@ */ package com.android.settings.accessibility; +import android.graphics.drawable.Drawable; import android.media.AudioAttributes; import android.os.Vibrator; +import android.os.VibrationEffect; import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java index d9b1d7935d2505650e72fe8222ea4ffb35c5c1f5..ef7753513a0b193d513e31dc905ebfe9fc1cd942 100644 --- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java @@ -23,7 +23,6 @@ import android.os.Handler; import android.os.Looper; import android.os.Vibrator; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java index 1101611a84529dcff28fe270df5259434b0d51dc..99557836aa084ed222fd99d238b50c2434d88983 100644 --- a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import static android.os.Vibrator.VibrationIntensity; +import androidx.annotation.VisibleForTesting; import android.content.Context; import android.database.ContentObserver; import android.graphics.drawable.Drawable; @@ -29,8 +30,8 @@ import android.provider.Settings; import android.util.ArrayMap; import android.util.Log; -import androidx.annotation.VisibleForTesting; - +import com.android.internal.accessibility.AccessibilityShortcutController; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java index f9b7201ef291c58e7550cdf7e1af9adf01d33a04..241f1f3e043aa6971337756612b059f7f8344cd0 100644 --- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java @@ -21,7 +21,6 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java index e9476b39b74ab61e84923ab3270f060d6f5efee1..78713469c0bea693b7f4f68952df6e6a69591f2a 100644 --- a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java +++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java @@ -24,7 +24,6 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; - import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/AccountPreference.java b/src/com/android/settings/accounts/AccountPreference.java index eea311312566238bba07844be03894aa48422890..ad7a4b380e4a9ded9151c2ec9ca3a079aca9bb16 100644 --- a/src/com/android/settings/accounts/AccountPreference.java +++ b/src/com/android/settings/accounts/AccountPreference.java @@ -19,11 +19,10 @@ package com.android.settings.accounts; import android.accounts.Account; import android.content.Context; import android.graphics.drawable.Drawable; -import android.util.Log; -import android.widget.ImageView; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import android.util.Log; +import android.widget.ImageView; import com.android.settings.R; diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index ece9955945632e8caf3ea8ef5acdba6f8fc00344..fad2f13fafd0ff0559973f61f5e37fcda708aaeb 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -36,15 +36,14 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.text.BidiFormatter; -import android.util.ArrayMap; -import android.util.Log; -import android.util.SparseArray; - import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; +import android.text.BidiFormatter; +import android.util.ArrayMap; +import android.util.Log; +import android.util.SparseArray; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.AccessiblePreferenceCategory; diff --git a/src/com/android/settings/accounts/AccountRestrictionHelper.java b/src/com/android/settings/accounts/AccountRestrictionHelper.java index 5fa83b38ef051e1c1b4659f4c18d81cb6bfaac72..43c56ba9c49b2c582b8c0174c903d15ba66de18a 100644 --- a/src/com/android/settings/accounts/AccountRestrictionHelper.java +++ b/src/com/android/settings/accounts/AccountRestrictionHelper.java @@ -17,11 +17,9 @@ package com.android.settings.accounts; import android.annotation.UserIdInt; import android.content.Context; - import com.android.settings.AccessiblePreferenceCategory; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; - import java.util.ArrayList; public class AccountRestrictionHelper { diff --git a/src/com/android/settings/accounts/AccountSyncPreferenceController.java b/src/com/android/settings/accounts/AccountSyncPreferenceController.java index 34d903522c4d6ae7f2e873eb372458c42ae9462c..a0c30ac9c7ac8c0efc90e2b3ed20dd65f046064e 100644 --- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java +++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.SyncAdapterType; import android.os.Bundle; import android.os.UserHandle; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 5b5cf828c738900e83f80862786ae9af63242b37..11867c2b10e36831db3728c91e24eff655ceed46 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -35,6 +35,7 @@ import android.os.Binder; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -46,8 +47,6 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java index a452f8d5c322f2804a9cde2f00e5ac8f53d4fb6c..66f8888ecf772d9621e4bdbb2b37e7276f971b4a 100644 --- a/src/com/android/settings/accounts/AccountTypePreference.java +++ b/src/com/android/settings/accounts/AccountTypePreference.java @@ -24,7 +24,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java index e5e40c3b9b641d43438a264a40f85da83cc4901a..e811388066b5c63da1089c2d6450c406f010195e 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java @@ -29,14 +29,13 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.os.UserHandle; -import android.text.TextUtils; -import android.util.Log; - +import androidx.preference.PreferenceFragment; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.util.Log; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java index a10ea03c048bbd33e59fdc8505e2c99ce3e9c700..35f51afa80d0b93e2d07069fc5a6f0e865db36de 100644 --- a/src/com/android/settings/accounts/ChooseAccountActivity.java +++ b/src/com/android/settings/accounts/ChooseAccountActivity.java @@ -33,10 +33,9 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.util.Log; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.CharSequences; @@ -48,6 +47,7 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.widget.FooterPreference; +import com.android.settingslib.widget.FooterPreferenceMixin; import com.google.android.collect.Maps; diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java index 31e5613541cb59099b31fed8c7635549f34828f6..95bc8e7d3cc258fea73314a0f42757e21ec76f69 100644 --- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java +++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java @@ -22,7 +22,6 @@ import android.content.pm.UserInfo; import android.content.res.Resources; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java index 694b8af24e4a01370465c3decd56c5839d48055e..4227e6dec773ccb4c7cb84d6fa5a5aba39fc95d9 100644 --- a/src/com/android/settings/accounts/ManagedProfileSettings.java +++ b/src/com/android/settings/accounts/ManagedProfileSettings.java @@ -16,8 +16,6 @@ package com.android.settings.accounts; -import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -26,10 +24,9 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.util.Log; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -38,6 +35,8 @@ import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; +import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH; + /** * Setting page for managed profile. * FIXME: It currently assumes there is only one managed profile. diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java index fbeb90dcddb750e259072dc53a90ff6a86ea991c..ecb849bb8acb3eeca69e8fdc56e6dc4f2f1b886d 100644 --- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java +++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java @@ -31,12 +31,11 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.PreferenceScreen; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java index 9c7f739a68a83e2e6bb9b28508dd2d9c78c95fc5..b65b18381163ce15f424c563dd1577c2169cbd89 100644 --- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java +++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java @@ -19,15 +19,14 @@ package com.android.settings.accounts; import android.accounts.Account; import android.app.ActivityManager; import android.content.Context; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.view.View; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; - import com.android.settings.R; import com.android.settingslib.widget.AnimatedImageView; diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java index 8a147c17d2babc6630da1b63c54cc6e02388bae5..dd71087a2a0803454be6df455e9623b83cef1415 100644 --- a/src/com/android/settings/applications/AppInfoWithHeader.java +++ b/src/com/android/settings/applications/AppInfoWithHeader.java @@ -20,11 +20,10 @@ import static com.android.settings.widget.EntityHeaderController.ActionType; import android.app.Activity; import android.os.Bundle; +import androidx.preference.Preference; import android.util.IconDrawableFactory; import android.util.Log; -import androidx.preference.Preference; - import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 7d11ff95afa60526b5c17b94365a76a47f3b782e..7d422b1503071ea487533076b675dfcd4bde6223 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -16,11 +16,6 @@ package com.android.settings.applications; -import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS; -import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK; -import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; -import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; - import android.app.AlertDialog; import android.content.Intent; import android.content.IntentFilter; @@ -31,21 +26,25 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; import android.os.UserHandle; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import android.util.ArraySet; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import java.util.List; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; + public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener, Preference.OnPreferenceChangeListener { private static final String TAG = "AppLaunchSettings"; diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java index 0e3ee2d81169930abf5daff473a574c26f4cabd7..f8dd59ce8e50949398424e3cf2e15da30ad20aaa 100755 --- a/src/com/android/settings/applications/AppStateAppOpsBridge.java +++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java @@ -25,12 +25,11 @@ import android.content.pm.PackageManager; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; -import androidx.annotation.VisibleForTesting; - import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; diff --git a/src/com/android/settings/applications/AppStateInstallAppsBridge.java b/src/com/android/settings/applications/AppStateInstallAppsBridge.java index f852bcab9a094263f83b856f87c8e3620b2510e7..5b9ded648cfeb1131f86ee21932ea06b24337ff8 100644 --- a/src/com/android/settings/applications/AppStateInstallAppsBridge.java +++ b/src/com/android/settings/applications/AppStateInstallAppsBridge.java @@ -25,6 +25,7 @@ import android.os.RemoteException; import android.util.Log; import com.android.internal.util.ArrayUtils; +import com.android.settings.R; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; diff --git a/src/com/android/settings/applications/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java index 205c92d091a677dae434d20709b763d88e25caf1..6cf64c3e57b0aad8cdcc2c12a81de13e1bcfed44 100644 --- a/src/com/android/settings/applications/AppStateNotificationBridge.java +++ b/src/com/android/settings/applications/AppStateNotificationBridge.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import android.app.usage.IUsageStatsManager; import android.app.usage.UsageEvents; +import android.app.usage.UsageStatsManager; import android.content.Context; import android.os.RemoteException; import android.os.UserHandle; diff --git a/src/com/android/settings/applications/AppStateSmsPremBridge.java b/src/com/android/settings/applications/AppStateSmsPremBridge.java index 5a79a62bb9b97463cfc660f2d2219655174a2ba3..0fa7e50ff66513822a553aa827917e63254736a8 100644 --- a/src/com/android/settings/applications/AppStateSmsPremBridge.java +++ b/src/com/android/settings/applications/AppStateSmsPremBridge.java @@ -16,7 +16,6 @@ package com.android.settings.applications; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; - import com.android.internal.telephony.ISms; import com.android.internal.telephony.SmsUsageMonitor; import com.android.settingslib.applications.ApplicationsState; diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index f99bcc04860833845382763ce93da30fe507a9f8..8289114352747b333c6eded20ce0dc42d63bb78d 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -19,14 +19,18 @@ package com.android.settings.applications; import static android.content.pm.ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA; import static android.content.pm.ApplicationInfo.FLAG_SYSTEM; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_GRANTED; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS; +import static com.android.settings.applications.AppStateDirectoryAccessBridge.DEBUG; + import android.app.ActivityManager; import android.app.AlertDialog; import android.app.AppGlobals; import android.app.GrantedUriPermission; import android.app.LoaderManager; import android.content.ContentResolver; +import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -43,16 +47,15 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import android.util.Log; import android.util.MutableInt; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/AppStorageSizesController.java b/src/com/android/settings/applications/AppStorageSizesController.java index 43734b272c492f1f7a0de5cda71c850a1829f24d..6999a1581e21bfd370bf6c3879f5a4b068a38f22 100644 --- a/src/com/android/settings/applications/AppStorageSizesController.java +++ b/src/com/android/settings/applications/AppStorageSizesController.java @@ -17,11 +17,10 @@ package com.android.settings.applications; import android.content.Context; -import android.text.format.Formatter; - import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.preference.Preference; +import android.text.format.Formatter; import com.android.internal.util.Preconditions; import com.android.settingslib.applications.StorageStatsSource; diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java index 768fb4ea99c9ee1ef0871e7548b3c030b4711f61..26eb0844ce685b4b822938070aec2860a29fd447 100644 --- a/src/com/android/settings/applications/ClearDefaultsPreference.java +++ b/src/com/android/settings/applications/ClearDefaultsPreference.java @@ -24,6 +24,9 @@ import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.SpannableString; import android.text.TextUtils; import android.text.style.BulletSpan; @@ -33,10 +36,6 @@ import android.view.View; import android.widget.Button; import android.widget.TextView; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java index 5570f97144ff397fb39c371c8472ada5ab945313..1a4421e23041c6935cec2bdfceb416f80d7d7042 100644 --- a/src/com/android/settings/applications/ConfirmConvertToFbe.java +++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java @@ -15,6 +15,7 @@ */ package com.android.settings.applications; +import android.app.Fragment; import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/src/com/android/settings/applications/DataSaverController.java b/src/com/android/settings/applications/DataSaverController.java index c2e79bbc6a0cefdc9f5efa4007624e39e629b9ca..afe7cd64cd379140064e0216d06e3a9a708702a1 100644 --- a/src/com/android/settings/applications/DataSaverController.java +++ b/src/com/android/settings/applications/DataSaverController.java @@ -18,11 +18,10 @@ package com.android.settings.applications; import android.content.Context; - import androidx.annotation.VisibleForTesting; -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.R; public class DataSaverController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/DeviceAdministratorsController.java b/src/com/android/settings/applications/DeviceAdministratorsController.java index 6b942d6b3a8e0c62a675353f89f464a9b77b4403..ec1d556a611bbedd1d6d139b898370becec76e9c 100644 --- a/src/com/android/settings/applications/DeviceAdministratorsController.java +++ b/src/com/android/settings/applications/DeviceAdministratorsController.java @@ -17,11 +17,10 @@ package com.android.settings.applications; import android.content.Context; - import androidx.annotation.VisibleForTesting; -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.R; public class DeviceAdministratorsController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/DirectoryAccessDetails.java b/src/com/android/settings/applications/DirectoryAccessDetails.java index 47c36c296ff26f0c19b9c3148d398745226dd32a..8a8fa98b6523c547b7e04c08803581e084209a52 100644 --- a/src/com/android/settings/applications/DirectoryAccessDetails.java +++ b/src/com/android/settings/applications/DirectoryAccessDetails.java @@ -17,18 +17,16 @@ package com.android.settings.applications; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_DIRECTORY; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_GRANTED; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_PACKAGE; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_VOLUME_UUID; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract - .TABLE_PERMISSIONS_COLUMNS; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract - .TABLE_PERMISSIONS_COL_DIRECTORY; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract - .TABLE_PERMISSIONS_COL_GRANTED; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract - .TABLE_PERMISSIONS_COL_PACKAGE; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract - .TABLE_PERMISSIONS_COL_VOLUME_UUID; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COLUMNS; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_DIRECTORY; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_GRANTED; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_PACKAGE; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_VOLUME_UUID; import static com.android.settings.applications.AppStateDirectoryAccessBridge.DEBUG; import static com.android.settings.applications.AppStateDirectoryAccessBridge.VERBOSE; @@ -44,14 +42,20 @@ import android.net.Uri; import android.os.Bundle; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import android.util.IconDrawableFactory; -import android.util.Log; -import android.util.Pair; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.PreferenceGroupAdapter; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceCategory; +import android.text.TextUtils; +import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.util.ArrayMap; +import android.util.ArraySet; +import android.util.IconDrawableFactory; +import android.util.Log; +import android.util.Pair; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/EnabledVrListenersController.java b/src/com/android/settings/applications/EnabledVrListenersController.java index 901e3da3a777d3f8ac7703e8e6c99bf87d1bf59b..7b33529d7eb5ffb4f8170eb3e4ff9040486f11e8 100644 --- a/src/com/android/settings/applications/EnabledVrListenersController.java +++ b/src/com/android/settings/applications/EnabledVrListenersController.java @@ -17,11 +17,10 @@ package com.android.settings.applications; import android.content.Context; - import androidx.annotation.VisibleForTesting; -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.R; public class EnabledVrListenersController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/HighPowerAppsController.java b/src/com/android/settings/applications/HighPowerAppsController.java index 70d610083e4466ffedf3091eaa8833d7af688cee..39b84516315bc953a5592646450f268ee2b8e0c1 100644 --- a/src/com/android/settings/applications/HighPowerAppsController.java +++ b/src/com/android/settings/applications/HighPowerAppsController.java @@ -17,11 +17,10 @@ package com.android.settings.applications; import android.content.Context; - import androidx.annotation.VisibleForTesting; -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.R; public class HighPowerAppsController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/InstalledAppCounter.java b/src/com/android/settings/applications/InstalledAppCounter.java index 54216ce5e7d357065cfcb99dd14e9b83e09c7dc2..26372ee577e468a78f5163ba26662406dc5a3826 100644 --- a/src/com/android/settings/applications/InstalledAppCounter.java +++ b/src/com/android/settings/applications/InstalledAppCounter.java @@ -17,8 +17,8 @@ package com.android.settings.applications; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.content.pm.PackageManager; import android.os.UserHandle; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/src/com/android/settings/applications/LayoutPreference.java b/src/com/android/settings/applications/LayoutPreference.java index cc077cc753936a151cbb98ca81206b24e37316a8..f80100f9d2665bcda8a30ee4a3d44a98aa34d652 100644 --- a/src/com/android/settings/applications/LayoutPreference.java +++ b/src/com/android/settings/applications/LayoutPreference.java @@ -18,17 +18,16 @@ package com.android.settings.applications; import android.content.Context; import android.content.res.TypedArray; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java index 78a7b2d65e63690f7aeaa64bef481ef85ca0c841..1b9dbaf64cd498285d3fb8dbba31f44b775f255d 100644 --- a/src/com/android/settings/applications/ManageDomainUrls.java +++ b/src/com/android/settings/applications/ManageDomainUrls.java @@ -23,17 +23,16 @@ import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; import android.provider.Settings.Global; -import android.util.ArraySet; -import android.view.View; - import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; +import android.util.ArraySet; +import android.view.View; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java index e9259dbeebba339d26df29f39385399dda686e22..2210c0b176b6aec7e4feb04f8576d7d201535c21 100644 --- a/src/com/android/settings/applications/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/PremiumSmsAccess.java @@ -18,13 +18,12 @@ import android.annotation.Nullable; import android.app.Application; import android.content.Context; import android.os.Bundle; -import android.view.View; - import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; +import android.view.View; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/applications/PremiumSmsController.java b/src/com/android/settings/applications/PremiumSmsController.java index 5ac374f7162dbbfa6e9b6e9d5daa30e041e50cac..eeb5d86fd908c9381f55183211dbbb87b6a79829 100644 --- a/src/com/android/settings/applications/PremiumSmsController.java +++ b/src/com/android/settings/applications/PremiumSmsController.java @@ -17,11 +17,10 @@ package com.android.settings.applications; import android.content.Context; - import androidx.annotation.VisibleForTesting; -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.R; public class PremiumSmsController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/ProcStatsPackageEntry.java b/src/com/android/settings/applications/ProcStatsPackageEntry.java index 0c4f9be82b9ee51f6f850ba5dc1d2aaea626d08a..88d5bd645eb9c6b42763e07d8a4e996598459b07 100644 --- a/src/com/android/settings/applications/ProcStatsPackageEntry.java +++ b/src/com/android/settings/applications/ProcStatsPackageEntry.java @@ -21,8 +21,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Parcel; import android.os.Parcelable; -import android.util.Log; +import android.util.Log; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java index dda5063e8b9fddd9eddcdd9432920c9b2af308d2..75609528d8ef96365361bff803c48db6b430c601 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -16,8 +16,6 @@ package com.android.settings.applications; -import static com.android.settings.widget.EntityHeaderController.ActionType; - import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; @@ -35,6 +33,8 @@ import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Process; import android.os.UserHandle; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import android.text.format.Formatter; import android.util.ArrayMap; import android.util.IconDrawableFactory; @@ -44,9 +44,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CancellablePreference; import com.android.settings.CancellablePreference.OnCancelListener; @@ -62,6 +59,8 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; +import static com.android.settings.widget.EntityHeaderController.ActionType; + public class ProcessStatsDetail extends SettingsPreferenceFragment { private static final String TAG = "ProcessStatsDetail"; diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java index 64521984fc7ad729e4f1270ecc67716336587f3e..034a68dd69b87362e1a9093dc519354f06d8dfd4 100644 --- a/src/com/android/settings/applications/ProcessStatsPreference.java +++ b/src/com/android/settings/applications/ProcessStatsPreference.java @@ -20,8 +20,8 @@ import android.content.Context; import android.content.pm.PackageManager; import android.text.TextUtils; import android.text.format.Formatter; -import android.util.Log; +import android.util.Log; import com.android.settings.widget.AppPreference; public class ProcessStatsPreference extends AppPreference { diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java index b29b273693663161ba2f4395ce86ead4a24bc0d6..72572db83a7f79b6ee4a69b3016756905464cf06 100644 --- a/src/com/android/settings/applications/ProcessStatsSummary.java +++ b/src/com/android/settings/applications/ProcessStatsSummary.java @@ -18,11 +18,10 @@ package com.android.settings.applications; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import android.text.format.Formatter; -import android.text.format.Formatter.BytesResult; - import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; +import android.text.format.Formatter; +import android.text.format.Formatter.BytesResult; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index 25f9c7eec5bc0766b886762ca26d29dad7d70acb..42475d295f88180cbb1f487f1d27250b413742e3 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -19,15 +19,14 @@ package com.android.settings.applications; import android.content.Context; import android.content.pm.PackageManager; import android.os.Bundle; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; import android.util.Log; import android.util.TimeUtils; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - import com.android.internal.app.procstats.ProcessStats; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java index 628b3b1aa386fb56542b68bf8bd9c2bca0df448e..92d8af1f096fbf863e7e50faab16141a38d2a94d 100644 --- a/src/com/android/settings/applications/RecentAppsPreferenceController.java +++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java @@ -27,17 +27,16 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.UserHandle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/applications/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java index 6575ad1dfa7454c56d5d109c6122b64afe5a9d8f..b532896f1009116531af1897bceefba35c424580 100644 --- a/src/com/android/settings/applications/SpacePreference.java +++ b/src/com/android/settings/applications/SpacePreference.java @@ -17,13 +17,11 @@ package com.android.settings.applications; import android.content.Context; import android.content.res.TypedArray; -import android.util.AttributeSet; -import android.view.ViewGroup.LayoutParams; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; - +import android.util.AttributeSet; +import android.view.ViewGroup.LayoutParams; import com.android.settings.R; /** diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java index 81b48056515ba1a18c147ce5b9700b5ed29dc7bd..16fb4057e15db0a415156da86c3c6dadd306a68a 100644 --- a/src/com/android/settings/applications/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/SpecialAccessSettings.java @@ -17,18 +17,15 @@ package com.android.settings.applications; import android.app.ActivityManager; import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; - import androidx.annotation.NonNull; +import android.provider.SearchIndexableResource; import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; - import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java index e5d7deec9dfce5c287f218b7c83c3e3a8837c3f6..ef2b2118d3f8ac374b0a6e098d79d56cbffc2409 100644 --- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java +++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java @@ -14,9 +14,7 @@ package com.android.settings.applications; import android.content.Context; - import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.datausage.DataSaverBackend; diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index 1725af8444820d6f81cd57f4e92e187a00060ce6..1681b1d31695b52799d8fed06d503d0a956b9f1c 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -18,24 +18,27 @@ package com.android.settings.applications; import android.app.AlertDialog; import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; +import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; +import android.os.UserHandle; import android.provider.Settings; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.SwitchPreference; +import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateUsageBridge.UsageState; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java index 8836027ec3befcb749377e4547ad8f6f81a6639b..79c22248a690b1965b8b6e3b0b701c3298a15745 100644 --- a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java @@ -33,11 +33,10 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import android.util.Log; -import android.webkit.IWebViewUpdateService; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; +import android.util.Log; +import android.webkit.IWebViewUpdateService; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 20eba48c80ca541cd062c286aceb50135ce1e032..55a6c9ff4f288b979f640d596f33ea9841e955d7 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -23,7 +23,6 @@ import android.content.pm.PackageInfo; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java index 4e2904eb3e222eeb1d871303980d47a5c539bc1d..c572c3724efb2b292f3c835d51c5de281a814c69 100644 --- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java @@ -25,12 +25,11 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; -import android.text.format.DateUtils; -import android.text.format.Formatter; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.format.DateUtils; +import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java index c86117503fd0c40c21a6a2c8c4cab79aff58e11e..e37e6708209c5335d97ddd918b027a019e19516c 100644 --- a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.applications.appinfo; import android.app.Activity; import android.content.Context; import android.content.pm.PackageInfo; - import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index 2024c2ab885befc28ddc0ad49b9c0286adb7c057..d370ce0bce55191845734919192d749c1f5ac5a8 100755 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -39,14 +39,13 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.DeviceAdminAdd; import com.android.settings.R; @@ -68,7 +67,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; - /** * Dashboard fragment to display application information from Settings. This activity presents * extended information associated with a package like code, data, total size, permissions @@ -358,10 +356,8 @@ public class AppInfoDashboardFragment extends DashboardFragment final MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES); final boolean uninstallUpdateDisabled = getContext().getResources().getBoolean( R.bool.config_disable_uninstall_update); - uninstallUpdatesItem.setVisible(mUserManager.isAdminUser() - && mUpdatedSysApp - && !mAppsControlDisallowedBySystem - && !uninstallUpdateDisabled); + uninstallUpdatesItem.setVisible( + mUpdatedSysApp && !mAppsControlDisallowedBySystem && !uninstallUpdateDisabled); if (uninstallUpdatesItem.isVisible()) { RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getActivity(), uninstallUpdatesItem, mAppsControlDisallowedAdmin); diff --git a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java index c495cbc50c82fa2481f16158b8eeaceca51dd620..3fc629d5a574cd1d97ac40506f5dc86d47db513e 100644 --- a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java @@ -18,10 +18,9 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.os.Bundle; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java index bf8567684ecf36c3cb4aafe82696781a34a71f24..6a1079c7a7424e562718dc012e8a3a0db03b82bf 100644 --- a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.Intent; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java index 19e8ebbb29765856ee511adbfc66769b8533a329..e5b6eed0f59a0a2069f6261c2aa9827822cfe32a 100644 --- a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java @@ -20,10 +20,9 @@ import android.app.Activity; import android.content.Context; import android.content.pm.PackageInfo; import android.os.AsyncTask; -import android.text.format.Formatter; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java index 8519893da31e0745585cb36254328a901cbb5d26..d4e7e602b699c2fd12c5a755a27e836ea603d55c 100644 --- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java @@ -20,7 +20,6 @@ import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; import android.content.Context; import android.os.Bundle; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java index 7f64e3b48b1a48f85cbfca18037391aa03ee7a51..7e61385cb7df3abb648fa46c3eafab37d6374401 100644 --- a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java @@ -22,7 +22,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.hardware.usb.IUsbManager; import android.os.ServiceManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java index 3c07254fd2bde75693c001a4b84c4dc5b7b78aeb..c5eed7b4ecff35e765efa1366694147328699663 100644 --- a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java @@ -21,10 +21,9 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.icu.text.ListFormatter; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.util.Log; import com.android.settings.R; import com.android.settingslib.applications.PermissionsSummaryHelper; diff --git a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java index f5ce18e008075d12703250b214eb2291deecb7b5..4973ee90bb1eeac504c976a9ef4cf88e69e5d52e 100644 --- a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java @@ -21,9 +21,8 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java index 172810cae8c82cdbcfeb2989fd1eb9a5d3456cdf..5754dd2030313061ebb633d23d1b36956d716e24 100644 --- a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java @@ -22,10 +22,9 @@ import android.content.Loader; import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.os.UserHandle; -import android.text.format.Formatter; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java index e4e4d2052bd127067e66c15be3e1d5f6c99a2962..7b45b67de294e21024e0ce6bd62f8068e2e41623 100644 --- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java @@ -17,9 +17,8 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.os.Bundle; import android.os.UserManager; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java index 50de6fe06765269a1208c22abe2aff95b56774de..9efa998727b7b546c93bb739ffbd2a4839133e64 100644 --- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java @@ -19,19 +19,21 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYST import android.app.AlertDialog; import android.app.AppOpsManager; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; +import android.os.UserHandle; import android.provider.Settings; -import android.view.Window; -import android.view.WindowManager; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.SwitchPreference; +import android.util.Log; +import android.view.Window; +import android.view.WindowManager; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java index ec2508f107abd6644e8dc13adbc424a1ca2917bb..df8b86298bee1a15f90b506d7a67ccf75d68d9b1 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java index 8c83820e36bad20ae300e3a1051ddfeee746c6c5..0c06e081773c6e9e395c08c3930809ca60a3c0e9 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java @@ -24,7 +24,6 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java index aa6e3b8da1dd809c19d358c1abc8d7750895e670..eb5e2ebd92357030536758c0d2a2f866eab5cf04 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java @@ -25,6 +25,8 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; import android.os.UserHandle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; @@ -32,8 +34,6 @@ import android.view.MenuItem; import android.view.View; import android.widget.Button; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStoreUtil; diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java index cbb805f3554b7cecb593190487359240cf812ef8..c0ba33f2d0834dd419428294b9c8325099513f5e 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.pm.PackageManager; - import androidx.preference.Preference; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java index 584e12cb8a547ff782a5d281f57ef807a22c928d..7b98404e17b4307ede1e9ea9bde9d65aaad90a02 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java @@ -20,10 +20,9 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.UserHandle; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.util.Log; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java b/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java index 7f4faebbedc79f7af5d629220c521e125b5e0881..21b224a96ae3537b5920e1eaaeb58aa7c2e88d1d 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java @@ -15,18 +15,13 @@ */ package com.android.settings.applications.appinfo; -import static android.app.AppOpsManager.MODE_ALLOWED; -import static android.app.AppOpsManager.MODE_ERRORED; -import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE; - import android.app.AlertDialog; import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -34,6 +29,10 @@ import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.overlay.FeatureFactory; +import static android.app.AppOpsManager.MODE_ALLOWED; +import static android.app.AppOpsManager.MODE_ERRORED; +import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE; + public class PictureInPictureDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java b/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java index 419669814dcb96e2bb06477a05540445d13ebd8f..9d7f30a911a4789af1d918377b1c5911fd55526b 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java @@ -27,13 +27,12 @@ import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.util.IconDrawableFactory; -import android.util.Pair; -import android.view.View; - import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; +import android.util.IconDrawableFactory; +import android.util.Pair; +import android.view.View; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java index a4cfebfcb25a9976c760940b3255b52abdc0caf1..6a390770249bde2de5dc5f10c1e2f4a004268bcd 100644 --- a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java @@ -21,11 +21,10 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java index 97763050dbf39b81a0f12e03a339dc815de1bba2..617154797f94895e89d209c05641b3a1711f2a5e 100644 --- a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java @@ -17,17 +17,19 @@ package com.android.settings.applications.appinfo; import android.app.AlertDialog; import android.app.AppOpsManager; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; +import android.os.UserHandle; import android.provider.Settings; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.SwitchPreference; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java index b347e9306950f64a99a02c20414149129b4fb5f0..d9db9aa6c2a65363deac3120a7a6152d72ebf2c5 100644 --- a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java @@ -25,8 +25,8 @@ import android.view.View; import android.view.ViewGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.R; public class BackgroundCheckSummary extends InstrumentedPreferenceFragment { // layout inflater object used to inflate views diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java index 3e5c4ec5280cd12dd9869da6499ad858cb5f3503..2ac51e7264aa92724bed9f9f3535358bdc85bc39 100644 --- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java index a1d0ddc2c88e6187badd6f0d5d672fbf620c6089..ccdacedc5ac0eddb31ca2d815d2a267a77e0e426 100644 --- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java @@ -21,7 +21,6 @@ import android.content.Context; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java index 59479438c2552047999351350773b1df2f1e3939..59425f392e226795c7604017bf51971cb44e9be9 100644 --- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/assist/AssistSettingObserver.java b/src/com/android/settings/applications/assist/AssistSettingObserver.java index f0da694a3a8c041442af319b9c56853d0f79b0fa..c5d028ec432a91117479986e8b16ecc1105ae15a 100644 --- a/src/com/android/settings/applications/assist/AssistSettingObserver.java +++ b/src/com/android/settings/applications/assist/AssistSettingObserver.java @@ -20,7 +20,6 @@ import android.content.ContentResolver; import android.database.ContentObserver; import android.net.Uri; import android.provider.Settings; - import androidx.annotation.MainThread; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/applications/assist/DefaultAssistPicker.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java index c5a13c5b21c466204244b2e1918327badbb7c2fd..d54e6d1a3fee1f8a8b3f355cddefa62bbd464514 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPicker.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPicker.java @@ -32,6 +32,7 @@ import com.android.internal.app.AssistUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; + import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java index ccc2162f80827c2f57334b4e73b6fdf0d95ecbd4..6f44ff4f70caa9f7bb0b985f092b812b7ee382cc 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java @@ -23,7 +23,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.service.voice.VoiceInteractionService; import android.service.voice.VoiceInteractionServiceInfo; - import androidx.annotation.VisibleForTesting; import com.android.internal.app.AssistUtils; diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java index 1f8b9d1a5ccca7b8c965f4199a98ed0e917e9fb4..15433676dd1e375eed89d74b84f4ab66f58c1421 100644 --- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java @@ -20,10 +20,9 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.internal.app.AssistUtils; import com.android.settings.applications.defaultapps.DefaultAppPreferenceController; diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java index 8d3d86bacad22c21b1dfdcc30aab4c08c928d72c..ec8111ba90677a257710d6481bdc20d7f5e26e12 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java @@ -23,11 +23,10 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java index ffee2f7c411377a4628dd94b8c3b8c8204667ced..7d9989ff1cebcad39183f8b2aae0f68dfb670af1 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java @@ -30,12 +30,11 @@ import android.os.Bundle; import android.provider.Settings; import android.service.autofill.AutofillService; import android.service.autofill.AutofillServiceInfo; +import androidx.preference.Preference; import android.text.Html; import android.text.TextUtils; import android.util.Log; -import androidx.preference.Preference; - import com.android.internal.content.PackageMonitor; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java index a595e3061c82dc5a1e0c63ac5a59ed07cb6a3a9c..c243970bad09cca6a4c362b68e7da927e96f9f72 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java @@ -17,12 +17,14 @@ package com.android.settings.applications.defaultapps; import android.content.Context; +import android.content.pm.ComponentInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.util.ArraySet; +import android.util.ArraySet; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; + import com.android.settingslib.applications.DefaultAppInfo; import java.util.ArrayList; diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java index e1fd57b536d771505f986db04aa3af1a558c6730..9d72bcf63819076881432a5695891dfed22f2d51 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java @@ -24,12 +24,11 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.net.Uri; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.IconDrawableFactory; import android.util.Log; -import androidx.preference.Preference; - import com.android.settingslib.applications.DefaultAppInfo; import java.util.List; diff --git a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java index 55803c50f284d9f1350ede686a7ab4b61f096b4b..b774602aeeb44a352ecb771313775201a0a234c4 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.nfc.NfcAdapter; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java index 2e4a640de4d9a5480526c358e3ccfa1f7a763990..ff584b57e3294bd8cdccbf0115b7efcd43debf24 100644 --- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java +++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java @@ -19,11 +19,11 @@ package com.android.settings.applications.manageapplications; import androidx.annotation.IntDef; import com.android.settings.R; -import com.android.settings.applications.AppStateDirectoryAccessBridge; import com.android.settings.applications.AppStateInstallAppsBridge; import com.android.settings.applications.AppStateNotificationBridge; import com.android.settings.applications.AppStateOverlayBridge; import com.android.settings.applications.AppStatePowerBridge; +import com.android.settings.applications.AppStateDirectoryAccessBridge; import com.android.settings.applications.AppStateUsageBridge; import com.android.settings.applications.AppStateWriteSettingsBridge; import com.android.settings.wifi.AppStateChangeWifiStateBridge; diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java index 021a953db335923bd36ebd3a8ab8d1c03a269ea8..a1a4c22a4bb1ea00e0ba569a603d9c81a609ec02 100644 --- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java +++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java @@ -19,6 +19,9 @@ package com.android.settings.applications.manageapplications; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -28,10 +31,6 @@ import android.widget.ImageView; import android.widget.Switch; import android.widget.TextView; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.R; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index f1e15cc2bd7a111a0d6ba82599968a203f680325..b23a9670e6680ece3d9761a618992d11c11e08f7 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -17,7 +17,6 @@ package com.android.settings.applications.manageapplications; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; - import static com.android.settings.applications.manageapplications.AppFilterRegistry .FILTER_APPS_ALL; import static com.android.settings.applications.manageapplications.AppFilterRegistry @@ -43,6 +42,7 @@ import android.annotation.Nullable; import android.annotation.StringRes; import android.app.Activity; import android.app.usage.IUsageStatsManager; +import android.app.usage.UsageStatsManager; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -53,6 +53,10 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.preference.PreferenceFrameLayout; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; @@ -68,11 +72,6 @@ import android.widget.ArrayAdapter; import android.widget.FrameLayout; import android.widget.Spinner; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java index 3036657b11a83775d8dab6c3b1a4a4521a1c7973..2f33c1e33634227b0d35906bff85cbdb6dffc784 100644 --- a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java @@ -21,11 +21,10 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.provider.DocumentsContract; +import androidx.annotation.WorkerThread; import android.text.format.Formatter; import android.util.Log; -import androidx.annotation.WorkerThread; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.applications.StorageStatsSource; diff --git a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java index 694c95c4726be38acaaf5ae179807e431304a251..6b7c8d6ce07b71a0936205efcc48bcdc9bcb3717 100644 --- a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java @@ -20,11 +20,10 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.UserHandle; +import androidx.annotation.WorkerThread; import android.text.format.Formatter; import android.util.Log; -import androidx.annotation.WorkerThread; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.applications.StorageStatsSource; diff --git a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java index 6ef45935d4a3c76a912cd672428cd4b556977f12..3fc3c1dbf4d405a91b57f02d9d0f7ec1ea726a8c 100644 --- a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java +++ b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.applications.manageapplications; import android.content.Context; import android.os.Bundle; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java index 1cc0bddaee7e935edf4308a3327f17df0ef1199f..a16ab7839b5be4c1ee14265581a0c5e8b0a8f168 100644 --- a/src/com/android/settings/backup/BackupSettingsActivity.java +++ b/src/com/android/settings/backup/BackupSettingsActivity.java @@ -23,11 +23,11 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.settings.R; + import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java index 33da8eae72aaf94d0416cf8acd4d0ec6b0baed8e..e9bcc6fe9ec53d3ac77198bd1867f9ea4a1f7470 100644 --- a/src/com/android/settings/backup/BackupSettingsFragment.java +++ b/src/com/android/settings/backup/BackupSettingsFragment.java @@ -21,6 +21,7 @@ import android.os.Bundle; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java index 5f8ff9e8f60295b75395192803730b851afbe132..15f1dab92f36e0062a64fcccee6ace76439e7170 100644 --- a/src/com/android/settings/backup/BackupSettingsHelper.java +++ b/src/com/android/settings/backup/BackupSettingsHelper.java @@ -24,9 +24,8 @@ import android.content.Intent; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.settings.R; import com.android.settings.Settings.PrivacySettingsActivity; diff --git a/src/com/android/settings/backup/BackupSettingsPreferenceController.java b/src/com/android/settings/backup/BackupSettingsPreferenceController.java index 2a657eabb9fd93b78b7406bccb3583ec9d62d7e2..ec0c011585cd777c256a050a7dcd1a3fa0600d40 100644 --- a/src/com/android/settings/backup/BackupSettingsPreferenceController.java +++ b/src/com/android/settings/backup/BackupSettingsPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.backup; import android.content.Context; import android.content.Intent; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java index d6dea8bd597b83aae2d57826c1f860a50cc4cf32..d7ff0e6de9e723cb5b562163eb64278e6c835f16 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -9,13 +9,12 @@ import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; import android.provider.Settings; -import android.util.Log; -import android.view.View; -import android.widget.TextView; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; +import android.util.Log; +import android.view.View; +import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/bluetooth/AlwaysDiscoverable.java b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java index 20f1f12e256a88fec3535d8dc964af4c2992d3f3..6f74b54b99b6296bcbd85a3aa3aca208f254e06d 100644 --- a/src/com/android/settings/bluetooth/AlwaysDiscoverable.java +++ b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java @@ -21,11 +21,15 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; - +import android.os.Handler; import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; +import java.util.Timer; +import java.util.TimerTask; + /** Helper class, intended to be used by an Activity, to keep the local Bluetooth adapter in * discoverable mode indefinitely. By default setting the scan mode to * BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE will time out after some time, but some diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java index 084b502a03dcf2eed09e2f79b44e02196bf99122..930d9ff7d9e988d3c7e57270a17a4f427eceab3d 100644 --- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java @@ -18,15 +18,14 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; -import android.util.Log; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; +import android.util.Log; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import androidx.preference.Preference; /** * Controller to maintain available media Bluetooth devices diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java index ede0b834170884fd399879f6f2e4705c2c73a25f..20806458cb64955cae61db40bac47a62d38b247b 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import android.content.Context; - import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java index c68656c38bfa37df6450cb3a75d31e0155a92aa1..6ea49a6236d9d400e4a535f80c7f7247c5ca3245 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import android.content.Context; - import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index c445edf8b81a54cafcc137734473cf6ddf4c80f0..aff314b9b254ae97a91bbbecb6fd46028f9e5ce0 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -19,18 +19,18 @@ package com.android.settings.bluetooth; import android.content.Context; import android.graphics.drawable.Drawable; import android.util.Log; -import android.util.Pair; - import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; +import android.util.Pair; +import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import com.android.settingslib.core.lifecycle.Lifecycle; /** * This class adds a header with device name and status (connected/disconnected, etc.). diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java index 082ea9f05fa07662a67047c327b11ed59211b527..72effe49271ac45cbd7b7b81760da937888dea03 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import android.content.Context; - import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java index 0285fec08c5a74a6da8e6c9b4a6f660c7216ab47..90723540b5c2acf8573b5ad44fac8ba8b2285df3 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java @@ -19,14 +19,13 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceFragment; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index 71231b3b826a51a994daf61402361dc5fbabb2ba..630c2c57c7add65aa9e41ef2a1c113d2538672d5 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -21,12 +21,11 @@ import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java index 95466501f1b90a82beb11519e9238018d758534d..61bed17fe421a11c05cc214bcb1f7bc8b4b4a43d 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java @@ -21,13 +21,12 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.text.BidiFormatter; -import android.text.TextUtils; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.BidiFormatter; +import android.text.TextUtils; +import android.util.Log; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index e344df083479399fce20cc2048200ba33b89fcbb..39a14add55432066bbfeb3f25c8477117597483f 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -16,8 +16,6 @@ package com.android.settings.bluetooth; -import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; - import android.app.AlertDialog; import android.bluetooth.BluetoothDevice; import android.content.Context; @@ -25,15 +23,14 @@ import android.content.DialogInterface; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.Html; import android.text.TextUtils; import android.util.Pair; import android.util.TypedValue; import android.widget.ImageView; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -41,6 +38,8 @@ import com.android.settings.widget.GearPreference; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; + /** * BluetoothDevicePreference is the preference type used to display each remote * Bluetooth device in the Bluetooth Settings screen. diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java index a217b87f5a30da71b10721cc6e6bf81e8dcfc0dd..3b07bd3cd209e71a3445b946ac1d4126a7118578 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.bluetooth; import android.app.Fragment; import android.content.Context; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java index 65fd15c904b648762e5fbda3921bf84ae48763a0..71335c7fe798910e0a843e81d58cb97cac2b625e 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java @@ -19,9 +19,9 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.util.Log; import com.android.settings.R; import com.android.settings.connecteddevice.DevicePreferenceCallback; diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java index 0ab45bb2471497a917f424817e8f905d744cc1b5..189df3a4998632d8a8a38120cc5c397c82cfea6c 100755 --- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java @@ -24,9 +24,8 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.os.Handler; import android.os.SystemProperties; -import android.util.Log; - import androidx.preference.Preference; +import android.util.Log; import com.android.settings.R; import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver; diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java index 3f566f0373a4589dca98f9647c27ad3654f17e33..8ce701748c15591a9c9583523f4126e8b8ce6f82 100644 --- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java @@ -16,10 +16,9 @@ package com.android.settings.bluetooth; +import android.content.pm.PackageManager; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java index 0eb974628876ccf77e2494555a547767f008b404..85abadeddcc3e8ff99c828556d52fdef69b7aad8 100644 --- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java @@ -29,6 +29,7 @@ import android.text.TextWatcher; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; +import android.view.WindowManager; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.Button; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java index ef5648cf56478dd55ae9c8fc38519ed02b474c3e..5120cc0ff9bd7708f3f99ac90bd811788c43b1e6 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java @@ -23,12 +23,10 @@ import android.text.Editable; import android.util.Log; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; - import com.android.settings.R; import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfile; - import java.util.Locale; /** diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java index 23ff044f619dc6923e401a762621acbd80a96770..b3f60967c494649f2804fa68f22255f8f5f50f45 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -22,9 +22,8 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index 813300597e327442287ee57f8fc656b36dc4bce4..f1960e8b18af2321c71154de55feca996b59f0ee 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; - import androidx.annotation.VisibleForTesting; /** diff --git a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java index 0ce00deb1fdcf479ccb6b594fb11f45fccd55a10..3d8d038ddfadb9bbc2b62bdfe7a6d9d25f81709b 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java index 7da63428c726448157802c0208f1f697ea0fb305..4d02fd50c3116c0db3a62c00dc2c4a4bacc4c621 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java @@ -20,6 +20,7 @@ import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.res.Resources; import android.os.PowerManager; import android.os.UserHandle; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java index d93a7989525b5c5df94815e4af84058a4435591c..4fedb6d4f32619679bd305e4128fa1fa072f2c26 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingService.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java @@ -17,15 +17,15 @@ package com.android.settings.bluetooth; import android.app.Notification; -import android.app.NotificationChannel; import android.app.NotificationManager; +import android.app.NotificationChannel; import android.app.PendingIntent; import android.app.Service; import android.bluetooth.BluetoothDevice; +import android.content.IntentFilter; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.res.Resources; import android.os.IBinder; import android.text.TextUtils; diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java index 83ddbd3f611555c25e35e692ad88f6353d904c3a..21e8fb8c93d00cdce2929bcf6761989e6a42b675 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java @@ -23,13 +23,12 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; +import androidx.preference.Preference; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.TextView; -import androidx.preference.Preference; - import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; import com.android.settings.R; diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index f89b1f410ca7b166d0cc8fd314171db56e11b9d0..7a731ec2033b1df76c98cf9edc301901ef8ff6cd 100644 --- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java +++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java @@ -26,11 +26,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.Uri; import android.provider.SettingsSlicesContract; - import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -41,6 +37,10 @@ import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + public class BluetoothSliceBuilder { private static final String TAG = "BluetoothSliceBuilder"; diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java index 4a5d78fccf02676e4a64483822b5728e087c53ae..62fc4eff558b37b239d31dffcb04646b2e4ff7b5 100644 --- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java @@ -19,9 +19,8 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; @@ -30,6 +29,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import java.util.Collection; import java.util.Set; /** diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java index 77e00f715b287bb1ead774810763ecf4ff1e5b29..c22aa5a2ffe56d567a3bc705f6eda601c17733dd 100644 --- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java @@ -19,10 +19,9 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.util.Log; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java index baad9aeb6d8fc20c6b6b5c6bd1c888045dd24797..688fd27e4152211e28f1365e8f8fc901870ed00e 100644 --- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java +++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java @@ -20,13 +20,12 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.os.Bundle; import android.os.SystemProperties; -import android.text.BidiFormatter; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; +import android.text.BidiFormatter; +import android.util.Log; import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java index 6c2876db215d2f67d4a5e883498ab005227e7412..3a6865355ed713c39b43adc343108472fe045897 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -25,11 +25,10 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; import android.view.Menu; import android.view.MenuInflater; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java index 6098014f63a8049b34edde4954e43849c63c2f09..d6cdb239d4abcb40a6ff0c321f6e16d9a36d31ff 100644 --- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java +++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java @@ -23,6 +23,7 @@ import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; import android.text.Html; import android.text.TextUtils; import android.util.Log; @@ -34,8 +35,6 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java index 2a659013eb686a80019e8988db97a9d21ce32dba..19eb2005f1c3e82cd5a65d16304db0f7b700ad75 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; +import android.app.QueuedWork; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Configuration; diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java index aaa7b507f715a026f42b1382f3b0ce139b437553..3ba38448e273398d816839de544c96663c4e2041 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java +++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java @@ -21,12 +21,18 @@ import android.app.admin.DevicePolicyManager; import android.bluetooth.BluetoothAdapter; import android.content.DialogInterface; import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserManager; +import androidx.annotation.NonNull; +import android.text.TextUtils; import android.util.Log; import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; +import com.android.internal.util.ArrayUtils; +import com.android.internal.util.CharSequences; import com.android.settings.R; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java index a70bc94cb316bd4f4cdc208d91e14447f4029d81..1dfa6472e61077e47161bf4b9874682d17bf9523 100644 --- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java @@ -18,14 +18,14 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import androidx.preference.Preference; +import android.util.Log; /** * Maintain and update saved bluetooth devices(bonded but not connected) diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java index f125f6f84768532ab80ec3bde91a079c551e8d8f..daaac314fb1284299e3de065b54c8cd21ab8c8f2 100755 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -22,9 +22,8 @@ import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.DialogInterface; import android.provider.Settings; -import android.widget.Toast; - import androidx.annotation.VisibleForTesting; +import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java index 3239dd5b32f30b753074f3d9b1b4e30eb5174ec8..9730515343d73f4267f643691a752ed7b17d66ab 100644 --- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java @@ -21,12 +21,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.R; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java index 26c3e34555847e965177937b43d4a1e0e9854209..b089b4a93509b24493c8a763042a70de5ee73e50 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java @@ -17,9 +17,7 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.nfc.NfcPreferenceController; diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java index 8db49068aa2406cd2cc25d7fce5ca39505a7cb90..f94e81a6d4e59c75094caadc28ec8d7f2a932b04 100644 --- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java @@ -19,18 +19,16 @@ import static com.android.settingslib.Utils.isAudioModeOngoingCall; import android.content.Context; import android.content.pm.PackageManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; - -import com.android.settings.R; import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.Utils; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.R; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index c4c9369eddcd1fb88e6e0bb3fa614886dad6b9a0..b30aff132943f4c9ad56f91e459bdd4b40dcf8ba 100644 --- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java @@ -19,14 +19,17 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothManager; import android.content.Context; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController; import com.android.settings.bluetooth.BluetoothSwitchPreferenceController; +import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.TogglePreferenceController; import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.location.ScanningSettings; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 60dd14b2140b547a7b2a7cec81dda1bb72037867..cf6bd1392c16f17f9ecc2035ac703cb66fc344c7 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -18,13 +18,13 @@ package com.android.settings.connecteddevice; import android.app.Activity; import android.content.Context; import android.provider.SearchIndexableResource; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; +import com.android.settings.nfc.NfcPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java index 2b8fefadca723f03ed235d9624fac309758dd0db..aa0b6cd54fd355a2465619b198a5c0b7444c1af3 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java @@ -15,9 +15,8 @@ */ package com.android.settings.connecteddevice; -import android.content.Context; import android.content.pm.PackageManager; - +import android.content.Context; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; @@ -32,9 +31,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.DockUpdaterFeatureProvider; import com.android.settings.overlay.FeatureFactory; -import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import com.android.settingslib.core.lifecycle.LifecycleObserver; /** * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java index 3d84348dc5d5df6590f6efe022883b9a6a40527c..cafc0a3dc234d2886cd38ad27489673011f99672 100644 --- a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java +++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java @@ -22,22 +22,21 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; -import androidx.preference.PreferenceScreen; - import com.android.internal.annotations.VisibleForTesting; -import com.android.settings.R; import com.android.settings.bluetooth.AlwaysDiscoverable; import com.android.settings.bluetooth.Utils; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.R; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixin; diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java index c1dd6ed127cf5f9fa383ff0821ddc837ffb29235..195daf372ff97492b7541919ee4fe6210bbcdaff 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java @@ -17,7 +17,6 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.res.Resources; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java index 23598a0399f35019df363ee6d6adbb3b28a4fbe1..05506a171adefeaa5fa0052fbdd6fbe812462887 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java @@ -17,15 +17,16 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.pm.PackageManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; +import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; @@ -35,10 +36,14 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc private Preference mPreference; private BluetoothDeviceUpdater mBluetoothDeviceUpdater; + private DockUpdater mSavedDockUpdater; private int mPreferenceSize; public PreviouslyConnectedDevicePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); + + mSavedDockUpdater = FeatureFactory.getFactory( + context).getDockUpdaterFeatureProvider().getSavedDockUpdater(context, this); } @Override @@ -60,12 +65,14 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc @Override public void onStart() { mBluetoothDeviceUpdater.registerCallback(); + mSavedDockUpdater.registerCallback(); updatePreferenceOnSizeChanged(); } @Override public void onStop() { mBluetoothDeviceUpdater.unregisterCallback(); + mSavedDockUpdater.unregisterCallback(); } public void init(DashboardFragment fragment) { @@ -90,6 +97,11 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc mBluetoothDeviceUpdater = bluetoothDeviceUpdater; } + @VisibleForTesting + void setSavedDockUpdater(DockUpdater savedDockUpdater) { + mSavedDockUpdater = savedDockUpdater; + } + @VisibleForTesting void setPreferenceSize(int size) { mPreferenceSize = size; diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java index 81390a797c2d896e1fc7ce712debb687e63fb6b5..4bc9cdd637f398165830a677d50e49ddb58401fb 100644 --- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java @@ -15,9 +15,8 @@ */ package com.android.settings.connecteddevice; -import android.content.Context; import android.content.pm.PackageManager; - +import android.content.Context; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/connecteddevice/dock/DockUpdater.java b/src/com/android/settings/connecteddevice/dock/DockUpdater.java index 7be79ed1503b280d573747db8ee4c46b29f89b9d..19ee732417986b80f2bb0e14f3a53bdbdd45ad90 100644 --- a/src/com/android/settings/connecteddevice/dock/DockUpdater.java +++ b/src/com/android/settings/connecteddevice/dock/DockUpdater.java @@ -15,6 +15,8 @@ */ package com.android.settings.connecteddevice.dock; +import android.content.Context; + /** * Update the dock devices. It notifies the upper level whether to add/remove the preference * through {@link DevicePreferenceCallback} diff --git a/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java b/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java index 7caaae609eef728fac16ab737c33cbf41f4a91c6..7cd2d508519865c009553cc3af1021f5b24e4b66 100644 --- a/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java +++ b/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java @@ -3,6 +3,7 @@ package com.android.settings.connecteddevice.dock; import android.content.Context; import com.android.settings.connecteddevice.DevicePreferenceCallback; +import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.overlay.DockUpdaterFeatureProvider; /** diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java index be253e1cbc6e89e77202b059547a9d28d0daac67..90df30880f0df0afc881967c2b0e81a059efe855 100644 --- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java @@ -18,7 +18,6 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java index f68a4a07f4388f229372fda9dcd44cbaf51bc830..e030757f4de549d0e4352e68339ac247a8e6db78 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java +++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java @@ -24,7 +24,6 @@ import android.hardware.usb.UsbPortStatus; import android.net.ConnectivityManager; import android.os.UserHandle; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; /** diff --git a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java index 1d43371a02cf8c06c5d4863ed73cb9f2da875041..1b525352d0fc9e59e2220d47a15fb61437d52f5e 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java +++ b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java @@ -24,8 +24,8 @@ import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPortStatus; import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import com.android.settingslib.core.lifecycle.events.OnPause; /** * Receiver to receive usb update and use {@link UsbConnectionListener} to invoke callback diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java index e7544e3a04ddd4429e709a1b8166544f69e33257..cb54216649a0d7a55b634cb10c26ed387f637235 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java @@ -18,7 +18,6 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.os.Handler; - import androidx.annotation.UiThread; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java index 84576b14252f464f4a72aa82c573e68b8861e4be..2e336e48960faddec40640f7a9d0cf26564f4ca9 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java @@ -18,7 +18,6 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbPort; - import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index 1217a34d64886947e6f742ab11a62c61a1938b5d..0ef01d9f9c81b5fd2539ab2893740ba9bb98e616 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -18,7 +18,6 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.provider.SearchIndexableResource; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java index e30237dd37b49eb5e499b3760e4cdf1f7a14ae02..8ae334c3a8fe01838f3785aba73978f73b6732bf 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java @@ -19,7 +19,6 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; - import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java index 0e1811d70edc4fcd5b77dc9f8e9c09c19e021bff..c569e1f9bd2efd48320e24fb5f4633ff9a198843 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java @@ -17,7 +17,6 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; - import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java index 30314f6e2caf1f11709e52cf6de72dc4560e8a54..ae21601e780ad3ff650db42484d4df5b576b56d9 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java @@ -18,12 +18,11 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbPort; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java index 3c5271845943ef54bc518728499314c7b7f39697..64b24772035440cfcfa94fa912b217c8f43ea1f4 100644 --- a/src/com/android/settings/core/BasePreferenceController.java +++ b/src/com/android/settings/core/BasePreferenceController.java @@ -19,9 +19,6 @@ import android.content.IntentFilter; import android.text.TextUtils; import android.util.Log; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.search.ResultPayload; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.slices.SliceData; @@ -33,6 +30,10 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + /** * Abstract class to consolidate utility between preference controllers and act as an interface * for Slices. The abstract classes that inherit from this class will act as the direct interfaces diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java index 12584e2f999d771a5004b1b823228308d1205b8e..3a3c3d9e19009d1a7dbe8c2cc967bf4264f17f84 100644 --- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java @@ -18,11 +18,10 @@ package com.android.settings.core; import android.content.Context; import android.os.Bundle; -import android.text.TextUtils; -import android.util.Log; - import androidx.annotation.XmlRes; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.util.Log; import com.android.settings.overlay.FeatureFactory; import com.android.settings.survey.SurveyMixin; diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java index 96399f68b5f0ce5cc3fc9253d5c7090b23c4775f..a0534ab48ce4a94ae384a208f2bef637d508745d 100644 --- a/src/com/android/settings/core/PreferenceXmlParserUtils.java +++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java @@ -23,15 +23,14 @@ import android.content.Context; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.os.Bundle; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; import android.util.Xml; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import org.xmlpull.v1.XmlPullParser; diff --git a/src/com/android/settings/core/SliderPreferenceController.java b/src/com/android/settings/core/SliderPreferenceController.java index 0ea6be3073808b21d7cd4538ef725e9993bd3d69..65c71eb4219361cb7d4f81604e449ee3d3188c9a 100644 --- a/src/com/android/settings/core/SliderPreferenceController.java +++ b/src/com/android/settings/core/SliderPreferenceController.java @@ -15,7 +15,6 @@ package com.android.settings.core; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.slices.SliceData; diff --git a/src/com/android/settings/core/SubSettingLauncher.java b/src/com/android/settings/core/SubSettingLauncher.java index 2dd059f387f387ef3b1bc26c6e6dc0b6fac6caa6..88fbb701d614cc505703c60dc3e7f6356f6fd645 100644 --- a/src/com/android/settings/core/SubSettingLauncher.java +++ b/src/com/android/settings/core/SubSettingLauncher.java @@ -22,9 +22,8 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; +import android.text.TextUtils; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java index 165d7eb13058376b9c591aed5397fd3012eb50de..3a199b896500cd7d878f2ab3f968cf652f67beb9 100644 --- a/src/com/android/settings/core/TogglePreferenceController.java +++ b/src/com/android/settings/core/TogglePreferenceController.java @@ -14,7 +14,6 @@ package com.android.settings.core; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index 17a295c7a600bf7f0c2405bb09c1f2b473834881..8f5d992c847646e01b72bf918d81175dc6782048 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -79,9 +79,9 @@ import com.android.settings.gestures.AssistGestureSettings; import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapScreenSettings; import com.android.settings.gestures.DoubleTwistGestureSettings; +import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.gestures.PickupGestureSettings; import com.android.settings.gestures.SwipeToNotificationSettings; -import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; import com.android.settings.inputmethod.KeyboardLayoutPickerFragment; import com.android.settings.inputmethod.PhysicalKeyboardFragment; @@ -106,8 +106,10 @@ import com.android.settings.notification.NotificationStation; import com.android.settings.notification.SoundSettings; import com.android.settings.notification.ZenAccessSettings; import com.android.settings.notification.ZenModeAutomationSettings; +import com.android.settings.notification.ZenModeMsgEventReminderSettings; import com.android.settings.notification.ZenModeBlockedEffectsSettings; import com.android.settings.notification.ZenModeEventRuleSettings; +import com.android.settings.notification.ZenModeRestrictNotificationsSettings; import com.android.settings.notification.ZenModeScheduleRuleSettings; import com.android.settings.notification.ZenModeSettings; import com.android.settings.password.ChooseLockPassword; @@ -134,6 +136,7 @@ import com.android.settings.wifi.WifiInfo; import com.android.settings.wifi.WifiSettings; import com.android.settings.wifi.calling.WifiCallingSettings; import com.android.settings.wifi.p2p.WifiP2pSettings; +import com.android.settings.wifi.tether.WifiTetherSettings; public class SettingsGateway { @@ -149,6 +152,7 @@ public class SettingsGateway { SimSettings.class.getName(), TetherSettings.class.getName(), WifiP2pSettings.class.getName(), + WifiTetherSettings.class.getName(), BackgroundCheckSummary.class.getName(), VpnSettings.class.getName(), DateTimeSettings.class.getName(), diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java index 5ce7f352b36f81484e6783c9d07155d0bfed9ae6..27b45252683465327cfdbe73253ee55822e2bc38 100644 --- a/src/com/android/settings/dashboard/DashboardAdapter.java +++ b/src/com/android/settings/dashboard/DashboardAdapter.java @@ -21,6 +21,10 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -30,11 +34,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.DiffUtil; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.R.id; diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java index f324cd4907dc253f940f339935922fabbcabdf40..2ef4abe84b12bf8d8ff9371ef24b6bde23faab06 100644 --- a/src/com/android/settings/dashboard/DashboardData.java +++ b/src/com/android/settings/dashboard/DashboardData.java @@ -18,10 +18,9 @@ package com.android.settings.dashboard; import android.annotation.IntDef; import android.graphics.drawable.Drawable; import android.service.settings.suggestions.Suggestion; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.DiffUtil; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.dashboard.conditional.Condition; diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java index 2a25c24d936503c76892fe6a374f77928e047b4b..b1f66ae4792c1528bf310b4cdd7c22371f323968 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard; import android.app.Activity; import android.content.Context; - import androidx.preference.Preference; import com.android.settingslib.drawer.DashboardCategory; diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index 397b2bfd4db12c859a058500d422cd0a80ff53f0..c98c982013d0d3f8092520e596f72aa5a4e5e64b 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -29,14 +29,13 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Icon; import android.os.Bundle; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; import android.util.Pair; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index 4cb9c8db3a48efd92eb521a26e911898ebae1366..bef66c3650ad38b799bc5a9cfb455a90710db048 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -19,15 +19,14 @@ import android.app.Activity; import android.content.Context; import android.content.res.TypedArray; import android.os.Bundle; -import android.text.TextUtils; -import android.util.ArrayMap; -import android.util.ArraySet; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.util.ArrayMap; +import android.util.ArraySet; +import android.util.Log; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/dashboard/DashboardItemAnimator.java b/src/com/android/settings/dashboard/DashboardItemAnimator.java index 51dd49eea3e83f44d6dec76b0429fa3dd5ed3cd6..73224ab2358fb4d6c375cc2e87daf3dcad7dbbcc 100644 --- a/src/com/android/settings/dashboard/DashboardItemAnimator.java +++ b/src/com/android/settings/dashboard/DashboardItemAnimator.java @@ -18,7 +18,6 @@ package com.android.settings.dashboard; import androidx.core.view.ViewCompat; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.RecyclerView.ViewHolder; - import com.android.settingslib.drawer.Tile; public class DashboardItemAnimator extends DefaultItemAnimator { diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java index 94b4e0d45e32f6cf06350ff9597af489a34b7cc5..e680afdfab3548429e30b6c58ad2b47a19f5f3fa 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -22,15 +22,14 @@ import android.content.Context; import android.os.Bundle; import android.os.Handler; import android.service.settings.suggestions.Suggestion; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.recyclerview.widget.LinearLayoutManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.recyclerview.widget.LinearLayoutManager; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; diff --git a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java index fc26e5521cd7b372c60d33d3c05cefb13616d540..7b532752866c849b0f153549de1de3957274d40e 100644 --- a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java +++ b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java index 8258678791ae1d847b37690348ec0c801cef83cd..de0b39667de5d8868031551bc69fdde72ec972a8 100644 --- a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java +++ b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java @@ -32,9 +32,9 @@ import android.os.UserManager; import android.view.View; import android.widget.TextView; +import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; -import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; /** diff --git a/src/com/android/settings/dashboard/RoundedHomepageIcon.java b/src/com/android/settings/dashboard/RoundedHomepageIcon.java index c88619d6d5421b83f93f4a48b546e38672011a82..77acaf3ec127f5a11541af845520943017eae254 100644 --- a/src/com/android/settings/dashboard/RoundedHomepageIcon.java +++ b/src/com/android/settings/dashboard/RoundedHomepageIcon.java @@ -22,7 +22,6 @@ import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; - import androidx.annotation.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java index eddad452d3cbceacd8162dd4a1bcca872771c146..a97113147ed5cecc3ee06598000a24110ae90a7c 100644 --- a/src/com/android/settings/dashboard/SummaryLoader.java +++ b/src/com/android/settings/dashboard/SummaryLoader.java @@ -25,13 +25,12 @@ import android.os.HandlerThread; import android.os.Looper; import android.os.Message; import android.os.Process; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; -import androidx.annotation.VisibleForTesting; - import com.android.settings.SettingsActivity; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.drawer.DashboardCategory; diff --git a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java index 94d89a9dfda771da872a0bde2b75c5d89b5da129..fdd1508db816aef59736f0b294df40ceb4ed6f9f 100644 --- a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java +++ b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java @@ -22,6 +22,7 @@ import android.os.PowerManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; +import com.android.settings.fuelgauge.BatterySaverDrawable; import com.android.settings.fuelgauge.BatterySaverReceiver; import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settingslib.fuelgauge.BatterySaverUtils; diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/dashboard/conditional/Condition.java index bfefe3bed743ff53c1cefbe23b190e6de7de7ecd..f3a3b9c05a58f3b398ddb56bcc266ebca99165e6 100644 --- a/src/com/android/settings/dashboard/conditional/Condition.java +++ b/src/com/android/settings/dashboard/conditional/Condition.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.IntentFilter; import android.graphics.drawable.Drawable; import android.os.PersistableBundle; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java index 4c4463105d62265b741084eb23f7323b65cebbbc..923f1241a531c71f4627388750b5ab3d992f1aff 100644 --- a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java +++ b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java @@ -16,16 +16,15 @@ package com.android.settings.dashboard.conditional; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.ItemTouchHelper; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder; diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java index 2854ebb26730684b42a9cd45e013e63aa69d978b..6bcc67e60b80fe6b88f2228a82595d3db10c8f9c 100644 --- a/src/com/android/settings/dashboard/conditional/DndCondition.java +++ b/src/com/android/settings/dashboard/conditional/DndCondition.java @@ -25,7 +25,6 @@ import android.os.PersistableBundle; import android.provider.Settings; import android.provider.Settings.Global; import android.service.notification.ZenModeConfig; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java b/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java index abe4743cb3e558081d0a3b30d1249b5b9aac516e..fc44d0de3ffdf09bd5589070ca64bdc4aa19e265 100644 --- a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java +++ b/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java @@ -16,10 +16,9 @@ package com.android.settings.dashboard.conditional; import android.content.Context; -import android.util.AttributeSet; - import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; +import android.util.AttributeSet; /** * Version of RecyclerView that can have listeners for onWindowFocusChanged. diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java index 6ddb974291ec70e28e526886ae7692f01d26222d..4a3bc334645f5987dc5fc349d27748fb46a23c55 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java @@ -23,6 +23,8 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; @@ -30,11 +32,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; +import android.widget.ImageView; import android.widget.LinearLayout; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java index f40f2b772d1f76634c2a8baa7a4e5ddbf807bfa8..ef3513c4d42784065f33db6b09b358be8f88a1d4 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java @@ -20,9 +20,8 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.service.settings.suggestions.Suggestion; -import android.util.Pair; - import androidx.annotation.NonNull; +import android.util.Pair; import com.android.settingslib.drawer.Tile; import com.android.settingslib.suggestions.SuggestionControllerMixin; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java index 20a9aeaa25ab8ab9bfe7fe3adff85aefaaf2ee67..6ff7ef3795dd768984151416c3bff8ce936ee817 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java @@ -21,11 +21,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.service.settings.suggestions.Suggestion; +import androidx.annotation.NonNull; import android.util.Log; import android.util.Pair; -import androidx.annotation.NonNull; - import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.Settings.NightDisplaySuggestionActivity; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java index 8547db0ff03912c8518c352340c8a321a9624c31..1474f83e55a8edf1517912c0109d600d98a6480c 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java @@ -25,9 +25,8 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index 7a422368b5648346419a37393a69145c46893074..79adfdab3529ec7550ed715e3a253190d51c2218 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -32,16 +32,15 @@ import android.net.TrafficStats; import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; import android.view.View; import android.widget.AdapterView; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java index 0eab5ab936bb7f63b12be39709af1752e25b8794..7595eb56a489873c54834a6a20893a6f2c06ce97 100644 --- a/src/com/android/settings/datausage/AppDataUsagePreference.java +++ b/src/com/android/settings/datausage/AppDataUsagePreference.java @@ -15,11 +15,10 @@ package com.android.settings.datausage; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.ProgressBar; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.widget.AppPreference; import com.android.settingslib.AppItem; import com.android.settingslib.net.UidDetail; diff --git a/src/com/android/settings/datausage/AppPrefLoader.java b/src/com/android/settings/datausage/AppPrefLoader.java index 9df741abd5d325c5927ac5a2cad35689978cc293..690ac2dbfcfb3515ae79205951999302d4e0173f 100644 --- a/src/com/android/settings/datausage/AppPrefLoader.java +++ b/src/com/android/settings/datausage/AppPrefLoader.java @@ -19,10 +19,8 @@ package com.android.settings.datausage; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.util.ArraySet; - import androidx.preference.Preference; - +import android.util.ArraySet; import com.android.settingslib.utils.AsyncLoader; public class AppPrefLoader extends AsyncLoader> { diff --git a/src/com/android/settings/datausage/BillingCyclePreference.java b/src/com/android/settings/datausage/BillingCyclePreference.java index d92e4f6b866af8a6a4714814de96829f57bebdf9..9ed6ea7df0eab73d62fbd02aa25c069f7fb05a0f 100644 --- a/src/com/android/settings/datausage/BillingCyclePreference.java +++ b/src/com/android/settings/datausage/BillingCyclePreference.java @@ -21,13 +21,13 @@ import android.content.Intent; import android.net.NetworkTemplate; import android.os.Bundle; import android.os.RemoteException; +import androidx.preference.Preference; import android.util.AttributeSet; import android.util.FeatureFlagUtils; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; + import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.CellDataPreference.DataStateListener; diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index de74f550aae99d3d88cfd58a44ef4ccc48255ea1..5cdf22a8970e23bbd054da3f7a97586a4a05fdc2 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -27,6 +27,8 @@ import android.content.res.Resources; import android.net.NetworkPolicy; import android.net.NetworkTemplate; import android.os.Bundle; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import android.text.format.Time; import android.util.FeatureFlagUtils; import android.util.Log; @@ -36,9 +38,6 @@ import android.widget.EditText; import android.widget.NumberPicker; import android.widget.Spinner; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index a580873741799427029e88ee76cfd2dc2e85017c..fb97cd89320eb0de4dd0d7c886072be11d9f90a0 100644 --- a/src/com/android/settings/datausage/CellDataPreference.java +++ b/src/com/android/settings/datausage/CellDataPreference.java @@ -25,6 +25,9 @@ import android.os.Looper; import android.os.Parcel; import android.os.Parcelable; import android.provider.Settings.Global; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -33,10 +36,6 @@ import android.util.Log; import android.view.View; import android.widget.Checkable; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.PreferenceViewHolder; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java index a9bcf3b5aa8d508508e4de1ef38df9c086b116d6..2a58840ed88171ad38603e88a781fb119615314e 100644 --- a/src/com/android/settings/datausage/ChartDataUsagePreference.java +++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java @@ -18,6 +18,9 @@ import android.content.Context; import android.net.NetworkPolicy; import android.net.NetworkStatsHistory; import android.net.TrafficStats; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.text.format.Formatter; @@ -25,10 +28,6 @@ import android.text.style.ForegroundColorSpan; import android.util.AttributeSet; import android.util.SparseIntArray; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.graph.UsageView; diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java index 79e4c130a0a75ef0d1228bdc973dabcd01df9162..3e29896a38362da10097ee3ece5a985f4a05eb8a 100644 --- a/src/com/android/settings/datausage/DataSaverPreference.java +++ b/src/com/android/settings/datausage/DataSaverPreference.java @@ -15,10 +15,8 @@ package com.android.settings.datausage; import android.content.Context; -import android.util.AttributeSet; - import androidx.preference.Preference; - +import android.util.AttributeSet; import com.android.settings.R; public class DataSaverPreference extends Preference implements DataSaverBackend.Listener { diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index 0be579c11c3274dbe1f8592ff1df8832570ddefe..47887b3d4937f6705d67254d0a774a3db090a9f1 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -16,9 +16,8 @@ package com.android.settings.datausage; import android.app.Application; import android.os.Bundle; -import android.widget.Switch; - import androidx.preference.Preference; +import android.widget.Switch; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/datausage/DataUsageBase.java b/src/com/android/settings/datausage/DataUsageBase.java index 5939048f7b0efa5032c23b891af92aa2015642a3..b889a2f5812681c08922de0d962e6768f2433508 100644 --- a/src/com/android/settings/datausage/DataUsageBase.java +++ b/src/com/android/settings/datausage/DataUsageBase.java @@ -33,7 +33,6 @@ import android.os.UserManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; - import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.NetworkPolicyEditor; diff --git a/src/com/android/settings/datausage/DataUsageBaseFragment.java b/src/com/android/settings/datausage/DataUsageBaseFragment.java index 512b358d6828f79ae8fd0a28f0e70f68dc603acc..e9c73ff8cc3269dc1100a2b356a37d6374da114c 100644 --- a/src/com/android/settings/datausage/DataUsageBaseFragment.java +++ b/src/com/android/settings/datausage/DataUsageBaseFragment.java @@ -34,6 +34,7 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; +import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.NetworkPolicyEditor; diff --git a/src/com/android/settings/datausage/DataUsageEditController.java b/src/com/android/settings/datausage/DataUsageEditController.java index edc30b1d4c421d81f1ac0dbb4f4baeacace1658d..adc0fe7dd01951b4427975323270c2ff4ef713a1 100644 --- a/src/com/android/settings/datausage/DataUsageEditController.java +++ b/src/com/android/settings/datausage/DataUsageEditController.java @@ -15,7 +15,6 @@ package com.android.settings.datausage; import android.net.NetworkTemplate; - import com.android.settingslib.NetworkPolicyEditor; /** diff --git a/src/com/android/settings/datausage/DataUsageInfoController.java b/src/com/android/settings/datausage/DataUsageInfoController.java index a471c39a7360e22d32e2a9d1a7a514ad0419f251..115e45e50a2e803d2fc492b721355150e776a309 100644 --- a/src/com/android/settings/datausage/DataUsageInfoController.java +++ b/src/com/android/settings/datausage/DataUsageInfoController.java @@ -15,7 +15,6 @@ package com.android.settings.datausage; import android.net.NetworkPolicy; - import com.android.settingslib.net.DataUsageController.DataUsageInfo; /** diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index 7be55f5dbe714b3ff0ebab8541fe40a6f21a2217..2ab75ee02680a14681a73d246f2f893c55c39ded 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -41,6 +41,9 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -52,10 +55,6 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.Spinner; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java index f0deb49b5f9a16d66e23613438eb3f8c8ee0d95c..9e6684c36848b8f39f3e5fa6e0408669252e3700 100644 --- a/src/com/android/settings/datausage/DataUsagePreference.java +++ b/src/com/android/settings/datausage/DataUsagePreference.java @@ -19,11 +19,10 @@ import android.content.Intent; import android.content.res.TypedArray; import android.net.NetworkTemplate; import android.os.Bundle; -import android.util.AttributeSet; -import android.util.FeatureFlagUtils; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; +import android.util.AttributeSet; +import android.util.FeatureFlagUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index 71fb5ca42f1f04347eb07e5a8d6bad6ee89a83bd..b6e72dd83d694e54eaa774475bc73f48543026d2 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -21,6 +21,9 @@ import android.content.Intent; import android.net.NetworkTemplate; import android.os.Bundle; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionPlan; @@ -32,10 +35,6 @@ import android.text.format.Formatter; import android.text.style.RelativeSizeSpan; import android.view.MenuItem; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java index 7ce968ad7c3658b06e4c4db960dc53822b428995..1818b305e33d4459964331b1cd173d966cd69dbd 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java +++ b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java @@ -23,6 +23,9 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.os.UserManager; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.text.BidiFormatter; @@ -35,10 +38,6 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SummaryPreference; diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 3a357a1da2df150885860d4285ac831cc16e4807..b687127ca6a00b32d0f5daddf9c2c2303c525339 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -22,6 +22,8 @@ import android.content.Intent; import android.graphics.Typeface; import android.net.NetworkTemplate; import android.os.Bundle; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; @@ -33,9 +35,6 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index 6338798b27c1ac3924fbf563c984cb7023976557..e973e6126f238636a7b33140f9ef7615c4585012 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java @@ -21,6 +21,9 @@ import android.content.Context; import android.content.Intent; import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.recyclerview.widget.RecyclerView; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionPlan; @@ -28,10 +31,6 @@ import android.text.TextUtils; import android.util.Log; import android.util.RecurrenceRule; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.util.CollectionUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/datausage/NetworkRestrictionsPreference.java b/src/com/android/settings/datausage/NetworkRestrictionsPreference.java index 9afc0c32ab68265095959f871c7b6553f52f419c..e4c6beddcca18c7865ec79178c4900fae445db59 100644 --- a/src/com/android/settings/datausage/NetworkRestrictionsPreference.java +++ b/src/com/android/settings/datausage/NetworkRestrictionsPreference.java @@ -16,9 +16,8 @@ package com.android.settings.datausage; import android.content.Context; import android.net.NetworkTemplate; -import android.util.AttributeSet; - import androidx.preference.Preference; +import android.util.AttributeSet; public class NetworkRestrictionsPreference extends Preference implements TemplatePreference { diff --git a/src/com/android/settings/datausage/SpinnerPreference.java b/src/com/android/settings/datausage/SpinnerPreference.java index 867930baa971406e06f64dc9244f1f7e82d4cad7..c0355b14456740cfbb7aca665a9b747a3317a79e 100644 --- a/src/com/android/settings/datausage/SpinnerPreference.java +++ b/src/com/android/settings/datausage/SpinnerPreference.java @@ -15,14 +15,12 @@ package com.android.settings.datausage; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.AdapterView; import android.widget.Spinner; - -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; public class SpinnerPreference extends Preference implements CycleAdapter.SpinnerInterface { diff --git a/src/com/android/settings/datausage/TemplatePreference.java b/src/com/android/settings/datausage/TemplatePreference.java index 158c3b67c2e39a1b9f9721d9301055681a1fdd8e..4b1cd0cf828a61e397e61c761920e1d3a9293b65 100644 --- a/src/com/android/settings/datausage/TemplatePreference.java +++ b/src/com/android/settings/datausage/TemplatePreference.java @@ -19,9 +19,9 @@ import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; import android.os.INetworkManagementService; import android.os.UserManager; +import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; - import com.android.settingslib.NetworkPolicyEditor; public interface TemplatePreference { diff --git a/src/com/android/settings/datausage/TemplatePreferenceCategory.java b/src/com/android/settings/datausage/TemplatePreferenceCategory.java index d26b9b18ae057d20e8de8657deb1129601ee9ea2..814a2595472345560929f9957c56daf94e966859 100644 --- a/src/com/android/settings/datausage/TemplatePreferenceCategory.java +++ b/src/com/android/settings/datausage/TemplatePreferenceCategory.java @@ -16,10 +16,9 @@ package com.android.settings.datausage; import android.content.Context; import android.net.NetworkTemplate; -import android.util.AttributeSet; - import androidx.preference.Preference; import androidx.preference.PreferenceCategory; +import android.util.AttributeSet; public class TemplatePreferenceCategory extends PreferenceCategory implements TemplatePreference { diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java index b6d1a30f845a681ae00c97a1c591a1f0c28e791e..7aa716c491b2c89e66034bc6b1464c1a90320e29 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -20,14 +20,13 @@ import android.app.Application; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java index 7b7e0640666713dbcb03c88b491689a53a14984c..42ea41a905a842bbd69d485e167a3711dd751ccd 100644 --- a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java @@ -19,16 +19,13 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; import android.provider.Settings.System; -import android.text.TextUtils; -import android.text.format.DateFormat; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import androidx.preference.TwoStatePreference; - +import android.text.TextUtils; +import android.text.format.DateFormat; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; - import java.util.Locale; public class AutoTimeFormatPreferenceController extends AbstractPreferenceController diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java index 3916ef27316cea9e46a37c66ad6dc582d387ffaa..22c01ec78099be8455d16d1c00644fe561b38f21 100644 --- a/src/com/android/settings/datetime/AutoTimePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java index 4426bde99f4a6d39cc3f2befd69700b86056d87a..f9a4821fa8a9921d975aa9082c3f468ef329706b 100644 --- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java index 1704bd6febdde10e446f8c4edd1fffeda36340a1..856722ca460c5404b06b3f2fadd5db9798d8562d 100644 --- a/src/com/android/settings/datetime/DatePreferenceController.java +++ b/src/com/android/settings/datetime/DatePreferenceController.java @@ -20,13 +20,12 @@ import android.app.Activity; import android.app.AlarmManager; import android.app.DatePickerDialog; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; import android.text.TextUtils; import android.text.format.DateFormat; import android.widget.DatePicker; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java index 3ad879a279a3c14104046e6d12b7d186259ed2cb..2be6b80afc663ccdcc36d565d9ffaff72869c907 100644 --- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java @@ -19,12 +19,11 @@ package com.android.settings.datetime; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import android.text.TextUtils; -import android.text.format.DateFormat; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import androidx.preference.TwoStatePreference; +import android.text.TextUtils; +import android.text.format.DateFormat; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java index 3ca26bc8a748c45bb991ff006aeeca0d3eb040f1..58173711a90f7d6abee215aa3802e0f7406c6588 100644 --- a/src/com/android/settings/datetime/TimePreferenceController.java +++ b/src/com/android/settings/datetime/TimePreferenceController.java @@ -20,12 +20,11 @@ import android.app.Activity; import android.app.AlarmManager; import android.app.TimePickerDialog; import android.content.Context; +import androidx.preference.Preference; import android.text.TextUtils; import android.text.format.DateFormat; import android.widget.TimePicker; -import androidx.preference.Preference; - import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java index 99b76f6e9b77065e9293c7809b2c245579dda31a..743cb33c73b9fc1492f32624564ccbfdc14b513e 100644 --- a/src/com/android/settings/datetime/TimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java @@ -17,10 +17,9 @@ package com.android.settings.datetime; import android.content.Context; -import android.util.FeatureFlagUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.util.FeatureFlagUtils; import com.android.settings.core.FeatureFlags; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/datetime/ZonePicker.java b/src/com/android/settings/datetime/ZonePicker.java index 5bcc2a9b3a7d502b744574b93273a99c6849fb8c..559a8b3b41727e81d20c3f21bc5957ae8cea1406 100644 --- a/src/com/android/settings/datetime/ZonePicker.java +++ b/src/com/android/settings/datetime/ZonePicker.java @@ -22,6 +22,7 @@ import android.app.AlarmManager; import android.app.ListFragment; import android.content.Context; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -32,8 +33,6 @@ import android.widget.ListView; import android.widget.SimpleAdapter; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java index dd8481de3622d551e4970fc4fdd9ad2cb7d4ab2d..1a868b8f296f14db65d07784ea591c30e1612a1b 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java @@ -17,6 +17,11 @@ package com.android.settings.datetime.timezone; import android.icu.text.BreakIterator; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -24,12 +29,6 @@ import android.view.ViewGroup; import android.widget.Filter; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.R; import com.android.settings.datetime.timezone.BaseTimeZonePicker.OnListItemClickListener; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java index 1ed851674ea3869b0df6f91227ed1d24c7c08da2..83b85c0704599d92e21ff10b3ef71977e6d6b47d 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java @@ -23,7 +23,6 @@ import android.content.res.Resources; import android.icu.text.DateFormat; import android.icu.text.SimpleDateFormat; import android.icu.util.Calendar; - import androidx.annotation.Nullable; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java index 887b9f2af99517fb457f786123b59849b3e2628a..6d93ac91de24dabaa4710c1c9015396807fdbe89 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java @@ -17,6 +17,9 @@ package com.android.settings.datetime.timezone; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -27,9 +30,7 @@ import android.widget.LinearLayout; import android.widget.SearchView; import android.widget.TextView; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.datetime.timezone.model.TimeZoneData; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java index 8a0d73708ca6ee3bbe5cae02bd6bf6f7ea18f48e..3e731f62715b469cefbdb157db2d3791afaac562 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.datetime.timezone; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/datetime/timezone/RegionPreferenceController.java b/src/com/android/settings/datetime/timezone/RegionPreferenceController.java index 53959a69514ed2b718fec325076bed038528b5eb..efb3e4def7af61942bb58dae26c56cb57cdfc6aa 100644 --- a/src/com/android/settings/datetime/timezone/RegionPreferenceController.java +++ b/src/com/android/settings/datetime/timezone/RegionPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import android.content.Context; import android.icu.text.LocaleDisplayNames; +import androidx.preference.Preference; import java.util.Locale; diff --git a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java index 0abf4e49a54d18e3a7ad6be491e6677c466b3540..e660c330648f2d22505e158f91b552ce6334c739 100644 --- a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java +++ b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java @@ -21,9 +21,8 @@ import android.content.Intent; import android.icu.text.Collator; import android.icu.text.LocaleDisplayNames; import android.os.Bundle; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/RegionZonePicker.java b/src/com/android/settings/datetime/timezone/RegionZonePicker.java index 83d71f1c8d246b4c332e1da8867ba4d7bae7f4a5..7a3378acb5e6273239dd3e003dcfea1e2f849b2b 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePicker.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePicker.java @@ -21,10 +21,9 @@ import android.icu.text.Collator; import android.icu.text.LocaleDisplayNames; import android.icu.util.TimeZone; import android.os.Bundle; -import android.util.Log; - import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java index a297ce6085168f67603dc39391dd6910dfdcca25..79539c3577259c55f57200aed3478707f920c15b 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.datetime.timezone; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java index a819f101a87f1a8d73c61bc5be2e4efb1071341d..413458db90cf5f44ed37aa176b377d7a4b492b97 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java @@ -24,7 +24,6 @@ import android.icu.util.BasicTimeZone; import android.icu.util.Calendar; import android.icu.util.TimeZone; import android.icu.util.TimeZoneTransition; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java index a20cdb5d41e9a6d0aa99125419edea583a5cd8ef..354889965844b435b006a0ec04211c0003291427 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java @@ -23,14 +23,13 @@ import android.content.Intent; import android.content.SharedPreferences; import android.icu.util.TimeZone; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceCategory; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceCategory; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java index 1f6fb6b24c73691bc2b179513d2e1cf6b577a92c..f7d46d1c433c5b443bbe451957ce24e7aa2d60da 100644 --- a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java +++ b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java @@ -19,8 +19,8 @@ package com.android.settings.deletionhelper; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; +import android.content.DialogInterface; import android.os.Bundle; - import com.android.settings.R; /** diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java index d11e68b64a44b5006f4ca4216e34e8f00aa516e8..92aa61246fa9677d2d60ca25ac2b0144af91ee7a 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java @@ -16,11 +16,10 @@ package com.android.settings.deletionhelper; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.text.format.DateUtils; -import android.text.format.Formatter; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.format.DateUtils; +import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index 20ac6ea5a86a0d3609da86624b484aa53606e16e..9e41e62a4e140a5b6cae1c897ade65fc7fe1f77d 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -20,13 +20,12 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java index e7cddf36e96e890da1d3f7c7cd575d257c515ee1..011deffc95073c10e55cc528d343c642a4bab0ca 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java @@ -20,15 +20,14 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import android.widget.Switch; - import androidx.preference.Preference; +import android.widget.Switch; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.widget.SwitchBar; -import com.android.settingslib.Utils; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import com.android.settingslib.Utils; /** Handles the logic for flipping the storage management toggle on a {@link SwitchBar}. */ public class AutomaticStorageManagerSwitchBarController diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java index 0f21deebf0d2404ce39567385cf4a9dbc56442d2..9608f17da10b010a015fffa0d1b4e0c88cde0f58 100644 --- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java +++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java @@ -21,7 +21,6 @@ import android.bluetooth.BluetoothCodecConfig; import android.bluetooth.BluetoothCodecStatus; import android.bluetooth.BluetoothDevice; import android.content.Context; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/AdbPreferenceController.java b/src/com/android/settings/development/AdbPreferenceController.java index 468c5bdd5c9743e2d0b78600ec7fa72aac1d940e..86622eec5a75711212ed2e2a1239886607ddeba2 100644 --- a/src/com/android/settings/development/AdbPreferenceController.java +++ b/src/com/android/settings/development/AdbPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.development; import android.content.Context; - import androidx.annotation.Nullable; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java index 14474f29785eafa3852b6ca08ac17310ecaabe43..c785bb67e24227cdcc3997cb8ae52dd56ccbe1cf 100644 --- a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java +++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java index 766352a6caeea750eab6641011899f370e5c1f27..35943951db4b18697af9849187fe3a5df943d05f 100644 --- a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java +++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java @@ -19,11 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; -import android.view.IWindowManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java index 15e26633439a299de8a1cce76659db07df8ee60e..19db369d285a9bad2a25cdea2d54e647f0d5a792 100644 --- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java +++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java @@ -17,10 +17,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java index 690d079257c2efe0a0ae0204be08b6caff75bffb..7333aad656aed3e6a912f96e1fdcc9a94640dd32 100644 --- a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java +++ b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java @@ -20,7 +20,6 @@ import android.app.ActivityManager; import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java index 0fcec05bd43f8a3a0a5622c4461d4fd1a87af072..96d2f5f42ce53d5d98fdbb7cc191a0d138a1ad7e 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; - -import androidx.preference.Preference; +import androidx.annotation.VisibleForTesting; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java index d315517566cc77664d782dc8c27fe1b829385061..6fe03dd1fe8b9fb0be7af83c8232646954712a66 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java @@ -19,6 +19,7 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; import android.app.FragmentManager; +import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.os.PowerManager; diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java index 77f0f507f8eaccb12dc986352371e6e7f6f1cb26..4ea2456f46fbfcb0a09f9566643b3b4902941a7b 100644 --- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java +++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java index 136ddad5fcf9c54c7430e53e0854f1b7e7ec6776..688f125d1a698db60f6d4a8c95e23b262b7cbba3 100644 --- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java +++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java @@ -18,11 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java index 849e981981b38aafd7416f16174bc8e020b968ce..3e913bdfca14f12cd688ff6e89a1110f3689034a 100644 --- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java +++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java index ee6af1c8785f136e106099a8fd7a79635b0ae9ea..6ad3689334a0838ad50fe4b19f42aa9fc1670ce5 100644 --- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java +++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java index c92fe90a93653c01f99af99a22b26d0f596bf215..4b1bf5cb292358a7809d878590e86a7bb8aab8ab 100644 --- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java +++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java index 99ced77325521f5afe35ef9e3f5bb597a4a2fea7..22b9f2b86ae8e9939dd7849bd495308b90bcd1c8 100644 --- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java +++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.development; import android.content.Context; import android.os.UserManager; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java index bc33a7c7b08bd93c2aeb21ee63d01f573100d882..74f879462c2e7c795b5268e4c09c2036798ec4a4 100644 --- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java +++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import android.text.TextUtils; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java index ce23e3fc03c1cac27035c82b17aaa1efa5588a33..9598b377f9770ecf374d29bbface2309d3ffabd1 100644 --- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java +++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java @@ -22,12 +22,11 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.UserManager; -import android.text.TextUtils; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.util.Log; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/ColorModePreference.java b/src/com/android/settings/development/ColorModePreference.java index 9e5666ef22eba98ece03257780d94ad981db8eaa..54ca4687850fbe1a8a17e5034d6d471ec3a47448 100644 --- a/src/com/android/settings/development/ColorModePreference.java +++ b/src/com/android/settings/development/ColorModePreference.java @@ -21,11 +21,10 @@ import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager.DisplayListener; import android.os.Handler; import android.os.Looper; +import androidx.preference.SwitchPreference; import android.util.AttributeSet; import android.view.Display; -import androidx.preference.SwitchPreference; - import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java index 54df6badb0249420d57d459fee76f791a9af60fc..ae459acbcabf27290faf4b6d807405c8cfe7ff4c 100644 --- a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java +++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java @@ -18,11 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import android.widget.Toast; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.widget.Toast; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/DarkUIPreferenceController.java b/src/com/android/settings/development/DarkUIPreferenceController.java index dc5eeb1fc53949b56a0410ca56ae151f77e48d50..fc457716bc607adfc1a7d127cc90a194b91c5266 100644 --- a/src/com/android/settings/development/DarkUIPreferenceController.java +++ b/src/com/android/settings/development/DarkUIPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.development; import android.app.UiModeManager; import android.content.Context; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java index da4b94b15936d4fd3c10e3598e8e25547a9dfa10..9b3f1d834710b1fa0c36f597effb0e8aa2b66c99 100644 --- a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java +++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java @@ -18,11 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import android.text.TextUtils; -import android.view.ThreadedRenderer; - import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.text.TextUtils; +import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java index 8f15c8697b6cf11b4fdc9ee463489fd7f953ac80..03e3dab18e94451a2bfc933316b5ba23dc2d4f55 100644 --- a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java +++ b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java @@ -18,11 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import android.text.TextUtils; -import android.view.ThreadedRenderer; - import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.text.TextUtils; +import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java index 04d819c86a68ed1cb37de7c6e9e54e40b88d6cbe..8950b86bdcd92330b2a94fbdb786ee30597478b9 100644 --- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java +++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index a7cd761c066423b594cb923a704c48f3dabe1a46..8518c7446eb328841323b2f57f3d5f83fc0e1809 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -28,15 +28,14 @@ import android.content.IntentFilter; import android.os.Bundle; import android.os.UserManager; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Switch; -import androidx.annotation.VisibleForTesting; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java index f10e171c8c7832df32b90e3796d9f412a4dac010..5ecb67633dd725cd3d8e11fc278ee60a9e5631a3 100644 --- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java +++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java index 8ad61e55eaa5df117f284e76105f7e8faeea0b33..3d551cdefafe897530a103b64dd51b61f7e4c3bc 100644 --- a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java +++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java @@ -19,21 +19,18 @@ package com.android.settings.development; import static android.os.UserHandle.USER_SYSTEM; import android.content.Context; -import android.content.om.IOverlayManager; -import android.content.om.OverlayInfo; import android.content.pm.PackageManager; -import android.os.RemoteException; -import android.os.ServiceManager; -import android.text.TextUtils; -import android.view.DisplayCutout; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.view.DisplayCutout; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.wrapper.OverlayManagerWrapper; +import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import java.util.List; @@ -44,7 +41,7 @@ public class EmulateDisplayCutoutPreferenceController extends private static final String KEY = "display_cutout_emulation"; - private final IOverlayManager mOverlayManager; + private final OverlayManagerWrapper mOverlayManager; private final boolean mAvailable; private ListPreference mPreference; @@ -52,7 +49,7 @@ public class EmulateDisplayCutoutPreferenceController extends @VisibleForTesting EmulateDisplayCutoutPreferenceController(Context context, PackageManager packageManager, - IOverlayManager overlayManager) { + OverlayManagerWrapper overlayManager) { super(context); mOverlayManager = overlayManager; mPackageManager = packageManager; @@ -60,8 +57,7 @@ public class EmulateDisplayCutoutPreferenceController extends } public EmulateDisplayCutoutPreferenceController(Context context) { - this(context, context.getPackageManager(), IOverlayManager.Stub - .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE))); + this(context, context.getPackageManager(), new OverlayManagerWrapper()); } @Override @@ -106,14 +102,10 @@ public class EmulateDisplayCutoutPreferenceController extends } final boolean result; - try { - if (TextUtils.isEmpty(packageName)) { - result = mOverlayManager.setEnabled(currentPackageName, false, USER_SYSTEM); - } else { - result = mOverlayManager.setEnabledExclusiveInCategory(packageName, USER_SYSTEM); - } - } catch (RemoteException re) { - throw re.rethrowFromSystemServer(); + if (TextUtils.isEmpty(packageName)) { + result = mOverlayManager.setEnabled(currentPackageName, false, USER_SYSTEM); + } else { + result = mOverlayManager.setEnabledExclusiveInCategory(packageName, USER_SYSTEM); } updateState(mPreference); return result; @@ -153,17 +145,13 @@ public class EmulateDisplayCutoutPreferenceController extends } private OverlayInfo[] getOverlayInfos() { - List overlayInfos; - try { - overlayInfos = mOverlayManager.getOverlayInfosForTarget("android", USER_SYSTEM); - for (int i = overlayInfos.size() - 1; i >= 0; i--) { - if (!DisplayCutout.EMULATION_OVERLAY_CATEGORY.equals( - overlayInfos.get(i).category)) { - overlayInfos.remove(i); - } + @SuppressWarnings("unchecked") List overlayInfos = + mOverlayManager.getOverlayInfosForTarget("android", USER_SYSTEM); + for (int i = overlayInfos.size() - 1; i >= 0; i--) { + if (!DisplayCutout.EMULATION_OVERLAY_CATEGORY.equals( + overlayInfos.get(i).category)) { + overlayInfos.remove(i); } - } catch (RemoteException re) { - throw re.rethrowFromSystemServer(); } return overlayInfos.toArray(new OverlayInfo[overlayInfos.size()]); } diff --git a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java index 6348d623e19dec08f3d602fdb9d0eee1c26c1c2c..86663682d62ce7fdb8a120f76dc9fd281c3ed2a6 100644 --- a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java +++ b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; +import androidx.annotation.VisibleForTesting; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java index 163605fb1759abb4b8dd03568cc0fd254074abd0..9882975ff6bd002a09069349fb4ec290d9e35bff 100644 --- a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java +++ b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java index a0628b0f6377052141961230ff62210aa3d8963f..f8326abf313a7c9dad94d0e4d4d2d5b4cbb96da1 100644 --- a/src/com/android/settings/development/FileEncryptionPreferenceController.java +++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java @@ -21,10 +21,9 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.storage.IStorageManager; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java index fa9761af3ce90e39effff2c87d5e1a9475642888..82ab190551bb9b644cdcdb54057b1a0635d0e192 100644 --- a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java +++ b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java index be6efca8772d90ceef1812d0489b4db8998074d6..17b5e4bdacab83c9462dd9e2d82c8f7c30bc92f2 100644 --- a/src/com/android/settings/development/ForceMSAAPreferenceController.java +++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java index 5b19f36c15230aad3d34748f9b927708fba95a17..e6c3813d448c369de08b780a4c47904f81581630 100644 --- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java +++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java @@ -19,11 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.provider.Settings; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java index d79c231e334528dfb43e5d17e63fc70d4de7693d..a7613763a798c9961307153b02073765a6a8e93e 100644 --- a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java index 0087e28709397ea9d6bd7a7bb4c072b68ab81c29..6b8ead5f5e29f453d2ffce6e823418454a6540fa 100644 --- a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java +++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import android.view.ThreadedRenderer; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.view.ThreadedRenderer; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java index 8ffbdcdc1cc0fa99720080ae652f537d3c36d48d..4c501b6fb77f3228e835648e9445db9d55f7dadb 100644 --- a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java +++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import android.view.ThreadedRenderer; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.view.ThreadedRenderer; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java index c10e1070a48e9c6250ea4bd9268f42d0667816be..69f1ba1003e6364c48f3cf209795776e90dc4e00 100644 --- a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java +++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java @@ -21,10 +21,9 @@ import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java index 52fe8e04a7659c6978d0c2f39b04bafe8f20b0ac..6dcca77520919f53adc631137b48b60ac09a3361 100644 --- a/src/com/android/settings/development/HdcpCheckingPreferenceController.java +++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java @@ -19,11 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.os.SystemProperties; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java index 0ba2c42dbcff1bbef40f5d3a045bfee0e69915c6..839397b68e99af1435388abd2f97fd811672e904 100644 --- a/src/com/android/settings/development/KeepActivitiesPreferenceController.java +++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java @@ -21,11 +21,10 @@ import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java index d970f4266eb7313f74269c2733e6208a23b09639..18e3a061cd856254bf6d43096da3055c22ad251d 100644 --- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java +++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java @@ -21,7 +21,6 @@ import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java index 453ab3d7c742ec056ee8caca16a73c3b85e4cedb..be60ed7c1853ad36a0ebf63ac799080364ec1dcb 100644 --- a/src/com/android/settings/development/LocalTerminalPreferenceController.java +++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java @@ -3,11 +3,10 @@ package com.android.settings.development; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/LogPersistPreferenceController.java b/src/com/android/settings/development/LogPersistPreferenceController.java index 1386cec37064bbd26879b36090578d3b96f02d41..9c7a0378cb3c2d30bdbd5ec1a27ffac116e09f00 100644 --- a/src/com/android/settings/development/LogPersistPreferenceController.java +++ b/src/com/android/settings/development/LogPersistPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.development; import android.content.Context; - import androidx.annotation.Nullable; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/LogdSizePreferenceController.java b/src/com/android/settings/development/LogdSizePreferenceController.java index 3a62e63175e74e35841ed4a5672f942c0cca59b9..cae07668471f14d2988de24cb19cef4b7dfdb79b 100644 --- a/src/com/android/settings/development/LogdSizePreferenceController.java +++ b/src/com/android/settings/development/LogdSizePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.development; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/MemoryUsagePreferenceController.java b/src/com/android/settings/development/MemoryUsagePreferenceController.java index 1b20e70a5789185ba70cd6682c507f434a3767f7..84120797c34c47620580b0b25460a1156d85798c 100644 --- a/src/com/android/settings/development/MemoryUsagePreferenceController.java +++ b/src/com/android/settings/development/MemoryUsagePreferenceController.java @@ -17,11 +17,10 @@ package com.android.settings.development; import android.content.Context; -import android.text.format.Formatter; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.applications.ProcStatsData; diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java index 78054ae2ab7dfd3120eeee1b7050f6d99068a6e6..031ff9efdd857727f395f026e18a9ef8bd8ef798 100644 --- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java +++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java index b1bd48874cc72e032249d874867c185005673768..bbce58262dbcc2a203913ca744091996a96e2df3 100644 --- a/src/com/android/settings/development/MockLocationAppPreferenceController.java +++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java @@ -26,9 +26,8 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java index 775b70871f28d03c3d93c733b7eee56caf580789..5e159c65d57a3594cddac7736743cffea9f338f7 100644 --- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java +++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java index cadb0bcfd6b486109a7bbd9e9834ea928dbbc962..243cd3f281fa81e5734571b23367b3da5b3e5704 100644 --- a/src/com/android/settings/development/OemUnlockPreferenceController.java +++ b/src/com/android/settings/development/OemUnlockPreferenceController.java @@ -26,11 +26,10 @@ import android.content.res.Resources; import android.os.UserHandle; import android.os.UserManager; import android.service.oemlock.OemLockManager; -import android.telephony.TelephonyManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java index 3cf1f4e8bbf987c77f1714a99437be155c37bd02..fe07083e45d79d8843b39aa1c9ea8b2909f41bc1 100644 --- a/src/com/android/settings/development/PictureColorModePreferenceController.java +++ b/src/com/android/settings/development/PictureColorModePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.development; import android.content.Context; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java index 0fd0137cb243a6ad92a9524092246c3b3065cbfe..079184c7dd7d039a33cb0e2d7192ed121d559968 100644 --- a/src/com/android/settings/development/PointerLocationPreferenceController.java +++ b/src/com/android/settings/development/PointerLocationPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java index 52e730ba36aa3c80f955f85d4a7bad11a902a460..ba9ce7746d3083aa4cf2b5dd564ebf4ab2ad3a43 100644 --- a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java +++ b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java @@ -18,11 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import android.text.TextUtils; -import android.view.ThreadedRenderer; - import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.text.TextUtils; +import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java index c74e995540dbe0d05cbd2eb2368a7df62b2d7945..9ae9216402ed8acb67b8a1a1c3f71a3b6e37da7a 100644 --- a/src/com/android/settings/development/ResizableActivityPreferenceController.java +++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java index 97b366a5a6c29770239787f8db871073f205f2e1..a88f16f90bd39bc89368a2d7c65294e420b55f3c 100644 --- a/src/com/android/settings/development/RtlLayoutPreferenceController.java +++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.internal.app.LocalePicker; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java index 3e1653d8a437e9af06da5e653639a6501cb95cab..21f9881ec0bc638dfaa8154f949c23627694a441 100644 --- a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java +++ b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import android.text.TextUtils; - import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java index a72c0e05e1a35345f9e205cb271b00b4e3101a98..8974c0a8ef9813760d80497abeefa69ad8359060 100644 --- a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java index dcc830208039c3931dc9894c8631c6267fa4ebc9..823bf2e9fa5d7714087e3b1d09b91745152aec5d 100644 --- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java +++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java @@ -25,7 +25,6 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java index 05ddf3abba816585435ed47a167984316a672d83..f7f5b6ddd1456bfbef51a9f35634b0a16402e3a1 100644 --- a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java +++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java @@ -20,12 +20,11 @@ import android.content.Context; import android.content.pm.IShortcutService; import android.os.RemoteException; import android.os.ServiceManager; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java index 5e0cda829445d2e1d67574362feefcd2b71bb4f7..d0df9c8d3a0b92ec59169c060a30e15e42a9ffa5 100644 --- a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java +++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java index fb091b7d47379ecf71ec23c6e4320de2739b7dd2..4d3fdbf6ca789d28d04d022d63de75eb4d2f1af7 100644 --- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java +++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import android.view.View; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.view.View; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java index 5dadb6ff6c26a8cb1e87eba137037d41c910f2ff..ffd3da27cd118bb72e5386349941473945b4eecd 100644 --- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java +++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java @@ -21,10 +21,9 @@ import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java index 25d421ddf2b713dc9d2c850c3142ee2f3da07001..87fbf6928b5a7519acea2c2e349c25cf4414e796 100644 --- a/src/com/android/settings/development/ShowTapsPreferenceController.java +++ b/src/com/android/settings/development/ShowTapsPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java index 56fa76d379c8ae6697786ba5309dc51071b40fef..ed16b685b78e8aa7d12cecc453d47449736164fa 100644 --- a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java +++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java @@ -20,11 +20,10 @@ import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; -import android.view.accessibility.AccessibilityManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.view.accessibility.AccessibilityManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java index 7d67b9e4d07aea12dca852eb36f9474f0862f1d4..31eb71aff88425aead5aefdb1388ee9230416297 100644 --- a/src/com/android/settings/development/StayAwakePreferenceController.java +++ b/src/com/android/settings/development/StayAwakePreferenceController.java @@ -23,7 +23,6 @@ import android.net.Uri; import android.os.BatteryManager; import android.os.Handler; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java index c28e476621916094cc880294c22563205ac89718..2af301c0d6d87aac40834d559f28ac15f25989f2 100644 --- a/src/com/android/settings/development/StrictModePreferenceController.java +++ b/src/com/android/settings/development/StrictModePreferenceController.java @@ -21,11 +21,10 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemProperties; -import android.view.IWindowManager; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.view.IWindowManager; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java index 476cf50ffe6dca67d3eb46b665e4ddc2f894774e..7174b457e0b63dc6edd802ea9c8f7ed312d8632b 100644 --- a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java index f838a76cfa8285983231bd3a4ae293a5669058fa..72b0bf3a31f4e912035611eaa33a9a2a348e3367 100644 --- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java +++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java index 0a8e941ea57ae468ffad08906cc63d4f81392df3..6f57f88834069ec07900a6642ddfa2c16c2ace8f 100644 --- a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java @@ -19,11 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; -import android.view.IWindowManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java index 335a48de82a35ab2f79d834e8a0dbb89ed52688e..c73412dbb3597357da3294b87442499adc4260f9 100644 --- a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java +++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java index 77094e9b35475aaa9e8d7c22985a3fc492d826a5..f151134705cc1afa7989978f7db8a00058599fb7 100644 --- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java +++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java @@ -22,7 +22,6 @@ import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java index d11fe37c66a8f368116098775404af118a2de7f2..9959f12ce1a153649b77dff794c5840065b93274 100644 --- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java +++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java @@ -26,11 +26,10 @@ import android.content.Context; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/WebViewAppPreferenceController.java b/src/com/android/settings/development/WebViewAppPreferenceController.java index fb48cd54ea1edf395da55856212e92fe00a83dad..7796cfda3504ecfc977ddddbf42796e188c05553 100644 --- a/src/com/android/settings/development/WebViewAppPreferenceController.java +++ b/src/com/android/settings/development/WebViewAppPreferenceController.java @@ -18,11 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.content.pm.PackageInfo; -import android.text.TextUtils; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.text.TextUtils; +import android.util.Log; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java index fed07f654361b8f1e5bda8dfca1fe63b63062bdd..9582ebe4ad3b65c12f1a9756a383ed2ac07d0781 100644 --- a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java +++ b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java index 0236f1585e2eb512bd8ed3462d700b93f8b95886..71ca8f1956d661bf1426f5bc187b23b869394e48 100644 --- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java +++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java index de53a2d714697038d29098c87050567a23a300a4..c3c9ca3ec139bb1121fc50fac2dbd7bc75f7c818 100644 --- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java +++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.net.wifi.WifiManager; - import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java index 70b2e2de186ba9bd9eb7a09d918433137addb9c1..6414372470d0999b80f01886d0f3d5d91474d533 100644 --- a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java @@ -19,11 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; -import android.view.IWindowManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java index ebf35de1f3128ccb242ca796ae72e9cd5c017ee9..66d76c2dc0b764bf86c7f9aca679be1ede19f4fe 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java @@ -17,10 +17,10 @@ package com.android.settings.development.featureflags; import android.content.Context; -import android.util.FeatureFlagUtils; import android.util.Log; import androidx.preference.SwitchPreference; +import android.util.FeatureFlagUtils; public class FeatureFlagPreference extends SwitchPreference { diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java index 2acda4ebe7728037525fc7ef72808f3e7573e9f1..960979c40f168a28b32878a0c667ab34fbc900ea 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java @@ -17,9 +17,8 @@ package com.android.settings.development.featureflags; import android.content.Context; -import android.util.FeatureFlagUtils; - import androidx.preference.PreferenceScreen; +import android.util.FeatureFlagUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java index 0362074663a439f438262b9e2306275c5a493714..71d3d07888e3227527458655c06272ebe244d730 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java +++ b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java @@ -25,12 +25,11 @@ import android.content.pm.ServiceInfo; import android.os.RemoteException; import android.os.ServiceManager; import android.service.quicksettings.TileService; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.util.Log; import com.android.internal.statusbar.IStatusBarService; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java index 165c74e410c2f198912e3b2007cdbc881bf8fb42..1094ab9c7bb9326fd65a6fd80a3008b4c6c58d4a 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTiles.java +++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java @@ -25,6 +25,7 @@ import android.os.SystemProperties; import android.provider.Settings; import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; +import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.IWindowManager; import android.view.ThreadedRenderer; @@ -32,8 +33,6 @@ import android.view.View; import android.view.WindowManagerGlobal; import android.widget.Toast; -import androidx.annotation.VisibleForTesting; - import com.android.internal.app.LocalePicker; import com.android.settingslib.development.SystemPropPoker; diff --git a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java index fff1f58940ec3d75dd45f7ee8571383005c02c9b..ca2175b4c13797224efcedb2d1483441573144a0 100644 --- a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.deviceinfo; import android.accounts.Account; import android.content.Context; import android.os.Bundle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index aa6fe41d19137fc806964f3d4dee6f139bbf3a92..707d660b2c8e542602b93058f00492d36a41c5dd 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -25,14 +25,13 @@ import android.content.pm.ResolveInfo; import android.os.Build; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; import android.util.Pair; import android.widget.Toast; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java index f9665dabdf544910001bfd1fa96327a8a6852945..5a4dfc26235543a4d6ce6cad7241d3be2f0ba63e 100644 --- a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java +++ b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java @@ -21,9 +21,8 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.provider.SearchIndexableResource; -import android.telephony.TelephonyManager; - import androidx.annotation.VisibleForTesting; +import android.telephony.TelephonyManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java index f4661ba82a902d4ece723533ce17c3ae1e703580..1fc54cd6755c90c88d6a47047edb5b9f7b27d56e 100644 --- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.deviceinfo; import android.app.Fragment; import android.content.Context; import android.os.Build; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java index 5c9e172f9227bd72cbae1211e4ede1529a7769cf..fc89dc19420e9d8f37cced2548d2168d285f06f7 100644 --- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java @@ -23,10 +23,11 @@ import android.net.wifi.WifiManager; import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import android.text.SpannedString; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.SpannedString; + +import com.android.internal.annotations.VisibleForTesting; import com.android.settings.bluetooth.BluetoothLengthDeviceNameFilter; import com.android.settings.core.BasePreferenceController; @@ -34,6 +35,7 @@ import com.android.settings.widget.ValidatedEditTextPreference; import com.android.settings.wifi.tether.WifiDeviceNameTextValidator; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; diff --git a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java index 1150838dacfc6043659cea1efda49c2c3d6e032b..62077ca2b1427d42a90584f3a4e14af213697a1e 100644 --- a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java @@ -17,10 +17,9 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.os.SystemProperties; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java index eecf9eed236f8e406a12351dff815746146a3cfd..52721821a417a0c60d7cd7b5e74cf10d28a2d7f7 100644 --- a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.deviceinfo; import android.app.Fragment; import android.content.Context; import android.content.Intent; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java index 8f32ede4c08c744fce3c307d383fbf2266d456bc..58155af1ca5e925153a33d6f7c857df8ebd6844b 100644 --- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java @@ -21,13 +21,12 @@ import android.app.Dialog; import android.os.Build; import android.os.Bundle; import android.os.SystemProperties; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java index 6ba45b35eebc91c747baffe7c5ff5915808af742..1af63975f5dbd0df23d7e9aa6a18e9ed174599ad 100644 --- a/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java +++ b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.deviceinfo; import android.content.Context; -import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.R; + import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.deviceinfo.AbstractIpAddressPreferenceController; diff --git a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java index 5c2b6417102c7c0a078f2aa6bb4abc84ee9b7303..c0ae99a1ee59d3953b86b1c24effddab223b5167 100644 --- a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.deviceinfo; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java index 8e60b06fee2cf3b964f37a2708b41d5d0e090d2c..95cd09c39542d973689f432d40dff7dc7784e9a3 100644 --- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java @@ -17,6 +17,9 @@ package com.android.settings.deviceinfo; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -24,10 +27,6 @@ import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java index 054b7cfda7276c6f59b2b31ed93ebb31caefe24d..b6d50cef75aa6aab97bb964be55f1813f8dbafbd 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo; import android.app.AlertDialog; import android.app.Dialog; +import android.app.DialogFragment; import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java index 4bc3bccd77453e90d90c2427778ad218c26af698..6047f8cc082e5c0fe9094e75885e999a2ec03ed3 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java @@ -24,6 +24,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.settings.R; +import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; import com.android.settingslib.core.lifecycle.events.OnOptionsItemSelected; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index a8b24f62c5e4bb8570036d024b9a4127327c8db1..54e0eef48970ee5d2746f0d39417a7bb17441258 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -36,6 +36,10 @@ import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; import android.provider.DocumentsContract; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; @@ -47,11 +51,6 @@ import android.view.MenuItem; import android.view.View; import android.widget.EditText; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings.StorageUseActivity; diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index 84769744839a0e0c861cc949f0d1a003e4f46c03..5982be68a284df774da2a60965f04e99baff7f34 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -28,6 +28,8 @@ import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; import android.provider.DocumentsContract; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; @@ -35,9 +37,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index b0a6d343d5c330a4d99facdda44a255b9929dfa4..5575790c322b5a613a39eac068934cadaba80e74 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -28,11 +28,10 @@ import android.os.UserManager; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; import android.util.SparseArray; import android.view.View; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java index 0766a740b3f2b9f7ef255673f936984c0a53c0bd..6cf85b1fc2010e9886596bfe6b71022f986a575a 100644 --- a/src/com/android/settings/deviceinfo/StorageItemPreference.java +++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java @@ -18,11 +18,11 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.content.res.Resources; -import android.util.AttributeSet; -import android.widget.ProgressBar; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import android.util.AttributeSet; +import android.view.View; +import android.widget.ProgressBar; import com.android.settings.R; import com.android.settings.utils.FileSizeFormatter; diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java index b17d01fcfc5dd91d21c4b4d77bf32fad1e9314f0..5e66fdd0de79777dcdd2c3f96b8b84c74f8a5ac8 100644 --- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java +++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java @@ -24,9 +24,8 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import android.util.SparseArray; - import androidx.annotation.VisibleForTesting; +import android.util.SparseArray; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 082a02402618db948d5922a2a5c0a618f58aaaa3..9e4a1e2732b848bebbab72b801a97032c0d782b1 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -35,17 +35,16 @@ import android.os.storage.StorageEventListener; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; import android.util.Log; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java index 72b67de1ddde3ec2c97f062dc99f5225b0da9795..292ee44be16bef1e9f916ee71a2f26ca57afb014 100644 --- a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java +++ b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java @@ -18,14 +18,13 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.graphics.Color; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.MathUtils; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; public class StorageSummaryPreference extends Preference { diff --git a/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java index 81ac97b21d3d4918f3b7f8d93d97dd27d898fbc6..095cf15af4cdac7b52f95edb43dfe6c56671130e 100644 --- a/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java +++ b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java @@ -16,8 +16,6 @@ package com.android.settings.deviceinfo; -import static com.android.settings.deviceinfo.StorageSettings.TAG; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -27,6 +25,8 @@ import android.util.Log; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; +import static com.android.settings.deviceinfo.StorageSettings.TAG; + public class StorageUnmountReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index 525c5621a70eebdd8267101ad3d6ce990975b94e..b6466cae9854fd6bfd49a0ec9439765a84c5421d 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -23,6 +23,8 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.format.Formatter; import android.util.Log; import android.view.View; @@ -30,15 +32,12 @@ import android.view.View.OnClickListener; import android.widget.ImageView; import android.widget.ProgressBar; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; import com.android.settingslib.Utils; -import java.io.File; import java.io.IOException; +import java.io.File; /** * Preference line representing a single {@link VolumeInfo}, possibly including diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java index 7a2f0c105f326de76cc0ba3a493fe77eff1abe94..1f393c5128ea5e879c2c65c0330982f3578481b4 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java @@ -16,20 +16,20 @@ package com.android.settings.deviceinfo; -import static android.content.Intent.EXTRA_TITLE; -import static android.content.pm.PackageManager.EXTRA_MOVE_ID; - -import static com.android.settings.deviceinfo.StorageSettings.TAG; - import android.content.pm.PackageManager; import android.content.pm.PackageManager.MoveCallback; import android.os.Bundle; import android.os.Handler; import android.util.Log; +import android.view.View; import android.widget.Toast; import com.android.settings.R; +import static android.content.Intent.EXTRA_TITLE; +import static android.content.pm.PackageManager.EXTRA_MOVE_ID; +import static com.android.settings.deviceinfo.StorageSettings.TAG; + public class StorageWizardMoveProgress extends StorageWizardBase { private int mMoveId; diff --git a/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java index c7005966c480019256c4092223ca8c89208e2ecc..8375310c107e28fdfc3fb0944cad7c8fd5ce0a62 100644 --- a/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java +++ b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.deviceinfo; import android.content.Context; -import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.deviceinfo.AbstractWifiMacAddressPreferenceController; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java index 0e36d85899af550637d6ae1d87fdf1df3131ee56..21663f6820ec1f63c76c2cfa3f23f95e95ed6de2 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo.firmwareversion; import android.content.Context; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java index ba4eb7af74813b94fef51197682f496d9c5425fa..6dc651abad15fc37a719145cf83c9fc28e4e5bdf 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java @@ -17,9 +17,8 @@ package com.android.settings.deviceinfo.firmwareversion; import android.os.Build; -import android.text.BidiFormatter; - import androidx.annotation.VisibleForTesting; +import android.text.BidiFormatter; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java index 17415cca5731fa7b983a393041df67498d16905e..277024576a818e4890f7d0b2cc2505e1a75898b6 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java @@ -22,11 +22,10 @@ import android.os.Build; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.View; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java index fbf44a15e01f1b470d84599eb79e39b734f0c8eb..785ec595b097bca438df0e48dd09a94dcaef989f 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.deviceinfo.firmwareversion; import android.app.Fragment; import android.content.Context; import android.os.Build; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java index d72d5f62e780ea3133b57c7e66be19c1403cee02..cf8ee61090e1c40efb5cbb44b4ca9049cae86587 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java @@ -19,12 +19,11 @@ package com.android.settings.deviceinfo.firmwareversion; import android.content.Context; import android.content.Intent; import android.net.Uri; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.View; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java index dc4ba2fb2936853db7f0911730fcdf5fe9e51524..71da4a3d5db3576bf265a7a90e114683ddfc7613 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java @@ -18,6 +18,8 @@ package com.android.settings.deviceinfo.imei; import android.content.Context; import android.content.res.Resources; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -27,9 +29,6 @@ import android.text.Spanned; import android.text.TextUtils; import android.text.style.TtsSpan; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import com.android.internal.telephony.PhoneConstants; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java index 084d44f424ebfb18c96d568b422a086c0882129a..3cc90e482931979bbdf3e9f080229b76d699e1f3 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java @@ -21,14 +21,13 @@ import android.app.Dialog; import android.app.Fragment; import android.app.FragmentManager; import android.os.Bundle; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index 8d87843323d4886f0eb3572c54d4280115b639ba..d673a280274650174b30d2f2c590a5b2531686ec 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -20,11 +20,10 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import android.app.Fragment; import android.content.Context; -import android.telephony.TelephonyManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index f273689abdacdf94f860e4f896cf130f9499b1cf..2a682d205b510142637095143c0cdfc5952b642f 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -30,6 +30,8 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.PersistableBundle; import android.os.UserHandle; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.telephony.CarrierConfigManager; import android.telephony.CellBroadcastMessage; import android.telephony.PhoneStateListener; @@ -44,9 +46,6 @@ import android.text.TextDirectionHeuristics; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index 888dc25f5c6a6b08c8b440eaf9a322d2d9164ad8..3f714712a0800e674487e6b1a77a79615dab953b 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -18,13 +18,12 @@ package com.android.settings.deviceinfo.simstatus; import android.app.Fragment; import android.content.Context; -import android.telephony.SubscriptionInfo; -import android.telephony.SubscriptionManager; -import android.telephony.TelephonyManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.telephony.SubscriptionInfo; +import android.telephony.SubscriptionManager; +import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java index 741ad7bb6afc4687e804634c4a901b2723239cd0..92078036c17815f467df9c67653988adfaf78807 100644 --- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java @@ -21,7 +21,6 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java index e6d9a724d94e07c137e18aa8262bbc9c954d752e..f07af5e56e098d8b5c133a91c46b49c863a05744 100644 --- a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java +++ b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java @@ -19,9 +19,8 @@ package com.android.settings.deviceinfo.storage; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; -import android.util.SparseArray; - import androidx.annotation.VisibleForTesting; +import android.util.SparseArray; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.deviceinfo.PrivateStorageInfo; diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java index ee9fad6d52a1af24843a0087e850f94d4acbee1e..1eccb67f5483fd49520f28d83d7f8a7956660b04 100644 --- a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java +++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java @@ -20,13 +20,12 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; -import android.util.SparseArray; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; +import android.util.SparseArray; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index e9e8c4f8277461ab3c5422e055d1d62ef3554d5c..6ae4a6f0b202757c09a7a40069c7fee101a4d66b 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -26,12 +26,11 @@ import android.net.TrafficStats; import android.os.Bundle; import android.os.UserHandle; import android.os.storage.VolumeInfo; -import android.util.Log; -import android.util.SparseArray; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.Log; +import android.util.SparseArray; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java index a025d8c4dafe0a120ae498bd4d4f4dff5f0a7792..813261f50b3d7be657b7c7275181180dd7db044d 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java @@ -20,20 +20,28 @@ import android.content.Context; import android.content.Intent; import android.graphics.Typeface; import android.os.storage.StorageManager; +import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import android.text.SpannableString; +import android.text.Spanned; import android.text.TextPaint; +import android.text.TextUtils; import android.text.style.StyleSpan; import android.util.AttributeSet; +import android.util.MathUtils; import android.view.View; import android.widget.Button; - -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; +import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.DonutView; +import java.text.NumberFormat; +import java.util.Locale; + /** * StorageSummaryDonutPreference is a preference which summarizes the used and remaining storage left * on a given storage volume. It is visualized with a donut graphing the % used. diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java index 1a5152ed4005d24dbfd0451019ac2de3f3f735bd..f4c33be5ae3d5c58c1a5eb47a351ca7fd58a6346 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java @@ -18,11 +18,10 @@ package com.android.settings.deviceinfo.storage; import android.content.Context; import android.os.storage.VolumeInfo; -import android.text.TextUtils; -import android.text.format.Formatter; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/storage/UserIconLoader.java b/src/com/android/settings/deviceinfo/storage/UserIconLoader.java index e85bf08a5ea41bf625598057bf6d089a9889475b..d1c29dfe38a951dd33167881322e9f4ce6b6613f 100644 --- a/src/com/android/settings/deviceinfo/storage/UserIconLoader.java +++ b/src/com/android/settings/deviceinfo/storage/UserIconLoader.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; +import android.util.Log; import android.util.SparseArray; import com.android.internal.util.Preconditions; diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java index afc68b5d6a7a7763283aec62cb3d1cacf11d8ecd..1778d13f325cf0b268f16793b77230dd1dfe94e7 100644 --- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java +++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java @@ -21,10 +21,9 @@ import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.storage.VolumeInfo; -import android.util.SparseArray; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.SparseArray; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.Preconditions; diff --git a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java index 3d1e9b805fe6d57293fb58bcd7ffa48910b3991f..a9b047c58b458522ffcae228f5f8b58e0f2868dd 100644 --- a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java +++ b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java @@ -19,7 +19,6 @@ package com.android.settings.deviceinfo.storage; import android.app.usage.StorageStatsManager; import android.content.Context; import android.os.storage.VolumeInfo; - import androidx.annotation.VisibleForTesting; import com.android.settingslib.deviceinfo.PrivateStorageInfo; diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java index 58054b501afef5b945ecf61e2fd88246c6eefc01..0da5dbeb7686935f21f6500272e892da4efa9a64 100644 --- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java @@ -21,10 +21,9 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.provider.Settings; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; diff --git a/src/com/android/settings/display/AmbientDisplayPreferenceController.java b/src/com/android/settings/display/AmbientDisplayPreferenceController.java index 6638282343b3c0519b3c439803f5d54ce7a27bd8..f429b0dfe5a2e988c4197ad719e0c34d1b0a9e9d 100644 --- a/src/com/android/settings/display/AmbientDisplayPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.display; import android.content.Context; import android.os.UserHandle; - import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java index 01a5539e73667e89d45c6e8d22e8c826543ac1c1..8745e3ff18088aed8dff9f4f345ffae0e72c2532 100644 --- a/src/com/android/settings/display/AmbientDisplaySettings.java +++ b/src/com/android/settings/display/AmbientDisplaySettings.java @@ -17,6 +17,7 @@ package com.android.settings.display; import android.content.Context; +import android.os.UserHandle; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; @@ -25,8 +26,12 @@ import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.gestures.DoubleTapScreenPreferenceController; import com.android.settings.gestures.PickupGesturePreferenceController; +import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; +import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/display/AppGridView.java b/src/com/android/settings/display/AppGridView.java index effc6af8bb7b709c75895b034b8dc40b41fadfc8..00275375280f3b0436af9be193d6eeefeb33aebb 100644 --- a/src/com/android/settings/display/AppGridView.java +++ b/src/com/android/settings/display/AppGridView.java @@ -22,6 +22,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.os.UserHandle; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.IconDrawableFactory; import android.view.View; @@ -30,8 +31,6 @@ import android.widget.ArrayAdapter; import android.widget.GridView; import android.widget.ImageView; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java index 027d4c454074cf3e9f5074a524641e8ac53c1943..7c93d2859085f7c98e1e0635cf9438c05f2144e4 100644 --- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java +++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java @@ -13,21 +13,21 @@ */ package com.android.settings.display; -import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; -import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; -import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; - import android.content.Context; import android.content.Intent; import android.provider.Settings; import android.text.TextUtils; import com.android.settings.DisplaySettings; -import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; +import com.android.settings.R; + +import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; +import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; +import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; public class AutoBrightnessPreferenceController extends TogglePreferenceController { diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index c852c01f380dbdbfa28758f55f1cf56830128f96..6bdf75aebf533366edd72749f0303f37833285f5 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -14,9 +14,8 @@ package com.android.settings.display; import android.content.Context; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.view.RotationPolicy; diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java index e6a62bc5016725063a37f3f04414731f847ff2fb..8ef8425bc57369d0ce677e99fc8625170e2c9d96 100644 --- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java +++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java @@ -15,17 +15,17 @@ */ package com.android.settings.display; -import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; - import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.internal.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; + /** * A controller to manage the switch for showing battery percentage in the status bar. */ @@ -41,7 +41,8 @@ public class BatteryPercentagePreferenceController extends AbstractPreferenceCon @Override public boolean isAvailable() { - return true; + return mContext.getResources() + .getBoolean(R.bool.config_battery_percentage_setting_available); } @Override diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index 05f43f650acb6a66628b686f6a4338e83994765d..be79f66b55680c33c3d6e5943569c591c64ecead 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -28,11 +28,10 @@ import android.os.ServiceManager; import android.provider.Settings; import android.provider.Settings.System; import android.service.vr.IVrManager; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java index 8e72a55227b92aacf284e2614ca8f2cdc5055d3e..9b1b2c296c4ae797500ace7a9f8d630feb3ec83f 100644 --- a/src/com/android/settings/display/CameraGesturePreferenceController.java +++ b/src/com/android/settings/display/CameraGesturePreferenceController.java @@ -13,18 +13,17 @@ */ package com.android.settings.display; -import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED; - import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED; + public class CameraGesturePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index e6ee77d7640ef89b63c4b08102e62a2f878dcba6..ab17c72051b6b3e1862a778594d8ef8ea5f6a7d1 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -15,14 +15,14 @@ package com.android.settings.display; import android.content.Context; import android.graphics.drawable.Drawable; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; + import com.android.settings.applications.LayoutPreference; +import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/display/ConversationMessageView.java b/src/com/android/settings/display/ConversationMessageView.java index 22e1f205509fb9607f948e674d3a288166eb4385..b054444fe57088e281d7111b75481c6a8bca649c 100644 --- a/src/com/android/settings/display/ConversationMessageView.java +++ b/src/com/android/settings/display/ConversationMessageView.java @@ -29,7 +29,6 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; - import com.android.settings.R; /** diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java index e55e578996eea9e744dd830b06e5c02eb7b5a440..581a3ee444e1b6e79574c7645da932859090d301 100644 --- a/src/com/android/settings/display/DensityPreference.java +++ b/src/com/android/settings/display/DensityPreference.java @@ -26,8 +26,8 @@ import android.view.View; import android.widget.EditText; import com.android.settings.R; -import com.android.settings.Utils; import com.android.settingslib.CustomEditTextPreference; +import com.android.settings.Utils; import com.android.settingslib.display.DisplayDensityUtils; import java.text.NumberFormat; diff --git a/src/com/android/settings/display/FontSizePreferenceController.java b/src/com/android/settings/display/FontSizePreferenceController.java index 28c7922ea36377cb1bc84a2b6a2d3aeb430a6147..3d6b6b41d31027d4fa20fa40c84e9594efb1aa5c 100644 --- a/src/com/android/settings/display/FontSizePreferenceController.java +++ b/src/com/android/settings/display/FontSizePreferenceController.java @@ -18,6 +18,7 @@ import android.content.res.Resources; import android.provider.Settings; import com.android.settings.R; +import com.android.settings.accessibility.ToggleFontSizePreferenceFragment; import com.android.settings.core.BasePreferenceController; public class FontSizePreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/display/LiftToWakePreferenceController.java b/src/com/android/settings/display/LiftToWakePreferenceController.java index d12b7c4c15dec34def122a849ea1e7392a4a5b85..42feda2c960d890a0b0da6612a0acb20dccb323c 100644 --- a/src/com/android/settings/display/LiftToWakePreferenceController.java +++ b/src/com/android/settings/display/LiftToWakePreferenceController.java @@ -13,19 +13,18 @@ */ package com.android.settings.display; -import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED; - import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorManager; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED; + public class LiftToWakePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java index 6421ebdbd4e6f56862deed1dea22aea4fcbe8611..ffc73860c2949efe37e47952a8e1a62420f861f0 100644 --- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java @@ -17,14 +17,12 @@ package com.android.settings.display; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; - -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java index cfe17915fd68012bf5d17b1caf7bc8b747723c5e..bb42c857a7e7c7242b6c894d33c7b9d35d89aaec 100644 --- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java @@ -17,11 +17,9 @@ package com.android.settings.display; import android.content.Context; - import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; - import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java index e2abe1b24c83b49e65a7b06806aa677fa87b4e98..1eebb6be5ae25a74f96bf77e584f5e2b38f0c542 100644 --- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java @@ -17,9 +17,7 @@ package com.android.settings.display; import android.content.Context; - import androidx.preference.Preference; - import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java index 255003c701155f510cb7c774b2174171d3e5bcfa..19297b82f32d1600830f36df45a418f1dfe4d8d7 100644 --- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java @@ -17,9 +17,7 @@ package com.android.settings.display; import android.content.Context; - import androidx.preference.Preference; - import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java index bb598590bc52219bdd1a2f2ce5c5d116c030c96b..2075cfca322f806569065cb3b238150cad2cd891 100644 --- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java @@ -17,9 +17,7 @@ package com.android.settings.display; import android.content.Context; - import androidx.preference.Preference; - import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java index db053a596ffee7f93ecc7640511deb1122957203..9f215d9b59910a955c64d98f149af7c0da1ceeec 100644 --- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java @@ -17,10 +17,9 @@ package com.android.settings.display; import android.content.Context; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.internal.app.ColorDisplayController; import com.android.settings.core.SliderPreferenceController; diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java index a84ba5888160479b81a6f52228ab77c92e509064..a1608d75e09e7ba01fc652fc1384f3f19ba49bf7 100644 --- a/src/com/android/settings/display/NightDisplayPreference.java +++ b/src/com/android/settings/display/NightDisplayPreference.java @@ -15,9 +15,8 @@ package com.android.settings.display; import android.content.Context; -import android.util.AttributeSet; - import androidx.preference.SwitchPreference; +import android.util.AttributeSet; import com.android.internal.app.ColorDisplayController; diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java index 3cb57e0272bf98bfe6546c8dd9569f5bdd53ce69..0bbab935f8a3dbf56292a83bf039ef7ff240bba6 100644 --- a/src/com/android/settings/display/NightDisplayPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayPreferenceController.java @@ -16,9 +16,9 @@ package com.android.settings.display; import android.content.Context; import com.android.internal.app.ColorDisplayController; -import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settings.R; public class NightDisplayPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 564d9d3edf5c80caa82aa31fa39ff84daf3184cb..848ddd51ae6c6e477a680a08e6ac8e371b940734 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -21,7 +21,6 @@ import android.app.TimePickerDialog; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; - import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java index 5846a6583464e22be054ebd179a4e07eee53dd00..41620ea4704cec6ab27ba25e53160c3b3ceb2e41 100644 --- a/src/com/android/settings/display/NightModePreferenceController.java +++ b/src/com/android/settings/display/NightModePreferenceController.java @@ -17,11 +17,10 @@ import static android.content.Context.UI_MODE_SERVICE; import android.app.UiModeManager; import android.content.Context; -import android.util.Log; - import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java index c1b0b4e9eb619cc69cd95252a32dc51203b87f83..ae44bf3e182bc2528294345ad26ec0d9289e2189 100644 --- a/src/com/android/settings/display/ScreenSaverPreferenceController.java +++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java @@ -14,7 +14,6 @@ package com.android.settings.display; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java index f47d7da4384f727493a06cfb6e5ea862686fe760..8451a2d4e3fa5fb4af933f5a281ac48728217d2a 100644 --- a/src/com/android/settings/display/ScreenZoomPreference.java +++ b/src/com/android/settings/display/ScreenZoomPreference.java @@ -17,11 +17,10 @@ package com.android.settings.display; import android.content.Context; -import android.text.TextUtils; -import android.util.AttributeSet; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; +import android.text.TextUtils; +import android.util.AttributeSet; import com.android.settingslib.display.DisplayDensityUtils; diff --git a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java index e02579f7dfb9aa8d71d923a4b20939f2dbe18ab7..82cb58d3cd00754b9bd6b34f8a925e2bbbb9f35d 100644 --- a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java @@ -18,7 +18,8 @@ package com.android.settings.display; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -public class ScreenZoomPreferenceFragmentForSetupWizard extends ScreenZoomSettings { +public class ScreenZoomPreferenceFragmentForSetupWizard + extends ScreenZoomSettings { @Override public int getMetricsCategory() { diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java index 5d7375d85bb5ad2818d9bfc6826687f223539509..6b5216e7ab815196210e8cba2b787c38fc3d5a08 100644 --- a/src/com/android/settings/display/ScreenZoomSettings.java +++ b/src/com/android/settings/display/ScreenZoomSettings.java @@ -24,6 +24,7 @@ import android.os.Bundle; import android.view.Display; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.PreviewSeekBarPreferenceFragment; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -41,26 +42,17 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme private int mDefaultDensity; private int[] mValues; - @Override - protected int getActivityLayoutResId() { - return R.layout.screen_zoom_activity; - } - - @Override - protected int[] getPreviewSampleResIds() { - return getContext().getResources().getBoolean( - R.bool.config_enable_extra_screen_zoom_preview) - ? new int[]{ - R.layout.screen_zoom_preview_1, - R.layout.screen_zoom_preview_2, - R.layout.screen_zoom_preview_settings} - : new int[]{R.layout.screen_zoom_preview_1}; - } - @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + mActivityLayoutResId = R.layout.screen_zoom_activity; + + // This should be replaced once the final preview sample screen is in place. + mPreviewSampleResIds = new int[] {R.layout.screen_zoom_preview_1, + R.layout.screen_zoom_preview_2, + R.layout.screen_zoom_preview_settings}; + final DisplayDensityUtils density = new DisplayDensityUtils(getContext()); final int initialIndex = density.getCurrentIndex(); @@ -69,8 +61,8 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme // connect to the window manager service. Just use the current // density and don't let the user change anything. final int densityDpi = getResources().getDisplayMetrics().densityDpi; - mValues = new int[]{densityDpi}; - mEntries = new String[]{getString(DisplayDensityUtils.SUMMARY_DEFAULT)}; + mValues = new int[] {densityDpi}; + mEntries = new String[] {getString(DisplayDensityUtils.SUMMARY_DEFAULT)}; mInitialIndex = 0; mDefaultDensity = densityDpi; } else { @@ -115,7 +107,7 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme } /** Index provider used to expose this fragment in search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getRawDataToIndex(Context context, diff --git a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java index 40eaad330d026c18491d1d1ee03e479815b90eee..cdb89fb4e11dac3e5f941708fcd0e52ac45fe7b6 100644 --- a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java +++ b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java @@ -15,9 +15,8 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/SystemUiThemePreferenceController.java b/src/com/android/settings/display/SystemUiThemePreferenceController.java index 1660fc56d8b51ae2d8dec6b2cac600d3136d6b7c..3419ece9dd656012f5c2f9df4a63a28917060e8e 100644 --- a/src/com/android/settings/display/SystemUiThemePreferenceController.java +++ b/src/com/android/settings/display/SystemUiThemePreferenceController.java @@ -20,13 +20,14 @@ import static android.provider.Settings.Secure.THEME_MODE; import android.content.Context; import android.provider.Settings; -import android.util.FeatureFlagUtils; - import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.FeatureFlagUtils; import com.android.settings.core.BasePreferenceController; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; /** * Setting where user can pick if SystemUI will be light, dark or try to match diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java index 5c2d97530dad673be7d8e73e48d5b613cd09ac6d..ff149ba838ae9f730bff52c5f40da784b1988b6f 100644 --- a/src/com/android/settings/display/TapToWakePreferenceController.java +++ b/src/com/android/settings/display/TapToWakePreferenceController.java @@ -15,9 +15,8 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index 6fc4b08bf00648547a42474765e2b2060ccf90a7..2cdf7e21c3025e2a269122049d908634d1b3dc22 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java @@ -13,26 +13,23 @@ */ package com.android.settings.display; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME; - import android.content.Context; -import android.content.om.IOverlayManager; -import android.content.om.OverlayInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; +import com.android.settings.wrapper.OverlayManagerWrapper; +import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -40,22 +37,24 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME; + public class ThemePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { private static final String KEY_THEME = "theme"; private final MetricsFeatureProvider mMetricsFeatureProvider; - private final IOverlayManager mOverlayService; + private final OverlayManagerWrapper mOverlayService; private final PackageManager mPackageManager; public ThemePreferenceController(Context context) { - this(context, IOverlayManager.Stub - .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE))); + this(context, ServiceManager.getService(Context.OVERLAY_SERVICE) != null + ? new OverlayManagerWrapper() : null); } @VisibleForTesting - ThemePreferenceController(Context context, IOverlayManager overlayManager) { + ThemePreferenceController(Context context, OverlayManagerWrapper overlayManager) { super(context); mOverlayService = overlayManager; mPackageManager = context.getPackageManager(); @@ -78,7 +77,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl @Override public void updateState(Preference preference) { ListPreference pref = (ListPreference) preference; - String[] pkgs = getAvailableThemes(false /* currentThemeOnly */); + String[] pkgs = getAvailableThemes(); CharSequence[] labels = new CharSequence[pkgs.length]; for (int i = 0; i < pkgs.length; i++) { try { @@ -110,15 +109,11 @@ public class ThemePreferenceController extends AbstractPreferenceController impl @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - String current = getCurrentTheme(); + String current = getTheme(); if (Objects.equals(newValue, current)) { return true; } - try { - mOverlayService.setEnabledExclusiveInCategory((String) newValue, UserHandle.myUserId()); - } catch (RemoteException re) { - throw re.rethrowFromSystemServer(); - } + mOverlayService.setEnabledExclusiveInCategory((String) newValue, UserHandle.myUserId()); return true; } @@ -134,43 +129,39 @@ public class ThemePreferenceController extends AbstractPreferenceController impl } } + private String getTheme() { + List infos = mOverlayService.getOverlayInfosForTarget("android", + UserHandle.myUserId()); + for (int i = 0, size = infos.size(); i < size; i++) { + if (infos.get(i).isEnabled() && isTheme(infos.get(i))) { + return infos.get(i).packageName; + } + } + return null; + } + @Override public boolean isAvailable() { if (mOverlayService == null) return false; - String[] themes = getAvailableThemes(false /* currentThemeOnly */); + String[] themes = getAvailableThemes(); return themes != null && themes.length > 1; } @VisibleForTesting String getCurrentTheme() { - String[] themePackages = getAvailableThemes(true /* currentThemeOnly */); - return themePackages.length < 1 ? null : themePackages[0]; + return getTheme(); } @VisibleForTesting - String[] getAvailableThemes(boolean currentThemeOnly) { - List infos; - List pkgs; - try { - infos = mOverlayService.getOverlayInfosForTarget("android", UserHandle.myUserId()); - pkgs = new ArrayList<>(infos.size()); - for (int i = 0, size = infos.size(); i < size; i++) { - if (isTheme(infos.get(i))) { - if (infos.get(i).isEnabled() && currentThemeOnly) { - return new String[] {infos.get(i).packageName}; - } else { - pkgs.add(infos.get(i).packageName); - } - } + String[] getAvailableThemes() { + List infos = mOverlayService.getOverlayInfosForTarget("android", + UserHandle.myUserId()); + List pkgs = new ArrayList<>(infos.size()); + for (int i = 0, size = infos.size(); i < size; i++) { + if (isTheme(infos.get(i))) { + pkgs.add(infos.get(i).packageName); } - } catch (RemoteException re) { - throw re.rethrowFromSystemServer(); - } - - // Current enabled theme is not found. - if (currentThemeOnly) { - return new String[0]; } return pkgs.toArray(new String[pkgs.size()]); } diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java index 763ef4e089cc3e994c0570b1f4b04b5365486463..b2a638ecdeb5594284f1299029bc21ba9991f8cb 100644 --- a/src/com/android/settings/display/TimeoutPreferenceController.java +++ b/src/com/android/settings/display/TimeoutPreferenceController.java @@ -20,9 +20,8 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.util.Log; - import androidx.preference.Preference; +import android.util.Log; import com.android.settings.R; import com.android.settings.TimeoutListPreference; diff --git a/src/com/android/settings/display/VrDisplayPreferenceController.java b/src/com/android/settings/display/VrDisplayPreferenceController.java index 6fcb5b0bc1759b638002746960c1ca6dae889399..9ff2861daedad9dd02ff85465cf04dbfd9c141d0 100644 --- a/src/com/android/settings/display/VrDisplayPreferenceController.java +++ b/src/com/android/settings/display/VrDisplayPreferenceController.java @@ -17,7 +17,6 @@ import android.app.ActivityManager; import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java index 8e290046ef678edc4b27114e2cf719974b0ec3d4..3c0e9476d8b4a255abcc4721f5006f8a486e8ff6 100644 --- a/src/com/android/settings/display/WallpaperPreferenceController.java +++ b/src/com/android/settings/display/WallpaperPreferenceController.java @@ -13,25 +13,24 @@ */ package com.android.settings.display; -import static android.os.UserManager.DISALLOW_SET_WALLPAPER; - import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; +import static android.os.UserManager.DISALLOW_SET_WALLPAPER; + import java.util.List; public class WallpaperPreferenceController extends AbstractPreferenceController implements diff --git a/src/com/android/settings/dream/CurrentDreamPicker.java b/src/com/android/settings/dream/CurrentDreamPicker.java index d33a1d9e25f3f156c8e451ccf8859f301a0cf44b..3ebce1c1d5408ffda002ea11004cc1362fe7b8fb 100644 --- a/src/com/android/settings/dream/CurrentDreamPicker.java +++ b/src/com/android/settings/dream/CurrentDreamPicker.java @@ -19,14 +19,12 @@ package com.android.settings.dream; import android.content.ComponentName; import android.content.Context; import android.graphics.drawable.Drawable; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; import com.android.settingslib.widget.CandidateInfo; - import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java index 80f9f77fa840ed9e13e6e650d203f86f14dc240c..fe33365b2bdb90db5078062abfdae92eff07bb61 100644 --- a/src/com/android/settings/dream/CurrentDreamPreferenceController.java +++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java @@ -17,15 +17,12 @@ package com.android.settings.dream; import android.content.Context; - import androidx.preference.Preference; - import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.GearPreference; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; - import java.util.Optional; public class CurrentDreamPreferenceController extends AbstractPreferenceController implements diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index ebf8e989077599cef6f65981f22753e6d75a8d7a..73762bd7cdf8d24a8ecd96f10a94d046dcf80e37 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -23,7 +23,6 @@ import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED; import android.content.Context; import android.provider.SearchIndexableResource; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java index 5519a0efc49ee136e3364568fc9b11610feac7a5..0a6c1b67464a9e7401647ac08eaec39f5063e564 100644 --- a/src/com/android/settings/dream/StartNowPreferenceController.java +++ b/src/com/android/settings/dream/StartNowPreferenceController.java @@ -17,11 +17,9 @@ package com.android.settings.dream; import android.content.Context; -import android.widget.Button; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; - +import android.widget.Button; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/dream/WhenToDreamPicker.java b/src/com/android/settings/dream/WhenToDreamPicker.java index 4c69b360bc0994f5af1f5fcd9b91045bd5705f6c..f6f89a89f8bc9bc9e9b015b17e5319577f90d01d 100644 --- a/src/com/android/settings/dream/WhenToDreamPicker.java +++ b/src/com/android/settings/dream/WhenToDreamPicker.java @@ -18,13 +18,11 @@ package com.android.settings.dream; import android.content.Context; import android.graphics.drawable.Drawable; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.widget.CandidateInfo; - import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/dream/WhenToDreamPreferenceController.java b/src/com/android/settings/dream/WhenToDreamPreferenceController.java index 4108e850538ecc2958872ce75af8018552ab762a..702812e7fda7a52618fffd9cbb6893dca11d27d3 100644 --- a/src/com/android/settings/dream/WhenToDreamPreferenceController.java +++ b/src/com/android/settings/dream/WhenToDreamPreferenceController.java @@ -17,9 +17,7 @@ package com.android.settings.dream; import android.content.Context; - import androidx.preference.Preference; - import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index 4047e8a4d35b7fef0546e0d1d94670ca459bd237..026b79f0fd9f0a65495527624e8e8e6fa6972d9c 100644 --- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java +++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java @@ -26,6 +26,7 @@ import android.graphics.drawable.Drawable; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; import android.util.IconDrawableFactory; import android.view.LayoutInflater; import android.view.View; @@ -33,8 +34,6 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import com.android.settings.DeviceAdminAdd; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java index 1c7ff620c3c98ec4139bd58dd4eacbd48fae48dc..520c436662ecfd28dee151bc07227a23c030c0ce 100644 --- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java @@ -15,9 +15,8 @@ package com.android.settings.enterprise; import android.content.Context; -import android.text.format.DateUtils; - import androidx.preference.Preference; +import android.text.format.DateUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java index 86d08cb674df48d737b6baf8e67d6eeb98239fd9..93ed1027c2550ad9ee9212650a03a90dd47fdc71 100644 --- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java @@ -16,7 +16,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java index 696561bad8cab083b23d127a3aa84f1867deaa53..7b6d5df3fde4e9b1292ce6272ec39b175f55ee11 100644 --- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java @@ -14,7 +14,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java index 3170dac364d2503ffaff43a60e17cad4ce399259..07a39e3a90c07e04d9b246683673100bf29da4d2 100644 --- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java +++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.enterprise; import android.content.Context; import android.content.pm.PackageManager; -import android.util.IconDrawableFactory; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.IconDrawableFactory; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java index 45170b3842f810e63b9dffff0f7432519707c47d..6e81482e10001595aefc563d1dd83f402116a900 100644 --- a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java @@ -15,7 +15,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java index 1bfe74724f309ad33e44b24695c6484ce1040ef7..2d3f41a6d4f7ad90241b8483b2c52a9d82d44174 100644 --- a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java @@ -15,7 +15,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.annotation.VisibleForTesting; public class CaCertsManagedProfilePreferenceController extends CaCertsPreferenceControllerBase { diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java index c7dde5cc4625782e089b393edc1a968217e90bf2..4220ccc546942c6df3750a34a0ac34f7ec38c0e7 100644 --- a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java @@ -15,7 +15,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java index 9bd4279db3f1ffb0037d365a709a06d5e0b826d2..9e8574fcfb444a2a332bb4f62490476b582670b7 100644 --- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java @@ -14,7 +14,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java index b07eb9111438b185af0dd122b2244b9dd809cf2d..e0c287df9e7fdf7209a5d7b9bb56f70b269470cb 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java @@ -14,7 +14,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java index e3136f4a5c1878cbe992c147c6b710f73d834abc..876d706d4af6aef5dbc52bb5af3fd388c5fde925 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java @@ -21,7 +21,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserHandle; - import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java index b2f9459d8a3380d5a022c9c38916618ab5e09d4a..63a552d0ac2ae53202a8efc98b1031221f7209d3 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.enterprise; import android.content.Context; import android.os.UserHandle; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java index 322589ea3f92da70bae2b1a689c5f7eb924bf16c..2a2a94e704096f4fcec79198303603ff7bb4d91b 100644 --- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java @@ -15,7 +15,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java index 51a24a2762070e2882a9bf1d2be8fb398144a1f3..fa4e7aa1a9a8e4f6ace67bd7cd38934495a2fe1a 100644 --- a/src/com/android/settings/enterprise/ImePreferenceController.java +++ b/src/com/android/settings/enterprise/ImePreferenceController.java @@ -15,7 +15,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java index 832e2ba8ce5ed87df7601425cd9e7aba9704f139..e4f2e76f7d199af6c7a8faff8d2b925a274b75e3 100644 --- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java +++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java @@ -14,7 +14,6 @@ package com.android.settings.enterprise; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java index b87e61f848115fba2fd90dc4b99fd4cd61a5d21b..f3c14865590febb2d714ab959a065bfa416b0ae0 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java @@ -17,7 +17,9 @@ package com.android.settings.fingerprint; import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; +import android.animation.ValueAnimator; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java index 4800a4fd48b996f747ae10dbe6b5e16704e34625..95a534cdd426e231ec51e63f5800fff20fb76648 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java @@ -20,11 +20,10 @@ import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; import android.os.UserHandle; +import androidx.annotation.Nullable; import android.view.View; import android.widget.Button; -import androidx.annotation.Nullable; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java index bca871343a2d18d041ac78c77b267acc061b3327..226d7185fb40af8e17c2476b522269715ef4ebf2 100644 --- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java +++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java @@ -24,13 +24,12 @@ import android.media.MediaPlayer; import android.media.MediaPlayer.OnInfoListener; import android.media.MediaPlayer.OnPreparedListener; import android.net.Uri; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.Surface; import android.view.TextureView; import android.view.View; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; /** diff --git a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java index ce679b66488fa448588a2b05b3690abfe3af3421..7caca3fff5771af8a9582c8c7bcc56d88f3881ae 100644 --- a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java +++ b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java @@ -17,17 +17,16 @@ package com.android.settings.fingerprint; import android.annotation.Nullable; +import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; -import android.os.UserHandle; -import android.util.Log; - -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; - -import java.util.LinkedList; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import android.os.UserHandle; import java.util.Queue; +import java.util.LinkedList; +import android.util.Log; /** * Sidecar fragment to handle the state around fingerprint removal. diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index 8fccd66cf2b7d983c0b838829b873c1a171a1f74..ed691895e84f6704d7b25d4b7aab887b09e16793 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -31,19 +31,18 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; -import android.text.TextUtils; -import android.util.Log; -import android.view.View; -import android.view.WindowManager; -import android.widget.EditText; -import android.widget.Toast; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; +import android.text.TextUtils; +import android.util.Log; +import android.view.View; +import android.view.WindowManager; +import android.widget.EditText; +import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java index aa1ddfb948ee738fade0e308e77792730a015ce7..519f116a0483286672d7d4fcfeacfd6dc8477019 100644 --- a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java +++ b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java @@ -22,7 +22,6 @@ import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java index fbf4309f25b39c04cc3c9b99fa87a74fe0ad5965..78dcb80afc0ae2830b4643dc0648917c15451cdb 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -24,7 +24,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; - import androidx.annotation.NonNull; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index de4867f572a7c7378d45154675fb8ded6de41548..badcb535471c17243cde659b4cdf80319a137140 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -29,13 +29,12 @@ import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.view.View; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java index 06f35266edd57162085a58af30dba77b6c0cca31..a2ba9a961819d35c39a281c99f62e66f05a37cab 100644 --- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java @@ -37,13 +37,12 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; import android.util.Log; import android.view.View; import android.webkit.IWebViewUpdateService; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.DeviceAdminAdd; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java index 26fd39851565bd29aa0fc0a249f3dfe01250341b..7527db3acb1ccb0b819f5ce511a69f56df10f71c 100644 --- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java @@ -17,9 +17,8 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java index 7f74d9e439b8812b73486415ce8abd3f9f75a9c7..cd384f1fa242432ed066d3c7cd2e595379133782 100644 --- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java @@ -18,7 +18,6 @@ import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java index 6848ea88b0887fefa9193eba22cc8bafb08b1abd..83b0984c7e9d6f71efc2b12fe1f2c5c104c3fd8c 100644 --- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java @@ -27,23 +27,24 @@ import android.os.Message; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.ArrayMap; +import android.util.FeatureFlagUtils; import android.util.Log; import android.util.SparseArray; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.internal.os.BatteryStatsHelper; import com.android.internal.os.PowerProfile; import com.android.settings.R; import com.android.settings.SettingsActivity; +import com.android.settings.core.FeatureFlags; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.fuelgauge.anomaly.Anomaly; diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java index b5c39a1f697ae0c5f420ece36fa6d3597a6a8f4f..f07389de53bde68fc9f8258084a27a6d2d91356f 100644 --- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java +++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java @@ -21,11 +21,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.PowerManager; - import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import com.android.settings.Utils; +import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/settings/fuelgauge/BatteryCellParser.java b/src/com/android/settings/fuelgauge/BatteryCellParser.java index 9139084d52e0a9873d62afad878ec5802d1e2a11..2b398778ca30ab108aad7908f233c24acf809104 100644 --- a/src/com/android/settings/fuelgauge/BatteryCellParser.java +++ b/src/com/android/settings/fuelgauge/BatteryCellParser.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import android.os.BatteryStats.HistoryItem; import android.telephony.ServiceState; import android.util.SparseIntArray; - import com.android.settings.Utils; import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider; diff --git a/src/com/android/settings/fuelgauge/BatteryFlagParser.java b/src/com/android/settings/fuelgauge/BatteryFlagParser.java index e16d5e7633f7e564f9cfd88b442a7e851ce208cf..d4f3fb20fd483e1a5d6fd668956eda41330e98b6 100644 --- a/src/com/android/settings/fuelgauge/BatteryFlagParser.java +++ b/src/com/android/settings/fuelgauge/BatteryFlagParser.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import android.os.BatteryStats.HistoryItem; import android.util.SparseBooleanArray; import android.util.SparseIntArray; - import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider; public class BatteryFlagParser implements BatteryInfo.BatteryDataParser, BatteryActiveProvider { diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java index 1695e40b901b6b6b75cad9a9ed5cf82ac9262496..7038fade345c94904bbae18bc66fad89f70b9553 100644 --- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java @@ -22,11 +22,10 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; -import android.widget.TextView; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; +import android.widget.TextView; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java index f7d62473dc499f683cf24d3d004cece51d80db74..3661467887b290cc30ae5560454ccdd59ee9d971 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java @@ -25,7 +25,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java index 4193cb9a131e57e307bdcf97ff2f23902919dd29..6ef09570b6ed5da84c8e202768f9387a3673fc87 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java @@ -17,14 +17,12 @@ package com.android.settings.fuelgauge; import android.content.Context; -import android.util.AttributeSet; -import android.view.View; -import android.widget.TextView; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; - +import android.util.AttributeSet; +import android.view.View; +import android.widget.TextView; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.graph.UsageView; diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java index 7d0c7989602e4d31324cb207a237bad048299e10..9afaabad3952758fdbab4c8110d172be82ec30f4 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfo.java +++ b/src/com/android/settings/fuelgauge/BatteryInfo.java @@ -24,11 +24,10 @@ import android.os.BatteryStats; import android.os.BatteryStats.HistoryItem; import android.os.Bundle; import android.os.SystemClock; +import androidx.annotation.WorkerThread; import android.text.format.Formatter; import android.util.SparseIntArray; -import androidx.annotation.WorkerThread; - import com.android.internal.os.BatteryStatsHelper; import com.android.settings.Utils; import com.android.settings.graph.UsageView; diff --git a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java index 22efaf6dec7cc73f8d78f97b513ee24adca48445..c60f42314f776f25fbb325eeccfb942ffa8c7df9 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java @@ -17,10 +17,11 @@ package com.android.settings.fuelgauge; import android.content.Context; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; import com.android.settingslib.utils.AsyncLoader; +import com.android.internal.annotations.VisibleForTesting; + /** * Loader that can be used by classes to load BatteryInfo in a background thread. This loader will * automatically grab enhanced battery estimates if available or fall back to the system estimate diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java index 5ad24003096b9775fbdacbb0082dba667e9128c7..0ad3724c906fafa576a53fed4729b0e190fe383e 100644 --- a/src/com/android/settings/fuelgauge/BatteryMeterView.java +++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java @@ -22,11 +22,10 @@ import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.widget.ImageView; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.graph.BatteryMeterDrawableBase; diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java index 6d2f1247027f3964cc898bde55a3a59a817f9fb6..b010998befd6075e4d82ef7078e75135f68b9f74 100644 --- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java @@ -15,7 +15,6 @@ package com.android.settings.fuelgauge; import android.os.Bundle; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java index 2b4e91508ddb0424ba4c4e2b9e5dcb4437d8381e..8b32a9cca1bf5b91e21d2172b11f1a918e4816fe 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverController.java +++ b/src/com/android/settings/fuelgauge/BatterySaverController.java @@ -21,7 +21,6 @@ import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java index c71478339ecb9f6f051dde21a2b7a27d52ea8310..addd30945c5024d2dabd4d546c90d3ef411717a9 100644 --- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java @@ -17,8 +17,9 @@ package com.android.settings.fuelgauge; import android.content.Context; +import android.os.BatteryStats; +import android.os.Bundle; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index 68cdf6c346e05800ba2ba354972df5d2a5ed6337..4a3e6d42e889987260de1a0ca9948019102d096f 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -24,21 +24,21 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.BatteryStats; -import android.os.Build; import android.os.Bundle; +import android.os.Build; import android.os.Process; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; -import android.text.format.DateUtils; -import android.util.Log; -import android.util.SparseLongArray; - import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; +import android.text.TextUtils; +import android.text.format.DateUtils; +import android.util.Log; +import android.util.SparseLongArray; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -48,6 +48,7 @@ import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.AnomalyInfo; import com.android.settings.fuelgauge.batterytip.StatsManagerConfig; import com.android.settings.overlay.FeatureFactory; + import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import com.android.settingslib.utils.PowerUtil; diff --git a/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java b/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java index 3a6e4eb01dacc29fe1703a949fceeec417e500e2..f4784a97824ac3d377c4bdac24f3412f7e5c41a2 100644 --- a/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java +++ b/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java @@ -1,11 +1,11 @@ package com.android.settings.fuelgauge; +import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; - import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java index f58ad9608189f0cc8291b1885c93da46f3288ffc..784902fca79a2dea744426dcaca16a1f5c513182 100644 --- a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java +++ b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java @@ -20,12 +20,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryStats; import android.os.SystemClock; - import com.android.internal.os.BatteryStatsHelper; import com.android.settings.overlay.FeatureFactory; -import com.android.settingslib.utils.AsyncLoader; import com.android.settingslib.utils.PowerUtil; - +import com.android.settingslib.utils.AsyncLoader; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index cb419ca253b63934d5cbe46203482a86bdf644c5..f93cffc1f4bb2bfcbb310f8496bfa216ed7aeaad 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -30,14 +30,15 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.os.Bundle; - import androidx.preference.ListPreference; import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.widget.RadioButtonPreference; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java index a2ceb67cab788258e56805f64168980cd158698e..95ff45c922817bf20842d312fdc0770dac856f06 100644 --- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java +++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java @@ -19,11 +19,10 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.AppPreference; diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index a793aed64ad7ca8fda5aa22f63f5dec2ca757f84..b73245733e3fdff008603d1acf04d14f91a3fd89 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -21,12 +21,11 @@ import android.content.IntentFilter; import android.os.BatteryManager; import android.os.Bundle; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java index 8c7bfbc429afafe4839550528d813b83365b61a8..cd34a477a62b41c77c6dc885232fbd760c3e1cd7 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java @@ -21,10 +21,9 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; -import android.util.IconDrawableFactory; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; +import android.util.IconDrawableFactory; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java index 52f786acdfb5a6371469fe95766973c0b9604496..aa029191a86ad012b146562335d73301ad450483 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageBase.java +++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java @@ -15,7 +15,7 @@ */ package com.android.settings.fuelgauge; -import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; +import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.*; import android.app.Activity; import android.app.LoaderManager; @@ -23,9 +23,8 @@ import android.content.Context; import android.content.Loader; import android.os.Bundle; import android.os.UserManager; -import android.view.Menu; - import androidx.annotation.VisibleForTesting; +import android.view.Menu; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 315d62741dccbf8a761fd6cebfa02783b690214c..2332c91d994ed74f6995fc1a396c1a2bc82fdf40 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -26,6 +26,7 @@ import android.content.Loader; import android.os.BatteryStats; import android.os.Bundle; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; import android.text.format.Formatter; import android.util.SparseArray; @@ -36,8 +37,6 @@ import android.view.View; import android.view.View.OnLongClickListener; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -473,6 +472,12 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList @Override public List getNonIndexableKeys(Context context) { List niks = super.getNonIndexableKeys(context); + + final BatteryPercentagePreferenceController controller = + new BatteryPercentagePreferenceController(context); + if (!controller.isAvailable()) { + niks.add(controller.getPreferenceKey()); + } niks.add(KEY_BATTERY_SAVER_SUMMARY); return niks; } diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java index d3c1d54e1af730ff1cda0196b4ff2cca526cb81f..f282154b66934ae9900f67fc56080af892236dd7 100644 --- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java +++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java @@ -19,12 +19,13 @@ package com.android.settings.fuelgauge; import android.app.AppOpsManager; import android.content.Context; +import android.os.UserHandle; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import com.android.settings.R; +import com.android.settings.SettingsActivity; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AppInfo; diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java index 4491155d7162e1c355a86e7d4e25ceeb168d2f90..b89824bf08374a9aba51405d7f4995002be0a3a4 100644 --- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java +++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java @@ -21,11 +21,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; -import android.util.IconDrawableFactory; - import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; +import android.util.IconDrawableFactory; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java index af49f3d9541d942ef43ad6caba188a2fe3a68a46..a3afd459ae80f0411c07097c64a124c42643c6fa 100644 --- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.provider.Settings; -import android.text.TextUtils; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/fuelgauge/anomaly/Anomaly.java b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java index 801b28fd1a24471e6870273af097a03a08f5d261..edbc14f5fb603e38a7c78a7d63518f7e08c7ce11 100644 --- a/src/com/android/settings/fuelgauge/anomaly/Anomaly.java +++ b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java @@ -18,9 +18,8 @@ package com.android.settings.fuelgauge.anomaly; import android.os.Parcel; import android.os.Parcelable; -import android.text.TextUtils; - import androidx.annotation.IntDef; +import android.text.TextUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java index 166095d94929fedfe89830987e187dacf832e6a1..55d972157b24d67710be89a6944cd245c7b6babf 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java @@ -19,12 +19,11 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; import android.net.Uri; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.KeyValueListParser; import android.util.Log; -import androidx.annotation.VisibleForTesting; - import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java index 440a81f5204ba57e323e3f5293fd6ee9e36c058e..918f98af50e06bfee6566271bd73f30b1b371196 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java @@ -21,7 +21,6 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java index 97d67040766e84b75880eb4b40bc42db6a52b931..fbd7dedf05a8104bf9fe20cf3d55fdbe2fe2d3a4 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java @@ -21,13 +21,15 @@ import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserManager; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.internal.os.BatteryStatsHelper; +import com.android.internal.util.ArrayUtils; import com.android.settingslib.utils.AsyncLoader; +import java.io.FileDescriptor; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java index ba061473049d1236eafd0e9c51d7a5429fbbdf48..a54b02ec3d86a7b398f05a65a26d26bcc38caf87 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java @@ -1,9 +1,10 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; - import androidx.preference.Preference; +import com.android.settings.R; + /** * Preference that stores {@link Anomaly} */ diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java index a78576fc8dbacc7e3487806463fdfbcd0a1ed9a0..dd90d89949b686dd7732593b569c37da2c8dae33 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java index f9891b34449d9e61563f06039d1588fd8356993e..2926547237d163fe382ec1a016809047551d4775 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java @@ -18,11 +18,10 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; import android.os.Build; +import androidx.annotation.VisibleForTesting; import android.util.Pair; import android.util.SparseIntArray; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.fuelgauge.anomaly.action.AnomalyAction; diff --git a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java index 0519ea1d6ed1e25d710d370c5a79e2e14e10622b..e3666d8f14c7312200299bb8d1604e8062de549f 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.anomaly.action; import android.app.AppOpsManager; import android.content.Context; import android.os.Build; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java index 5a93c5151c621b837415537e0a1752fe3a5d1899..dcf7e46fda55de25f53c96444abd0c8a9bdeb2a9 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.anomaly.action; import android.Manifest; import android.content.Context; import android.content.pm.permission.RuntimePermissionPresenter; - import androidx.annotation.VisibleForTesting; import androidx.core.content.PermissionChecker; diff --git a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java index e9e31e3f2b617c49590bf4a7eac5a140bcc298e7..b5fd20b5caa16c99991663f03e5ceaba39efc88c 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly.action; import android.content.Context; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java index b65279bdc733e229cd1c008286057b9b4d59a284..5cb188a220a5e93a108982cf65ee2410a70bde2e 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java @@ -19,8 +19,9 @@ package com.android.settings.fuelgauge.anomaly.checker; import android.content.Context; import android.os.BatteryStats; import android.os.SystemClock; - import androidx.annotation.VisibleForTesting; +import android.text.format.DateUtils; +import android.util.ArrayMap; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -29,6 +30,7 @@ import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy; import com.android.settings.fuelgauge.anomaly.AnomalyUtils; +import com.android.settings.fuelgauge.anomaly.action.AnomalyAction; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java index 8b9e5d57776c2a12035b542e9a9eb04664f7b99e..73d092517a1ffe0bdd8db0d335cf212efc860616 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.SystemClock; - import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatterySipper; diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java index 3becba124a94d8d60d7fda9dad356f27b50b8f4a..f891b514868d0a6a21b09369c1ab6c0d4fc20513 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java @@ -18,10 +18,11 @@ package com.android.settings.fuelgauge.anomaly.checker; import android.content.Context; import android.os.BatteryStats; +import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.ArrayMap; - -import androidx.annotation.VisibleForTesting; +import android.util.ArraySet; +import android.util.Log; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -32,6 +33,7 @@ import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy; import com.android.settings.fuelgauge.anomaly.AnomalyUtils; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java index c0ecbf9fb294af7b5a17d869db0de39d2a6df70e..06c05c075d5f616e455847e65f98cb134d5259d6 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java index c824dbb450c7c8767aa2f9b58b668fbadb6da07d..b082eeb52f93c0141ee6093e565727ef88634f5c 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java @@ -22,12 +22,11 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import android.util.Log; -import android.view.accessibility.AccessibilityNodeInfo; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.Log; +import android.view.accessibility.AccessibilityNodeInfo; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java index 80a72e67f71f33222ad138931d42dfd27a1dbe14..0618b44bdf1ea6d1dd817919126c0326c470f3a9 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.os.PowerManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java index bb73142b9be0c5650d54797ca1d9fddf2e357080..331572ba6114dcfb194a12a4dffdcda03889a24a 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java @@ -22,9 +22,8 @@ import android.app.job.JobScheduler; import android.app.job.JobService; import android.content.ComponentName; import android.content.Context; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java index ad02c3a75b699777a755237d8d7041a13e19a070..44169f0bfe62ef25b33cf8b51f0a57587e612dd6 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java @@ -25,12 +25,11 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Base64; import android.util.Log; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java index 369e61382db1013ac3ee5edede2a8df4e6605241..8e224470221ee2318b0de852cb9f43b8e5f94097 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java @@ -16,12 +16,15 @@ package com.android.settings.fuelgauge.batterytip; +import android.app.PendingIntent; import android.app.StatsManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.util.Log; +import com.android.internal.annotations.VisibleForTesting; + /** * Receive broadcast when {@link StatsManager} restart, then check the anomaly config and * prepare info for {@link StatsManager} diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java index e7f654c6ec545726aec48ae5f570edbe06e4b65c..404d8d7a889b7d05aa9d130feaef759a646c743c 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java @@ -19,9 +19,8 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; - import androidx.annotation.IntDef; +import android.util.Log; import com.android.settings.fuelgauge.anomaly.Anomaly; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java index 9f28cc3dddafe950dd22f56863bed96fd492d035..ad63fd21ad6794481e25d94041cbd7a7222358e1 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java @@ -34,11 +34,10 @@ import android.os.Bundle; import android.os.StatsDimensionsValue; import android.os.UserManager; import android.provider.Settings; -import android.util.Log; -import android.util.Pair; - import androidx.annotation.GuardedBy; import androidx.annotation.VisibleForTesting; +import android.util.Log; +import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.ArrayUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java index 7ec33062243115f2086a6cf6c7cef24bf6ff8e2f..4128f9dc487d2effa31ab3917d4d4fd76e7c02e8 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java +++ b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java @@ -18,11 +18,10 @@ package com.android.settings.fuelgauge.batterytip; import android.os.Parcel; import android.os.Parcelable; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; -import androidx.annotation.VisibleForTesting; - import com.android.settings.fuelgauge.anomaly.Anomaly; import java.util.Objects; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java index fe0fd180f56d0cd236edd4c5435fd9cd2105c70d..8edc45e338ad79667df3566d715264599fb355ef 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java @@ -20,7 +20,6 @@ import android.app.AppOpsManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java index 00064869044bb08757fcd655b0c7d202e3f58269..5cd52775ec06f151307b74b134c81c485cfbb6cf 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java @@ -21,11 +21,10 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.view.LayoutInflater; - import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import android.view.LayoutInflater; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -33,12 +32,15 @@ import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import com.android.settings.fuelgauge.Estimate; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController.BatteryTipListener; import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; +import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; +import com.android.settingslib.utils.StringUtil; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java index 1742a05aac4eb3ae07e962483adae250520f249f..c445687b20f3f8e497515d8f7e5505bad05aab28 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; - import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; @@ -27,8 +26,8 @@ import com.android.settings.fuelgauge.Estimate; import com.android.settings.fuelgauge.batterytip.detectors.EarlyWarningDetector; import com.android.settings.fuelgauge.batterytip.detectors.HighUsageDetector; import com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetector; -import com.android.settings.fuelgauge.batterytip.detectors.RestrictAppDetector; import com.android.settings.fuelgauge.batterytip.detectors.SmartBatteryDetector; +import com.android.settings.fuelgauge.batterytip.detectors.RestrictAppDetector; import com.android.settings.fuelgauge.batterytip.detectors.SummaryDetector; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java index 93234a7873bfb392bc38afd26656c57c6fbd12c1..42e723d23966cceb43375380a6634f39b4c6b6f1 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java @@ -18,12 +18,12 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; import android.util.KeyValueListParser; import android.util.Log; -import androidx.annotation.VisibleForTesting; - import java.time.Duration; +import java.util.concurrent.TimeUnit; /** * Class to store the policy for battery tips, which comes from diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java index 8e407f148d4000d3082d4aadae854ccff498fc80..21fc132259d834b8e26c369f46484954f4e3c48f 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java @@ -18,12 +18,12 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.os.Bundle; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsActivity; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -34,6 +34,7 @@ import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java index 16a9de9222110ef44c386fec999137c97e218d7a..da2d81f1ff412770861bac74748d57859508f8c4 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; - import androidx.annotation.NonNull; import com.android.internal.util.CollectionUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java index d832640736a7bf49cef56199bf7eefbbf282f594..b1866b9d2228050128fe15f2086cf283f1d8031d 100644 --- a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java +++ b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; +import androidx.recyclerview.widget.RecyclerView; import android.util.IconDrawableFactory; import android.view.LayoutInflater; import android.view.View; @@ -26,12 +27,10 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.R; import com.android.settings.Utils; -import com.android.settingslib.utils.StringUtil; +import com.android.settingslib.utils.StringUtil; import java.util.List; /** diff --git a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java index 230be3636fe7203990a81acf3a49c3411bb7780b..4a0b5ba01fb779666ab6469cc9b2a115bf6d8ffe 100644 --- a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java +++ b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java @@ -18,6 +18,9 @@ package com.android.settings.fuelgauge.batterytip; import androidx.annotation.IntDef; +import com.google.common.hash.HashFunction; +import com.google.common.hash.Hashing; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java index 236413eb844bc5c7bae13a455a4a2f730280cc6b..9f9a99d0f5821955a56fcd048ec7f80721763dcf 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java @@ -19,8 +19,17 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.SettingsActivity; +import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.SubSettingLauncher; +import com.android.settings.fuelgauge.BatteryUtils; +import com.android.settings.fuelgauge.RestrictedAppDetails; import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; +import com.android.settings.fuelgauge.batterytip.AppInfo; +import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; + +import java.util.List; /** * diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java index ac946df571d476aff7e6141502a3ceee2fe279b6..59b5c15b0556589147705d55fc96e617b257c0cc 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java @@ -18,9 +18,8 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.app.AppOpsManager; import android.content.Context; -import android.util.Pair; - import androidx.annotation.VisibleForTesting; +import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.CollectionUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java index 419e04313451cdfa1f3e152972f11928a65a0883..ea40107d62edd08bd10a9e99417ce3be1e41e0a6 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java @@ -18,9 +18,8 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.app.AppOpsManager; import android.content.Context; -import android.util.Pair; - import androidx.annotation.VisibleForTesting; +import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.BatteryUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java index 13ba5f6bcfe9e8d7423e7a6c718cf59ab60b74b5..664a8ca202e9786a29d2db69433b7414189d8012 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java @@ -18,16 +18,15 @@ package com.android.settings.fuelgauge.batterytip.detectors; import android.content.Context; import android.os.BatteryStats; -import android.text.format.DateUtils; - import androidx.annotation.VisibleForTesting; +import android.text.format.DateUtils; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; +import com.android.settings.fuelgauge.batterytip.AppInfo; +import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.batterytip.HighUsageDataParser; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip; diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java index 80e1af129d20341d36e4aac7c3a0d02c7dcd88bf..3ff0989d08af049d99f10e0f7fe11626408de1df 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java @@ -17,9 +17,8 @@ package com.android.settings.fuelgauge.batterytip.detectors; import android.content.Context; -import android.text.format.DateUtils; - import androidx.annotation.VisibleForTesting; +import android.text.format.DateUtils; import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.AppInfo; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java b/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java index 3650fe38e2c8ea040ee2f8758b4734c41b848dbd..21bdbf10816b2818a1eedb17d03f9816f67f800e 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.app.AppOpsManager; import android.content.Context; +import com.android.settings.Utils; import com.android.settings.fuelgauge.batterytip.AppInfo; import java.util.function.Predicate; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index 21af43249e97408cffa4a3f1a90e73ac4123f963..b1a0d7c6b24200dab904c8f0641195d72e6359c1 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -19,12 +19,11 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import android.util.SparseIntArray; - import androidx.annotation.IdRes; import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.util.SparseIntArray; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java index 356097dfbda03271078b18c538775edd3ceef179..2b8ad231c10e9d4bf40c18433e97e66559a6f5bb 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java @@ -19,12 +19,12 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; + import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java index 818a46757dfd74f6dead1f36c1796f6e59689945..c2e45b19c48a4bc54b6659c9967bc57ae75cff69 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.res.Resources; import android.icu.text.ListFormatter; import android.os.Parcel; +import android.text.TextUtils; import android.util.Pair; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java index e8dc6a9e7897211acd1de3d454cd56781ca00cb0..68c7d70be5ef467022d5e484748317059fe61793 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; +import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java index 0e2e8b59ffaaf9fc8bfc1353568579b6ce4718e6..8d0624aa965d88d84ccc3b58201ba4113f6faa48 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java index 11c6b2253954b68333cca41c73d50438d037f1fd..187b1cabb4ad4d20075ac6f85519574353951994 100644 --- a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java +++ b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java @@ -18,6 +18,7 @@ package com.android.settings.gestures; import android.content.Context; +import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java index 4a5ab1ab6e06ab16d2e27b6676590b75619f8278..6e318d65b2eaaf86a46b8f598c5d4cd785a21f37 100644 --- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java +++ b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java @@ -22,7 +22,6 @@ import static android.provider.Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENA import android.content.Context; import android.content.Intent; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java index 95810a80bf4879085ac1f8e679518aa0e6c7c67d..4433dd6e29e9084a60d73f21d4e1bec9a6601377 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java @@ -22,9 +22,8 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.provider.Settings; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index b9edbf48d8104138ce21de9ab11fc64690019d49..f1c2ed30c2ae5fac60dc1fc2bd8138970b8c5a12 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java @@ -16,17 +16,15 @@ package com.android.settings.gestures; -import static android.provider.Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP; - import android.annotation.UserIdInt; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.UserHandle; import android.provider.Settings; -import android.text.TextUtils; - +import androidx.preference.Preference; import androidx.annotation.VisibleForTesting; +import android.text.TextUtils; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; @@ -34,6 +32,8 @@ import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; +import static android.provider.Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP; + public class DoubleTapScreenPreferenceController extends GesturePreferenceController { private final int ON = 1; diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 8614b11f3e669b2223d34fea38e25a246363fda6..29e0a1a4b7365de22b3ea643c20bb2a49da252ad 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -18,6 +18,7 @@ package com.android.settings.gestures; import android.content.Context; import android.content.SharedPreferences; +import android.os.UserHandle; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; @@ -28,6 +29,7 @@ import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java index d4c63c0a76bf2f5796d86deaad07618d71e19c28..6a72dc4e4d7c6a7d9a4612e2cef3f927813881b1 100644 --- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java @@ -24,9 +24,8 @@ import android.hardware.SensorManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java index a4274bf7417939e4bc4acb33b3ae283386ca7b7c..780325f085733210554f815875e91ecf86c3c403 100644 --- a/src/com/android/settings/gestures/GesturePreferenceController.java +++ b/src/com/android/settings/gestures/GesturePreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.gestures; import android.content.Context; import android.os.Bundle; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index 26ec87d8013ff8eb15eed181e01270ddd8665d59..27172d95b1f165dbc38377e9effb0bd636bd7369 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -17,14 +17,20 @@ package com.android.settings.gestures; import android.content.Context; +import android.os.UserHandle; import android.provider.SearchIndexableResource; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.core.lifecycle.Lifecycle; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java index d0cdfb7039cd15e01707e750b18e21eff3585598..652e1518188e0bb8bf63f6352e13f5fcf95212b0 100644 --- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java +++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.gestures; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import androidx.annotation.NonNull; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index c76811c457a860b975bcaade25fe571ae28bc994..6d01e52e84292c04bf48d66101e7a55d0ff1c8b7 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java @@ -24,9 +24,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.UserHandle; import android.provider.Settings; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; +import android.text.TextUtils; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; diff --git a/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/src/com/android/settings/gestures/PreventRingingGestureSettings.java index 11eb84ce45115047ca969c4da5809c460af5cd16..241e5c0bf5df79313473afa15848a97ecded5c91 100644 --- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java +++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java @@ -17,13 +17,17 @@ package com.android.settings.gestures; import android.content.Context; +import android.os.UserHandle; import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.core.lifecycle.Lifecycle; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -54,7 +58,7 @@ public class PreventRingingGestureSettings extends DashboardFragment { @Override public int getHelpResource() { - return 0; + return R.string.help_uri_prevent_ringing_gesture; } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/gestures/PreventRingingPreferenceController.java b/src/com/android/settings/gestures/PreventRingingPreferenceController.java index 29269234dc1db91c2b882fde7c9608753d550f6d..c6bc3aa8f265c649c61219befb65c0339719ea09 100644 --- a/src/com/android/settings/gestures/PreventRingingPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingPreferenceController.java @@ -24,7 +24,6 @@ import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; import android.content.Context; import android.os.Bundle; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index 7eb3d6cbe5bba9dc51b19dc7ced247f6b6ea38cb..c18289c1a92fb731329c48bc465f0b770fb60e47 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -70,10 +70,5 @@ public class SwipeToNotificationSettings extends DashboardFragment { sir.xmlResId = R.xml.swipe_to_notification_settings; return Arrays.asList(sir); } - - @Override - protected boolean isPageSearchEnabled(Context context) { - return SwipeToNotificationPreferenceController.isAvailable(context); - } }; } diff --git a/src/com/android/settings/gestures/SwipeUpPreferenceController.java b/src/com/android/settings/gestures/SwipeUpPreferenceController.java index f48d21b90d4097562dccbafa2faded0bba34348b..331a5efbaf1a4548d550702ab3b6b0a136dc0c5b 100644 --- a/src/com/android/settings/gestures/SwipeUpPreferenceController.java +++ b/src/com/android/settings/gestures/SwipeUpPreferenceController.java @@ -22,6 +22,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.UserManager; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import com.android.internal.R; diff --git a/src/com/android/settings/graph/BottomLabelLayout.java b/src/com/android/settings/graph/BottomLabelLayout.java index d68fa2fc9431dd7d20ec8861c31ffefcacd1d39c..20d97e5e4d0e410b2fe8606cd03ae5146d6fec84 100644 --- a/src/com/android/settings/graph/BottomLabelLayout.java +++ b/src/com/android/settings/graph/BottomLabelLayout.java @@ -19,13 +19,12 @@ package com.android.settings.graph; import android.annotation.Nullable; import android.content.Context; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; import android.widget.LinearLayout; -import androidx.annotation.VisibleForTesting; - import com.android.settingslib.R; /** diff --git a/src/com/android/settings/graph/UsageGraph.java b/src/com/android/settings/graph/UsageGraph.java index 51e0270f7e2b84f4aa2f126d8d2deff3ebd94bca..b9d517d5e8d11b2c0620954e807b687bd6349f65 100644 --- a/src/com/android/settings/graph/UsageGraph.java +++ b/src/com/android/settings/graph/UsageGraph.java @@ -28,13 +28,12 @@ import android.graphics.Paint.Style; import android.graphics.Path; import android.graphics.Shader.TileMode; import android.graphics.drawable.Drawable; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.SparseIntArray; import android.util.TypedValue; import android.view.View; -import androidx.annotation.VisibleForTesting; - import com.android.settings.fuelgauge.BatteryUtils; import com.android.settingslib.R; diff --git a/src/com/android/settings/graph/UsageView.java b/src/com/android/settings/graph/UsageView.java index 8297d0b0bed46813d251af9f88a89982f5ddd1ba..bcf04414cfe4ae2b325735e8c1860dba0ad0091e 100644 --- a/src/com/android/settings/graph/UsageView.java +++ b/src/com/android/settings/graph/UsageView.java @@ -24,7 +24,6 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; - import com.android.settingslib.R; public class UsageView extends FrameLayout { diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java index 80f668069f103dacb13fdc7b9225b135114552a2..a635842aa4c6cf38d6582c193ef0e1dd69e00888 100644 --- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java +++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.inputmethod; import android.content.Context; import android.hardware.input.InputManager; import android.provider.Settings; -import android.view.InputDevice; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.view.InputDevice; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index be54ee2332924b4f0366a1cc3b8548adc8146260..37f64133915177a5db30e76dc27cd083346f401c 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -18,9 +18,8 @@ package com.android.settings.inputmethod; import android.content.Intent; import android.os.Bundle; -import android.text.TextUtils; - import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java index 62c0470eddb9b30e4393367265a087c2cdf21e9a..e100dd2dc96a3388af046d0a17d78c75259f7646 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java @@ -19,6 +19,7 @@ package com.android.settings.inputmethod; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; +import android.app.DialogFragment; import android.app.LoaderManager.LoaderCallbacks; import android.content.AsyncTaskLoader; import android.content.Context; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java index a455b3c7d29437955d6964d97a25e5162abe6891..47625e768bf464970154f46ecc2d542ede18d6d7 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java @@ -22,11 +22,10 @@ import android.hardware.input.InputManager; import android.hardware.input.InputManager.InputDeviceListener; import android.hardware.input.KeyboardLayout; import android.os.Bundle; -import android.view.InputDevice; - import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.view.InputDevice; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index 532ad15065ae94707fce248c58caeaaca60b138e..cc2e8aa82fefc1db50307d83ce2b7d1cf046219e 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -30,14 +30,13 @@ import android.os.Handler; import android.os.UserHandle; import android.provider.SearchIndexableResource; import android.provider.Settings.Secure; -import android.text.TextUtils; -import android.view.InputDevice; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; +import android.view.InputDevice; import com.android.internal.inputmethod.InputMethodUtils; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java index 78f4d347b70f0318bdcd543793250ce52be37354..38937de3b8eef8e26be9add7a51a83743bc6d062 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.inputmethod; import android.content.Context; import android.hardware.input.InputManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java index 88649ec249cbf73ded022db4711d2c55730e3176..62874266bf38bd3180a39515c13d32955a044ca2 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java @@ -21,13 +21,12 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; import android.view.textservice.SpellCheckerInfo; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.CustomListPreference; import com.android.settings.R; diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java index a7ebd07598f6702230db7c12c506b039aa0e89ec..8adf2389770d37c5e8a7e82de9f8a13aa2bc2090 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java @@ -17,11 +17,10 @@ package com.android.settings.inputmethod; import android.content.Context; -import android.view.textservice.SpellCheckerInfo; -import android.view.textservice.TextServicesManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.view.textservice.SpellCheckerInfo; +import android.view.textservice.TextServicesManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index 20ec6f8190896a622212e88db3a3aed3cb7f32c7..3f38704de6ed3c461f02bc46491d65498ddfb629 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -22,17 +22,16 @@ import android.content.DialogInterface; import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; import android.util.Log; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.SpellCheckerSubtype; import android.view.textservice.TextServicesManager; import android.widget.Switch; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java index 9ec10785eb7bc1d30671a1be5fb6cc44670e83b4..3f1122a58ce6a0549065dcb562604395f9473e67 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java +++ b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java @@ -21,9 +21,8 @@ import android.content.CursorLoader; import android.database.Cursor; import android.database.MatrixCursor; import android.provider.UserDictionary; -import android.util.ArraySet; - import androidx.annotation.VisibleForTesting; +import android.util.ArraySet; import java.util.Locale; import java.util.Objects; diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java index 916e55419f1fb35262b91034a6ba8a8b45369941..990c12bcdb7ffdc77922c9916a59342d852997ad 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryList.java +++ b/src/com/android/settings/inputmethod/UserDictionaryList.java @@ -22,15 +22,14 @@ import android.content.Intent; import android.database.Cursor; import android.os.Bundle; import android.provider.UserDictionary; +import androidx.annotation.NonNull; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; -import androidx.annotation.NonNull; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java index 585ce194b22ff0fab5a4750ec4f3051706e6b648..bd33b3ff4c91b3e3336be95c21e7b22dcd6dff98 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -24,11 +24,10 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.provider.SearchIndexableResource; +import androidx.preference.Preference; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java index 0f5a49ea2bc11783dd9d5e2f27af6d49a505c4d3..4a046469d9d48ae844cf6a8e5bac8565f92cc74a 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java @@ -19,12 +19,11 @@ package com.android.settings.inputmethod; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.pm.PackageManager; +import androidx.preference.Preference; import android.text.BidiFormatter; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 7e04023a79f2de0b97c9713cb16177aca143b1f3..7e7bdcaecd94f43ad2e426b9012ed84623fd228f 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -24,13 +24,12 @@ import android.content.pm.PackageManager; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.speech.tts.TtsEngines; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController; diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java index c0aedfeaede9c91a6d3db92ba3e4a822180e1290..af60ba0fa44acd001193d0d75b6e1f8731c12c51 100644 --- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java +++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.language; import android.content.Context; - import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/language/PointerSpeedController.java b/src/com/android/settings/language/PointerSpeedController.java index 67326ddab0e6fdf2689caa063fecad007ead8367..8a0226a20d1b4349d5167bce8f5530e9138c7992 100644 --- a/src/com/android/settings/language/PointerSpeedController.java +++ b/src/com/android/settings/language/PointerSpeedController.java @@ -18,10 +18,10 @@ package com.android.settings.language; import android.content.Context; -import androidx.annotation.VisibleForTesting; - -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.R; + +import androidx.annotation.VisibleForTesting; public class PointerSpeedController extends BasePreferenceController { diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java index c83492c4883d0b8aee5aa9bef5ba0677b910dde2..f19047b5b88b0a23b4a809d5a890f2ae83f52a62 100644 --- a/src/com/android/settings/language/TtsPreferenceController.java +++ b/src/com/android/settings/language/TtsPreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.language; import android.content.Context; import android.speech.tts.TtsEngines; -import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; public class TtsPreferenceController extends AbstractPreferenceController diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java index f2c55c43da31b676db66628b1579a050bd833f97..9338a296da9d905858ee3152c1914252de69a566 100644 --- a/src/com/android/settings/language/UserDictionaryPreferenceController.java +++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.language; import android.app.Fragment; import android.content.Context; import android.os.Bundle; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index af7dc7613dc17e9b140d6d50e69570676bc898cf..be6447ef1950d5de9eba8301d5aff139474bb624 100644 --- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java +++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java @@ -20,6 +20,9 @@ import android.content.Context; import android.graphics.Canvas; import android.os.Bundle; import android.os.LocaleList; +import androidx.core.view.MotionEventCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; @@ -28,14 +31,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; -import androidx.core.view.MotionEventCompat; -import androidx.recyclerview.widget.ItemTouchHelper; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.app.LocalePicker; import com.android.internal.app.LocaleStore; -import com.android.settings.R; + import com.android.settings.shortcut.CreateShortcut; +import com.android.settings.R; import java.text.NumberFormat; import java.util.ArrayList; diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java index 90698129ccc34456f0bd9a30a3e5ab51e9e2e90b..d3d58ff73e535bb0e007aef23dc3e041438b1241 100644 --- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java +++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java @@ -18,11 +18,10 @@ package com.android.settings.localepicker; import android.content.Context; import android.os.Bundle; -import android.view.View; - import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import android.view.View; import com.android.settings.R; diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index ffb8cae467d897cee6bfa46743d630c47dad6332..de68f00e318e31693c0fa6708bf604da7aac0610 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -16,23 +16,20 @@ package com.android.settings.localepicker; -import static android.os.UserManager.DISALLOW_CONFIG_LOCALE; - import android.app.AlertDialog; import android.app.FragmentTransaction; import android.content.DialogInterface; import android.os.Bundle; import android.os.LocaleList; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.recyclerview.widget.RecyclerView; +import android.widget.TextView; import com.android.internal.app.LocalePicker; import com.android.internal.app.LocalePickerWithRegion; import com.android.internal.app.LocaleStore; @@ -44,6 +41,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import static android.os.UserManager.DISALLOW_CONFIG_LOCALE; + /** * Drag-and-drop editor for the user-ordered locale lists. */ diff --git a/src/com/android/settings/localepicker/LocaleRecyclerView.java b/src/com/android/settings/localepicker/LocaleRecyclerView.java index e82874dab70f782e5e993db4ebb8e6009b2091ae..93d54a49a8f586e6ea6933077fa82936116ea114 100644 --- a/src/com/android/settings/localepicker/LocaleRecyclerView.java +++ b/src/com/android/settings/localepicker/LocaleRecyclerView.java @@ -17,11 +17,10 @@ package com.android.settings.localepicker; import android.content.Context; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.MotionEvent; -import androidx.recyclerview.widget.RecyclerView; - class LocaleRecyclerView extends RecyclerView { public LocaleRecyclerView(Context context) { super(context); diff --git a/src/com/android/settings/location/BluetoothScanningPreferenceController.java b/src/com/android/settings/location/BluetoothScanningPreferenceController.java index d16e1e58e2f17e8b4cb51705b163dd563530acc1..6350ffa49f1cfd7df5995b020cc7981a8ef0880a 100644 --- a/src/com/android/settings/location/BluetoothScanningPreferenceController.java +++ b/src/com/android/settings/location/BluetoothScanningPreferenceController.java @@ -15,9 +15,8 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java index 65de6e2339d6b528050ae903baaab1dbfcab95eb..d45128cea3d3ff22fe2eeba935dd5e9cb40d38fb 100644 --- a/src/com/android/settings/location/LocationEnabler.java +++ b/src/com/android/settings/location/LocationEnabler.java @@ -13,11 +13,8 @@ */ package com.android.settings.location; -import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; -import static com.android.settingslib.Utils.updateLocationEnabled; -import static com.android.settingslib.Utils.updateLocationMode; - import android.app.ActivityManager; +import android.Manifest.permission; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -26,9 +23,8 @@ import android.location.LocationManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; @@ -37,6 +33,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import static com.android.settingslib.Utils.updateLocationMode; +import static com.android.settingslib.Utils.updateLocationEnabled; +import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; + /** * A class that listens to location settings change and modifies location settings diff --git a/src/com/android/settings/location/LocationFooterPreferenceController.java b/src/com/android/settings/location/LocationFooterPreferenceController.java index 3431aa25c05818da6d0c0b323710cc4e6337bca4..658c3cd45206814f3ed8ab750864f5185afb6fdf 100644 --- a/src/com/android/settings/location/LocationFooterPreferenceController.java +++ b/src/com/android/settings/location/LocationFooterPreferenceController.java @@ -22,17 +22,14 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.location.LocationManager; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; - +import android.util.Log; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.widget.FooterPreference; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/com/android/settings/location/LocationForWorkPreferenceController.java b/src/com/android/settings/location/LocationForWorkPreferenceController.java index 580f8880f93e30422c430cb1b7334620a59740f5..3f51d6f4db5cdbdef616abfb087ad712c07fa0a4 100644 --- a/src/com/android/settings/location/LocationForWorkPreferenceController.java +++ b/src/com/android/settings/location/LocationForWorkPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.location; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java index bc39b19e1a737d25a06efab0708a8e2c9c47e5d0..a091ca82b0150b9d53b5e94f94c5c352fb330d3d 100644 --- a/src/com/android/settings/location/LocationPreferenceController.java +++ b/src/com/android/settings/location/LocationPreferenceController.java @@ -21,17 +21,15 @@ import android.content.Intent; import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings.Secure; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineListPayload; import com.android.settings.search.ResultPayload; -import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java index 9d1bdc0dc86def4b1e244a4ccd751728a9408f48..33fe612913a23e318dde7004f478be97e188781a 100644 --- a/src/com/android/settings/location/LocationScanningPreferenceController.java +++ b/src/com/android/settings/location/LocationScanningPreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.location; import android.content.Context; -import androidx.annotation.VisibleForTesting; - -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.R; + +import androidx.annotation.VisibleForTesting; public class LocationScanningPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/location/LocationServicePreferenceController.java b/src/com/android/settings/location/LocationServicePreferenceController.java index cc5e53d082296ffa37ccc585aa1d355cffdf56df..f865b449041d56e0648a191e7169253366547efe 100644 --- a/src/com/android/settings/location/LocationServicePreferenceController.java +++ b/src/com/android/settings/location/LocationServicePreferenceController.java @@ -19,12 +19,11 @@ import android.content.Intent; import android.content.IntentFilter; import android.location.SettingInjectorService; import android.os.UserHandle; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import android.util.Log; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 2d3911bbe914ac56295640145f8bb727283728e1..8b0ee8a496bba0e9ccceafb1c8726b701e06fb48 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -21,10 +21,8 @@ import android.content.Context; import android.location.SettingInjectorService; import android.os.Bundle; import android.provider.SearchIndexableResource; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -36,7 +34,6 @@ import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/com/android/settings/location/LocationSliceBuilder.java b/src/com/android/settings/location/LocationSliceBuilder.java index c2f2adfb38ab7e41e18bc2ba60e8bcf6d570b2ea..160d90a6390063b2b72f821e2ab820fe23c6985a 100644 --- a/src/com/android/settings/location/LocationSliceBuilder.java +++ b/src/com/android/settings/location/LocationSliceBuilder.java @@ -29,17 +29,18 @@ import android.content.Intent; import android.net.Uri; import android.provider.SettingsSlicesContract; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; import com.android.settings.search.DatabaseIndexingUtils; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + +import androidx.core.graphics.drawable.IconCompat; + /** * Utility class to build an intent-based Location Slice. */ diff --git a/src/com/android/settings/location/LocationSwitchBarController.java b/src/com/android/settings/location/LocationSwitchBarController.java index 7aa66ce20497ea27bca8fcebdd7e4d4f5c0b0302..70ecc1eb850e957ffd077603a16a42a61caba57c 100644 --- a/src/com/android/settings/location/LocationSwitchBarController.java +++ b/src/com/android/settings/location/LocationSwitchBarController.java @@ -16,7 +16,6 @@ package com.android.settings.location; import android.content.Context; import android.os.UserHandle; import android.widget.Switch; - import com.android.settings.widget.SwitchBar; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java index a41aa945d20f6c01c316066e858009198ef7d9fb..f4ae15bdc54691cbbdaef10db6519eb98a8eda70 100644 --- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java @@ -16,12 +16,10 @@ package com.android.settings.location; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.SubSettingLauncher; @@ -29,7 +27,6 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; - import java.util.List; public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController { diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java index 1a11d92933d31aa478e8f80305750b83a1d67034..0b7614c22be2cc9a592916bd0421e183f12eb25a 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java @@ -19,7 +19,6 @@ package com.android.settings.location; import android.content.Context; import android.provider.SearchIndexableResource; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -27,7 +26,6 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java index 6a1ebd938f1eb99561b7085e6b5023aa0d4e3ddd..99dc9fc348715d87e5933f93d6b51fc5859bfecc 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java @@ -17,16 +17,13 @@ package com.android.settings.location; import android.content.Context; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; - import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; - import java.util.List; /** Preference controller for preference category displaying all recent location requests. */ diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java index 1144e8f0ab785225bbad8c248b7def8e2a42a1d2..52b06564f759e04f07fd0a112dda1c06a2df54bb 100644 --- a/src/com/android/settings/location/SettingsInjector.java +++ b/src/com/android/settings/location/SettingsInjector.java @@ -37,14 +37,13 @@ import android.os.Messenger; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.AttributeSet; import android.util.IconDrawableFactory; import android.util.Log; import android.util.Xml; -import androidx.preference.Preference; - import com.android.settings.widget.AppPreference; import com.android.settings.widget.RestrictedAppPreference; diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java index 234ec5e53e12a91fa0d0309362e270961d4cf2ef..c5389ca496cc5cbc9638c181c9208ed4df83440b 100644 --- a/src/com/android/settings/location/WifiScanningPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningPreferenceController.java @@ -15,9 +15,8 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index b0776f0e59e9d4fe6ea10e14c9d017e97e26f897..469449ff107d1f10b46e75de1691065111d39bab 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -22,11 +22,11 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.SystemProperties; -import android.text.TextUtils; - +import android.provider.SettingsSlicesContract; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java index c0a34202ec2a07fd098b43310484258e474b9dc5..86e9f7b8c3cd1182a5f81d1476b8cf3bdb2b2265 100644 --- a/src/com/android/settings/network/ApnEditor.java +++ b/src/com/android/settings/network/ApnEditor.java @@ -28,6 +28,13 @@ import android.net.Uri; import android.os.Bundle; import android.os.PersistableBundle; import android.provider.Telephony; +import androidx.annotation.VisibleForTesting; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.SwitchPreference; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import android.telephony.CarrierConfigManager; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; @@ -41,14 +48,6 @@ import android.view.MenuItem; import android.view.View; import android.view.View.OnKeyListener; -import androidx.annotation.VisibleForTesting; -import androidx.preference.EditTextPreference; -import androidx.preference.ListPreference; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.util.ArrayUtils; diff --git a/src/com/android/settings/network/ApnPreference.java b/src/com/android/settings/network/ApnPreference.java index 412259bab729dff48af62f10906dcfa542cb0fd8..ee53ca9518f079b6def97bc4519c6112ec4f9c7b 100755 --- a/src/com/android/settings/network/ApnPreference.java +++ b/src/com/android/settings/network/ApnPreference.java @@ -21,6 +21,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.provider.Telephony; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionManager; import android.util.AttributeSet; import android.util.Log; @@ -30,9 +32,6 @@ import android.widget.CompoundButton; import android.widget.RadioButton; import android.widget.RelativeLayout; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; public class ApnPreference extends Preference implements diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index beeaab35c7aee7a51fc3cb5f7f02de9d32bedc75..013ae8cc7c8184de1e95a18f272739f7b853ac9c 100755 --- a/src/com/android/settings/network/ApnSettings.java +++ b/src/com/android/settings/network/ApnSettings.java @@ -37,6 +37,8 @@ import android.os.PersistableBundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Telephony; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -50,9 +52,6 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.widget.Toast; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java index 5e729afec3cc0bd614ed8ad29b0cc407f39c5520..e4d52bc8d090e8eecd4f1d82e679869afd4ca2cc 100644 --- a/src/com/android/settings/network/MobileNetworkPreferenceController.java +++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java @@ -24,13 +24,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.UserManager; import android.provider.Settings; -import android.telephony.PhoneStateListener; -import android.telephony.ServiceState; -import android.telephony.TelephonyManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.telephony.PhoneStateListener; +import android.telephony.ServiceState; +import android.telephony.TelephonyManager; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java index 1db6b2e0b320cb43740a487d86dcc37196c9b361..f29f11c3320d6f4a85565363fe004f97dacba12b 100644 --- a/src/com/android/settings/network/MobilePlanPreferenceController.java +++ b/src/com/android/settings/network/MobilePlanPreferenceController.java @@ -31,12 +31,11 @@ import android.net.NetworkInfo; import android.net.Uri; import android.os.Bundle; import android.os.UserManager; +import androidx.preference.Preference; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 581799930ed0a75600718ba9fc615eac6b547be7..5dafeec2e167a35ced22de91f0d2539b9cc7fa68 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -24,11 +24,10 @@ import android.app.Dialog; import android.app.Fragment; import android.content.Context; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; import android.util.Log; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/network/NetworkResetRestrictionChecker.java b/src/com/android/settings/network/NetworkResetRestrictionChecker.java index bb1fde7bf591c7f338d1c345bce60998efd85fda..5ae3a77423eb5eafaeca3b0e6c454d61423ebe58 100644 --- a/src/com/android/settings/network/NetworkResetRestrictionChecker.java +++ b/src/com/android/settings/network/NetworkResetRestrictionChecker.java @@ -19,7 +19,6 @@ package com.android.settings.network; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java index d9c20ffdf48240d801a89070fafa674bc55bb9d0..0a63adca80cb1e2c43c042de1007d04e9dc4f35c 100644 --- a/src/com/android/settings/network/NetworkScorerPicker.java +++ b/src/com/android/settings/network/NetworkScorerPicker.java @@ -19,15 +19,14 @@ import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java index 7239b00d084d3785057a4a93968e47c0fc8da303..98482016e4c0131176d8d43a25d841d92312fb62 100644 --- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java +++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.network; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index 8ba2d62c3fcca2b1f47d43ae6b0e83158e813df4..0627cb305443bbfe8e6262c067513770e55992be 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -29,6 +29,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; import android.system.Os; import android.text.Editable; import android.text.TextWatcher; @@ -41,8 +42,6 @@ import android.widget.EditText; import android.widget.RadioGroup; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -50,6 +49,7 @@ import com.android.settings.utils.AnnotationSpan; import com.android.settingslib.CustomDialogPreference; import com.android.settingslib.HelpUtils; +import java.net.InetAddress; import java.util.HashMap; import java.util.Map; diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 62714fa63805b1dfde2c3133dacf170185215720..13e5bf342dc57967ad043a65c6c45c8658779227 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -23,8 +23,8 @@ import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; -import android.content.ContentResolver; import android.content.Context; +import android.content.ContentResolver; import android.content.res.Resources; import android.database.ContentObserver; import android.net.ConnectivityManager; @@ -35,7 +35,6 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -43,9 +42,9 @@ import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import com.android.settingslib.core.lifecycle.LifecycleObserver; import java.net.InetAddress; import java.util.List; diff --git a/src/com/android/settings/network/ProxyPreferenceController.java b/src/com/android/settings/network/ProxyPreferenceController.java index 8f26bfb6b100a129979323b9e2fa65f89007860b..dc2eb9f5bdb80610cf65cc0ac5a4cebc3c1a9780 100644 --- a/src/com/android/settings/network/ProxyPreferenceController.java +++ b/src/com/android/settings/network/ProxyPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.network; import android.app.admin.DevicePolicyManager; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index a47b897b191a3fb65b27a6a26818abcb925266ad..4bafa2511d0b53fd59d08ed05e3585b4bcfe0e33 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.network; import static android.os.UserManager.DISALLOW_CONFIG_TETHERING; - import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction; @@ -34,7 +33,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java index 8ecd79660f9d951d2a9e7eb2b2702806b795dab2..bb0bff638ea587bab40b2c6d8d1e83ca3254bb75 100644 --- a/src/com/android/settings/network/VpnPreferenceController.java +++ b/src/com/android/settings/network/VpnPreferenceController.java @@ -29,12 +29,11 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.provider.SettingsSlicesContract; -import android.util.Log; -import android.util.SparseArray; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.Log; +import android.util.SparseArray; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index ebed87b9a2be620f58826c217383564a37d57509..4e90680aac9b08a0a713ce66c21645a7e041fa90 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -16,8 +16,6 @@ package com.android.settings.nfc; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - import android.nfc.NfcAdapter; import android.os.Bundle; import android.os.UserHandle; @@ -30,14 +28,16 @@ import android.view.ViewGroup; import android.widget.Switch; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; +import com.android.settingslib.HelpUtils; +import com.android.settings.core.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.core.InstrumentedFragment; -import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.widget.SwitchBar; -import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtils; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + public class AndroidBeam extends InstrumentedFragment implements SwitchBar.OnSwitchChangeListener { private View mView; diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java index 07931523ff8bfc3af988ed248aa6c551c660db8d..12ab1b756dcde359735d4db44e5f8b216aed3928 100644 --- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java +++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -27,6 +26,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import java.util.List; + public class AndroidBeamPreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/nfc/BaseNfcEnabler.java b/src/com/android/settings/nfc/BaseNfcEnabler.java index c046d05aced4e2a804fe14e2fe853de12e88aaf1..88bafb98fb94e882ab52b062a1951ee756480178 100644 --- a/src/com/android/settings/nfc/BaseNfcEnabler.java +++ b/src/com/android/settings/nfc/BaseNfcEnabler.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.nfc.NfcAdapter; +import androidx.preference.Preference; /** * BaseNfcEnabler is a abstract helper to manage the Nfc state for Nfc and Android Beam diff --git a/src/com/android/settings/nfc/NfcAirplaneModeObserver.java b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java index b3e6f256157c3c3e86e7b0f84190ecd621cb3bd9..d0ce045296ff79925680dbf691ce53768a6af7cd 100644 --- a/src/com/android/settings/nfc/NfcAirplaneModeObserver.java +++ b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java @@ -22,7 +22,6 @@ import android.nfc.NfcAdapter; import android.os.Handler; import android.os.Looper; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java index 77c40e2de1ae88ca007234a68f026594e3dc0559..b3450cbb8cdf0d5c62d4e41453d1f571827828c7 100644 --- a/src/com/android/settings/nfc/NfcEnabler.java +++ b/src/com/android/settings/nfc/NfcEnabler.java @@ -18,7 +18,6 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; - import androidx.preference.SwitchPreference; /** diff --git a/src/com/android/settings/nfc/NfcForegroundPreference.java b/src/com/android/settings/nfc/NfcForegroundPreference.java index 8dd54827912b1fc2093f6a9ab235f7bc4d1ad3ef..728f2e4b5987ae03fcc8532b98dbff0b04f22ba1 100644 --- a/src/com/android/settings/nfc/NfcForegroundPreference.java +++ b/src/com/android/settings/nfc/NfcForegroundPreference.java @@ -16,7 +16,6 @@ package com.android.settings.nfc; import android.content.Context; - import androidx.preference.DropDownPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java index 9dd111354361247e152dda903c1a3e30123f59d7..0838a90e622b060be6f1855566d19c08fbb2c6b2 100644 --- a/src/com/android/settings/nfc/NfcPaymentPreference.java +++ b/src/com/android/settings/nfc/NfcPaymentPreference.java @@ -16,11 +16,12 @@ package com.android.settings.nfc; import android.app.AlertDialog; -import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.Context; +import android.app.Dialog; import android.content.DialogInterface; import android.content.Intent; +import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -30,8 +31,6 @@ import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.RadioButton; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; import com.android.settingslib.CustomDialogPreference; diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index 2ea3a3c573515f97ab0ec0d717fdd6732ef15889..a74b9875605912e84f60b289eda14bcd187a169e 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -30,6 +30,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import java.util.List; + public class NfcPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index cd2df68ea0ba202198d7807d1fc181ababbe678c..27ae09348456bbda0c7fb0534b9ee5765dffef4b 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -21,14 +21,14 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.Bundle; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java index 9f4ed8f02f649fade6e42d9f36fcfbe002702535..4284ecfc7969242de08b7ded6b9a954734ecf480 100644 --- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java @@ -27,7 +27,6 @@ import android.content.pm.ServiceInfo; import android.provider.Settings; import android.service.notification.ConditionProviderService; import android.service.notification.ZenModeConfig; - import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java index 41841ddff7b8c7c170b591f4d9f63934395fa331..175a607b5205cd8a79f3d11fd5788f9aa19ebd0e 100644 --- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.java @@ -29,7 +29,6 @@ import android.os.UserHandle; import android.provider.Settings; import android.service.notification.ScheduleCalendar; import android.service.notification.ZenModeConfig; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java index 6c0d59b479bd424f4b08d3d4d9c6a606169791dd..2dcc31df8a4ea84cbe157d149298fbfca5a0b298 100644 --- a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java +++ b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java @@ -21,7 +21,6 @@ import android.content.IntentFilter; import android.media.AudioManager; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.Preference; import com.android.internal.annotations.VisibleForTesting; @@ -29,6 +28,7 @@ import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SliderPreferenceController; import com.android.settingslib.RestrictedPreference; +import com.android.settingslib.core.AbstractPreferenceController; /** * Base class for preference controller that handles preference that enforce adjust volume diff --git a/src/com/android/settings/notification/AllowSoundPreferenceController.java b/src/com/android/settings/notification/AllowSoundPreferenceController.java index cbabd2d6e1d1153c0443848af40d94538820a914..a1fd3c0c8fd9aca546ec15d92313d7f8174c64fc 100644 --- a/src/com/android/settings/notification/AllowSoundPreferenceController.java +++ b/src/com/android/settings/notification/AllowSoundPreferenceController.java @@ -22,9 +22,8 @@ import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import android.app.NotificationChannel; import android.content.Context; -import android.util.Log; - import androidx.preference.Preference; +import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/src/com/android/settings/notification/AppLinkPreferenceController.java b/src/com/android/settings/notification/AppLinkPreferenceController.java index c696e8ef8a4b214a80bc9fa49c9fb9329d149831..6e09ccebfe7e9b105d62fff606051f2ae5e2958d 100644 --- a/src/com/android/settings/notification/AppLinkPreferenceController.java +++ b/src/com/android/settings/notification/AppLinkPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index a5f7ff10eaa054fe37913426f0271e016b65e84b..9ebcd33b7bf2b938034b7e0b0c370654b62d11d8 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -21,14 +21,13 @@ import android.app.NotificationChannelGroup; import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; -import android.text.TextUtils; -import android.util.Log; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/notification/AudioHelper.java b/src/com/android/settings/notification/AudioHelper.java index a918d8689d66d8007ebcefef72c8ccf09c393a7a..5f745c8a691443cde5559089aa65ca6b80ba3a59 100644 --- a/src/com/android/settings/notification/AudioHelper.java +++ b/src/com/android/settings/notification/AudioHelper.java @@ -22,7 +22,6 @@ import android.media.AudioManager; import android.media.AudioSystem; import android.os.UserHandle; import android.os.UserManager; - import com.android.settings.Utils; /** diff --git a/src/com/android/settings/notification/BadgePreferenceController.java b/src/com/android/settings/notification/BadgePreferenceController.java index ad417b0ad6aeaaaae5efd5ea4bdb7d04fbaff14b..e6cd4494d2369d6beda71264e05fa258363f1659 100644 --- a/src/com/android/settings/notification/BadgePreferenceController.java +++ b/src/com/android/settings/notification/BadgePreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.notification; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; +import android.app.NotificationChannel; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java index 073d721ec8ec3aac11af74c5d74402f0f000d996..94419c49287b7e7d8b85c3946b248ea8884a30dd 100644 --- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java +++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java @@ -16,8 +16,6 @@ package com.android.settings.notification; -import static android.provider.Settings.Secure.NOTIFICATION_BADGING; - import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -25,15 +23,16 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; +import android.text.TextUtils; -import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.TogglePreferenceController; +import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; @@ -41,6 +40,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import static android.provider.Settings.Secure.NOTIFICATION_BADGING; + public class BadgingNotificationPreferenceController extends TogglePreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java index 9e4c46320046b861a39aa3514464976eadb09066..65d31193984d4bae56eca92a0f40502a53d120b8 100644 --- a/src/com/android/settings/notification/BlockPreferenceController.java +++ b/src/com/android/settings/notification/BlockPreferenceController.java @@ -16,15 +16,15 @@ package com.android.settings.notification; +import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import android.app.NotificationManager; import android.content.Context; -import android.widget.Switch; - import androidx.preference.Preference; +import android.widget.Switch; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/BootSoundPreferenceController.java b/src/com/android/settings/notification/BootSoundPreferenceController.java index a6871639a7fd8aa5ab4bffd8767e7eea0750f95e..97639b1cd56268e40b8f1fb6999150626f8f1b29 100644 --- a/src/com/android/settings/notification/BootSoundPreferenceController.java +++ b/src/com/android/settings/notification/BootSoundPreferenceController.java @@ -18,12 +18,10 @@ package com.android.settings.notification; import android.content.Context; import android.os.SystemProperties; - import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java index 17710c4c58e1a906fc922be9234576cacc148184..c17b3b070050d27da47ed3e2206982fde09c71c9 100644 --- a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java @@ -18,9 +18,8 @@ package com.android.settings.notification; import android.app.NotificationChannel; import android.content.Context; -import android.util.Log; - import androidx.preference.Preference; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 3580967b4613874f84a6faee8c79a5becdeda3e3..0ea0eaccff81f141c8221a9d53b921499e52a304 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -20,14 +20,14 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; +import com.android.settings.applications.AppInfoBase; import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; diff --git a/src/com/android/settings/notification/ChargingSoundPreferenceController.java b/src/com/android/settings/notification/ChargingSoundPreferenceController.java index fccde6a56e36219ae4a62046bb927074a9ca697a..e280177ce6d5f9175a67c4f999e1b8bed7297ea9 100644 --- a/src/com/android/settings/notification/ChargingSoundPreferenceController.java +++ b/src/com/android/settings/notification/ChargingSoundPreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; -import android.provider.Settings.Global; +import android.provider.Settings.Global; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index b396073e8f6221c2d5e3bd2c32ed0a703603ee3b..bd7a82ae8e2b3d31cbbfc98c7eb1cf222d2ee873 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -24,15 +24,16 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.provider.SearchIndexableResource; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RingtonePreference; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; +import com.android.settings.gestures.SwipeToNotificationPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/DefaultNotificationTonePreference.java b/src/com/android/settings/notification/DefaultNotificationTonePreference.java index 4a2e0b610d2e7b645af982e61ce9e86fddea98a2..3a7d3b1922a9ac9ecb9c047f1f48e95e5488271d 100644 --- a/src/com/android/settings/notification/DefaultNotificationTonePreference.java +++ b/src/com/android/settings/notification/DefaultNotificationTonePreference.java @@ -17,15 +17,25 @@ package com.android.settings.notification; +import com.android.settings.DefaultRingtonePreference; +import com.android.settings.Utils; + +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.database.Cursor; +import android.database.sqlite.SQLiteException; import android.media.Ringtone; import android.media.RingtoneManager; -import android.net.Uri; import android.os.AsyncTask; +import android.os.UserHandle; +import android.os.UserManager; +import android.net.Uri; +import android.provider.MediaStore; +import android.provider.OpenableColumns; import android.util.AttributeSet; -import com.android.settings.DefaultRingtonePreference; +import static android.content.ContentProvider.getUriWithoutUserId; public class DefaultNotificationTonePreference extends DefaultRingtonePreference { private Uri mRingtone; diff --git a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java index 14e0c84e2f87c0ffc7efac5488834693c1d7dfd6..1ebc01c1337ad8fc2bf0762a6581e5bcc1368655 100644 --- a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java +++ b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/DescriptionPreferenceController.java b/src/com/android/settings/notification/DescriptionPreferenceController.java index 1e996463aa0d85fa5aec0d9f3f5702017fbee378..61a9ddb96c5a6d970009ce0ad1256ea7ea8ecf9c 100644 --- a/src/com/android/settings/notification/DescriptionPreferenceController.java +++ b/src/com/android/settings/notification/DescriptionPreferenceController.java @@ -17,9 +17,8 @@ package com.android.settings.notification; import android.content.Context; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/DialPadTonePreferenceController.java b/src/com/android/settings/notification/DialPadTonePreferenceController.java index 1b05ce21187de94666ed9d547938dbae12068675..e0ca2996834a62bf5c2244623f140646904a4183 100644 --- a/src/com/android/settings/notification/DialPadTonePreferenceController.java +++ b/src/com/android/settings/notification/DialPadTonePreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; -import android.provider.Settings.System; +import android.provider.Settings.System; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/DndPreferenceController.java b/src/com/android/settings/notification/DndPreferenceController.java index a615221dff921a5e86e4a4d0cfd271cc9b49b5b6..acbc0704bb46b03ad955c6213e86488b68ea829f 100644 --- a/src/com/android/settings/notification/DndPreferenceController.java +++ b/src/com/android/settings/notification/DndPreferenceController.java @@ -17,12 +17,15 @@ package com.android.settings.notification; import android.app.NotificationChannel; +import android.app.NotificationManager; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnResume; public class DndPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java index d9367d58ab267eab10bd5f5ab9a723bfdc9b3295..f7f13c58ff5640968f7cbd6d2e835a086fec91d6 100644 --- a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java +++ b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; + import android.content.res.Resources; import android.provider.Settings.Global; - +import android.telephony.TelephonyManager; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/DockingSoundPreferenceController.java b/src/com/android/settings/notification/DockingSoundPreferenceController.java index f3a281ec4cd8361d2e91188f1b1b138f7020a64a..476fd6a990ea30f56e6d8b74196774e7a8dbaae6 100644 --- a/src/com/android/settings/notification/DockingSoundPreferenceController.java +++ b/src/com/android/settings/notification/DockingSoundPreferenceController.java @@ -20,7 +20,6 @@ import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; import android.provider.Settings.Global; - import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java index 7add167ab8e5c3ee1cfa04062400c46d19e6f384..e67de2b48c06989fe615a7240dc2d259c3771d10 100644 --- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java +++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; import android.os.UserManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/notification/EmergencyTonePreferenceController.java b/src/com/android/settings/notification/EmergencyTonePreferenceController.java index 9c2a9584eb26844b411419e89b2f167d763373fc..a67ec8aac302d80119d4da5c730e57ea6490c6de 100644 --- a/src/com/android/settings/notification/EmergencyTonePreferenceController.java +++ b/src/com/android/settings/notification/EmergencyTonePreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; + import android.content.res.Resources; import android.provider.Settings.Global; import android.telephony.TelephonyManager; - import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/EmptyTextSettings.java b/src/com/android/settings/notification/EmptyTextSettings.java index 4ac3d52d1d55b9d1869c76a7b683e0aa1d0d2296..3f8ccc63097639b0a25a71c5d5bed22f4fa3c46b 100644 --- a/src/com/android/settings/notification/EmptyTextSettings.java +++ b/src/com/android/settings/notification/EmptyTextSettings.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.widget.TextView; - +import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; public abstract class EmptyTextSettings extends SettingsPreferenceFragment { diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java index dc8b557be48f34059c2cccc5aa3b5e8e620c7920..29b8670a6a8f08ee79b742804bce7db1ea69d4a5 100644 --- a/src/com/android/settings/notification/HeaderPreferenceController.java +++ b/src/com/android/settings/notification/HeaderPreferenceController.java @@ -19,17 +19,17 @@ package com.android.settings.notification; import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER; import android.app.Activity; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; import android.content.Context; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; import android.text.BidiFormatter; import android.text.SpannableStringBuilder; import android.text.TextUtils; +import android.util.Slog; import android.view.View; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.OnLifecycleEvent; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; - import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/ImportancePreferenceController.java index 4c20a46409d668396431d544c2577aaab7ef14f6..c05647240fc1797661102361231ef80d6bcf96c1 100644 --- a/src/com/android/settings/notification/ImportancePreferenceController.java +++ b/src/com/android/settings/notification/ImportancePreferenceController.java @@ -26,7 +26,6 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.media.RingtoneManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/LightsPreferenceController.java b/src/com/android/settings/notification/LightsPreferenceController.java index 04f25510c2eda5ff168d2c2616aefc689db69954..3710cc5a9962fa2e7f3bdfb10462906da4d7f375 100644 --- a/src/com/android/settings/notification/LightsPreferenceController.java +++ b/src/com/android/settings/notification/LightsPreferenceController.java @@ -16,14 +16,17 @@ package com.android.settings.notification; +import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnResume; public class LightsPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java index d708edfb53b3319a9c8dc0d4141007a28b0e177c..518d2a949bbd2610e1e714acea7d36259b47e25f 100644 --- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java +++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java @@ -28,11 +28,10 @@ import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.text.TextUtils; -import android.util.Log; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.util.Log; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/notification/NotificationAppPreference.java b/src/com/android/settings/notification/NotificationAppPreference.java index dfa3e36800b1e2c8869bef0249ccd7685747317f..bb015ca3f25732e82007448f013b97cb385e356b 100644 --- a/src/com/android/settings/notification/NotificationAppPreference.java +++ b/src/com/android/settings/notification/NotificationAppPreference.java @@ -16,12 +16,11 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.Switch; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/notification/NotificationFooterPreference.java b/src/com/android/settings/notification/NotificationFooterPreference.java index abaffc85941b64e57c99b1dd1319475fec359361..2b41281c5101e606c98e20cc3bfc5a743694a051 100644 --- a/src/com/android/settings/notification/NotificationFooterPreference.java +++ b/src/com/android/settings/notification/NotificationFooterPreference.java @@ -17,13 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import android.text.method.LinkMovementMethod; -import android.util.AttributeSet; -import android.widget.TextView; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import android.text.method.LinkMovementMethod; +import android.util.AttributeSet; +import android.widget.TextView; import com.android.settingslib.R; diff --git a/src/com/android/settings/notification/NotificationLockscreenPreference.java b/src/com/android/settings/notification/NotificationLockscreenPreference.java index b3f39f9a7391d13a5b3d510aa05b1cb95983f066..01eecf52ed727474ab4c7a563372e9ba0fbd98d2 100644 --- a/src/com/android/settings/notification/NotificationLockscreenPreference.java +++ b/src/com/android/settings/notification/NotificationLockscreenPreference.java @@ -16,6 +16,11 @@ package com.android.settings.notification; +import com.android.settings.R; +import com.android.settings.RestrictedListPreference; +import com.android.settings.Utils; +import com.android.settingslib.RestrictedLockUtils; + import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; @@ -28,14 +33,10 @@ import android.util.AttributeSet; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; +import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ListView; -import com.android.settings.R; -import com.android.settings.RestrictedListPreference; -import com.android.settings.Utils; -import com.android.settingslib.RestrictedLockUtils; - public class NotificationLockscreenPreference extends RestrictedListPreference { private boolean mAllowRemoteInput; diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java index 0b3db1505a4663f3ce3a993f99c5d5dff3fa2e0f..49bb08ef154d9779ca0fd7fcc4060fbf5c2eaafd 100644 --- a/src/com/android/settings/notification/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/NotificationPreferenceController.java @@ -25,10 +25,10 @@ import android.app.NotificationManager; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; -import android.util.Log; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import android.util.Log; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java index 50caaf830000ec3d3c164615e5c31648851f5119..6006162955bc9146fb4c3a0898eabb87437ff224 100644 --- a/src/com/android/settings/notification/NotificationSettingsBase.java +++ b/src/com/android/settings/notification/NotificationSettingsBase.java @@ -18,9 +18,9 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; - import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import android.app.Activity; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; @@ -37,13 +37,12 @@ import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; -import android.text.TextUtils; -import android.util.Log; -import android.widget.Toast; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.util.Log; +import android.widget.Toast; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index d3ebc08f77a7a6bfcdccaa0e370384c10c9402b1..e63e5886461cf5146da65c9ecf863a7c9eea43cd 100644 --- a/src/com/android/settings/notification/NotificationStation.java +++ b/src/com/android/settings/notification/NotificationStation.java @@ -39,6 +39,9 @@ import android.service.notification.NotificationListenerService; import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.NotificationListenerService.RankingMap; import android.service.notification.StatusBarNotification; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.TextUtils; @@ -49,10 +52,6 @@ import android.widget.DateTimeView; import android.widget.ImageView; import android.widget.TextView; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -61,6 +60,7 @@ import com.android.settings.Utils; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.List; public class NotificationStation extends SettingsPreferenceFragment { diff --git a/src/com/android/settings/notification/NotificationSwitchBarPreference.java b/src/com/android/settings/notification/NotificationSwitchBarPreference.java index ff4298799256d229b8d04c0cca6b4fcae29c60a7..ede7d881f96b6791ecc77b7a5debf314e6d5532e 100644 --- a/src/com/android/settings/notification/NotificationSwitchBarPreference.java +++ b/src/com/android/settings/notification/NotificationSwitchBarPreference.java @@ -17,11 +17,10 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.ToggleSwitch; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/notification/NotificationsOffPreferenceController.java b/src/com/android/settings/notification/NotificationsOffPreferenceController.java index 8762f91c2714e133b7145af7793b966f45eef0bb..4dbf4917641b078ae379f0c778f17c08324662c9 100644 --- a/src/com/android/settings/notification/NotificationsOffPreferenceController.java +++ b/src/com/android/settings/notification/NotificationsOffPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java index 049dfe51b60cd31aa566577372fb0bba8cb68471..cb1115165fe9f9164d0f534bfd2371897278cf01 100644 --- a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java +++ b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.content.Context; import android.media.RingtoneManager; - import com.android.settings.Utils; public class PhoneRingtonePreferenceController extends RingtonePreferenceControllerBase { diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java index 63fe7463ac7b531e9f2fb58432492c988952bf16..15bbf6d115b202ded0b630d8cb70969cb77d33f1 100644 --- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java +++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java @@ -16,19 +16,16 @@ package com.android.settings.notification; -import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; - import android.content.ContentResolver; import android.content.Context; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; -import android.util.Log; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; +import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -36,6 +33,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; + public class PulseNotificationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java index e1132019223cc4c5bbadab892e7e9e0b12f010e2..8081e4e943ff871b389e55fa8eaeec04f1725e48 100644 --- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java +++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java @@ -24,17 +24,16 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; import android.service.notification.NotifyingApp; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java index 75ad4a701df622aa456aea6ab65fc660676f2141..becf95fece7d2a6317c2c28c897ea47fa7bb210b 100644 --- a/src/com/android/settings/notification/RingVolumePreferenceController.java +++ b/src/com/android/settings/notification/RingVolumePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.app.NotificationManager; +import androidx.lifecycle.OnLifecycleEvent; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -29,8 +30,6 @@ import android.os.Message; import android.os.Vibrator; import android.text.TextUtils; -import androidx.lifecycle.OnLifecycleEvent; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java index 7d5ebf13347fdaa616b7d54b9fc215f17577bb90..21b7e539a18a353caaeef86659c5e1ebbddde07c 100644 --- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java +++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java @@ -20,7 +20,6 @@ import android.content.Context; import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java index 896d99e1ed9762d4caeda84214775529a486e776..11aaa92dd01121f131330ca0276b9588273d07e1 100644 --- a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java +++ b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; -import android.provider.Settings.System; +import android.provider.Settings.System; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java index 2cd2a137ce798bdc6930fcab3dc5175c455e8e4a..08031b12fbb1fb21a9e8baa4c6d2a2c7a9a919f8 100644 --- a/src/com/android/settings/notification/SettingPref.java +++ b/src/com/android/settings/notification/SettingPref.java @@ -22,7 +22,6 @@ import android.content.res.Resources; import android.net.Uri; import android.provider.Settings.Global; import android.provider.Settings.System; - import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java index 9d54190f225a4fb8636444bd644409d6b4ae51da..891c7b3f8fa91b347d849f62d55b9a480949ca44 100644 --- a/src/com/android/settings/notification/SettingPrefController.java +++ b/src/com/android/settings/notification/SettingPrefController.java @@ -18,10 +18,10 @@ package com.android.settings.notification; import android.content.ContentResolver; import android.content.Context; + import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/SoundPreferenceController.java b/src/com/android/settings/notification/SoundPreferenceController.java index d0b098c8d60faf303fefa34cad6bebe0c8cb0ace..6c537ff0d26467f2091bdd29ab282aa8788a9429 100644 --- a/src/com/android/settings/notification/SoundPreferenceController.java +++ b/src/com/android/settings/notification/SoundPreferenceController.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.preference.PreferenceManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 0b12b21c306ec3bfb843f2dcf860476bd695049c..4e8218fbb569fe6a7977d71dc9c58572841dd81c 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -25,11 +25,10 @@ import android.os.Message; import android.os.UserHandle; import android.preference.SeekBarVolumizer; import android.provider.SearchIndexableResource; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/notification/SuppressorHelper.java b/src/com/android/settings/notification/SuppressorHelper.java index d3a017c4c649b350e31aeaa74c036a74a019fdcd..837517ca82ad2b5b3e5dc1386cccc7034894cfba 100644 --- a/src/com/android/settings/notification/SuppressorHelper.java +++ b/src/com/android/settings/notification/SuppressorHelper.java @@ -20,9 +20,8 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; public class SuppressorHelper { private static final String TAG = "SuppressorHelper"; diff --git a/src/com/android/settings/notification/TouchSoundPreferenceController.java b/src/com/android/settings/notification/TouchSoundPreferenceController.java index 608cf677965cce4d83c9cda17c43b9821e878293..20c9cee0d05826a15f560676ccf96ed96bed841c 100644 --- a/src/com/android/settings/notification/TouchSoundPreferenceController.java +++ b/src/com/android/settings/notification/TouchSoundPreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; + import android.media.AudioManager; import android.os.AsyncTask; import android.provider.Settings.System; - import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java index 0ae4c03040b322a0b2869dceeed76e784dda715b..acb6b4d52c3dc5700e5c8ed1e0954ef432ba493b 100644 --- a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java +++ b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java @@ -21,7 +21,6 @@ import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; import android.os.Vibrator; import android.provider.Settings.System; - import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java index ae111b2081208c3f0200f816ff48661fb594496b..3d9557e34703307efb25c337e8ae5ea0a03751dd 100644 --- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java +++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java @@ -24,10 +24,9 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/notification/VibrationPreferenceController.java b/src/com/android/settings/notification/VibrationPreferenceController.java index ec5554a9d4591fe0a62d4792c5ee2175430a54b9..04aa201a587b8941cc2460e313dfe8a0376cd59c 100644 --- a/src/com/android/settings/notification/VibrationPreferenceController.java +++ b/src/com/android/settings/notification/VibrationPreferenceController.java @@ -16,10 +16,10 @@ package com.android.settings.notification; +import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.Vibrator; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java index 114759cd3f0beaf6cc3136491992eba872e33f51..5fde67e8a9750d9ffaa5496b23359a90c757359b 100644 --- a/src/com/android/settings/notification/VisibilityPreferenceController.java +++ b/src/com/android/settings/notification/VisibilityPreferenceController.java @@ -25,7 +25,6 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.provider.Settings; import android.service.notification.NotificationListenerService; - import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; @@ -148,8 +147,10 @@ public class VisibilityPreferenceController extends NotificationPreferenceContro } private boolean getLockscreenNotificationsEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0; + final UserInfo parentUser = mUm.getProfileParent(UserHandle.myUserId()); + final int primaryUserId = parentUser != null ? parentUser.id : UserHandle.myUserId(); + return Settings.Secure.getIntForUser(mContext.getContentResolver(), + Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, primaryUserId) != 0; } private boolean getLockscreenAllowPrivateNotifications() { diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java index 2ef33d4ab044dabeef306d088f93d88ac91b4a61..ee02b628b084b8f3d27741d3968846d30504706a 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreference.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java @@ -21,16 +21,16 @@ import android.content.Context; import android.media.AudioManager; import android.net.Uri; import android.preference.SeekBarVolumizer; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; +import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.SeekBar; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.widget.SeekBarPreference; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index 941f5bd89936a89a4060da3e310b197cb0488ff4..720fddd7208f2d02ec4703aba8b40bbd48abd1e1 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -16,10 +16,9 @@ package com.android.settings.notification; -import android.content.Context; - import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; +import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java index 363f0f0d2e83282ae5e39ae252058e1a59873a7e..108fbcaa2e8f11374b8cc1af86a97854e4502b42 100644 --- a/src/com/android/settings/notification/WorkSoundPreferenceController.java +++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java @@ -32,7 +32,6 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 83e40225d4fc674453ca19238cfa0a969022da67..62c9315f8ab0943703aaf09ac3d8cf3af21015ad 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -37,16 +37,15 @@ import android.os.Handler; import android.os.Looper; import android.os.RemoteException; import android.provider.Settings.Secure; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; import android.view.View; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java index e432fb083ad817f6d64810602da36dfd5fe6b683..388b40d14b399dc445daafe93432d2ab88b21b9e 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java @@ -25,12 +25,11 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.service.notification.ZenModeConfig; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; import android.util.Slog; import android.view.View; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java index a284db760f74ca877364a6bee936e8b389cc0529..599af2682479c8147e958f347fb4cc2711f3c010 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.app.Fragment; import android.content.Context; -import android.widget.Switch; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.widget.Switch; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java index 000a75632068362219f6bf4f11ddb0655f678afc..c28b7b445636de2640d968331dabc7a3cbd48a39 100644 --- a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java +++ b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java @@ -17,12 +17,11 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.RadioButton; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; diff --git a/src/com/android/settings/notification/ZenFooterPreferenceController.java b/src/com/android/settings/notification/ZenFooterPreferenceController.java index 15a2252397c3322e49fb91e1c0b1b2bd57a85fb6..a00ac6a346c0dddeee2f6b9c0f96cdbb5ca5dc5f 100644 --- a/src/com/android/settings/notification/ZenFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenFooterPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java index d7b9db6aa69bad2ddb985fa80f636f88a0541d82..8898b055c245f9b72075cb039d18cffa4007f4c4 100644 --- a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java @@ -19,12 +19,11 @@ package com.android.settings.notification; import android.app.Fragment; import android.content.Context; import android.content.Intent; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settings.utils.ZenServiceListing; -import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeAddAutomaticRulePreferenceController extends AbstractZenModeAutomaticRulePreferenceController implements diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java index 96495dfbf76bf19e9a8eb7cae7ce65d60a97debf..70c1ae905e2715d9373589e28a40f07d40c4c8d3 100644 --- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import android.util.Log; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java index dc9d6fefe1f467100fa7724a33935141c43a278d..2ea46392c7bd65d8534c067baa14098dd467e850 100644 --- a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.app.Fragment; import android.content.Context; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; diff --git a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java index 4220a42c7fddc214a12b9e3df1356c39be50feb6..faa0f8a19609b272c1f912017daadf31c9f8f732 100644 --- a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java index e239b1a3c9d8ffd41d70b48255c6daaffd9c7741..8c8f14df67194d1fff31b6c14c6bc3933f90ab84 100644 --- a/src/com/android/settings/notification/ZenModeBackend.java +++ b/src/com/android/settings/notification/ZenModeBackend.java @@ -26,9 +26,8 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java index 0dba4d6dd5d9c92b210068852ae478aab4cb9c9d..4ab14379e92766ba39ced881a29b8db2d1b6e54c 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java index e9f74d2880ce1966b7d287b4873f9be2ff8af178..6a0b657b23fbc808276d4fb56967d6b38b939183 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java @@ -21,7 +21,6 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java index 2046244c622f9c7bd8a33f8ef9a9cfad114f9555..d11baee8e8b7c48d20edba8f4990ff90a94b358e 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java index 425f770937482553cc112cc8ba521a89f7e3802e..3d250639e18f7b5740bf129e788cac863cc00d0d 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java b/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java index 08c4ca7975bbff717f5093514f0f9caa0ff53cc1..b017cac3157bcae4e60a24a07964d23804e7c08b 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java index 4e11a9cf4d628a23534054b3fe6006cf2736c348..aa2b55ccbfd57974c4fe31e3f6485074848e9b70 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java @@ -27,6 +27,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BA import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; +import androidx.preference.CheckBoxPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java index 215cdd1ebf6de5ad2ba5919f4a215269e81ced90..ac9497dbe3b14a411137d382bac6a3395e975cbf 100644 --- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java @@ -19,11 +19,10 @@ package com.android.settings.notification; import android.app.FragmentManager; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; import android.view.View; import android.widget.Button; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java index aceb6b998b127f055da94f40f2e8652f7c688127..1b6c122be44fb3d1a0bd33e98fa6eb7f3f1b23f5 100644 --- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java @@ -19,11 +19,10 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; -import android.text.TextUtils; - import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java index ccd4d5716020d076e6cbc6e6abfa1f29060d6399..5e58444efbdc520b243c1bc8b5fb21de503956cf 100644 --- a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.FragmentManager; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java index 3dd9afb4e4a70b3191f0b8c778d768252c6a2215..51ea51780d58d447171ca86f3912df1e4b0b974d 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -26,7 +26,6 @@ import android.provider.CalendarContract.Calendars; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.EventInfo; - import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java index 235ebd5b00473bbc42da61ada2b90e5c2b3ba6a3..8ca6cf63dfdfbe184ca2a005212ef5e554f00218 100644 --- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import android.util.Log; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java index 2bec84f9c75415aadc8e568c3fd085bcd0bac38d..d8099bed210d7444a1004fd205a7899c137cf11b 100644 --- a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import android.util.Log; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.util.Log; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java index f57c19304cba147e53456756dc03e0d266b3cb56..5939abbce53d12f934c92207006f9671f4dc3b7a 100644 --- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java @@ -3,11 +3,10 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; -import android.text.TextUtils; - import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModePreferenceController.java b/src/com/android/settings/notification/ZenModePreferenceController.java index edd531a3b5ecc1ebbcd5d2731c4d8cb29d5aae48..0d94029f47cad1ee56bd588f248d2bee7c16d1f5 100644 --- a/src/com/android/settings/notification/ZenModePreferenceController.java +++ b/src/com/android/settings/notification/ZenModePreferenceController.java @@ -23,9 +23,9 @@ import android.net.Uri; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.Slog; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java index 41f1eb1c6ecd8aff7bde9760dfec3d0c09e8b1b3..c0f319afaf65d0e7b914083babe7444e5a2c7b09 100644 --- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; -import android.util.Log; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java index db5c6e1b3e8552d227d43e63414129fef98fe077..e3f5c2f7ac4b03999cf862dd8b9cf247f5a96f85 100644 --- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java @@ -19,11 +19,10 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import android.util.Log; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java index 9e5dbc33042feed78e8e283b97b73fec56d9cd9d..576da167295a7bd347d0400d5a96835de23f9810 100644 --- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java +++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java @@ -23,11 +23,10 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.service.notification.ConditionProviderService; -import android.util.Log; -import android.widget.Toast; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.Log; +import android.widget.Toast; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index cd1c6f55dfa57e8ac90ce94fab489ad96c12a3af..50ecd8bd09e3a737d04adbd1fe6067a225d4c914 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -28,14 +28,13 @@ import android.os.Bundle; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ScheduleInfo; -import android.text.format.DateFormat; -import android.util.Log; -import android.widget.TimePicker; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.text.format.DateFormat; +import android.util.Log; +import android.widget.TimePicker; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index ce8c8292f279a09c41c24b04787ef3e98289510d..232502ec222236378822f245da7eb7397997daf0 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -34,7 +34,6 @@ import android.icu.text.ListFormatter; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.ZenModeConfig; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java index 6d5aac915da53b9f71dfac1e71dfc3a380d77491..c21f23dac6e5772c433051bc0eff077c95116d9f 100644 --- a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java index da866af13d4119dfdcc165ca2aa74faf6035eb4f..bf47154a1d6a5441d084180ace84b6de98c9bdf6 100644 --- a/src/com/android/settings/notification/ZenModeSliceBuilder.java +++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java @@ -18,6 +18,8 @@ package com.android.settings.notification; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; +import static androidx.slice.builders.ListBuilder.ICON_IMAGE; + import android.annotation.ColorInt; import android.app.NotificationManager; import android.app.PendingIntent; @@ -29,11 +31,6 @@ import android.net.Uri; import android.provider.Settings; import android.provider.SettingsSlicesContract; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SubSettings; @@ -41,6 +38,13 @@ import com.android.settings.Utils; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; +import com.android.settings.slices.SliceBuilderUtils; + +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + +import androidx.core.graphics.drawable.IconCompat; public class ZenModeSliceBuilder { diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java index 9c142132365c75c54ed15d9b69c629448c152416..bab16619ea26ed4f0c6f95ee57fc5e95a6d373c9 100644 --- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java @@ -27,7 +27,6 @@ import android.database.Cursor; import android.icu.text.ListFormatter; import android.provider.Contacts; import android.provider.ContactsContract; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java index 73907b9fffd7401ec3a636a4aa2f10a6dd6b9277..b41f11e3cf3e5a310a52ffe89883d92c6eb05295 100644 --- a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import android.util.Log; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java index e3098f0e22f387358b58fac72bde102162ed6027..4c49224bc77fb2a2fb0e07e01573900ddae97c1d 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java @@ -18,14 +18,13 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; - import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.widget.DisabledCheckBoxPreference; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settings.widget.DisabledCheckBoxPreference; public class ZenModeVisEffectPreferenceController extends AbstractZenModePreferenceController diff --git a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java index cd1a08a1ab19f8d3c556f70d718a1b28cceb97b3..2af7866450b263061d2df6213aeac40ead00aa44 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java index 7077bab62764530e0945541dcc8f6ff0eab60e3d..c015d9d8f22147d76d39f3d4faf30dfeb8f98018 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java index 0ce293dee3b3d553bf6f9894b3a0b5e8ed547594..3fd5420f6a7579fc50e1cf00fdbeaee8b5470a07 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeVoiceActivity.java b/src/com/android/settings/notification/ZenModeVoiceActivity.java index 0a52c3da0b472359984e5792cc2883add2f2a571..db8de69f86271ae523f1bedc8b555cb5f99a5c0a 100644 --- a/src/com/android/settings/notification/ZenModeVoiceActivity.java +++ b/src/com/android/settings/notification/ZenModeVoiceActivity.java @@ -16,9 +16,6 @@ package com.android.settings.notification; -import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED; -import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES; - import android.app.NotificationManager; import android.content.Context; import android.content.Intent; @@ -36,6 +33,9 @@ import com.android.settings.utils.VoiceSettingsActivity; import java.util.Locale; +import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED; +import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES; + /** * Activity for modifying the Zen mode (Do not disturb) by voice * using the Voice Interaction API. diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java index 03ea257c775f49e9dabee390a811da3785c8380c..1bb1538f014afd36750a73356c186884a4123554 100644 --- a/src/com/android/settings/notification/ZenRulePreference.java +++ b/src/com/android/settings/notification/ZenRulePreference.java @@ -24,10 +24,9 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.service.notification.ZenModeConfig; -import android.view.View; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import android.view.View; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java index 8bc252a0be548297712631a2e548d73c172e6a39..89e1eb8eda43fe744325234a5349222c945d3b49 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.java +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java @@ -21,7 +21,6 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.net.ConnectivityManager; import android.os.UserManager; - import androidx.annotation.Keep; import com.android.settings.accounts.AccountFeatureProvider; diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java index 0988fd43aa0177fd2f77a309862870dccdab96a8..ad68a748e62a0d8754eaa9d6e52ebe6a934080dd 100644 --- a/src/com/android/settings/overlay/SupportFeatureProvider.java +++ b/src/com/android/settings/overlay/SupportFeatureProvider.java @@ -19,13 +19,18 @@ package com.android.settings.overlay; import android.accounts.Account; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.StringRes; import android.app.Activity; +import android.app.FragmentManager; import android.content.Context; +import android.content.Intent; +import android.os.Bundle; import com.android.settings.support.SupportPhone; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.List; /** * Feature provider for support tab. diff --git a/src/com/android/settings/overlay/SurveyFeatureProvider.java b/src/com/android/settings/overlay/SurveyFeatureProvider.java index 44ee525060e47f08f87b68a57c021244291a5f1f..d078d39247c923d6bf87bff52ec68108018309f5 100644 --- a/src/com/android/settings/overlay/SurveyFeatureProvider.java +++ b/src/com/android/settings/overlay/SurveyFeatureProvider.java @@ -18,7 +18,7 @@ package com.android.settings.overlay; import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; - +import android.content.IntentFilter; import androidx.annotation.Nullable; import androidx.localbroadcastmanager.content.LocalBroadcastManager; diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index 4a1d50e94d89376171b7f9ab638504b56e8da035..add05e4e4a50b9fc64b058ac31c290dc7fc57412 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -19,8 +19,7 @@ package com.android.settings.password; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD; -import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment - .RESULT_FINISHED; +import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment.RESULT_FINISHED; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; @@ -40,16 +39,15 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; import android.security.KeyStore; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.EventLog; import android.util.Log; import android.view.accessibility.AccessibilityManager; import android.widget.TextView; -import androidx.annotation.StringRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.EncryptionInterstitial; diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java index 98e81a83a3d89695b8c3e066c17543a8a86b6f27..2550510a3e67c75b2e2cca2642f2260a2202d632 100644 --- a/src/com/android/settings/password/ChooseLockGenericController.java +++ b/src/com/android/settings/password/ChooseLockGenericController.java @@ -19,7 +19,6 @@ package com.android.settings.password; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserHandle; - import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 4fad4eb28cc42aaf180fb12d20022bc4e0ab318f..1913ec6872771d8b433520f9e43a0f8af65b9ac4 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -34,6 +34,9 @@ import android.graphics.Typeface; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.InputType; import android.text.Selection; @@ -52,10 +55,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils.RequestThrottledException; diff --git a/src/com/android/settings/password/ManagedLockPasswordProvider.java b/src/com/android/settings/password/ManagedLockPasswordProvider.java index 2494af556ed89181c2d69820e3bdaf0ed9f6d0f6..5786a5afa09a1cedb86f6092b67bd8fce76f62bf 100644 --- a/src/com/android/settings/password/ManagedLockPasswordProvider.java +++ b/src/com/android/settings/password/ManagedLockPasswordProvider.java @@ -19,6 +19,8 @@ package com.android.settings.password; import android.content.Context; import android.content.Intent; +import com.android.settings.R; + /** * Helper for handling managed passwords in security settings UI. * It provides resources that should be shown in settings UI when lock password quality is set to diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java index 0e194afca166d98017c9c7978551e89bade07b9b..0148ca5568373050db0f040a0ab279765c6f8268 100644 --- a/src/com/android/settings/password/PasswordRequirementAdapter.java +++ b/src/com/android/settings/password/PasswordRequirementAdapter.java @@ -16,13 +16,12 @@ package com.android.settings.password; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.R; import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirementViewHolder; diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java index d4227b2abaf679823f6a2b637a2184e91eb4fc2e..a8d51eddd4adb4032bb2442f8f34dcbf2a4578fb 100644 --- a/src/com/android/settings/password/SetNewPasswordController.java +++ b/src/com/android/settings/password/SetNewPasswordController.java @@ -19,7 +19,6 @@ package com.android.settings.password; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; - import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.Nullable; diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 9744365d8b6ccccb24873b8167b7e5bfdc53de4e..a72047308c2910353b8246c3dcf96307e8fbc6e3 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -22,15 +22,14 @@ import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; import android.os.UserHandle; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.SetupEncryptionInterstitial; diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java index 452a34bdc6a154dd3cf0a47c15488b05cf598821..56b66a324aacf85f3898c5cd7364c2352953e5b1 100644 --- a/src/com/android/settings/password/SetupChooseLockPassword.java +++ b/src/com/android/settings/password/SetupChooseLockPassword.java @@ -22,13 +22,12 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import androidx.annotation.Nullable; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; -import androidx.annotation.Nullable; - import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener; diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index 0fa5710c4c659b3f293e4080f40c59d1dbd491c9..0b272f5b93863dff8f00f959baabfad7952909d1 100644 --- a/src/com/android/settings/password/SetupChooseLockPattern.java +++ b/src/com/android/settings/password/SetupChooseLockPattern.java @@ -20,13 +20,12 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import androidx.annotation.Nullable; - import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java index fdcdb2f77bfa635427820d818ea6d656988d3fea..f5396c4efd292c030a99c754e5831b68cc6cf9c8 100644 --- a/src/com/android/settings/password/SetupSkipDialog.java +++ b/src/com/android/settings/password/SetupSkipDialog.java @@ -22,7 +22,6 @@ import android.app.Dialog; import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; - import androidx.annotation.NonNull; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index ba0172ba5609995b2fac0cd916832c413b48257f..bb50d0af259ee1372b8b68bc2b77a51bc2f42d32 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -25,6 +25,7 @@ import android.print.PrintJobId; import android.print.PrintJobInfo; import android.print.PrintManager; import android.print.PrintManager.PrintJobStateChangeListener; +import androidx.preference.Preference; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; @@ -35,8 +36,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index a47bb978e9f70ce384783753eff1326af20a9f21..3e3582397bdf1057549585add2602ee9e4f805af 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -44,8 +44,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.view.View.OnClickListener; import android.view.accessibility.AccessibilityManager; import android.widget.AdapterView; import android.widget.BaseAdapter; diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java index 16c432032f8ab2def9bed3f6ef0749b0709c89d2..f40846a121fc38de3f5cefbd965a35c9bc9fe573 100644 --- a/src/com/android/settings/print/PrintSettingPreferenceController.java +++ b/src/com/android/settings/print/PrintSettingPreferenceController.java @@ -24,7 +24,6 @@ import android.print.PrintJobId; import android.print.PrintJobInfo; import android.print.PrintManager; import android.printservice.PrintServiceInfo; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index da0948b64248e302f529b23ff542662d132caa55..b42be8f29e43ec7d5a2745c5ae98f54203cb9309 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -39,6 +39,8 @@ import android.print.PrintServicesLoader; import android.printservice.PrintServiceInfo; import android.provider.SearchIndexableResource; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; @@ -49,9 +51,6 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index f234bbe8edc55a65677d04d05cd0ef80f62a8b67..3864750a67b0dcd5c48d9cc029405762b52359ef 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -20,14 +20,13 @@ import android.annotation.XmlRes; import android.content.Context; import android.content.res.XmlResourceParser; import android.provider.SearchIndexableResource; +import androidx.annotation.CallSuper; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Xml; -import androidx.annotation.CallSuper; -import androidx.annotation.VisibleForTesting; - import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/search/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java index a7f4005547f9e46e8e3b1749c44b8497a7b3c2c4..e793cac5475ecfe846bd2c5d11500a861da86054 100644 --- a/src/com/android/settings/search/DatabaseIndexingManager.java +++ b/src/com/android/settings/search/DatabaseIndexingManager.java @@ -55,11 +55,11 @@ import android.database.sqlite.SQLiteException; import android.os.Build; import android.provider.SearchIndexablesContract; import android.provider.SearchIndexablesContract.SiteMapColumns; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.VisibleForTesting; - +import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.indexing.IndexData; import com.android.settings.search.indexing.IndexDataConverter; import com.android.settings.search.indexing.PreIndexData; diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java index c4d3abfcaa89162aab0dee3870902b65a9ff1af8..e6b3e937b859cb0a02a41ccf8d39f424103849dc 100644 --- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java +++ b/src/com/android/settings/search/DeviceIndexFeatureProvider.java @@ -21,7 +21,10 @@ import android.app.job.JobInfo; import android.app.job.JobScheduler; import android.content.ComponentName; import android.content.Context; +import android.content.pm.PackageManager; +import android.content.pm.ServiceInfo; import android.net.Uri; +import android.os.Binder; import android.os.Build; import android.provider.Settings; import android.text.TextUtils; @@ -36,7 +39,6 @@ import java.util.Locale; public interface DeviceIndexFeatureProvider { - String TAG = "DeviceIndex"; String INDEX_VERSION = "settings:index_version"; @@ -57,7 +59,7 @@ public interface DeviceIndexFeatureProvider { default void updateIndex(Context context, boolean force) { if (!isIndexingEnabled()) { - Log.w(TAG, "Skipping: device index is not enabled"); + Log.i(TAG, "Skipping: device index is not enabled"); return; } @@ -66,7 +68,29 @@ public interface DeviceIndexFeatureProvider { return; } + final ComponentName jobComponent = new ComponentName(context.getPackageName(), + DeviceIndexUpdateJobService.class.getName()); + + try { + final int callerUid = Binder.getCallingUid(); + final ServiceInfo si = context.getPackageManager().getServiceInfo(jobComponent, + PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE); + if (si == null) { + Log.w(TAG, "Skipping: No such service " + jobComponent); + return; + } + if (si.applicationInfo.uid != callerUid) { + Log.w(TAG, "Skipping: Uid cannot schedule DeviceIndexUpdate: " + callerUid); + return; + } + } catch (PackageManager.NameNotFoundException e) { + Log.w(TAG, "Skipping: error finding DeviceIndexUpdateJobService from packageManager"); + return; + } + if (!force && skipIndex(context)) { + Log.i(TAG, "Skipping: already indexed."); // No need to update. return; } @@ -74,8 +98,6 @@ public interface DeviceIndexFeatureProvider { // Prevent scheduling multiple jobs setIndexState(context); - final ComponentName jobComponent = new ComponentName(context.getPackageName(), - DeviceIndexUpdateJobService.class.getName()); final int jobId = context.getResources().getInteger(R.integer.device_index_update); // Schedule a job so that we know it'll be able to complete, but try to run as // soon as possible. diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java index 0b12fe49cace102afbbb2e698af7db70eff5d8e4..3eb904119bc7a90e60d77cc3156458c010b5dc43 100644 --- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java +++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java @@ -17,7 +17,6 @@ package com.android.settings.search; import static android.app.slice.Slice.HINT_LARGE; import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.SliceItem.FORMAT_TEXT; - import static com.android.settings.search.DeviceIndexFeatureProvider.createDeepLink; import android.app.job.JobParameters; @@ -29,14 +28,6 @@ import android.net.Uri.Builder; import android.provider.SettingsSlicesContract; import android.util.Log; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceViewManager; -import androidx.slice.SliceViewManager.SliceCallback; -import androidx.slice.core.SliceQuery; -import androidx.slice.widget.ListContent; - import com.android.internal.annotations.VisibleForTesting; import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SettingsSliceProvider; @@ -45,6 +36,14 @@ import com.android.settings.slices.SliceDeepLinkSpringBoard; import java.util.Collection; import java.util.concurrent.CountDownLatch; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceViewManager; +import androidx.slice.SliceViewManager.SliceCallback; +import androidx.slice.SliceMetadata; +import androidx.slice.core.SliceQuery; +import androidx.slice.widget.ListContent; + public class DeviceIndexUpdateJobService extends JobService { private static final String TAG = "DeviceIndexUpdate"; diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java index 8ab9140a082face623b7395227e8e1fec3415d0d..7c87bf74f61378d8a6a5f8278caec7472cf35099 100644 --- a/src/com/android/settings/search/IndexDatabaseHelper.java +++ b/src/com/android/settings/search/IndexDatabaseHelper.java @@ -23,11 +23,10 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.os.Build; import android.provider.SearchIndexablesContract.SiteMapColumns; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.VisibleForTesting; - import java.util.List; public class IndexDatabaseHelper extends SQLiteOpenHelper { diff --git a/src/com/android/settings/search/InlinePayload.java b/src/com/android/settings/search/InlinePayload.java index fab1e3b7038894027a914f6d67b6c2134fc64ed8..1cb694a7cb6d816b364454e24a200aca26e4223b 100644 --- a/src/com/android/settings/search/InlinePayload.java +++ b/src/com/android/settings/search/InlinePayload.java @@ -17,10 +17,12 @@ package com.android.settings.search; -import android.content.Context; import android.content.Intent; + +import android.content.Context; import android.os.Parcel; import android.provider.Settings; +import com.android.internal.annotations.VisibleForTesting; /** * Abstract Payload for inline settings results. diff --git a/src/com/android/settings/search/SearchIndexableResourcesImpl.java b/src/com/android/settings/search/SearchIndexableResourcesImpl.java index 63e975f0dc0b77befb3e35a8776b762806587d00..7d7606de00eb9c42ff8733d29cdc52447b252787 100644 --- a/src/com/android/settings/search/SearchIndexableResourcesImpl.java +++ b/src/com/android/settings/search/SearchIndexableResourcesImpl.java @@ -21,6 +21,11 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.DateTimeSettings; import com.android.settings.DisplaySettings; import com.android.settings.LegalSettings; +import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment; +import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment; +import com.android.settings.connecteddevice.BluetoothDashboardFragment; +import com.android.settings.datausage.DataUsageSummaryLegacy; +import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment; import com.android.settings.accessibility.MagnificationPreferenceFragment; @@ -32,19 +37,14 @@ import com.android.settings.applications.SpecialAccessSettings; import com.android.settings.applications.assist.ManageAssist; import com.android.settings.backup.BackupSettingsActivity; import com.android.settings.backup.BackupSettingsFragment; -import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment; -import com.android.settings.connecteddevice.BluetoothDashboardFragment; import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; -import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment; import com.android.settings.connecteddevice.usb.UsbDetailsFragment; import com.android.settings.datausage.DataUsageSummary; -import com.android.settings.datausage.DataUsageSummaryLegacy; import com.android.settings.deletionhelper.AutomaticStorageManagerSettings; import com.android.settings.development.DevelopmentSettingsDashboardFragment; import com.android.settings.deviceinfo.DeviceInfoSettings; import com.android.settings.deviceinfo.StorageDashboardFragment; import com.android.settings.deviceinfo.StorageSettings; -import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.display.AmbientDisplaySettings; import com.android.settings.display.AutoBrightnessSettings; import com.android.settings.display.NightDisplaySettings; @@ -52,17 +52,17 @@ import com.android.settings.display.ScreenZoomSettings; import com.android.settings.dream.DreamSettings; import com.android.settings.enterprise.EnterprisePrivacySettings; import com.android.settings.fuelgauge.PowerUsageAdvanced; +import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.fuelgauge.SmartBatterySettings; -import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settings.gestures.AssistGestureSettings; import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapScreenSettings; import com.android.settings.gestures.DoubleTwistGestureSettings; +import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.gestures.GestureSettings; import com.android.settings.gestures.PickupGestureSettings; import com.android.settings.gestures.SwipeToNotificationSettings; -import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; import com.android.settings.inputmethod.PhysicalKeyboardFragment; import com.android.settings.inputmethod.VirtualKeyboardFragment; @@ -75,9 +75,9 @@ import com.android.settings.nfc.PaymentSettings; import com.android.settings.notification.ConfigureNotificationSettings; import com.android.settings.notification.SoundSettings; import com.android.settings.notification.ZenModeAutomationSettings; -import com.android.settings.notification.ZenModeBlockedEffectsSettings; import com.android.settings.notification.ZenModeCallsSettings; import com.android.settings.notification.ZenModeMsgEventReminderSettings; +import com.android.settings.notification.ZenModeBlockedEffectsSettings; import com.android.settings.notification.ZenModeRestrictNotificationsSettings; import com.android.settings.notification.ZenModeSettings; import com.android.settings.notification.ZenModeSoundVibrationSettings; diff --git a/src/com/android/settings/search/indexing/IndexDataConverter.java b/src/com/android/settings/search/indexing/IndexDataConverter.java index 4192777bd6a1ae91e095c3c8667c49212dbed86c..8aa84fa515e2971bcd074c8372ba170472cb6ec7 100644 --- a/src/com/android/settings/search/indexing/IndexDataConverter.java +++ b/src/com/android/settings/search/indexing/IndexDataConverter.java @@ -23,15 +23,14 @@ import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.provider.SearchIndexableData; import android.provider.SearchIndexableResource; +import androidx.annotation.DrawableRes; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Xml; -import androidx.annotation.DrawableRes; - -import com.android.settings.core.PreferenceXmlParserUtils; import com.android.settings.search.DatabaseIndexingUtils; +import com.android.settings.core.PreferenceXmlParserUtils; import com.android.settings.search.ResultPayload; import com.android.settings.search.SearchIndexableRaw; diff --git a/src/com/android/settings/search/indexing/PreIndexDataCollector.java b/src/com/android/settings/search/indexing/PreIndexDataCollector.java index 93dc7e232559b1845e225075ebef8b9eede98024..63000b48744c1a310fcd31b8be735d97e2dcef4a 100644 --- a/src/com/android/settings/search/indexing/PreIndexDataCollector.java +++ b/src/com/android/settings/search/indexing/PreIndexDataCollector.java @@ -17,28 +17,6 @@ package com.android.settings.search.indexing; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ICON_RESID; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_ACTION; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEYWORDS; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_RANK; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SCREEN_TITLE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_OFF; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_ON; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_TITLE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID; - import android.Manifest; import android.content.ContentResolver; import android.content.Context; @@ -62,6 +40,29 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID; + +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ICON_RESID; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_ACTION; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEYWORDS; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_RANK; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SCREEN_TITLE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_OFF; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_ON; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_TITLE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE; + /** * Collects all data from {@link android.provider.SearchIndexablesProvider} to be indexed. */ diff --git a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java index ca08cacd73827be768ee25547218ad3e729a9dde..c244e47b562014399cedd60cded9961c8ea5e288 100644 --- a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java @@ -21,9 +21,8 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java index be9845d9ebe2e37f7e937b3b6e2c7d1e748a78fd..5188d1ce9185108794d8eb8c930947e687d8b351 100644 --- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java @@ -21,10 +21,9 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java index 9835ea228962db76078060f8813841c1d8ff8d54..f5d9068729a49d5eef00bbdc2949610dfa14e329 100644 --- a/src/com/android/settings/security/ConfigureKeyGuardDialog.java +++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java @@ -23,7 +23,6 @@ import android.app.admin.DevicePolicyManager; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java index 060d9642e1c14b38363d47860562674b59237f20..3bf61f63c1a28c086c4130984b0417c50bb441f4 100644 --- a/src/com/android/settings/security/CredentialStoragePreferenceController.java +++ b/src/com/android/settings/security/CredentialStoragePreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; import android.security.KeyStore; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java index 4101fadb196e421d7b05dce4c21e488ae1b82216..72ae0a797432f0a41c0a3a4bbf64262ecf044477 100644 --- a/src/com/android/settings/security/CryptKeeperSettings.java +++ b/src/com/android/settings/security/CryptKeeperSettings.java @@ -28,14 +28,13 @@ import android.os.BatteryManager; import android.os.Bundle; import android.os.UserHandle; import android.os.storage.StorageManager; +import androidx.preference.Preference; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CryptKeeperConfirm; import com.android.settings.R; diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java index ea38068648c97dc4068dc2d4901af79e5f628e14..27e896aff3966bd31292f3e62b5a67796ff1612e 100644 --- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java +++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; -import android.text.TextUtils; - import androidx.preference.Preference; +import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java index d0a4287a406278fe7f796b5420037d7e2f4c792d..ca6dc2d4ff4d7589fb4ba49bde7d65c88d87a1a9 100644 --- a/src/com/android/settings/security/LockUnificationPreferenceController.java +++ b/src/com/android/settings/security/LockUnificationPreferenceController.java @@ -27,7 +27,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/security/LockdownButtonPreferenceController.java b/src/com/android/settings/security/LockdownButtonPreferenceController.java index 8c3d19a2f623a660cda14f4adde1e526106df637..d0a49d7bf6aa799a2fb44b25b8be7a4694e8fb8d 100644 --- a/src/com/android/settings/security/LockdownButtonPreferenceController.java +++ b/src/com/android/settings/security/LockdownButtonPreferenceController.java @@ -19,6 +19,8 @@ package com.android.settings.security; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.TwoStatePreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index ae5dd96f09a0e0c85be6715dc11f78153d52e0af..c928b8ecce724ee8ee087a46c0fdbc53edac71c0 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -18,7 +18,6 @@ package com.android.settings.security; import android.content.Context; import android.provider.SearchIndexableResource; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java index 012d0b66ff095d032f58588f9f3c56ff5d85e655..01a02900e520566d0fb3144ac13d6eecef9faacc 100644 --- a/src/com/android/settings/security/OwnerInfoPreferenceController.java +++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.security; import android.app.Fragment; import android.content.Context; import android.os.UserHandle; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/security/ResetCredentialsPreferenceController.java b/src/com/android/settings/security/ResetCredentialsPreferenceController.java index ee09bcad0e91dfcbce551e9337497e3312750fc4..d77fa628604583cfdb320a097d48306acc20d801 100644 --- a/src/com/android/settings/security/ResetCredentialsPreferenceController.java +++ b/src/com/android/settings/security/ResetCredentialsPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; import android.security.KeyStore; - import androidx.preference.PreferenceScreen; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index 00892c19f692163f3f87ca92d20ac66062d328e9..4806b8e8aaae9787a91f821eda06af3301ac185d 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -22,16 +22,15 @@ import android.os.Bundle; import android.os.UserHandle; import android.provider.SearchIndexableResource; import android.provider.Settings; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Switch; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java index 472101bfc558c8e3e97c795779015cd54dce3e25..8672974fd2d7af589ee1513393515e75f1ffa86b 100644 --- a/src/com/android/settings/security/ShowPasswordPreferenceController.java +++ b/src/com/android/settings/security/ShowPasswordPreferenceController.java @@ -21,9 +21,9 @@ import android.os.UserHandle; import android.provider.Settings; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; +import com.android.settings.R; public class ShowPasswordPreferenceController extends TogglePreferenceController { diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java index d8d6252e7a3e1e606e5f1b5bc7f6ac7e71267908..683b99a3bfba8ef109fe6e2328c09463e9758e82 100644 --- a/src/com/android/settings/security/SimLockPreferenceController.java +++ b/src/com/android/settings/security/SimLockPreferenceController.java @@ -19,14 +19,13 @@ package com.android.settings.security; import android.content.Context; import android.os.PersistableBundle; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.core.BasePreferenceController; import java.util.List; diff --git a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java index 00167672441c3617945f18b35cb0126dc7a6c609..1c71975bf8deb93bc89b9957bb5933aec234db5a 100644 --- a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java +++ b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java @@ -21,10 +21,9 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import android.util.Log; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.Log; import com.android.internal.widget.LockPatternUtils; import com.android.settings.Utils; diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java index 6aa3ccb4d4657881aea3405be5bd78a3225a6d64..c2bd38bcef59090ec35d1059c30a31f8915369c1 100644 --- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java @@ -22,11 +22,10 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; -import androidx.preference.Preference; - import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.TimeoutListPreference; diff --git a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java index 38c6f2426d34c3d1783adabf036e64b114189b24..1624f12cbb819317ae4ac0a1f6e58bdf2b33dc7e 100644 --- a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java @@ -20,7 +20,6 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED import android.content.Context; import android.os.UserHandle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java index 133078c9eec1246994807f08b40af9539c1590ef..5f436803c84ec767b81bf686ee6e0d6006947747 100644 --- a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java +++ b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.security.screenlock; import android.app.admin.DevicePolicyManager; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java index ffd01830daee2ed78200465ebd68dd094e4fbdd8..6421bd9fe9e302969c3742c46f9b2a2fe0e8bdaa 100644 --- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java +++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.security.screenlock; import android.app.admin.DevicePolicyManager; import android.content.Context; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.TwoStatePreference; +import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java index 056c1f293c2b786f6bc23ac0a0d1b2773a5353ed..3d92bdea47d963c8112cef1b7bc98a04bad777c9 100644 --- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java +++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.security.trustagent; import android.content.Context; import android.os.UserHandle; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java index 6f5d7eb955ac8e173098cc66cf28eeee95d9742f..89d8de7b04457b585a87a22ab9bb0df02a55ff77 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java @@ -23,12 +23,11 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/trustagent/TrustAgentManager.java b/src/com/android/settings/security/trustagent/TrustAgentManager.java index feac9fa76b215761fc46b5c7719271c101d5b93a..7dcb832b9b4ed79d0c4601322632e47218d22263 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentManager.java +++ b/src/com/android/settings/security/trustagent/TrustAgentManager.java @@ -29,14 +29,13 @@ import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.os.UserHandle; import android.service.trust.TrustAgentService; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Slog; import android.util.Xml; -import androidx.annotation.VisibleForTesting; - import com.android.internal.widget.LockPatternUtils; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java index c7988981155f640862db62bef0b61f470bc0509c..02d354a78fd3d00d913174bb9e4f3a6c4cbe6917 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentSettings.java +++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java @@ -28,12 +28,11 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.service.trust.TrustAgentService; -import android.util.ArrayMap; -import android.util.ArraySet; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import androidx.preference.SwitchPreference; +import android.util.ArrayMap; +import android.util.ArraySet; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/shortcut/CreateShortcut.java b/src/com/android/settings/shortcut/CreateShortcut.java index 9fce3bafd0db233fba48a8a8da92200264723ac6..78969fed3e2ad1839598a81fb952e499b232c5ef 100644 --- a/src/com/android/settings/shortcut/CreateShortcut.java +++ b/src/com/android/settings/shortcut/CreateShortcut.java @@ -33,6 +33,7 @@ import android.graphics.drawable.Icon; import android.graphics.drawable.LayerDrawable; import android.net.ConnectivityManager; import android.os.AsyncTask; +import androidx.annotation.VisibleForTesting; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; @@ -40,8 +41,6 @@ import android.view.View.MeasureSpec; import android.widget.ImageView; import android.widget.ListView; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Settings.TetherSettingsActivity; diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index 6806f9f08578108fb39786956e23288ce6aa20ef..ebf34e5ca7c9b43995e50fc652ced7ebd7c4ec51 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -23,13 +23,13 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.res.Resources; +import android.provider.Settings; +import androidx.core.app.NotificationCompat; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; -import androidx.core.app.NotificationCompat; - import com.android.internal.telephony.IccCardConstants; import com.android.settings.R; import com.android.settings.Settings.SimSettingsActivity; diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index e3858f4b28f41695e64afcf40ef2b8b793c13427..b0cf194e04dd8aae972aaa493108bca2512a6165 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -23,6 +23,8 @@ import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; import android.os.SystemProperties; import android.provider.SearchIndexableResource; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telephony.PhoneNumberUtils; @@ -33,9 +35,6 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.R; diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index 2b670a78ec34045152d5f01bff296dff752fa679..4b9a7eced9527e14c77efa1312bf0d47870c3a32 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -26,16 +26,13 @@ import android.net.Uri; import android.os.StrictMode; import android.provider.Settings; import android.provider.SettingsSlicesContract; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; import android.util.KeyValueListParser; import android.util.Log; import android.util.Pair; -import androidx.annotation.VisibleForTesting; -import androidx.slice.Slice; -import androidx.slice.SliceProvider; - import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.core.BasePreferenceController; import com.android.settings.location.LocationSliceBuilder; @@ -57,6 +54,9 @@ import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; +import androidx.slice.Slice; +import androidx.slice.SliceProvider; + /** * A {@link SliceProvider} for Settings to enabled inline results in system apps. * diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java index 7065c5dc200d864eb25ce1246be1e717e87866a3..d81734a974d18690a7095f8b8f3c4d9c00fb9e16 100644 --- a/src/com/android/settings/slices/SliceBroadcastReceiver.java +++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java @@ -22,8 +22,8 @@ import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CH import static com.android.settings.slices.SettingsSliceProvider.ACTION_TOGGLE_CHANGED; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED; -import static com.android.settings.wifi.WifiSliceBuilder.ACTION_WIFI_SLICE_CHANGED; import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED; +import static com.android.settings.wifi.WifiSliceBuilder.ACTION_WIFI_SLICE_CHANGED; import android.app.slice.Slice; import android.content.BroadcastReceiver; diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index 889579f06b697e7af5c76447345b0bbf7bb7e218..baac3b620fbddeb0deb5bc46ef666467de6fb3bb 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -16,7 +16,11 @@ package com.android.settings.slices; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; +import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED; @@ -26,16 +30,12 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.provider.Settings; import android.provider.SettingsSlicesContract; import android.text.TextUtils; import android.util.Log; import android.util.Pair; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -46,13 +46,20 @@ import com.android.settings.core.SliderPreferenceController; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; +import com.android.settingslib.SliceBroadcastRelay; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.core.graphics.drawable.IconCompat; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + /** * Utility class to build Slices objects and Preference Controllers based on the Database managed diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java index 72729a842f7889ac725b4bf8b17128e04d6dd986..689108a0077773fcf9b4cd9d488040bf78b772d0 100644 --- a/src/com/android/settings/slices/SliceData.java +++ b/src/com/android/settings/slices/SliceData.java @@ -22,6 +22,7 @@ import android.text.TextUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.List; /** * Data class representing a slice stored by {@link SlicesIndexer}. diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java index 60a96aeaaddb581d5e289db9a193a9d18433eaac..4f8ed96b9a515335d04c928c9d667e84cd29bda2 100644 --- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java +++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java @@ -24,7 +24,9 @@ import android.util.Log; import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.location.LocationSliceBuilder; import com.android.settings.notification.ZenModeSliceBuilder; +import com.android.settings.overlay.FeatureFactory; import com.android.settings.wifi.WifiSliceBuilder; +import com.android.settings.wifi.calling.WifiCallingSliceHelper; import java.net.URISyntaxException; diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java index 79d3bc6f0077e9a65a87cc411834caa26deac75c..b14a716acab980e97bdf0b35ecef7ab6c914ad86 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -18,21 +18,22 @@ package com.android.settings.slices; import static com.android.settings.slices.SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX; -import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; + +import android.content.Context; import android.os.Binder; import android.util.Pair; -import androidx.slice.Slice; - import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import java.util.ArrayList; import java.util.List; +import androidx.slice.Slice; + /** * Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice. */ diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java index f1628e766ce290cb10fcd7cb0ddc7f765feb54bd..d4b71cfbbd21cb6dae5a949a406bcfb71e5d006c 100644 --- a/src/com/android/settings/slices/SlicesDatabaseHelper.java +++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java @@ -17,12 +17,12 @@ package com.android.settings.slices; import android.content.Context; + import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.os.Build; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import java.util.Locale; diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java index f88af8fe8f491c3b7e1e04b43d6a7b8a701a7311..704d8d6b074be643e1be5f4cc86d12b7af9ea399 100644 --- a/src/com/android/settings/slices/SlicesIndexer.java +++ b/src/com/android/settings/slices/SlicesIndexer.java @@ -19,12 +19,12 @@ package com.android.settings.slices; import android.content.ContentValues; import android.content.Context; import android.database.sqlite.SQLiteDatabase; +import androidx.annotation.VisibleForTesting; import android.util.Log; -import androidx.annotation.VisibleForTesting; +import com.android.settings.dashboard.DashboardFragment; import com.android.settings.core.BasePreferenceController; -import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import com.android.settings.slices.SlicesDatabaseHelper.Tables; diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java index ded8604a58ed48aafd82ec53eff64aa23740f1ab..5cdc993cd62ca952a333efa1f90061b773cfd991 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java @@ -37,13 +37,12 @@ import android.media.MediaRouter; import android.media.MediaRouter.Callback; import android.os.Handler; import android.os.Looper; -import android.text.TextUtils; -import android.util.FeatureFlagUtils; -import android.util.Log; - import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.util.FeatureFlagUtils; +import android.util.Log; import com.android.settings.R; import com.android.settings.bluetooth.Utils; @@ -171,12 +170,20 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont @Override public void onStart() { + if (mLocalBluetoothManager == null) { + Log.e(TAG, "Bluetooth is not supported on this device"); + return; + } mLocalBluetoothManager.setForegroundActivity(mContext); register(); } @Override public void onStop() { + if (mLocalBluetoothManager == null) { + Log.e(TAG, "Bluetooth is not supported on this device"); + return; + } mLocalBluetoothManager.setForegroundActivity(null); unregister(); } diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java index f8cd0a7a4571108ebcbcc3f0c0dcc878215339a2..0bf8786197971a064739db68423d023cc423fe14 100644 --- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java +++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java @@ -20,13 +20,13 @@ import static android.bluetooth.IBluetoothHearingAid.HI_SYNC_ID_INVALID; import static android.media.AudioManager.STREAM_VOICE_CALL; import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET; +import com.android.settingslib.Utils; + import android.bluetooth.BluetoothDevice; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; -import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.HearingAidProfile; diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java index 44130c7f07ebe35df770dd8a0980b31b5fc51a0a..5b1c217ff44d0eff7bf5f5104d6ce7a223ab015b 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -21,14 +21,14 @@ import static android.media.AudioManager.STREAM_MUSIC; import static android.media.AudioSystem.DEVICE_OUT_REMOTE_SUBMIX; import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET; +import com.android.settingslib.Utils; + import android.bluetooth.BluetoothDevice; import android.content.Context; import android.media.AudioManager; - import androidx.preference.Preference; import com.android.settings.R; -import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.HearingAidProfile; diff --git a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java index 4cf657288f8730587b4f7b13539230b2695ff2ca..1ec566e01bf53d80d76e25e07966cc658bc87b56 100644 --- a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java +++ b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java @@ -25,13 +25,12 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java index 552ed92953b34baaf9475e98159e767cf0cc898e..9b7a9df0c73b21bb584ddf120bdb3a974bb42523 100644 --- a/src/com/android/settings/survey/SurveyMixin.java +++ b/src/com/android/settings/survey/SurveyMixin.java @@ -18,7 +18,6 @@ package com.android.settings.survey; import android.app.Activity; import android.app.Fragment; import android.content.BroadcastReceiver; - import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.SurveyFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java index a493bcd75ee6138115d74510e89bfe1d68efdd90..62be5ffd0dbd4a8c8b143188136d8ececabaa6ef 100644 --- a/src/com/android/settings/system/SystemDashboardFragment.java +++ b/src/com/android/settings/system/SystemDashboardFragment.java @@ -18,7 +18,6 @@ package com.android.settings.system; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index dd044092c4bbc2ad1ba9334cfd7f7c63c78e84fd..54ab924a5784843fda64818c9a77aa5362eebbf0 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -25,13 +25,12 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.os.SystemUpdateManager; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.text.TextUtils; import android.util.Log; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index d0a086e20d339197f3113a5e803adf4e471c9a2d..95ac8f50fc8691fd061c8aaa6595620cad51483a 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -31,13 +31,12 @@ import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.EngineInfo; import android.speech.tts.TtsEngines; import android.speech.tts.UtteranceProgressListener; +import androidx.preference.ListPreference; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.util.Pair; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java index e073b7184169a9266f75a11e92bb7815fc316985..a5cb1fd365558417d845c428583363a01f5f115d 100644 --- a/src/com/android/settings/tts/TtsEnginePreference.java +++ b/src/com/android/settings/tts/TtsEnginePreference.java @@ -21,14 +21,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.speech.tts.TextToSpeech.EngineInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.widget.Checkable; import android.widget.CompoundButton; import android.widget.RadioButton; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index 9a78876053adcb8794f0cfcef91a521e4e8897d7..2b35a59692804d46397dadbc96cf26af82b31e3b 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -1,28 +1,25 @@ package com.android.settings.tts; -import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH; - -import android.content.Context; -import android.os.Bundle; -import android.provider.SearchIndexableResource; import android.speech.tts.TextToSpeech; -import android.speech.tts.TextToSpeech.EngineInfo; -import android.speech.tts.TtsEngines; -import android.util.Log; -import android.widget.Checkable; - -import androidx.preference.PreferenceCategory; - -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.SettingsActivity; +import android.os.Bundle; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import androidx.preference.PreferenceCategory; +import android.speech.tts.TtsEngines; +import android.speech.tts.TextToSpeech.EngineInfo; +import com.android.settings.SettingsActivity; import com.android.settings.tts.TtsEnginePreference.RadioButtonGroupState; +import android.widget.Checkable; +import android.util.Log; +import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH; +import com.android.settings.search.Indexable; +import com.android.settings.search.BaseSearchIndexProvider; +import android.content.Context; +import android.provider.SearchIndexableResource; -import java.util.Arrays; import java.util.List; +import java.util.Arrays; public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment //implements implements RadioButtonGroupState, Indexable { diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java index 24773e7a9b51ea932f8866424a095e1996a2c0a2..bebc2d73b062859c97a2f2a69b46575dd4a78391 100644 --- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java +++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.users; import android.content.Context; import android.provider.Settings.Global; - import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index a4e0cff5c3abf654f2776b88c0ec00bda8e6a698..db132426711ac922106f4e8d02c61966f1457f78 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -36,6 +36,14 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.SwitchPreference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; @@ -44,15 +52,6 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.Switch; -import androidx.preference.ListPreference; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index f73c6debd15dffddcd3f0386c75c5b7cfbc394e3..42de8921463d2f912340a0bfe2e0b0e48461be0b 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -26,10 +26,9 @@ import android.os.Bundle; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import android.util.Log; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java index a13c7702dc70bd5b113a472f39f28b974d51af9b..9368b81353a61067f2a11c0a662fbac178eabff7 100644 --- a/src/com/android/settings/users/EditUserPhotoController.java +++ b/src/com/android/settings/users/EditUserPhotoController.java @@ -38,6 +38,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.ContactsContract.DisplayPhoto; import android.provider.MediaStore; +import androidx.core.content.FileProvider; import android.util.Log; import android.view.Gravity; import android.view.View; @@ -49,8 +50,6 @@ import android.widget.ImageView; import android.widget.ListPopupWindow; import android.widget.TextView; -import androidx.core.content.FileProvider; - import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.drawable.CircleFramedDrawable; diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java index 4d4a2dd5ae03f9e0746f0d53e1b0920c8038d7af..a5cecde4b607a8cc9127aad997ca9b1871d7ca5f 100644 --- a/src/com/android/settings/users/RestrictionUtils.java +++ b/src/com/android/settings/users/RestrictionUtils.java @@ -22,6 +22,7 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import android.provider.Settings.Secure; import com.android.settings.R; diff --git a/src/com/android/settings/users/UserCapabilities.java b/src/com/android/settings/users/UserCapabilities.java index aca3e493a3d90e3b503e47dbaa749871baa3393d..f1bfae90c97551dab00c3d9fae026fab5ca46be7 100644 --- a/src/com/android/settings/users/UserCapabilities.java +++ b/src/com/android/settings/users/UserCapabilities.java @@ -22,7 +22,6 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; - import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index 65868e9653a790ca6f8d57c98ba96fbf87c13350..d18e2ea5bf333f1567f62865979a620b23fa8774 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -23,9 +23,8 @@ import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java index bcc016750775ecfc0b02532122536015a777dfed..391e13a7065e7194593456438180e7bf47a598c8 100644 --- a/src/com/android/settings/users/UserPreference.java +++ b/src/com/android/settings/users/UserPreference.java @@ -20,13 +20,12 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 56a921c982cce17c20984cbb1e5425be2e57588b..5e88895d3eee3b80e89c21d405696b48070fafd8 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -43,6 +43,12 @@ import android.os.UserManager; import android.provider.ContactsContract; import android.provider.SearchIndexableResource; import android.provider.Settings.Global; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; import android.util.Log; import android.util.SparseArray; import android.view.Menu; @@ -52,13 +58,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.SimpleAdapter; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.UserIcons; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index 6a05e91bef22926ba2b63cf589547cf5f7520fd1..71f52f83536d886d459888222a020c857e60840e 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -30,13 +30,12 @@ import android.content.pm.ServiceInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import android.util.IconDrawableFactory; import android.util.Log; import android.view.View; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/utils/SettingsDividerItemDecoration.java b/src/com/android/settings/utils/SettingsDividerItemDecoration.java index 85cd9617b98561ab7b650706ea804b679932a412..32844d5ee711c36719e92ad8f7047c9d58df328d 100644 --- a/src/com/android/settings/utils/SettingsDividerItemDecoration.java +++ b/src/com/android/settings/utils/SettingsDividerItemDecoration.java @@ -17,7 +17,6 @@ package com.android.settings.utils; import android.content.Context; - import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; diff --git a/src/com/android/settings/utils/ZenServiceListing.java b/src/com/android/settings/utils/ZenServiceListing.java index e87cc51f2c2bc13b2ba66f82c6c79e0261dc819e..40a4f34dfaeca592389ae1d2f3779475fd3b129e 100644 --- a/src/com/android/settings/utils/ZenServiceListing.java +++ b/src/com/android/settings/utils/ZenServiceListing.java @@ -18,15 +18,19 @@ package com.android.settings.utils; import android.app.ActivityManager; import android.app.NotificationManager; import android.content.ComponentName; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; +import android.provider.Settings; +import android.text.TextUtils; import android.util.ArraySet; import android.util.Slog; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Set; diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index 365fd9a5dfa61fcd57f891b86de8832f0fd3b0fb..1d77caf9b6222839568af9b71227ccd5f256d35e 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -34,11 +34,10 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; -import androidx.preference.Preference; - import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.VpnConfig; diff --git a/src/com/android/settings/vpn2/AppPreference.java b/src/com/android/settings/vpn2/AppPreference.java index 6b64250df327f5a500b8b71e89fd764ea0f64545..fc06b1e1129729cc0a0b70a02d11abf3f48bcd0a 100644 --- a/src/com/android/settings/vpn2/AppPreference.java +++ b/src/com/android/settings/vpn2/AppPreference.java @@ -21,7 +21,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.UserHandle; - import androidx.preference.Preference; import com.android.internal.net.LegacyVpnInfo; diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index 00b22bb2fb307f90f053bf0d382083556be4f68e..5aa10b94d1f6541c21f01bfd3e4eaba336acd263 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -18,6 +18,7 @@ package com.android.settings.vpn2; import android.app.AlertDialog; import android.app.Dialog; +import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.net.ConnectivityManager; @@ -34,6 +35,7 @@ import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.net.LegacyVpnInfo; +import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java index d4b26776eb42639f40ef14d6718970664d2df1c9..2e0914ed4e34839b553d4963e453cd7dcd208b9d 100644 --- a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java +++ b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java @@ -15,9 +15,10 @@ */ package com.android.settings.vpn2; +import android.app.Fragment; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; +import android.app.DialogFragment; import android.content.DialogInterface; import android.os.Bundle; diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java index e44a0570fa75e3260b3ea02ed0a49073586c0af2..1f06a958eae79c99d8465e2108a78ccfb20c083f 100644 --- a/src/com/android/settings/vpn2/LegacyVpnPreference.java +++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java @@ -19,11 +19,10 @@ package com.android.settings.vpn2; import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED; import android.content.Context; +import androidx.preference.Preference; import android.text.TextUtils; import android.view.View; -import androidx.preference.Preference; - import com.android.internal.net.VpnProfile; import com.android.settings.R; diff --git a/src/com/android/settings/vpn2/ManageablePreference.java b/src/com/android/settings/vpn2/ManageablePreference.java index 68971f2f2fb7377e2f640d44a21c1b9f65b492fc..11da75854163509209965ad3b8f95f1199bb97d2 100644 --- a/src/com/android/settings/vpn2/ManageablePreference.java +++ b/src/com/android/settings/vpn2/ManageablePreference.java @@ -23,8 +23,8 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.AttributeSet; -import com.android.settings.R; import com.android.settings.widget.GearPreference; +import com.android.settings.R; /** * This class sets appropriate enabled state and user admin message when userId is set diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 6d87707ed4b82930a5b886770ea69ecaca3e9136..f6444bf6437055babc84e28af74640d7bacb489b 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -16,8 +16,6 @@ package com.android.settings.vpn2; -import static android.app.AppOpsManager.OP_ACTIVATE_VPN; - import android.annotation.UiThread; import android.annotation.WorkerThread; import android.app.Activity; @@ -42,6 +40,8 @@ import android.os.UserHandle; import android.os.UserManager; import android.security.Credentials; import android.security.KeyStore; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; @@ -49,9 +49,6 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -74,6 +71,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static android.app.AppOpsManager.OP_ACTIVATE_VPN; + /** * Settings screen listing VPNs. Configured VPNs and networks managed by apps * are shown in the same list. diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java index 5a12e1b76abe55a192df84f7bacc9aa6fdc1c750..80910a1ea592d558113a1c27c98ee03c860cd9b9 100644 --- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java +++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; - import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java index ff3029e3697e327e6d781841ec5b80d65496ce9b..73a58fee0680ae3f30030df0ac35c21e5361120e 100644 --- a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java +++ b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java index e6b57a43f4fcd62f3eb7ca5d826272ffcd430411..6a8ab50681354721a9810afb8d8dd35374fb0764 100644 --- a/src/com/android/settings/webview/WebViewAppPicker.java +++ b/src/com/android/settings/webview/WebViewAppPicker.java @@ -25,11 +25,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.webkit.UserPackage; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index f102d64325a6648a558bbf550e4eca156673f0d3..5ab0bcbe807617902016300c6729e45128c0f90f 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -39,6 +39,14 @@ import android.os.Handler; import android.os.Looper; import android.provider.SearchIndexableResource; import android.provider.Settings; +import androidx.preference.SwitchPreference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; import android.util.Slog; import android.util.TypedValue; import android.view.Menu; @@ -51,15 +59,6 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; - import com.android.internal.app.MediaRouteDialogPresenter; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/widget/ActionBarShadowController.java b/src/com/android/settings/widget/ActionBarShadowController.java index 1b8d3192a4a1faca1af9003cae74a97e92336d69..cb5e38dcb62ab9d147668d41bb050202697203ec 100644 --- a/src/com/android/settings/widget/ActionBarShadowController.java +++ b/src/com/android/settings/widget/ActionBarShadowController.java @@ -18,10 +18,9 @@ package com.android.settings.widget; import android.app.ActionBar; import android.app.Activity; -import android.view.View; - import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.RecyclerView; +import android.view.View; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/widget/ActionButtonPreference.java b/src/com/android/settings/widget/ActionButtonPreference.java index 347a784b2bade191a1491fa519600b494a04d7da..64a01c7e178f6ec47581bb1da73bded06ea82669 100644 --- a/src/com/android/settings/widget/ActionButtonPreference.java +++ b/src/com/android/settings/widget/ActionButtonPreference.java @@ -17,15 +17,14 @@ package com.android.settings.widget; import android.content.Context; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.Button; -import androidx.annotation.StringRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; public class ActionButtonPreference extends Preference { diff --git a/src/com/android/settings/widget/AppCheckBoxPreference.java b/src/com/android/settings/widget/AppCheckBoxPreference.java index e779d403b0858d5db646b1d9a49ef6e71c0cad56..23ee894b8d90ee9fc576709ca31f1e4a952cde09 100644 --- a/src/com/android/settings/widget/AppCheckBoxPreference.java +++ b/src/com/android/settings/widget/AppCheckBoxPreference.java @@ -17,9 +17,8 @@ package com.android.settings.widget; import android.content.Context; -import android.util.AttributeSet; - import androidx.preference.CheckBoxPreference; +import android.util.AttributeSet; import com.android.settings.R; diff --git a/src/com/android/settings/widget/AppPreference.java b/src/com/android/settings/widget/AppPreference.java index 91e700a098010d03046a8af2f96aab01c6714f06..3b716a31b901f260beb43995a85cfa650f3f6886 100644 --- a/src/com/android/settings/widget/AppPreference.java +++ b/src/com/android/settings/widget/AppPreference.java @@ -16,14 +16,13 @@ package com.android.settings.widget; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.ProgressBar; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; public class AppPreference extends Preference { diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java index 288096e7f80648648e99d801eb27ca1b1ae7ca11..b42bb3db253b51ab4dbd60e626ccf4fc11c8b4c7 100644 --- a/src/com/android/settings/widget/AppSwitchPreference.java +++ b/src/com/android/settings/widget/AppSwitchPreference.java @@ -17,12 +17,11 @@ package com.android.settings.widget; import android.content.Context; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.view.View; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; - import com.android.settings.R; public class AppSwitchPreference extends SwitchPreference { diff --git a/src/com/android/settings/widget/AspectRatioFrameLayout.java b/src/com/android/settings/widget/AspectRatioFrameLayout.java index aa3d3c4ea1c8c27f32dd3045128368b376529dfc..5eab257ffaa71c0b8df40b0a306c4976f43db5ca 100644 --- a/src/com/android/settings/widget/AspectRatioFrameLayout.java +++ b/src/com/android/settings/widget/AspectRatioFrameLayout.java @@ -16,11 +16,10 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.widget.FrameLayout; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java index d1ddc14b40c970c1f76ba5d3f9f6d8e0629c70ce..2d9fe6fdcd9848888fa22a9cb3b09d2cee69ae5a 100644 --- a/src/com/android/settings/widget/ChartDataUsageView.java +++ b/src/com/android/settings/widget/ChartDataUsageView.java @@ -16,8 +16,6 @@ package com.android.settings.widget; -import static android.net.TrafficStats.MB_IN_BYTES; - import android.content.Context; import android.content.res.Resources; import android.net.NetworkPolicy; @@ -44,6 +42,8 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Objects; +import static android.net.TrafficStats.MB_IN_BYTES; + /** * Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along * with {@link ChartSweepView} for inspection ranges and warning/limits. diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java index de794823ceb3fa187f3fec1e96b738affe6bfddd..b456a4973388d6b2cc379b5c489d736202377068 100644 --- a/src/com/android/settings/widget/ChartGridView.java +++ b/src/com/android/settings/widget/ChartGridView.java @@ -16,8 +16,6 @@ package com.android.settings.widget; -import static com.android.settings.Utils.formatDateRange; - import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -34,6 +32,8 @@ import android.view.View; import com.android.internal.util.Preconditions; import com.android.settings.R; +import static com.android.settings.Utils.formatDateRange; + /** * Background of {@link ChartView} that renders grid lines as requested by * {@link ChartAxis#getTickPoints()}. diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java index 7aaba6626a12dc9e75e25b079c4ee674b6f01a2a..07c147924f612c14f812508ebbace7259472c11b 100644 --- a/src/com/android/settings/widget/ChartNetworkSeriesView.java +++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java @@ -16,9 +16,6 @@ package com.android.settings.widget; -import static android.text.format.DateUtils.DAY_IN_MILLIS; -import static android.text.format.DateUtils.WEEK_IN_MILLIS; - import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; @@ -36,6 +33,9 @@ import android.view.View; import com.android.internal.util.Preconditions; import com.android.settings.R; +import static android.text.format.DateUtils.DAY_IN_MILLIS; +import static android.text.format.DateUtils.WEEK_IN_MILLIS; + /** * {@link NetworkStatsHistory} series to render inside a {@link ChartView}, * using {@link ChartAxis} to map into screen coordinates. diff --git a/src/com/android/settings/widget/DisabledCheckBoxPreference.java b/src/com/android/settings/widget/DisabledCheckBoxPreference.java index be6deb3a0be638dd3322a5b6beb233f0a29de347..3966864b1eeac87cf22ff0cda33bfaf4130f5fa6 100644 --- a/src/com/android/settings/widget/DisabledCheckBoxPreference.java +++ b/src/com/android/settings/widget/DisabledCheckBoxPreference.java @@ -18,11 +18,10 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import android.util.AttributeSet; -import android.view.View; - import androidx.preference.CheckBoxPreference; import androidx.preference.PreferenceViewHolder; +import android.util.AttributeSet; +import android.view.View; /** * A CheckboxPreference that can disable its checkbox separate from its text. diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java index 315d380f938472c605a359006a5f6be071d20f69..32b994aefac121bcc8362276440d54d24f63dbfe 100644 --- a/src/com/android/settings/widget/DonutView.java +++ b/src/com/android/settings/widget/DonutView.java @@ -25,6 +25,7 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Typeface; import android.icu.text.DecimalFormatSymbols; +import androidx.annotation.ColorRes; import android.text.Layout; import android.text.Spannable; import android.text.SpannableString; @@ -36,8 +37,6 @@ import android.text.style.RelativeSizeSpan; import android.util.AttributeSet; import android.view.View; -import androidx.annotation.ColorRes; - import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/widget/DotsPageIndicator.java b/src/com/android/settings/widget/DotsPageIndicator.java index 88e695105a1e01aaa833a0162877cda868eb68b2..096338bbbf00491f01c65e44fc00461aab25c8d2 100644 --- a/src/com/android/settings/widget/DotsPageIndicator.java +++ b/src/com/android/settings/widget/DotsPageIndicator.java @@ -30,12 +30,10 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.RectF; import android.os.Build; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.View; import android.view.animation.Interpolator; - -import androidx.viewpager.widget.ViewPager; - import com.android.settings.R; import java.util.Arrays; diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index e2e803f4372a9965c992d59f3c34bad83bc908eb..0f3a8b066fd4fbb952fbcff7cb15054f1969248b 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -31,6 +31,9 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.IconDrawableFactory; import android.util.Log; @@ -40,10 +43,6 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java index 534ab08a69928ddf636ab24aa36bc0097a529a22..7187c7b6ee518b580194a42747396bfe931b6d3a 100644 --- a/src/com/android/settings/widget/FixedLineSummaryPreference.java +++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java @@ -16,13 +16,11 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils.TruncateAt; import android.util.AttributeSet; import android.widget.TextView; - -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/GearPreference.java b/src/com/android/settings/widget/GearPreference.java index 0a3010066986ae82fcbe278ada43545fdb291eec..200156b1cdbeacc3f3fa16b7b511e1ab4f765a7a 100644 --- a/src/com/android/settings/widget/GearPreference.java +++ b/src/com/android/settings/widget/GearPreference.java @@ -17,11 +17,10 @@ package com.android.settings.widget; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java index 313a204e5b60ee8d9b2e6c3483b20663f4d4be44..3a5548ea7a3aa988a28a6d721fe619f4bc2f05da 100644 --- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java +++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java @@ -25,17 +25,16 @@ import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Color; import android.os.Bundle; -import android.text.TextUtils; -import android.util.Log; -import android.util.TypedValue; -import android.view.View; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceGroupAdapter; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; +import android.text.TextUtils; +import android.util.Log; +import android.util.TypedValue; +import android.view.View; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java b/src/com/android/settings/widget/HotspotApBandSelectionPreference.java deleted file mode 100644 index 3d75b94f9cec9544dfbb4275572b9615639a944e..0000000000000000000000000000000000000000 --- a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (C) 2018 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.widget; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.net.wifi.WifiConfiguration; -import android.os.Parcel; -import android.os.Parcelable; -import android.util.AttributeSet; -import android.view.View; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.LinearLayout; - -import androidx.annotation.VisibleForTesting; - -import com.android.settings.R; -import com.android.settingslib.CustomDialogPreference; - -import java.util.ArrayList; - -public class HotspotApBandSelectionPreference extends CustomDialogPreference implements - CompoundButton.OnCheckedChangeListener, DialogInterface.OnShowListener { - private static final int UNSET = Integer.MIN_VALUE; - - @VisibleForTesting - static final String KEY_CHECKED_BANDS = "checked_bands"; - @VisibleForTesting - static final String KEY_HOTSPOT_SUPER_STATE = "hotspot_super_state"; - - @VisibleForTesting - CheckBox mBox2G; - @VisibleForTesting - CheckBox mBox5G; - @VisibleForTesting - ArrayList mRestoredBands; - @VisibleForTesting - boolean mShouldRestore; - - private String[] mBandEntries; - private int mExistingConfigValue = UNSET; - - public HotspotApBandSelectionPreference(Context context) { - super(context); - } - - public HotspotApBandSelectionPreference(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public HotspotApBandSelectionPreference(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public HotspotApBandSelectionPreference(Context context, AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - @Override - protected void onRestoreInstanceState(Parcelable state) { - SavedState myState = (SavedState) state; - - super.onRestoreInstanceState(myState.getSuperState()); - - mShouldRestore = myState.shouldRestore; - if (mShouldRestore) { - mRestoredBands = new ArrayList<>(); - if (myState.enabled2G) { - mRestoredBands.add(WifiConfiguration.AP_BAND_2GHZ); - } - if (myState.enabled5G) { - mRestoredBands.add(WifiConfiguration.AP_BAND_5GHZ); - } - } else { - mRestoredBands = null; - } - updatePositiveButton(); - } - - @Override - protected void onBindDialogView(View view) { - super.onBindDialogView(view); - final Context context = getContext(); - - // Register so we can adjust the buttons if needed once the dialog is available. - setOnShowListener(this); - - mBandEntries = context.getResources().getStringArray(R.array.wifi_ap_band_config_full); - // add a checkbox for every band entry. - addApBandViews((LinearLayout) view); - // try to update the button just in case we already missed the onShow call. - updatePositiveButton(); - // clear any saved state so it doesn't leak across multiple rotations/dialog closings - mRestoredBands = null; - mShouldRestore = false; - } - - @Override - protected Parcelable onSaveInstanceState() { - final Parcelable superState = super.onSaveInstanceState(); - - SavedState myState = new SavedState(superState); - myState.shouldRestore = getDialog() != null; - myState.enabled2G = mBox2G != null && mBox2G.isChecked(); - myState.enabled5G = mBox5G != null && mBox5G.isChecked(); - return myState; - } - - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (!(buttonView instanceof CheckBox)) { - return; - } - updatePositiveButton(); - } - - @Override - protected void onClick(DialogInterface dialog, int which) { - // we only want to persist our enabled bands if apply is clicked - if (which == DialogInterface.BUTTON_POSITIVE) { - if (mBox2G.isChecked() || mBox5G.isChecked()) { - int wifiBand = getWifiBand(); - mExistingConfigValue = wifiBand; - callChangeListener(wifiBand); - } - } - } - - /** - * Used to set the band selection for the preference if one already exists - * @param band the band to set it to from {@link WifiConfiguration} - */ - public void setExistingConfigValue(int band) { - mExistingConfigValue = band; - } - - private void addApBandViews(LinearLayout view) { - mBox2G = view.findViewById(R.id.box_2g); - mBox2G.setText(mBandEntries[WifiConfiguration.AP_BAND_2GHZ]); - mBox2G.setChecked(restoreBandIfNeeded(WifiConfiguration.AP_BAND_2GHZ)); - mBox2G.setOnCheckedChangeListener(this); - - mBox5G = view.findViewById(R.id.box_5g); - mBox5G.setText(mBandEntries[WifiConfiguration.AP_BAND_5GHZ]); - mBox5G.setChecked(restoreBandIfNeeded(WifiConfiguration.AP_BAND_5GHZ)); - mBox5G.setOnCheckedChangeListener(this); - } - - private boolean restoreBandIfNeeded(int band) { - // Only use the provided config if we aren't restoring, restore if state available - return (isBandPreviouslySelected(band) && !mShouldRestore) - || (mShouldRestore && mRestoredBands.contains(band)); - } - - private void updatePositiveButton() { - AlertDialog dialog = (AlertDialog) getDialog(); - Button button = dialog == null ? null : dialog.getButton(DialogInterface.BUTTON_POSITIVE); - if (button != null && mBox5G != null && mBox2G != null) { - button.setEnabled(mBox2G.isChecked() || mBox5G.isChecked()); - } - } - - @VisibleForTesting - int getWifiBand() { - final boolean checked_2g = mBox2G.isChecked(); - final boolean checked_5g = mBox5G.isChecked(); - if (checked_2g && checked_5g) { - return WifiConfiguration.AP_BAND_ANY; - } else if (checked_2g && !checked_5g) { - return WifiConfiguration.AP_BAND_2GHZ; - } else if (checked_5g && !checked_2g) { - return WifiConfiguration.AP_BAND_5GHZ; - } else { - throw new IllegalStateException("Wifi Config only supports selecting one or all bands"); - } - } - - private boolean isBandPreviouslySelected(int bandIndex) { - switch(mExistingConfigValue) { - case WifiConfiguration.AP_BAND_ANY: - return true; - case WifiConfiguration.AP_BAND_2GHZ: - return bandIndex == 0; - case WifiConfiguration.AP_BAND_5GHZ: - return bandIndex == 1; - case UNSET: - default: - return false; - } - } - - @Override - public void onShow(DialogInterface dialog) { - updatePositiveButton(); - } - - private static class SavedState extends BaseSavedState { - boolean shouldRestore; - boolean enabled2G; - boolean enabled5G; - - public SavedState(Parcelable source) { - super(source); - } - - private SavedState(Parcel in) { - super(in); - shouldRestore = in.readByte() == 1; - enabled2G = in.readByte() == 1; - enabled5G = in.readByte() == 1; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - super.writeToParcel(dest, flags); - dest.writeByte((byte) (shouldRestore ? 1 : 0)); - dest.writeByte((byte) (enabled2G ? 1: 0)); - dest.writeByte((byte) (enabled5G ? 1 : 0)); - } - - @Override - public String toString() { - return "HotspotApBandSelectionPreference.SavedState{" - + Integer.toHexString(System.identityHashCode(this)) - + " shouldRestore=" + shouldRestore - + " enabled2G=" + enabled2G - + " enabled5G=" + enabled5G + "}"; - } - - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } - - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; - } -} diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java index 14c3d7db012686d9e3924c93d0465d9b329d6c18..7725283e0c4392f5872cd0b48317d4ef67652faf 100644 --- a/src/com/android/settings/widget/LabeledSeekBar.java +++ b/src/com/android/settings/widget/LabeledSeekBar.java @@ -17,8 +17,12 @@ package com.android.settings.widget; import android.content.Context; +import android.content.res.Configuration; import android.graphics.Rect; import android.os.Bundle; +import androidx.core.view.ViewCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.customview.widget.ExploreByTouchHelper; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -27,10 +31,6 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.SeekBar; -import androidx.core.view.ViewCompat; -import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; -import androidx.customview.widget.ExploreByTouchHelper; - import java.util.List; /** diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/MasterCheckBoxPreference.java index 48e09c9a6cc87c5f3de70d9ca183bb64d4692d2f..8fe59e8b9a9b9d9994c6c338ef8ecbbe746b5a80 100644 --- a/src/com/android/settings/widget/MasterCheckBoxPreference.java +++ b/src/com/android/settings/widget/MasterCheckBoxPreference.java @@ -17,13 +17,12 @@ package com.android.settings.widget; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.CheckBox; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/MasterSwitchController.java index 91595848bdc13ee143385880758e9bd76e9e2f0c..1244d33651537ad0847ccb6a1ccbf929adb7edc2 100644 --- a/src/com/android/settings/widget/MasterSwitchController.java +++ b/src/com/android/settings/widget/MasterSwitchController.java @@ -17,7 +17,7 @@ package com.android.settings.widget; import androidx.preference.Preference; - +import android.widget.Switch; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; /* diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java index 42529cfd4d07a97d84deb12c41ff9019ba12b121..765eae1293abedf18f5cf3a49cf577bc22921e2e 100644 --- a/src/com/android/settings/widget/MasterSwitchPreference.java +++ b/src/com/android/settings/widget/MasterSwitchPreference.java @@ -17,13 +17,12 @@ package com.android.settings.widget; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.Switch; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.TwoTargetPreference; diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java index 89df487200ec725fd567d607d56181045a72633d..8142d0bc7163f09e448e05c2d7acd7175c9f61a2 100644 --- a/src/com/android/settings/widget/RadioButtonPickerFragment.java +++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java @@ -20,17 +20,16 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.LayoutRes; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import androidx.annotation.LayoutRes; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.InstrumentedPreferenceFragment; diff --git a/src/com/android/settings/widget/RadioButtonPreference.java b/src/com/android/settings/widget/RadioButtonPreference.java index ed7f905312187e8d6798a3568510749c15f0373a..9b5c17007088362cf96d49fcf4f56bd3b8aacc55 100644 --- a/src/com/android/settings/widget/RadioButtonPreference.java +++ b/src/com/android/settings/widget/RadioButtonPreference.java @@ -17,15 +17,14 @@ package com.android.settings.widget; import android.content.Context; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.CheckBoxPreference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.TextView; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.CheckBoxPreference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java index e33c34287daa118e40905480b80dfa4bdb5abe78..9518c693e30d05c5f10aefe1b54e536e345f4891 100644 --- a/src/com/android/settings/widget/RestrictedAppPreference.java +++ b/src/com/android/settings/widget/RestrictedAppPreference.java @@ -18,13 +18,12 @@ package com.android.settings.widget; import android.content.Context; import android.os.UserHandle; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; diff --git a/src/com/android/settings/widget/RtlCompatibleViewPager.java b/src/com/android/settings/widget/RtlCompatibleViewPager.java index 68caaa78ea5027d19ff1602aadc8a9c4e38ba9d3..ac28e7bf4cb1ce974a156d12575b535844ea6853 100644 --- a/src/com/android/settings/widget/RtlCompatibleViewPager.java +++ b/src/com/android/settings/widget/RtlCompatibleViewPager.java @@ -17,13 +17,12 @@ package com.android.settings.widget; import android.content.Context; -import android.os.Parcel; import android.os.Parcelable; +import androidx.viewpager.widget.ViewPager; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; - -import androidx.viewpager.widget.ViewPager; +import android.os.Parcel; import java.util.Locale; diff --git a/src/com/android/settings/widget/ScrollToParentEditText.java b/src/com/android/settings/widget/ScrollToParentEditText.java index 9d5394bb8fa992fef1a7757061ea1067df7730ca..705e918ea5e9b56c6864936f37ff5d05d989f3e6 100644 --- a/src/com/android/settings/widget/ScrollToParentEditText.java +++ b/src/com/android/settings/widget/ScrollToParentEditText.java @@ -21,6 +21,9 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; import android.view.ViewParent; +import android.widget.EditText; + +import com.android.settings.widget.ImeAwareEditText; /** * An EditText that, instead of scrolling to itself when focused, will request scrolling to its diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java index 2c57bb31a94c29d7b5cfa12b7c52943f812a5b48..2919b36ce592aa92e606f79fb7496432352f3eae 100644 --- a/src/com/android/settings/widget/SeekBarPreference.java +++ b/src/com/android/settings/widget/SeekBarPreference.java @@ -20,6 +20,8 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.Parcel; import android.os.Parcelable; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.KeyEvent; @@ -28,9 +30,7 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.PreferenceViewHolder; - +import com.android.settings.widget.DefaultIndicatorSeekBar; import com.android.settingslib.RestrictedPreference; /** diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java index 74108aa20d10fd54b8e58babf8f2684ba34ed8e2..adc386ac0c00f2358335c81ec0cfd0a28e9029dc 100644 --- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java +++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java @@ -16,6 +16,7 @@ package com.android.settings.widget; +import android.app.ActivityManager; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; @@ -32,10 +33,14 @@ import android.net.Uri; import android.net.wifi.WifiManager; import android.os.AsyncTask; import android.os.Handler; +import android.os.IPowerManager; import android.os.PowerManager; import android.os.Process; +import android.os.RemoteException; +import android.os.ServiceManager; import android.os.UserManager; import android.provider.Settings; +import android.provider.Settings.Secure; import android.util.Log; import android.widget.RemoteViews; diff --git a/src/com/android/settings/widget/SlidingTabLayout.java b/src/com/android/settings/widget/SlidingTabLayout.java index 3ae4e3cc6c7b5db8a10e511669b58a9a1a314e93..ef024ef5a121d5e68b4bc8c86eba1cf8624c96ba 100644 --- a/src/com/android/settings/widget/SlidingTabLayout.java +++ b/src/com/android/settings/widget/SlidingTabLayout.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import android.content.Context; +import androidx.viewpager.widget.PagerAdapter; import android.util.AttributeSet; import android.view.Gravity; import android.view.LayoutInflater; @@ -25,8 +26,6 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.viewpager.widget.PagerAdapter; - import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java index 52a3288dc5920887437701882cbf26dac49a37f3..857075bfb5a17f556508fd3178cc467f96168782 100644 --- a/src/com/android/settings/widget/SwitchBar.java +++ b/src/com/android/settings/widget/SwitchBar.java @@ -23,6 +23,9 @@ import android.content.res.TypedArray; import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; +import androidx.annotation.ColorInt; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.text.style.TextAppearanceSpan; @@ -36,10 +39,6 @@ import android.widget.LinearLayout; import android.widget.Switch; import android.widget.TextView; -import androidx.annotation.ColorInt; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/widget/SwitchBarController.java b/src/com/android/settings/widget/SwitchBarController.java index e471c7a1b70d816ea9b50e2152157f74ea072195..ede02afbeed312c1f9a83243953131b99fac2512 100644 --- a/src/com/android/settings/widget/SwitchBarController.java +++ b/src/com/android/settings/widget/SwitchBarController.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import android.widget.Switch; - import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; /* diff --git a/src/com/android/settings/widget/TwoStateButtonPreference.java b/src/com/android/settings/widget/TwoStateButtonPreference.java index b154fb4193c6742839d5a1ccaa4bc011188ffed9..0f71268975fd9292c3c3d87ca08411a23b4e374f 100644 --- a/src/com/android/settings/widget/TwoStateButtonPreference.java +++ b/src/com/android/settings/widget/TwoStateButtonPreference.java @@ -18,13 +18,12 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; import android.util.AttributeSet; import android.view.View; import android.widget.Button; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; - import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java index 9285c3d2c14181449766277dcd6d3ca80d773940..0243a6873e8ddb7a53e74b14c24a7757cc99ca99 100644 --- a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java +++ b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java @@ -18,12 +18,10 @@ package com.android.settings.widget; import android.app.AlertDialog; import android.content.res.TypedArray; import android.os.Bundle; -import android.widget.ArrayAdapter; - import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; import androidx.preference.PreferenceDialogFragment; - +import androidx.preference.ListPreference; +import android.widget.ArrayAdapter; import com.android.settingslib.core.instrumentation.Instrumentable; import java.util.ArrayList; diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java index ea2d04b948cf2cfd979980e6bdcbc62b0ae72604..8ffffb7f6565c3aaf38e044acbf2946c0e444579 100644 --- a/src/com/android/settings/widget/ValidatedEditTextPreference.java +++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java @@ -18,18 +18,18 @@ package com.android.settings.widget; import android.app.AlertDialog; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; import android.text.TextWatcher; import android.util.AttributeSet; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceViewHolder; - import com.android.settingslib.CustomEditTextPreference; /** diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java index b5874b1bdc307d96d71d7aebb6bb4dc8858b994d..4ec98296e1bb0cb545be5de7967c98bdf00b9ea3 100644 --- a/src/com/android/settings/widget/VideoPreference.java +++ b/src/com/android/settings/widget/VideoPreference.java @@ -22,6 +22,9 @@ import android.content.res.TypedArray; import android.graphics.SurfaceTexture; import android.media.MediaPlayer; import android.net.Uri; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.util.Log; import android.view.Surface; @@ -29,10 +32,6 @@ import android.view.TextureView; import android.view.View; import android.widget.ImageView; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/WorkOnlyCategory.java b/src/com/android/settings/widget/WorkOnlyCategory.java index 063b105dfb20b9a5c252a7fee835953e803358b3..449916b6cfe237995a03ad5bfea5dbb90af09a5a 100644 --- a/src/com/android/settings/widget/WorkOnlyCategory.java +++ b/src/com/android/settings/widget/WorkOnlyCategory.java @@ -16,9 +16,8 @@ package com.android.settings.widget; import android.content.Context; import android.os.UserManager; -import android.util.AttributeSet; - import androidx.preference.PreferenceCategory; +import android.util.AttributeSet; import com.android.settings.SelfAvailablePreference; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java index 19687fcfff16988487e98f94d7701e7af5245fb0..c643b8ca05de5a51e352eb6c2c6cfbb7486c2214 100644 --- a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java +++ b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java @@ -22,6 +22,7 @@ import android.content.Context; import com.android.internal.util.ArrayUtils; import com.android.settings.applications.AppStateAppOpsBridge; +import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java index a883826801fdfba4b12be09eb1f672f439e62f44..2fefb43e7a10420b90ba9046816154d338684a09 100644 --- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java +++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.wifi; import android.content.Context; import android.provider.Settings; -import android.text.TextUtils; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 03e98208afb1c5b8e4fec6de4063eff0dd5b176a..1c59ddd02b7090e1bdd9ad016238ab0002b1a94f 100644 --- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java +++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java @@ -16,22 +16,28 @@ package com.android.settings.wifi; +import android.Manifest.permission; import android.app.AlertDialog; import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; +import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; + import com.android.settings.wifi.AppStateChangeWifiStateBridge.WifiSettingsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; +import com.android.settingslib.applications.ApplicationsState.AppFilter; + +import static android.app.AppOpsManager.MODE_ALLOWED; +import static android.app.AppOpsManager.MODE_IGNORED; public class ChangeWifiStateDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java index 3efbbff7f3be81481016c46f4501d14d3ce83736..1e3723e3570ae067281b4b3ddc5626af1b28b3dc 100644 --- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java +++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java @@ -17,10 +17,9 @@ package com.android.settings.wifi; import android.content.Context; -import android.view.View; - import androidx.annotation.DrawableRes; import androidx.preference.PreferenceViewHolder; +import android.view.View; import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; diff --git a/src/com/android/settings/wifi/LinkablePreference.java b/src/com/android/settings/wifi/LinkablePreference.java index 033740a65c080643d4db108bbc583b62ee442171..e4cb95bcebd99eb7e6c5c6988d33e554ab203b4e 100644 --- a/src/com/android/settings/wifi/LinkablePreference.java +++ b/src/com/android/settings/wifi/LinkablePreference.java @@ -17,16 +17,14 @@ package com.android.settings.wifi; import android.content.Context; +import androidx.annotation.Nullable; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.Spannable; import android.text.method.LinkMovementMethod; import android.text.style.TextAppearanceSpan; import android.util.AttributeSet; import android.widget.TextView; - -import androidx.annotation.Nullable; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.LinkifyUtils; /** diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java index ab7abf2a31b74cdf1d06cef749b590ba0f95f541..213589b9de47111ae69f714a141b821d40c87665 100644 --- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java +++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java @@ -17,9 +17,9 @@ package com.android.settings.wifi; import android.app.Fragment; import android.content.Context; - import androidx.preference.PreferenceViewHolder; - +import android.widget.ImageView; +import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPointPreference; diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java index a46a82873a522479b4dd5d018d8290065f6361b2..baf273c21db512dc66d8aeec8daf9666e0d9df23 100644 --- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java +++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java @@ -22,11 +22,10 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; -import android.text.TextUtils; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java index 25e7a6e69b527f81c2cf1d421fc2ea6ca05fef0a..c45db69ba04102bb1f4603febd52d4f6bdcfe8cb 100644 --- a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java +++ b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java @@ -26,12 +26,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.net.wifi.WifiManager; import android.os.Bundle; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; - -import androidx.annotation.NonNull; - import com.android.internal.app.AlertActivity; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index 56072c1c1b0ffb20b5a6ec5abe899559820c5f5b..25c97b203e011381bbec6fa5a7981c17c91e638c 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -24,12 +24,11 @@ import android.icu.text.Collator; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.Handler; -import android.util.Log; -import android.widget.Toast; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.Log; +import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index 3b71037037b99f2807b881af532ead0f8442f679..6bc2d98f796fadff07bc2e7a7b53fe545949d344 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java @@ -13,11 +13,11 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import android.text.TextUtils; - +import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 6d3c3b8ef4241c0700895aaac6cc2d8dee1be6af..35f700de815623f8a65aca1c25e55e2c0e4d8ced 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -22,11 +22,10 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.net.wifi.WifiManager; import android.os.Bundle; -import android.text.Editable; -import android.widget.EditText; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.Editable; +import android.widget.EditText; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index de67c10baac28ae447dd8b9c70b3aa805cbd52a4..22de20c445c9e4c5d372ffcd05565ecab5eabec0 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -34,9 +34,11 @@ import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiEnterpriseConfig.Eap; import android.net.wifi.WifiEnterpriseConfig.Phase2; import android.net.wifi.WifiInfo; +import android.os.Handler; import android.os.UserManager; import android.security.Credentials; import android.security.KeyStore; +import androidx.annotation.VisibleForTesting; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; @@ -57,8 +59,6 @@ import android.widget.ScrollView; import android.widget.Spinner; import android.widget.TextView; -import androidx.annotation.VisibleForTesting; - import com.android.settings.ProxySelector; import com.android.settings.R; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/wifi/WifiDetailPreference.java b/src/com/android/settings/wifi/WifiDetailPreference.java index 2567a429932d58b66c78146da029a6a1f756e4a0..f7ddac7c6fc2786e9d04c53ab2a080a2ae4c4613 100644 --- a/src/com/android/settings/wifi/WifiDetailPreference.java +++ b/src/com/android/settings/wifi/WifiDetailPreference.java @@ -17,13 +17,12 @@ package com.android.settings.wifi; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.widget.TextView; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; /** diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index 5d0dc69437ca0eca9014f851f3aa53bc0a0a973c..02ce0e4d4e8971dc45065a69ff40b1b56d7a6899 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -24,9 +24,8 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.net.wifi.WifiManager.ActionListener; import android.os.Bundle; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.settings.SetupWizardUtils; import com.android.settingslib.wifi.AccessPoint; diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index 8efefc376285f69c965469786b8d424d61ae2224..018119b3e579a02deb28c02afd11cdcc8f440ffb 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -28,9 +28,8 @@ import android.net.wifi.WifiManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.widget.Toast; - import androidx.annotation.VisibleForTesting; +import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java index 0676d96ce03f1a1cb5042f98130acbe8265d83c0..ec17b08d121aa3a8403f1ef8ab9702b138a981e6 100644 --- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java +++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java @@ -23,11 +23,10 @@ import android.content.IntentFilter; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.text.TextUtils; - import androidx.core.text.BidiFormatter; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java index 692608ccbe81430444fd864e4eff7db583ccd2b6..cbbe8ba2c0175db4f213ba5fb13f782c7ce1ba7a 100644 --- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java @@ -16,14 +16,13 @@ package com.android.settings.wifi; import android.content.Context; - import androidx.preference.PreferenceScreen; -import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.widget.MasterSwitchController; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; +import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.MasterSwitchController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java index e12529d42d5196a48ac875d6d458b9c76c1ea8c9..b175665a9434320f7d2bcb947dd5404c220e3f05 100644 --- a/src/com/android/settings/wifi/WifiNoInternetDialog.java +++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java @@ -16,10 +16,6 @@ package com.android.settings.wifi; -import static android.net.ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION; -import static android.net.ConnectivityManager.ACTION_PROMPT_UNVALIDATED; -import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; - import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -41,6 +37,10 @@ import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; import com.android.settings.R; +import static android.net.ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION; +import static android.net.ConnectivityManager.ACTION_PROMPT_UNVALIDATED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; + public final class WifiNoInternetDialog extends AlertActivity implements DialogInterface.OnClickListener { private static final String TAG = "WifiNoInternetDialog"; diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java index 079d90f158e7635e2f4145abdf41e8010cf4eea7..51904418f8fc674ad92a5db3a89eb74ecf4fc660 100644 --- a/src/com/android/settings/wifi/WifiPickerActivity.java +++ b/src/com/android/settings/wifi/WifiPickerActivity.java @@ -16,7 +16,6 @@ package com.android.settings.wifi; import android.content.Intent; - import androidx.preference.PreferenceFragment; import com.android.settings.ButtonBarHandler; diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index f1eafd047dd97df3758b5c25ba9cb036bbd264ad..9db766cb3be1bd7754d445414af0770537825838 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -25,12 +25,11 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 3d13d12a13bca26b05c9cd9b258f7c90af51c426..7aeaba656694f88f48ccbc7dadb587d939c13320 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -39,6 +39,9 @@ import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; @@ -47,10 +50,6 @@ import android.view.MenuItem; import android.view.View; import android.widget.Toast; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.LinkifyUtils; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/WifiSliceBuilder.java b/src/com/android/settings/wifi/WifiSliceBuilder.java index b2aabdfff4702acb6b8aff186d3c7ded17dead4f..68aa9a5b8d3d901a3095bf87a5f00994379878b9 100644 --- a/src/com/android/settings/wifi/WifiSliceBuilder.java +++ b/src/com/android/settings/wifi/WifiSliceBuilder.java @@ -19,6 +19,8 @@ package com.android.settings.wifi; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import static android.provider.SettingsSlicesContract.KEY_WIFI; +import static androidx.slice.builders.ListBuilder.ICON_IMAGE; + import android.annotation.ColorInt; import android.app.PendingIntent; import android.content.ContentResolver; @@ -30,12 +32,6 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.WifiSsid; import android.provider.SettingsSlicesContract; -import android.text.TextUtils; - -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -43,6 +39,14 @@ import com.android.settings.SubSettings; import com.android.settings.Utils; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.slices.SliceBroadcastReceiver; +import com.android.settings.slices.SliceBuilderUtils; + +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + +import androidx.core.graphics.drawable.IconCompat; +import android.text.TextUtils; /** * Utility class to build a Wifi Slice, and handle all associated actions. diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java index 86961132c42c3208204e0e3ed56ec934a3804a97..d0b4f606946505088af280f6acef0c03b3fa4b62 100644 --- a/src/com/android/settings/wifi/WifiSummaryUpdater.java +++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java @@ -24,9 +24,8 @@ import android.net.ConnectivityManager; import android.net.NetworkScoreManager; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java index 4ffc589834ef3fbc315dc104ff21613ae6684c1b..99b77d9e36b8ccace2f44ad5ff41641b387fcc70 100644 --- a/src/com/android/settings/wifi/WifiUtils.java +++ b/src/com/android/settings/wifi/WifiUtils.java @@ -28,8 +28,6 @@ import android.text.TextUtils; import com.android.settingslib.wrapper.PackageManagerWrapper; -import java.nio.charset.StandardCharsets; - public class WifiUtils { private static final int SSID_ASCII_MIN_LENGTH = 1; @@ -42,7 +40,7 @@ public class WifiUtils { if (TextUtils.isEmpty(ssid)) { return false; } - return ssid.getBytes(StandardCharsets.UTF_8).length > SSID_ASCII_MAX_LENGTH; + return ssid.length() > SSID_ASCII_MAX_LENGTH; } public static boolean isSSIDTooShort(String ssid) { @@ -63,9 +61,8 @@ public class WifiUtils { /** * This method is a stripped and negated version of WifiConfigStore.canModifyNetwork. - * * @param context Context of caller - * @param config The WiFi config. + * @param config The WiFi config. * @return true if Settings cannot modify the config due to lockDown. */ public static boolean isNetworkLockedDown(Context context, WifiConfiguration config) { diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index 0dcdf54d70707e9516f4fb988742c36eef0c1231..0c088257abb8a5cabab191e451eef9040409ed6a 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -24,12 +24,11 @@ import android.content.Context; import android.content.Intent; import android.location.LocationManager; import android.provider.Settings; -import android.text.TextUtils; - import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java index ab04eca4afd8f84f21122f5e4360e3847fe68680..a9c0ee9f54cae5153700a83347fd6a33c33460b5 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java @@ -19,6 +19,7 @@ package com.android.settings.wifi.calling; import android.app.Fragment; import android.app.FragmentManager; import android.os.Bundle; +import androidx.legacy.app.FragmentPagerAdapter; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.util.Log; @@ -26,8 +27,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import androidx.legacy.app.FragmentPagerAdapter; - import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 76b5c7ae8a482e0229c02b91539e327f004653f6..15137cc821a4fb90ffcbdbfa899f1c4986c626d2 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -25,6 +25,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.os.PersistableBundle; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.PhoneStateListener; import android.telephony.SubscriptionManager; @@ -37,11 +41,6 @@ import android.view.ViewGroup; import android.widget.Switch; import android.widget.TextView; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; - import com.android.ims.ImsConfig; import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java index e8e33ef053155539e3d5d5c870a214a7cd28bae0..a80e9d03c948165d31008bde9fe625f21f8ce8fd 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java @@ -26,13 +26,13 @@ import android.content.Intent; import android.net.Uri; import android.os.PersistableBundle; import android.provider.Settings; +import androidx.core.graphics.drawable.IconCompat; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index f3460aff172cccdb3c9b7058b3afe7d400775f1a..fda5ce49347e6b08c690ba8ec5e69c1cd06dce0f 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -40,15 +40,14 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; -import android.text.TextUtils; -import android.util.Log; -import android.widget.ImageView; -import android.widget.Toast; - import androidx.core.text.BidiFormatter; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; +import android.util.Log; +import android.widget.ImageView; +import android.widget.Toast; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java index 341b2279994562d8a3fdacdf8d9fca99c5c9d1e8..097a49be3edbb776e65d11a73d5dea2a699a8957 100644 --- a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java @@ -20,12 +20,16 @@ import android.app.backup.BackupManager; import android.content.Context; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; - +import android.provider.Settings; import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; import androidx.preference.DropDownPreference; import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.core.BasePreferenceController; +import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; /** diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java index ac8113bcc5bde9d77da7709b8737c8424aedafb9..fed363d9dc7a635cbb067e5f72e9f07e7fbf148e 100644 --- a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.wifi.p2p; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java index ade423a486a2d4d286a7d3347151129435456248..84ce1ee04c656b19e7f3fcdef08cee09086d9c2f 100644 --- a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.p2p.WifiP2pDevice; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java index 6caef94c6fa666717df73d889a966557691d0efe..5a087e527aac9cb173b88d59da753e9b79ab1330 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java @@ -19,12 +19,10 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pDevice; -import android.text.TextUtils; -import android.widget.ImageView; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; - +import android.text.TextUtils; +import android.widget.ImageView; import com.android.settings.R; public class WifiP2pPeer extends Preference { diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java b/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java index 702942ca7fb316db77a1aeb9e3a06adee9015500..4d2b43364a8230287c2cba8be9fcb13433736846 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.p2p.WifiP2pGroup; - import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; public class WifiP2pPersistentGroup extends Preference { diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java index 4f3b7fd63b38df600e1ff82fb682cd680e51584f..78af007bdbd831e294f04017b1f0c05056f9fb30 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index 6afd03acf6d75fc7e20f78968da24d3646ad8e76..302981d9d6f85847163b3b3af1c9b455b5bddcf3 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -38,6 +38,8 @@ import android.net.wifi.p2p.WifiP2pManager.PeerListListener; import android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener; import android.os.Bundle; import android.os.SystemProperties; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.InputFilter; import android.text.TextUtils; import android.util.Log; @@ -47,9 +49,6 @@ import android.view.MenuItem; import android.widget.EditText; import android.widget.Toast; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java index fafcb037ae299affed3fb106adee51052237863f..2071075903e997080db52b0d7960c1374499ebc5 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -16,37 +16,31 @@ package com.android.settings.wifi.tether; -import static android.net.wifi.WifiConfiguration.AP_BAND_2GHZ; -import static android.net.wifi.WifiConfiguration.AP_BAND_5GHZ; - import android.content.Context; import android.content.res.Resources; -import android.icu.text.ListFormatter; import android.net.wifi.WifiConfiguration; -import android.util.Log; - +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; import androidx.preference.Preference; +import android.util.Log; import com.android.settings.R; -import com.android.settings.widget.HotspotApBandSelectionPreference; public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferenceController { private static final String TAG = "WifiTetherApBandPref"; private static final String PREF_KEY = "wifi_tether_network_ap_band"; - public static final String[] BAND_VALUES = - {String.valueOf(AP_BAND_2GHZ), String.valueOf(AP_BAND_5GHZ)}; - private final String[] mBandEntries; - private final String[] mBandSummaries; + private String[] mBandEntries; + private String[] mBandSummaries; private int mBandIndex; + private boolean isDualMode; public WifiTetherApBandPreferenceController(Context context, OnTetherConfigUpdateListener listener) { super(context, listener); - Resources res = mContext.getResources(); - mBandEntries = res.getStringArray(R.array.wifi_ap_band_config_full); - mBandSummaries = res.getStringArray(R.array.wifi_ap_band_summary_full); + isDualMode = mWifiManager.isDualModeSupported(); + updatePreferenceEntries(); } @Override @@ -56,7 +50,7 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen mBandIndex = 0; Log.d(TAG, "Updating band index to 0 because no config"); } else if (is5GhzBandSupported()) { - mBandIndex = config.apBand; + mBandIndex = validateSelection(config.apBand); Log.d(TAG, "Updating band index to " + mBandIndex); } else { config.apBand = 0; @@ -64,21 +58,23 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen mBandIndex = config.apBand; Log.d(TAG, "5Ghz not supported, updating band index to " + mBandIndex); } - HotspotApBandSelectionPreference preference = - (HotspotApBandSelectionPreference) mPreference; + ListPreference preference = + (ListPreference) mPreference; + preference.setEntries(mBandSummaries); + preference.setEntryValues(mBandEntries); if (!is5GhzBandSupported()) { preference.setEnabled(false); preference.setSummary(R.string.wifi_ap_choose_2G); } else { - preference.setExistingConfigValue(config.apBand); + preference.setValue(Integer.toString(config.apBand)); preference.setSummary(getConfigSummary()); } } String getConfigSummary() { if (mBandIndex == WifiConfiguration.AP_BAND_ANY) { - return ListFormatter.getInstance().format((Object[]) mBandSummaries); + return mContext.getString(R.string.wifi_ap_prefer_5G); } return mBandSummaries[mBandIndex]; } @@ -90,13 +86,46 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - mBandIndex = (Integer) newValue; + mBandIndex = validateSelection(Integer.parseInt((String) newValue)); Log.d(TAG, "Band preference changed, updating band index to " + mBandIndex); preference.setSummary(getConfigSummary()); mListener.onTetherConfigUpdated(); return true; } + private int validateSelection(int band) { + // Reset the band to 2.4 GHz if we get a weird config back to avoid a crash. + final boolean isDualMode = mWifiManager.isDualModeSupported(); + + // unsupported states: + // 1: no dual mode means we can't have AP_BAND_ANY - default to 5GHZ + // 2: no 5 GHZ support means we can't have AP_BAND_5GHZ - default to 2GHZ + // 3: With Dual mode support we can't have AP_BAND_5GHZ - default to ANY + if (!isDualMode && WifiConfiguration.AP_BAND_ANY == band) { + return WifiConfiguration.AP_BAND_5GHZ; + } else if (!is5GhzBandSupported() && WifiConfiguration.AP_BAND_5GHZ == band) { + return WifiConfiguration.AP_BAND_2GHZ; + } else if (isDualMode && WifiConfiguration.AP_BAND_5GHZ == band) { + return WifiConfiguration.AP_BAND_ANY; + } + + return band; + } + + @VisibleForTesting + void updatePreferenceEntries() { + Resources res = mContext.getResources(); + int entriesRes = R.array.wifi_ap_band_config_full; + int summariesRes = R.array.wifi_ap_band_summary_full; + // change the list options if this is a dual mode device + if (isDualMode) { + entriesRes = R.array.wifi_ap_band_dual_mode; + summariesRes = R.array.wifi_ap_band_dual_mode_summary; + } + mBandEntries = res.getStringArray(entriesRes); + mBandSummaries = res.getStringArray(summariesRes); + } + private boolean is5GhzBandSupported() { final String countryCode = mWifiManager.getCountryCode(); if (!mWifiManager.isDualBandSupported() || countryCode == null) { diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java index 01a0b5707cb3d0c0fc6709e10cec576f9a5592a5..d8c3cfd8a34464f8daade4b8ed491c2d5f103205 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java index 94e9209defbce007abd258aa2f045097d3b88725..e689916475d13425ea2dd1f08c762b9f85bce7e2 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java index 8d9e8586f44ba2f9fdead005e89075b65a146400..465170a2c4675653806f2d079be5a6d111cc11c6 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java @@ -18,10 +18,9 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; -import android.text.TextUtils; - import androidx.preference.EditTextPreference; import androidx.preference.Preference; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.widget.ValidatedEditTextPreference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 2ae6b586ae670e1c679fdb5b54be6a967035ed8f..3e0297e741b674b11f2fa6f72de62e4138b9cbf4 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -24,11 +24,10 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.text.BidiFormatter; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.BidiFormatter; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java index fb2ce97db6bd1ce31623f111eeb47ef457551731..176573f584615792e90b49fd3a72eaf991b25035 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java @@ -18,13 +18,13 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; -import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.preference.EditTextPreference; import androidx.preference.Preference; +import android.util.Log; import com.android.settings.widget.ValidatedEditTextPreference; +import com.android.settings.wifi.WifiUtils; public class WifiTetherSSIDPreferenceController extends WifiTetherBasePreferenceController implements ValidatedEditTextPreference.Validator { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java index f97a20911eb1081089e72b9db6c9fc66c6ebc0a9..0f08cbb709aabeab0afc9d4e2ffcbf92dd6663fc 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java @@ -1,8 +1,8 @@ package com.android.settings.wifi.tether; import android.content.Context; +import android.content.res.Resources; import android.net.wifi.WifiConfiguration; - import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 7d9afde77bc83357587405149be4cc6b63be901d..0de74043541dd6e10076bf075cc06a679b1d353f 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -27,9 +27,8 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.UserManager; -import android.util.Log; - import androidx.annotation.VisibleForTesting; +import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java index 8d87b3284b25300b2b8822ba4fbfc4455f1f8222..554cc0e32021c1f35b6012aa3b0f9c4bc5eca4e4 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java @@ -27,7 +27,6 @@ import android.net.wifi.WifiManager; import android.os.Handler; import android.os.Looper; import android.provider.Settings; - import androidx.annotation.VisibleForTesting; import com.android.settings.datausage.DataSaverBackend; diff --git a/src/com/android/settings/wrapper/OverlayManagerWrapper.java b/src/com/android/settings/wrapper/OverlayManagerWrapper.java new file mode 100644 index 0000000000000000000000000000000000000000..6e3c2348857519152153725260776bef6d5115bb --- /dev/null +++ b/src/com/android/settings/wrapper/OverlayManagerWrapper.java @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2018 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.wrapper; + +import android.content.Context; +import android.content.om.IOverlayManager; +import android.content.om.OverlayInfo; +import android.os.RemoteException; +import android.os.ServiceManager; + +import java.util.ArrayList; +import java.util.List; + +public class OverlayManagerWrapper { + + private final IOverlayManager mOverlayManager; + + public OverlayManagerWrapper(IOverlayManager overlayManager) { + mOverlayManager = overlayManager; + } + + public OverlayManagerWrapper() { + this(IOverlayManager.Stub.asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE))); + } + + public List getOverlayInfosForTarget(String overlay, int userId) { + if (mOverlayManager == null) { + return new ArrayList<>(); + } + try { + List infos + = mOverlayManager.getOverlayInfosForTarget(overlay, userId); + ArrayList result = new ArrayList<>(infos.size()); + for (int i = 0; i < infos.size(); i++) { + result.add(new OverlayInfo(infos.get(i))); + } + return result; + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + public boolean setEnabled(String overlay, boolean enabled, int userId) { + if (mOverlayManager == null) { + return false; + } + try { + return mOverlayManager.setEnabled(overlay, enabled, userId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + public boolean setEnabledExclusiveInCategory(String overlay, int userId) { + if (mOverlayManager == null) { + return false; + } + try { + return mOverlayManager.setEnabledExclusiveInCategory(overlay, userId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + public static class OverlayInfo { + + public static final String CATEGORY_THEME = android.content.om.OverlayInfo.CATEGORY_THEME; + public final String packageName; + public final String category; + private final boolean mEnabled; + + public OverlayInfo(String packageName, String category, boolean enabled) { + this.packageName = packageName; + this.category = category; + mEnabled = enabled; + } + + public OverlayInfo(android.content.om.OverlayInfo info) { + mEnabled = info.isEnabled(); + category = info.category; + packageName = info.packageName; + } + + public boolean isEnabled() { + return mEnabled; + } + } +} diff --git a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry index 8e0df9d0276be2312a1d44e0543bfd2c1ab5836f..be3507c93ae468dcc276f79363e026e97b12fa23 100644 --- a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry +++ b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry @@ -1,3 +1,2 @@ -com.android.settings.display.FontSizePreferenceFragmentForSetupWizard com.android.settings.display.ScreenZoomPreferenceFragmentForSetupWizard com.android.settings.search.indexing.FakeSettingsFragment diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index 3706983e73076311fe5ecef990053c07f3fa4b77..cecc9c59c59cc14021f1d8ad99b045b9fad604a8 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -63,12 +63,6 @@ false true - - false - - - false - fake_package/fake_service diff --git a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java index 1a4ce89fbcdbd5365a99d67a5c0b9e27e8cb2c0e..1602f15263a83841fc22191fcee43b5f134407ac 100644 --- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java +++ b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java @@ -18,23 +18,37 @@ package com.android.settings; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import android.app.AppOpsManager; +import android.app.admin.DeviceAdminInfo; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Answers; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; @RunWith(SettingsRobolectricTestRunner.class) public class DeviceAdminAddTest { + private static final int UID = 12345; + private static final String PACKAGE_NAME = "com.android.test.device.admin"; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private DeviceAdminInfo mDeviceAdmin; + @Mock + private BatteryUtils mBatteryUtils; private FakeFeatureFactory mFeatureFactory; private DeviceAdminAdd mDeviceAdminAdd; @@ -44,6 +58,10 @@ public class DeviceAdminAddTest { mFeatureFactory = FakeFeatureFactory.setupForTest(); mDeviceAdminAdd = Robolectric.buildActivity(DeviceAdminAdd.class).get(); + + doReturn(UID).when(mBatteryUtils).getPackageUid(PACKAGE_NAME); + when(mDeviceAdmin.getComponent().getPackageName()).thenReturn(PACKAGE_NAME); + mDeviceAdminAdd.mDeviceAdmin = mDeviceAdmin; } @Test @@ -56,4 +74,23 @@ public class DeviceAdminAddTest { verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class), eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_DENY), eq("app")); } + + @Test + public void unrestrictAppIfPossible_appRestricted_unrestrictApp() { + doReturn(true).when(mBatteryUtils).isForceAppStandbyEnabled(UID, PACKAGE_NAME); + + mDeviceAdminAdd.unrestrictAppIfPossible(mBatteryUtils); + + verify(mBatteryUtils).setForceAppStandby(UID, PACKAGE_NAME, AppOpsManager.MODE_ALLOWED); + } + + @Test + public void unrestrictAppIfPossible_appUnrestricted_doNothing() { + doReturn(false).when(mBatteryUtils).isForceAppStandbyEnabled(UID, PACKAGE_NAME); + + mDeviceAdminAdd.unrestrictAppIfPossible(mBatteryUtils); + + verify(mBatteryUtils, never()).setForceAppStandby(UID, PACKAGE_NAME, + AppOpsManager.MODE_ALLOWED); + } } diff --git a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java index cfef3c26c3965a05698722f1293dfa82329c4936..23639ff70ea59635e08e97c75a1182f18673a6ff 100644 --- a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java +++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java @@ -17,7 +17,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.Shadows.shadowOf; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java index 3bd8d984c34a94726c68e51d9328cb530d3795da..af0b757a1821ef8e913136e2dc21481207947768 100644 --- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java +++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java @@ -16,7 +16,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index c693a5ff9c86ce0ee41ec2b54c64fe5f22039ebf..64dab16118cf0bc8c8c4f3ddf963dc9e5b722b91 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -17,7 +17,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java index f024e4c868459400b4983ad07476b6dbdb1028fe..6ad520a66037dc3d7dde266ce79b2862bfd39637 100644 --- a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java @@ -19,9 +19,9 @@ package com.android.settings; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java index a10a4a41b10973dbf8e40e994f8e2c278f80326a..8753b1d39000846aaeb2331845a6fc906d422678 100644 --- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java +++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java @@ -17,7 +17,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java index 36256263eeb97cb7deb2a59152a73a8d61a72356..1cca84287614c74171052cf0eac76ebe45956b36 100644 --- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java @@ -16,7 +16,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -28,11 +27,9 @@ import android.app.KeyguardManager; import android.content.Intent; import android.os.Bundle; import android.util.AttributeSet; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreferenceHelper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java index 35f9e2876ab4d4fcd8842fe3993bb0443ff68bd8..e370cda5c96b8c36426229d25ba5ecdc1cd22415 100644 --- a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java @@ -15,6 +15,8 @@ */ package com.android.settings; +import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java index 6015e2789e8141393f639d01bda1b744b9ae03b9..dc1fe2b223d8e3c36e9c10be0ec205884c871891 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -28,7 +28,6 @@ import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; - import androidx.annotation.NonNull; import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java index 1c1c14ce0cc7339597213525944fb58264e0ce3d..f09723f507f26385dcfdfbe015d70bb57c397224 100644 --- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java +++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java @@ -21,20 +21,18 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; import android.content.pm.ShortcutInfo; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowShortcutManager; - +import java.util.ArrayList; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import java.util.ArrayList; -import java.util.List; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowShortcutManager.class}) public class SettingsInitializeTest { diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java index 8e35cfb3e56cc8758d1d80d699ca09b8e7a4e641..0e1384ddd71c4d0e9719e6f54a30eb833a3c73d0 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -17,7 +17,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index 2a32ed7fae9f4e2b1af0f6bf21e63ed0303fd68c..a7b91f5fb1fbde2dce1fae37f90b92b30d4ffaf0 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -27,12 +26,11 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import android.view.View; - import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import android.view.View; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index 83a727258fedb2915b61e64e33e044fdda3f5b38..f2bd79c4c6daf0a8b464744023e63d6b800ccb78 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -17,7 +17,6 @@ package com.android.settings; import static com.android.settings.testutils.ResIdSubject.assertResId; - import static com.google.common.truth.Truth.assertThat; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java index 3cb9c4c3da0b4c20399a65e8c579659ddb57a509..1b717772a6fe46e6aca2d5a276b2416bc7e54abe 100644 --- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java @@ -18,21 +18,20 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import org.robolectric.RuntimeEnvironment; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java index 5f2abba37efd8b81a29efd226e7412a45d86ac45..92aedcfe6a693b60f88d1d1ae12ccfc92b0b0f5c 100644 --- a/tests/robotests/src/com/android/settings/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/UtilsTest.java @@ -17,7 +17,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 0fbf4977eeaf8ea155c323068a38e42a1664dc41..30debd623d2303b9f2b6c43e64cbbb81a9c5f314 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -21,11 +21,12 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; import android.content.Context; +import android.os.Bundle; import android.os.Vibrator; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.R; @@ -34,6 +35,7 @@ import com.android.settings.testutils.XmlTestUtils; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java index b00d64d8eb5768dcec873fdb3c5fc7d395a71c2b..8392412e325a38761cce8810bbe2983f15508f31 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java @@ -37,14 +37,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import org.robolectric.shadow.api.Shadow; -import org.robolectric.shadows.ShadowAccessibilityManager; -import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowAccessibilityManager; +import org.xmlpull.v1.XmlPullParserException; + @RunWith(SettingsRobolectricTestRunner.class) public class AccessibilitySlicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java index 96b03236245e452ac177fcd91a35e1a56f92e830..aad6454e99f97257a50ee5e4d6ba75db201db8a1 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java @@ -18,9 +18,8 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; -import android.content.Context; - import androidx.lifecycle.LifecycleOwner; +import android.content.Context; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java index 020906aee5c211e9023e27ad97536d639c7a091a..98b1770668f50a0a3e2f630a193a3251c5dcba9c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java index 968f3b1431452f389d9fdea9a228a7563190366f..128e33bb351b8d0bd1928b8fd43b2736b43f25b6 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java index 3a7fd56b9c73e827be0bf4dd94d3b271fd073b09..dda2ae5e780e68004ce993e8e670440e18b42778 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java @@ -17,18 +17,15 @@ package com.android.settings.accessibility; import static android.provider.Settings.System.NOTIFICATION_VIBRATION_INTENSITY; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.res.Resources; import android.os.Vibrator; import android.provider.Settings; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java index 26b3a6c8e2c1781bc9f999b56a65631069d63c7a..1fe64c7f4e1bedbcba28b9db20b14d8db11d9ed0 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index 6a22ac946a83efe844d19a59f87bd165762ee24a..c1f54d605248e756df460cd0c3900929d36d41d6 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -21,12 +21,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import android.os.Bundle; +import androidx.annotation.XmlRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import androidx.annotation.XmlRes; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java index a44b62ba0b49f645f08493d9bcbe1cc101a612f6..ecd2ff9ce57fcb313a2fa5bda47220834d5c94e7 100644 --- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java @@ -21,12 +21,11 @@ import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_MEDIUM; import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_OFF; import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_ON; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import android.app.Activity; import android.content.Context; import android.content.res.Resources; import android.os.UserManager; @@ -34,8 +33,7 @@ import android.os.Vibrator; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.accessibility.VibrationPreferenceFragment - .VibrationIntensityCandidateInfo; +import com.android.settings.accessibility.VibrationPreferenceFragment.VibrationIntensityCandidateInfo; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.widget.CandidateInfo; @@ -43,6 +41,7 @@ import com.android.settingslib.widget.CandidateInfo; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java index 7c70f1df30cf367ad53a553295a88d80dc7a8915..ade7dc94ce59a00f706e96991c281ce7c3d6b87d 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java @@ -15,13 +15,9 @@ */ package com.android.settings.accounts; -import static com.android.settings.accounts.AccountDashboardFragmentTest - .ShadowAuthenticationHelper.LABELS; -import static com.android.settings.accounts.AccountDashboardFragmentTest - .ShadowAuthenticationHelper.TYPES; - +import static com.android.settings.accounts.AccountDashboardFragmentTest.ShadowAuthenticationHelper.LABELS; +import static com.android.settings.accounts.AccountDashboardFragmentTest.ShadowAuthenticationHelper.TYPES; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index 8cb30df6b0c599f9cba867700d727a8491643e77..558e074160cfacf9d00a0d58b8e57163088e8f51 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -16,7 +16,6 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -31,7 +30,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.UserHandle; - import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index fa049c67f7eb6cab0025c52fbc4dd42130853d25..59b0aeeb6ee0a5219c3569bd8b8af92d64afd960 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -17,22 +17,19 @@ package com.android.settings.accounts; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; import android.accounts.Account; import android.app.Activity; +import androidx.lifecycle.LifecycleOwner; import android.os.Bundle; import android.os.UserHandle; -import android.widget.TextView; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; +import android.widget.TextView; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index 5e252152974ab866d10d19ca8dd00f82fae581e4..1cc0c3a6643f918720c95b0ea1cc4e90b35173fe 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -38,12 +37,11 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index 672baaab576b4f3bdb7dc3194bfdcb2ffc267241..4e317d7d8cc1c441079c31149541b23375a06eb7 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -28,7 +27,6 @@ import android.content.Context; import android.content.Intent; import android.content.SyncAdapterType; import android.os.UserHandle; - import androidx.preference.Preference; import com.android.settings.R; @@ -44,6 +42,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index 330ef42a7932f02c8e72734698b67335aa0d9a68..4e42bc90154dea8c739a258a57b6598a446eb480 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -29,9 +29,8 @@ import android.accounts.AuthenticatorDescription; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; - -import androidx.preference.Preference; import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index 623a76efff217e2cf726891368baad714fea2d41..5db22652de2fccf04314fd28e5525af61027080b 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -30,7 +29,6 @@ import android.content.Intent; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java index 0803d78d0f25f9258e09323c091577046c760435..ce1dcb2712bec1ea44237dd74a3768141ac07913 100644 --- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java @@ -17,7 +17,6 @@ package com.android.settings.accounts; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; - import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index ff4e7a49acd49a2466bf1497c750f927aa279517..56659efb51c34f78dcfe6de50fc6e318b62bf159 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -38,11 +38,10 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; -import android.widget.Button; - import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import android.widget.Button; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java index faa1bde3ab6550b3efb0e1cecc4d4bfcd2ad5bfa..97210b332b49ed97b406c60f96821d0441991cfc 100644 --- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 0c7da76fc40aa3d73c05fd9c4891e92d16f15c96..605b8de1558ea6f533aee6d49ed75995e8370878 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -32,7 +31,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; import android.os.UserHandle; - import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index 545cb58a24305e4dfde32c5722a9280c3114225c..581b30015fda015c8691e89ba29501488c984923 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -32,7 +31,6 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java index 04a1237150ae99087e0125b7a5640c6ad0aff7e8..fa426291bc87a6366cb8e12e052ae40a27cd8662 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -1,12 +1,10 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index 27094e8b1765e175a4ece53bf3ffef8cd4fe4b01..dcc6a1e912e3848a70bd28de9e10a0cbf79c485e 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java @@ -17,9 +17,7 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index 780a715925dab4e49d41dca6c94c5d921b95ac62..8365db2ec4564e70b81de3238387b33476e57df0 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java @@ -17,9 +17,7 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java index 082bbad08f29b5695b93b0fe68a2125df9a58d8b..cd41c8612aaae2dd8bad1b81d4c5bd2e26dfc9fa 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java b/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java index c2089188db48be5ed252c292266ac7f7013c41ef..22140bb5c4dc36a94b5ef983ad704fed0da34386 100644 --- a/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java index 402d18d8e8459079813564e0d1320143262845bf..d17fc87156a5466899b148d38b7619e89d649926 100644 --- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java b/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java index 808cf4d5ee8e2eb0654ca25c971f78e2e8d88e39..ad7e615ce786bc73e928d46cbcac52a4ec819c34 100644 --- a/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java index 0aecf8b9c6b48c85ba5721f8d1a89dea17abd849..b36472031f7b904ed56aca2e750b02f3f129eb9f 100644 --- a/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java index 3378492d27d4315e3c081fe088ba0083e3436c94..4fa30eb921995f4b75c20670bccc48400d103597 100644 --- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java index 1bb444f47a7445559cdd367aea97a641d55f4b80..6dfaa7c59eb589249aac28fd1fb564bead0c18aa 100644 --- a/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java index 1e8ab77b8a7e0665626abe18424ec627ba73229e..d97194852fc50d33cb43218745f3fc7bad3639c7 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java @@ -17,9 +17,7 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.argThat; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index 1fefc2d7229c112167d2c92a5acbcdc77c1ef34d..119d3ebcffb2bdd05d47ce799fa3dd4f7fffb392 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -17,9 +17,7 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.argThat; diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java index da65165c1e91f5fd717e89cd086eced8cd3400e8..ff64a8441619f21bd7950565367bcd705ab7c631 100644 --- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java @@ -17,15 +17,13 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import android.view.LayoutInflater; - import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceViewHolder; +import android.view.LayoutInflater; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java index e0cbed08b70d818bbad066f6d9e20b21538398ab..cad4100adeaf91c5f198b434819be0e73e0f846f 100644 --- a/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index e3e45fb4dca20e87cf948cf4ca5c8db83246c9d0..2876b62f7dc69da9159365232b5fb14363ef2d0f 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -42,11 +41,10 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java index 035ae3ce92c57fece3b846de2edfe902c1ee284f..fd71af7ac1bdeeba7cc7953c0136848c34f98bf0 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java @@ -16,7 +16,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index 06cc2e3091540cdbf9d8d1795a92a6a2f58e4ad8..bd8b36e470ba72c55a29fb0a33b9f8842094a6e0 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -17,12 +17,10 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java index f9cb01b988160c7f5eb5ea76fff3003ac5b63d9f..79ada895aecc5f7b07debdc7ad3f561c2fa5f6e3 100644 --- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java index b119f1da77e2baea7eab5b6de65273bddc0382e9..cf423f7a635b5086a16f37a503c71e322cf76984 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -41,7 +40,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java index fc523b9c3c61316166300d40b051ebeea8231df7..e1e115446ae1d7dcd5c31a9f870126d5333b421b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -33,7 +32,6 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.BatteryStats; import android.os.Bundle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java index 210ee742c4b476aca23c7364273d092976dad97e..bab73b55a2ad47f24cffb6d042178311493a2177 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -34,7 +33,6 @@ import android.content.pm.ApplicationInfo; import android.net.ConnectivityManager; import android.net.INetworkStatsSession; import android.os.Bundle; - import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java index b7bc79a9a4f13d2e4a8c2a44f44fa044591039fd..1c8569d1c2f8fd05544a14c5a1d97bd5d65d1848 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.applications.appinfo; import static androidx.lifecycle.Lifecycle.Event.ON_START; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -30,17 +28,16 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.graphics.drawable.Drawable; +import androidx.preference.PreferenceScreen; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java index 79d8a6d0fa304cdcc4efa18ec0fa0a2fee5954ff..1a55059f5f2f8dc57c683b59e444ad8439be5b69 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java @@ -20,9 +20,7 @@ import static com.android.settings.applications.appinfo.AppInfoDashboardFragment import static com.android.settings.applications.appinfo.AppInfoDashboardFragment .UNINSTALL_ALL_USERS_MENU; import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.UNINSTALL_UPDATES; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; @@ -93,9 +91,7 @@ public final class AppInfoDashboardFragmentTest { doReturn(mActivity).when(mFragment).getActivity(); doReturn(mShadowContext).when(mFragment).getContext(); doReturn(mPackageManager).when(mActivity).getPackageManager(); - when(mUserManager.isAdminUser()).thenReturn(true); - ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); // Default to not considering any apps to be instant (individual tests can override this). ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider", (InstantAppDataProvider) (i -> false)); @@ -106,7 +102,7 @@ public final class AppInfoDashboardFragmentTest { when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false); when(mUserManager.getUsers().size()).thenReturn(2); ReflectionHelpers.setField(mFragment, "mDpm", mDevicePolicyManager); - + ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); final ApplicationInfo info = new ApplicationInfo(); info.enabled = true; final AppEntry appEntry = mock(AppEntry.class); @@ -122,6 +118,7 @@ public final class AppInfoDashboardFragmentTest { when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false); when(mUserManager.getUsers().size()).thenReturn(2); ReflectionHelpers.setField(mFragment, "mDpm", mDevicePolicyManager); + ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); final ApplicationInfo info = new ApplicationInfo(); info.flags = ApplicationInfo.FLAG_INSTALLED; info.enabled = true; @@ -230,6 +227,7 @@ public final class AppInfoDashboardFragmentTest { final PackageInfo packageInfo = mock(PackageInfo.class); ReflectionHelpers.setField(mFragment, "mDpm", mDevicePolicyManager); + ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); ReflectionHelpers.setField(mFragment, "mPackageInfo", packageInfo); assertThat(mFragment.shouldShowUninstallForAll(appEntry)).isFalse(); @@ -270,6 +268,7 @@ public final class AppInfoDashboardFragmentTest { userInfos.add(new UserInfo(userID1, "User1", UserInfo.FLAG_PRIMARY)); userInfos.add(new UserInfo(userID2, "yue", UserInfo.FLAG_GUEST)); when(mUserManager.getUsers(true)).thenReturn(userInfos); + ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); final ApplicationInfo appInfo = new ApplicationInfo(); appInfo.flags = ApplicationInfo.FLAG_INSTALLED; when(mPackageManager.getApplicationInfoAsUser( @@ -293,6 +292,7 @@ public final class AppInfoDashboardFragmentTest { userInfos.add(new UserInfo(userID1, "User1", UserInfo.FLAG_PRIMARY)); userInfos.add(new UserInfo(userID2, "yue", UserInfo.FLAG_GUEST)); when(mUserManager.getUsers(true)).thenReturn(userInfos); + ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); final ApplicationInfo appInfo = new ApplicationInfo(); appInfo.flags = ApplicationInfo.FLAG_INSTALLED; when(mPackageManager.getApplicationInfoAsUser( diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java index e68f8d39955da29caa69bb6c00c25d3b95daf60d..1616c83767af95c74642eefa555410ccc6e10a3e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java @@ -17,9 +17,7 @@ package com.android.settings.applications.appinfo; import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.SUB_INFO_FRAGMENT; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -28,7 +26,6 @@ import static org.mockito.Mockito.when; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.os.Bundle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java index 30152a4077597f51581a106f655178f43f23fa37..b640f9f5ce5add1bc16d013151ea61e06f42bda0 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.any; @@ -36,7 +35,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java index 3ec6ebbf5b21db47533eee5aff9fb3fd530ea286..1c0d89705dab1a6d3fcf81954234f9095153a5fc 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,7 +26,6 @@ import android.content.Context; import android.content.Intent; import android.os.UserManager; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java index 2547c2717497d2010c76aa2008a748a673236e5e..9678ecb3874538f61f709c5f9f45acc5cfff0918 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.applications.appinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -30,7 +28,6 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java index b3d0a0dbaf96c93c30a94320bf5b00ccb470e6e3..c18e5213bd568f19f9c08fb95cc49568b1244a5d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -28,7 +27,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java index aff29181eb6356a9c6b6b98b4273124f1b153fe8..505f25ea2e07ac14757a611732ea24f2faffd987 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -28,7 +27,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java index 2a1cc4dd7bdc9e1d40788caa2f8e8b8d6856fa67..b554a4de0f5dafb9f209af400da9722f4645cda8 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java @@ -17,14 +17,17 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; import android.app.Application; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ResolveInfo; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java index d3d7cdc2f5d6e0ffd3344260183d75e65df03d85..76c33cb57cb8d2179f73e0242f36f7acb4d45c72 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -29,7 +28,6 @@ import android.app.LoaderManager; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Bundle; - import androidx.preference.Preference; import com.android.settings.applications.AppStorageSettings; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java index e07f66e976247918cdb39164f866aa7d388ec17b..f577d1ca1ebcfb15ed769599e52e7d79e52718de 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java index f41ccf8960312b39021f24c9d937ed41e763139a..ae61a51549ec5748695a711dd75a08da866e0d98 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java index f6abb5bc1972a60effdf6de288e2f9b02d24cde0..34a9e2e2fa88be08c8719d4812b61e0ab33ff3b7 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java index e630a4c5d370caff479f3df381400a6284fd4acd..999e802b10d911fd29d2391bb2bee6d1b1e85177 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java index a0b802e80f1252afdacc08dc902d8aa3ef40ca30..5536cff17fe97b08a972daf33009b0d33f04741c 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java index ac79a4fba6ab0cb81bd49c5209f99152ea24393b..cd6a3aef62580eb1c7c94ae80e3b795b25cbf2ba 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java index 3b9ce3d450b69c6231befc4d3a208a5ae46a91c2..35f3d61809829dee655b5e2aa9cb95559eff64ed 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java index 3cc4cfe6caacbef12db054e4114cc33dd842b637..c8f19db21de79ee9d40294f3753295cc46f219dd 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java @@ -18,9 +18,7 @@ package com.android.settings.applications.appinfo; import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.Manifest.permission.WRITE_SETTINGS; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,7 +27,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java index 4e5ed28fed75de54cc988ddf2b9e61e9b1af7cc7..6f134ae53a10c4c0a71759a15ad4b7eae1d0efed 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; - import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.nullable; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java index a81035f17cc06c61d89f18509e13929723fcfc29..ef909070240974871a722aaff0cfcc0025de1a8b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java index d636fa468ef0dbf76b41adb464940895c19fe740..4f8961570a65d70837baab8d22898897090d0eba 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java index b256ec0be9f5fc57cf747cafb214c0061e82fadf..7c99fd0a609a9c16cd40d93ccd566ec80184a788 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -37,15 +36,14 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Button; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java index af38db390380be38f3231de6ad7c376c69235a08..7e1584842e36028c52bd9273a141de14a2239d36 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java index 557be39ae16be9acc211546179f12ac20468b85c..b5b600a18078d03129cbf475947f7435cbba85c6 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java @@ -17,14 +17,12 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java index 8d705d07209e9866cec45cb048a6ce7d766ce9b2..b804b228ea85f872d52c253293a9aa1077e9fb74 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java index feb6157a8fb478f98eae8c2e20dd3c5bd032e5d2..87dedade8437dcfcbcdf3e6435bbdae716ea70bb 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java index 358bd302b4d57e67fe54175e741d1b534c5d5557..9cdd2eaaa1c1188ccda468b9bd0ff93464d18f2f 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.applications.appinfo; import static android.content.Intent.EXTRA_PACKAGE_NAME; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; @@ -27,7 +25,6 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java index 00ecece335552ac7fdb8c1d14773ec3e73ff0109..e702cd46143d48472ee24b438a42d39644dbf05a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java @@ -18,9 +18,7 @@ package com.android.settings.applications.appinfo; import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.Manifest.permission.WRITE_SETTINGS; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,7 +27,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java index 74a38511c9b8e76286a199b101637a8959db4882..e83fbf861fe5cf2a86bd7d6999f4c077e4c59dec 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -17,20 +17,17 @@ package com.android.settings.applications.assist; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java index 10197aed4c8182a8cbfbbf0d4b1bd8b7ef79b5c1..dd4422a7f2e5ad45436f5a4000f4252255a6963f 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.applications.assist; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -28,12 +26,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java index b140faec43f8dad9f34a38b37a04a2dab1e1cc0e..0ccba4d6ad2781ab5f36ddd888569e3ca5413306 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.assist; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 02c1b8b439278081b4d7ca1da0537381609aaad0..320471c1b4f95b58ff445536ff240e27dc02b889 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.assist; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java index 2ea6b283bbde7e07e54348d223f7d6cd47d44c0c..93d594209123fe9209351d7392eeb833dc92e14b 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -26,9 +26,8 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.UserManager; -import android.util.Pair; - import androidx.preference.PreferenceScreen; +import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java index b9a131643e95ec26578443d780864fac2a075899..97e38a03c4c3d2b81eb56651938d6c0388e41b6e 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -18,14 +18,12 @@ package com.android.settings.applications.defaultapps; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java index 067562340635dd4ef1eb1af20c6cb43cf9815808..35ce6ca9c832b44a2710ac684a990b6a9c78f6ec 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java index cc64cbd76074744fefeaa02c77410f4e3d28553c..c7156d00e63e892ea819c272115d99b87057b9ff 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,9 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import android.view.autofill.AutofillManager; - import androidx.preference.Preference; +import android.view.autofill.AutofillManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java index cea8213a54fcea894d81e5c5480163834d2dba0f..15a1a67fe59704515972ca8991844e2f97935c79 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -38,6 +37,8 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.wrapper.PackageManagerWrapper; +import java.util.ArrayList; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,9 +47,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; -import java.util.ArrayList; -import java.util.List; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultBrowserPickerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java index f9ee145a049fa3571f674005a4ded4e07a4be334..fa2a62c5c59b4c0c58e1c224b6d83678255c5428 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -28,7 +27,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java index 47c9ee5b45835f501d3b772189ad31f31525e8fb..3fe7dc1891bb7192d5b6be2dedaa32e37329466a 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java index d50df2145c54de3ba96562794227807155dec321..9e85e0e3e9e4e07fd88dc6380551c7091625ab8d 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyList; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java index af1130f0c35f522f0d3615de1f6cc02416b39fae..34869b6d3b3fdccc1861384a9b6a42107c11fde6 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyList; @@ -32,9 +31,9 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -50,6 +49,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import java.util.Arrays; +import java.util.Collections; + @RunWith(SettingsRobolectricTestRunner.class) public class DefaultHomePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java index 1d4b5c0485d7adb456e9a6d004c7f519535e0c12..454a5644781bf6ed29692cf5a7ca534956604609 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,7 +26,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.nfc.NfcAdapter; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.nfc.PaymentBackend; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java index 13789302765c1b003beadcc40297165529e0e235..9b088cf39326fa00e0c1cee519f6283570f9ec96 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java @@ -16,11 +16,8 @@ package com.android.settings.applications.manageapplications; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_ENABLED; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_USAGE_ACCESS; - +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ENABLED; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS; import static com.google.common.truth.Truth.assertThat; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java index 7409136251bd2b35a157b9f374ce72c7b21f30f1..4c94e0a03c5aa70080e03ae40650404ae7fe4417 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java @@ -16,43 +16,26 @@ package com.android.settings.applications.manageapplications; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_ALL; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_INSTALL_SOURCES; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_POWER_WHITELIST; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST; + import static com.android.settings.applications.manageapplications.AppFilterRegistry .FILTER_APPS_RECENT; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_USAGE_ACCESS; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_WITH_OVERLAY; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_WRITE_SETTINGS; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_GAMES; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_HIGH_POWER; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_MAIN; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_MANAGE_SOURCES; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_MOVIES; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_NOTIFICATION; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_OVERLAY; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_PHOTOGRAPHY; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_STORAGE; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_USAGE_ACCESS; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_WRITE_SETTINGS; - +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MANAGE_SOURCES; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MOVIES; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_OVERLAY; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_PHOTOGRAPHY; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_STORAGE; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_USAGE_ACCESS; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_WRITE_SETTINGS; import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java index 2ae956185727233e5c0ddc2cd82654bad35b092e..5b0b275e16bc201045ecce5404bb1e90c8b03bf5 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java index 244daf9b2d41e19d76e8388cb2703fe60c01c6d3..d4e8a0cacedba8d9c87c75bd5deac9b5a3040150 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -18,16 +18,13 @@ package com.android.settings.applications.manageapplications; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; - -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_ALL; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_MAIN; -import static com.android.settings.applications.manageapplications.ManageApplications - .LIST_TYPE_NOTIFICATION; - +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN; +import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION; import static com.google.common.truth.Truth.assertThat; +import static junit.framework.Assert.assertEquals; + import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -44,14 +41,13 @@ import android.content.Context; import android.os.Bundle; import android.os.Looper; import android.os.UserManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.LoadingViewController; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java index 09bbe508631c4b1ea4c25e87492a359ed2bccb83..776235c811cd637900207ead9eee20f63ade486f 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java index 6828668d221c0f2bdfda14ea5029ad67451cd94d..fc8f272f3d031d3f97f3fd3ceef71b2fc874cabe 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java index 1c290c484aa057ca929d461fdb9153990c8cdd68..ee05740c0caaef3dd1ce169a70b18b7f6320191f 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.backup.BackupManager; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java index 50676c5624d2c0152f380bc80e3627d00f0a2a78..cd0ba79222361cb658894b746c0506b51de632fd 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java @@ -17,7 +17,6 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.isA; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java index f3cb850ee59f3497d7cee5dcf7aecd00549508f1..d156a2daee5afb8a0d39647ffd9e23e269e9c540 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java @@ -17,7 +17,6 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index fb3f947eba2a3bba91c7a8f42119663598b0d3ae..0a258bbe78b23f587790b77730300c4e3c81c239 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -17,14 +17,12 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java index 448a5c7212b295e701b698d218547740bee870a5..d9261c2ec649260c550bfca4cf50bbcf9a08ade0 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java index d40e87f6b8ec6585ad46385007aad914624045ad..ced8fc4a2e47155e07367bed4278a4dd3394ff57 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java @@ -15,27 +15,21 @@ */ package com.android.settings.bluetooth; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; +import android.bluetooth.BluetoothDevice; import android.content.Context; import android.media.AudioManager; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import org.junit.Before; import org.junit.Test; @@ -48,6 +42,13 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.Collection; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAudioManager.class}) public class AvailableMediaBluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index c23d282ce3b1b506ed472d514a8b60a3399e1435..17d46a87fe4df89a1b0aef888f228200a0c5a160 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java index 764c2e96f6173f5bd1ffbd93d4ab9e8b07370ceb..2f838081b0a4fdeb1c5d1ea858cd818c69902e34 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.content.Context; - import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index ca053f0443fc09309bf1995664831136a7575efb..0c2a381c59bc33f4e4ee91248d8e9a71afbe61e5 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -19,13 +19,12 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.Activity; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index 7833effc8381e57b07dccc560d651c4070cf2b39..e3f26b2c78bb8d9141df762a78f7606835bea0b7 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; @@ -33,6 +32,7 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; + import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index 3144f3f52b973e848a3dc7076a0827037dc2605d..e4d45795e996c395c966673a6ce9f5e483dc0386 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -28,9 +27,8 @@ import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; - -import androidx.preference.PreferenceCategory; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceCategory; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 8304059fccc5e27aedc502a9276bfff086882fd5..4be27753f87b361da0a27e3836b3b9180d4815ff 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index 8910418425b35fa0cb180883a097ef6e9f560173..a15d26cc34de165985a2b082ab2e7ceb965734e8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; @@ -26,7 +25,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index 55dd8ec24d9123a8a7cf6b30546f1db9a9731c8c..1162f8e6ad94eab6defd0db96144ae8badcdde7a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java index 265819adac28791b74330e0481caf2d47dcbe3d9..3ce585ab83c8b341b2368a83f011ceb8e5d36bac 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -28,7 +27,6 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index 0d053724c7913cadb8fcfa01fbb9f817f7bcc92b..c1024c8c3c3ac7dd25b7b5b5a70d921dee14472e 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -24,21 +23,21 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.Intent; - import androidx.preference.Preference; import com.android.settings.SettingsActivity; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.HeadsetProfile; +import com.android.settingslib.bluetooth.A2dpProfile; + import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index da00456155484456fe9f5ad190614fc6a1e565e4..4bb093c8035879491fa9d99e0aa59a102e5c1aba 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -32,10 +32,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.UserManager; -import android.view.View; - import androidx.preference.PreferenceViewHolder; +import android.view.View; +import android.widget.Switch; +import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SwitchBar; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java index f9129757b5207a917b7389fb0a50e06f9c69aca0..7d2257af0c37a08bddb29f7dba2b1424454981ba 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java @@ -21,11 +21,10 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; +import android.content.pm.PackageManager; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; import android.os.Bundle; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index 3cf880e3e06b92f1dab37f038633abcbb795b21f..3060734e491ab18f4b0ee3c9263a2391d3ffaba8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -31,7 +30,6 @@ import static org.mockito.Mockito.verify; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.res.Resources; - import androidx.preference.PreferenceGroup; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java index 5fbd18f97fb9acaa0216254725e1e19a8727b6d4..759c0cdb0022767e11164c4fa30c7d351287ad37 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index be86241fd4a549ccad3ed7ee4425a2ed6a6efba7..7a0a05d0cdbfbb3b8fa85acf66231e21d01f1abf 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; @@ -26,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index 4c1cce1157048d3beb2910e81f0e485e9c32e35f..fe705aaeb40520e002ac2f19516dd77eb512c717 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -24,16 +24,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; - -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,6 +33,10 @@ import com.android.settings.testutils.shadow.ShadowLocalBluetoothProfileManager; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import android.content.Intent; +import android.content.res.Resources; +import androidx.core.graphics.drawable.IconCompat; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -52,6 +46,13 @@ import org.robolectric.annotation.Config; import java.util.List; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowLocalBluetoothAdapter.class, ShadowLocalBluetoothProfileManager.class}) public class BluetoothSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index 500d534f4ee7da25a365a3dec63d49c1461021f6..2ac1ed8fea2a6a33dd3de0ce7fbf806a150c5726 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java index 39d0f419b6e8a37346922a75343e081cd66a1341..ccd57f5d66f589913cb73b9996c1319c075e849f 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java index 86203754fa691b4ec142ef5639d154bfc0b51a2a..483df01a6b867dd066e4d7f932ba4f5554665a14 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; +import android.bluetooth.BluetoothDevice; import android.content.Context; import android.media.AudioManager; @@ -34,10 +34,10 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java index 14dffe6182070e5ada61309922f396bb963f9db6..12bcd74c07995222ac72868c69ee6baa4ad3d0ea 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; @@ -28,7 +27,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.res.Resources; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java index 731b4d62c69b3498f3384f2d5da054e25637b427..96f09e21bc68b00b9fd62f44f6d7ae3c2a1de5df 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java @@ -17,12 +17,12 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.content.Context; import android.os.Bundle; import android.view.View; import android.view.ViewGroup; @@ -43,6 +43,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; import org.robolectric.util.FragmentTestUtil; import org.robolectric.util.ReflectionHelpers; diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java index 5387b3412d13ba8313e8c4afe3447fd3e583912d..c9a93acf50e12cc4006daea5029c0d702d77ada6 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java index 2af45bc3ebb3a00821b50b85dbb55d07cfd8966c..5a8f2490e7a463ded71751effeb45f971250b30c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java index a88d8ff446e63bd865cfc092ae690c2fb87c466a..547727beced719c9f930fc748641dde72eb5383d 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; +import android.bluetooth.BluetoothDevice; import android.content.Context; import com.android.settings.connecteddevice.DevicePreferenceCallback; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java index 4f02062cc630537fb2a31f81c48eb81440e7ac74..c73313d63ff74db74b9871d3ab237ae6778fd9ac 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java @@ -29,9 +29,10 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.text.TextUtils; - +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java index e3060e710a176a6e022fa94e7799b90111421cae..ce5580242f22ad4bcf9ed00749becac7cd60b632 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java @@ -17,19 +17,12 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.spy; -import static org.robolectric.Shadows.shadowOf; - import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import com.android.settings.R; import com.android.settings.nfc.NfcPreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,6 +32,10 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowNfcAdapter; import org.robolectric.util.ReflectionHelpers; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.spy; +import static org.robolectric.Shadows.shadowOf; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowNfcAdapter.class) public class AdvancedConnectedDeviceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java index a1e7f222dbf46d68252ab7470acb618b3e06dbb7..1b78f129d420d81bbef28d2d4f2b0420086bcf0e 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.connecteddevice; import static com.google.common.truth.Truth.assertThat; - +; import android.provider.SearchIndexableResource; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,8 +34,6 @@ import org.robolectric.annotation.Config; import java.util.List; -; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothPan.class, ShadowUserManager.class, ShadowConnectivityManager.class}) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index 8927670c356077a7a0d337f0d51a9d1e90267bfc..6d0c9fbc6d6fac678ea45d1980c6071a1cd62554 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -19,7 +19,6 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -30,7 +29,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; import android.media.AudioManager; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java index e192f8969cff2932e4e5850987a0795b9051f403..44b7b8fb79eddd6da9cf37abc9e71df4c8e45b9b 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java @@ -31,6 +31,7 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import java.util.List; +import java.util.stream.Collectors; @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index 763e6050af873712f166f074b9e629fc4660fc18..52715b084df248eb7f2516c7b6a26e004a31783d 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java index 92574bb0aa311602e0f921391fa629fb1fe15104..ba2a697a78170b33a490a5871a49b7946f51ccce 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.connecteddevice; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,14 +26,13 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; -import androidx.preference.PreferenceScreen; - -import com.android.settings.R; -import com.android.settings.bluetooth.AlwaysDiscoverable; import com.android.settings.core.BasePreferenceController; +import com.android.settings.bluetooth.AlwaysDiscoverable; +import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothPan; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 8a14c3f7dd39b9c4a17b406be31f0b5c5378e016..c449fab5475bb662281a18689841a757af3ea54d 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -15,21 +15,13 @@ */ package com.android.settings.connecteddevice; -import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import android.content.Context; import android.content.pm.PackageManager; import androidx.preference.Preference; import com.android.settings.bluetooth.BluetoothDeviceUpdater; +import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,6 +32,11 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.*; + @RunWith(SettingsRobolectricTestRunner.class) public class PreviouslyConnectedDevicePreferenceControllerTest { @@ -50,6 +47,8 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { @Mock private BluetoothDeviceUpdater mBluetoothDeviceUpdater; @Mock + private DockUpdater mDockUpdater; + @Mock private PackageManager mPackageManager; private Context mContext; @@ -65,6 +64,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { mPreConnectedDeviceController = new PreviouslyConnectedDevicePreferenceController(mContext, KEY); mPreConnectedDeviceController.setBluetoothDeviceUpdater(mBluetoothDeviceUpdater); + mPreConnectedDeviceController.setSavedDockUpdater(mDockUpdater); mPreference = new Preference(mContext); mPreConnectedDeviceController.setPreference(mPreference); @@ -75,10 +75,12 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { // register the callback in onStart() mPreConnectedDeviceController.onStart(); verify(mBluetoothDeviceUpdater).registerCallback(); + verify(mDockUpdater).registerCallback(); // unregister the callback in onStop() mPreConnectedDeviceController.onStop(); verify(mBluetoothDeviceUpdater).unregisterCallback(); + verify(mDockUpdater).unregisterCallback(); } @Test diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java index e85626df5edea3650b0c8b3d8a817ce9a6701c07..b1d4cd81c27cdaf5403963502f9dba0e763b384a 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java @@ -17,19 +17,15 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; - +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; - import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java index 9ad73bedb6e4cc7fcd04fc01bca9f47b28bfb335..567b072fdda03f5fcfe74a10776f5847f663a0fc 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java @@ -17,7 +17,6 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java index 8aec1f7af8505358c30ded06136ceb930bf52d8b..dca10d733904c3e3ed790722774ec88ae9d7baca 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java index 1e24a99b1b255cd794e0be151b7253c84de89389..716c9776f5caf827d14d3a2854a153221e38905d 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java @@ -27,7 +27,6 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; - import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java index e25ea68c4727bd5d14464d3963183b91733d9ed0..989a293fc1d1a0b9f63baab2d7b3a08cce6521ac 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -26,7 +26,6 @@ import android.app.Activity; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; - import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java index 1c6b750bbe6ca2acb42475de1ad83c972afb4f05..7550b451630350399b2c2dff243fd4af5afefc22 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java @@ -20,11 +20,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; +import androidx.preference.PreferenceFragment; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java index b3cecf83e24e9061d90aae8bf00e77e5a94c5e4c..2bc0ed965af9af4a3d469ab0b84efb745cb94a47 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java @@ -28,11 +28,10 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; - +import androidx.preference.SwitchPreference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -45,6 +44,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) public class UsbDetailsPowerRoleControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java index 867dd3eddf584d1c7a72d75f0594deb51c965c6c..a1f9bf4e85d28b0a033d4c71c7d7c658d1417db2 100644 --- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyString; @@ -29,9 +28,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,6 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BasePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java index 7709fb3b0a527f1899e13756378161b1757bd558..16830668a06985be783bc53c6618ebefa523a3cd 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; - import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java index 3bcc2a2f3ff8c32186cc94ecdd3210d258e87aae..8553f114d5b80925653379b3a8ee7a5c059343a7 100644 --- a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java @@ -17,10 +17,10 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import com.android.settings.widget.SeekBarPreference; import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.SeekBarPreference; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java index c57c384ab1902b1fc4c1067894204e53cb6d4456..c60d002237d0980eb0b115d065c02e944fee4671 100644 --- a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; - import androidx.preference.SeekBarPreference; import com.android.settings.slices.SliceData; diff --git a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java index 326f45e03118418a1a05dfd35b7e0e682e3400b9..55a0acbec312bf27557e5a6eb81740f90024386b 100644 --- a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java +++ b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java @@ -17,7 +17,6 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java index 53fe9a8b4543afacc465637612d03831b9a4a8c7..beaaa52a82e8c9cd2a6c7aa10beb6e7f95e9d208 100644 --- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; - import androidx.preference.SwitchPreference; import com.android.settings.slices.SliceData; diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java index 59082792e800c25dc1bc4f026f8fcbbab4df51b5..f0c2442d76219849f1adae44b6e62367203c0b1d 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java @@ -16,8 +16,6 @@ package com.android.settings.core.instrumentation; -import static com.google.common.truth.Truth.assertWithMessage; - import android.app.Fragment; import android.util.ArraySet; @@ -28,6 +26,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import static com.google.common.truth.Truth.assertWithMessage; + /** * {@link CodeInspector} that verifies all fragments implements Instrumentable. */ diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java index 030106ae2b793cb3162d826f2d4cdffc552ef4c1..1b2f72742d369c2d3370a5d712d89ef56620c210 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java @@ -16,7 +16,6 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -34,14 +33,13 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; +import androidx.recyclerview.widget.RecyclerView; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; import android.widget.TextView; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.conditional.Condition; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java index c0db3a0261a1eb2321a4cd52c5b69af84749eaa8..94126da5ff30c0bbfcbc0bc1d891f09046e01805 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java @@ -20,15 +20,12 @@ import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_C import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_FOOTER; import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONDITION_DIVIDER; import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONTAINER; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.service.settings.suggestions.Suggestion; - import androidx.annotation.NonNull; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListUpdateCallback; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 92b44707c04afcbe5476b2f14a972ebce61f9e7b..78d3a09adf52f967af8344ef58cfa6345e66b21b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -40,7 +39,6 @@ import android.graphics.drawable.Icon; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index 708f21b2caab35cd6a2f11d99bf648ef65c16ff1..7638a07f573f3ffc0b5d496d79811e55c6444f06 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -16,7 +16,6 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -30,7 +29,6 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.Icon; import android.os.Bundle; - import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java index d3aa59b9874ee5aa2c0b59430664bb8dc12fec47..7bcd80d6fc8de84a81c52202d43818a02f4b5d86 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java @@ -18,11 +18,10 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.Tile; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java index b08c47bea606a8b45936ea624ce445c4acc45367..189dd6b8f375c381cfe94c94414917ef2041812b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; @@ -30,7 +29,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; - import androidx.recyclerview.widget.LinearLayoutManager; import com.android.settings.dashboard.conditional.ConditionManager; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java index d5636a16d5b7d97ac5a2f0f10c90a334b1676681..e7014df7c6ac0316da6672d1fb6751aa37f3af35 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java @@ -17,13 +17,11 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java index c83dd79e43f69336f39306332e7e5836904f9d24..0c90660b114eb85854ef635470622d48233f619b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java index d54ac3aca3b2bd5174051411c45fb9c8b54423ed..0fac2fcbc566713e8394bae952c50e6b9a5a8dd9 100644 --- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java index c5c477940eba256fb5810f2bb031444fe9ac34fe..c72131fa8e2592301e5a8547a3aca638afe31c53 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java index 4a00a13ddeac9d8a54e9e46cbd4434705ca55da6..9b5bec359add3ca7df6abb0fa7a96bf0bfe9a167 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java @@ -16,7 +16,6 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java index 91970c369b334c92d02d2c3b9e04881987231cb3..79f01f88dd0f66d3ca3ee70550cd4e8459b35718 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java @@ -16,17 +16,15 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java index 434e008e40952c1c562bcefa21c8783410ad33b5..6d5673151a2e8ba94e1db2f0f14b2cae0ab503da 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java @@ -16,7 +16,6 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java index f5ec8bbd669c3f9203982fc6f70a364d73de0336..35940ce672032091ac8db18c178d841ef172faae 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java @@ -15,8 +15,6 @@ */ package com.android.settings.dashboard.conditional; -import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -25,6 +23,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static com.google.common.truth.Truth.assertThat; + import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java index ceae3c20fbe9a67bdb28a15a49707dcadd67ebc1..66ef5a039b306a39f4492045ffa1d7eab8bca648 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java @@ -18,7 +18,6 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java index 2bf1f98645bd385da4634157493650fdf1b3f2bb..a134fac572180e56d337b0d79264f5c4a0976f28 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java @@ -18,7 +18,6 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java index 6f71ac8271575cca7f367e1b2ac732202b013ceb..dc492a9390715ed3adf7b7caac043e0e54a46976 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java @@ -16,7 +16,6 @@ package com.android.settings.dashboard.suggestions; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java index 5a275227058edd986b57138a013ecb60af96893e..c62f63d20a97b25c98a10397033a1bcab42563d9 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard.suggestions; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -27,14 +26,17 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.app.ActivityManager; +import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; +import android.provider.Settings.Secure; import android.service.settings.suggestions.Suggestion; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.Settings.NightDisplaySuggestionActivity; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -52,6 +54,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java index 3a827960a32fdb14037c737fe1323724e7a8b6ac..5ff88bd42e6757665aa59a8d0b0a800cc9f69cc4 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard.suggestions; import static android.content.Intent.EXTRA_COMPONENT_NAME; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java index 99a3629c05af5c9642fe9923a017c9f3f89a0353..5de54ea277428373771d4c4496dd1d7add48dd86 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java @@ -17,7 +17,6 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.graphics.Color; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 2d98879c3918ac3f8c92e55f5fbee0d9d7921c80..4f107e583c5c1657745ceda8286145018010827b 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -31,11 +31,10 @@ import static org.mockito.Mockito.when; import android.content.pm.PackageManager; import android.net.NetworkPolicyManager; import android.os.Bundle; -import android.util.ArraySet; -import android.view.View; - import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import android.util.ArraySet; +import android.view.View; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index e3034f88c213b2176b836b4096dd1cab76fc478d..40c22c7444c6ddfcff9724943dded0bb077ee85e 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -17,7 +17,6 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; @@ -27,9 +26,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.drawable.Drawable; -import android.util.ArraySet; - import androidx.preference.Preference; +import android.util.ArraySet; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 96767a27a2582896508be77ed755d02c2264b260..e4ed8bf9721114060d99162ef563f1d115474a40 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -16,10 +16,8 @@ package com.android.settings.datausage; import static android.net.NetworkPolicy.CYCLE_NONE; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyObject; @@ -33,11 +31,10 @@ import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; -import android.util.FeatureFlagUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.SwitchPreference; +import android.util.FeatureFlagUtils; import com.android.settings.core.FeatureFlags; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java index 744096622fd6417c7d0465b58983cc3bca8bffa5..dd05b772ea57506caaca154aa230b006a3efdb51 100644 --- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java @@ -16,19 +16,17 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java index b969c3a914f1aca13deb055c916611fcb9bc278a..00d02a3d90b8b359cc0cb1078dc7d2071f705ded 100644 --- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java @@ -16,7 +16,6 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,10 +25,8 @@ import android.content.Context; import android.net.NetworkStatsHistory; import android.net.NetworkStatsHistory.Entry; import android.util.SparseIntArray; - import com.android.settings.graph.UsageView; import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index 6fad6e52fa6d509c7a4aec3d8ba8795370f45efe..04b50305972dfcbd31246f40357787ae822e52c7 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -17,7 +17,6 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java index 061c7952dbfe728ac9b05e915dc9e83527f4d867..2216792836c05fd8c0ac3189fce29eca798efcfb 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java @@ -17,7 +17,6 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -25,6 +24,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.text.format.Formatter; +import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index d0a3e136d16d47b5c9f2dc9f3e668a134f33f92a..e471e6d7629e93c1ce5c73cf796206eee62532c7 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -17,12 +17,10 @@ package com.android.settings.datausage; import static android.net.ConnectivityManager.TYPE_WIFI; - import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -34,12 +32,11 @@ import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkTemplate; +import androidx.recyclerview.widget.RecyclerView; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import androidx.recyclerview.widget.RecyclerView; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 8c520b40ceb2d5f9c877a85eecdcac4aac500e92..573bc74d037b34d7b7d21537b6552a9cd8646f77 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -17,8 +17,8 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -29,6 +29,7 @@ import android.content.Intent; import android.graphics.Typeface; import android.net.NetworkTemplate; import android.os.Bundle; +import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionManager; import android.view.LayoutInflater; import android.view.View; @@ -37,8 +38,6 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index e619399a504ba829daaafd84646a498b2c242c2f..6f0ec9f55c1cf2ddd1c977b4c205e64a005b1d39 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -17,7 +17,6 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java index 0270be4b4cdefe3216b77109f6bc49e25c0f1ba4..a35c897df05216a55b46c1221075d92927ec7f15 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java @@ -17,7 +17,6 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java index a8ad8aa083ef28130b684cfa14a7659ab55ae452..01639d40c0ee593ce8812dffd32c844b8793b962 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java @@ -16,7 +16,6 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.nullable; @@ -31,7 +30,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Process; - import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java index f1795f3d0e63443433dccc1f6cf5b453a7f35a14..8a3f8d34624418388c024938e2850e0765dae735 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java @@ -21,9 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import android.text.format.DateFormat; - import androidx.preference.SwitchPreference; +import android.text.format.DateFormat; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java index 4d1ba380a5e51850d70153a36643d9bb27d0c010..e725877eadf743489de552b1cf7be41fd364116a 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index 11b2efdfc07d58aa53ac6b57b79519bbe01a25d1..d0bacf7801e26c5931987ff37dc001ce9932a54e 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -17,14 +17,12 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.robolectric.shadow.api.Shadow.extract; import android.content.Context; import android.net.ConnectivityManager; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java index 0f5e0880b957510e12634d5df3ba04f63255ae79..7fd5b46ac0a3c886c491295ad1a174b44baef813 100644 --- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java index ee495d361f628ba1366c03ccc988f8faed0c0431..802d9edb120201af375563403fed8bb45a1c042c 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java @@ -17,7 +17,6 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java index 5180455fc49585d0dbd0a83cdb3af62c0250f4d6..58862ee2cb2730a410d66140863e1502ca8ebf6d 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import android.content.Context; import android.content.Intent; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java index d73c8db54f1efda5062377baa96daba5762b8f3a..c6f99a3c656058a419ad372768866e1eb9704eb2 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java index a8c09f26006c6001dbc24a1b4862c10939d5638a..38aace86e7be02b097a0c7026083de7dc2b2cd18 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java index 365bfa2a33c28540858f6ad0c896cc5dc89b3fb3..de330855f13b2142455083e60e633a260e77d2f6 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java @@ -16,8 +16,6 @@ package com.android.settings.datetime.timezone; -import static com.google.common.truth.Truth.assertThat; - import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,6 +29,8 @@ import java.util.Locale; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import static com.google.common.truth.Truth.assertThat; + @RunWith(SettingsRobolectricTestRunner.class) public class BaseTimeZoneAdapterTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java index daa46a54ee191f5dea3721169d3ea7bbb6e15c3b..aa0ba77d176de12f883c28983c33174d21bb6b9a 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java @@ -16,8 +16,6 @@ package com.android.settings.datetime.timezone; -import static org.mockito.Mockito.mock; - import android.content.Context; import android.icu.util.TimeZone; @@ -37,6 +35,8 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; +import static org.mockito.Mockito.mock; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { BaseTimeZoneInfoPickerTest.ShadowDataFormat.class }) public class BaseTimeZoneInfoPickerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java index 06d2b2bca7d01192eb688bbc6e577365c866a3b9..4b86c5031813136d5e14b63be575e2c56b020b5b 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.datetime.timezone; -import static com.google.common.truth.Truth.assertThat; - import android.app.Activity; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -29,6 +26,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RuntimeEnvironment; + +import static com.google.common.truth.Truth.assertThat; @RunWith(SettingsRobolectricTestRunner.class) public class BaseTimeZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java index 9f3453d542b749780c9ad1b00116163664c93e95..9d650cc45afd627774e370af7140517d2dd33133 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java @@ -16,11 +16,6 @@ package com.android.settings.datetime.timezone; -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import android.content.Context; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; @@ -39,6 +34,10 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + @RunWith(SettingsRobolectricTestRunner.class) public class FixedOffsetPickerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java index 6802e8aa30a4c376dae8bcc02fa5aecc1424436c..53fe2b6f9e035ba6286678c023e85525ccc895a8 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.datetime.timezone; -import static com.google.common.truth.Truth.assertThat; - import android.app.Activity; import android.icu.util.TimeZone; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -30,6 +27,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import static com.google.common.truth.Truth.assertThat; + @RunWith(SettingsRobolectricTestRunner.class) public class FixedOffsetPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java index f33311523dcd34453fcfd55dcbf2472e8c8ac817..e07d8a687b6097bd2d48d76ba5a03b7bcb52aa87 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java @@ -16,10 +16,7 @@ package com.android.settings.datetime.timezone; -import static com.google.common.truth.Truth.assertThat; - import android.app.Activity; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -29,6 +26,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import static com.google.common.truth.Truth.assertThat; + @RunWith(SettingsRobolectricTestRunner.class) public class RegionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java index 220e677f9077d84ee0c05dd40eaa97593361b794..e5272704ecb5f08ed54de7e85347836203860aa5 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java @@ -16,8 +16,6 @@ package com.android.settings.datetime.timezone; -import static com.google.common.truth.Truth.assertThat; - import android.icu.text.Collator; import com.android.settings.datetime.timezone.RegionZonePicker.TimeZoneInfoComparator; @@ -33,6 +31,8 @@ import java.util.Date; import java.util.List; import java.util.Locale; +import static com.google.common.truth.Truth.assertThat; + @RunWith(SettingsRobolectricTestRunner.class) public class RegionZonePickerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java index 3c98985c12ba8732913d50fa290c216435a69ab6..fc4607938636cd75fc5185cce27bc7bbd8dce16f 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.datetime.timezone; -import static com.google.common.truth.Truth.assertThat; - import android.app.Activity; import android.icu.util.TimeZone; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -30,6 +27,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import static com.google.common.truth.Truth.assertThat; + @RunWith(SettingsRobolectricTestRunner.class) public class RegionZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java index 4793118b955b782e2be8db28bd7e4999ca0e4e5e..55179070b58d6846c9084e062521b2380543f271 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java @@ -16,8 +16,6 @@ package com.android.settings.datetime.timezone; -import static com.google.common.truth.Truth.assertThat; - import android.text.Spannable; import com.android.settings.R; @@ -27,6 +25,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import static com.google.common.truth.Truth.assertThat; + @RunWith(SettingsRobolectricTestRunner.class) public class SpannableUtilTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java index 51d4a4b53a1fc93278eac3d7e6ccfd8939e56b23..725313e33f23c25d25e2e7721f8e387a5e7812e9 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java index d7fdd2ca4c587ee693b52da6357666a27e44d468..0359cfcd7ae52d4c6c2c3bf80342dfb4300f0f92 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java @@ -17,20 +17,19 @@ package com.android.settings.datetime.timezone.model; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import libcore.util.CountryTimeZones; -import libcore.util.CountryTimeZones.TimeZoneMapping; -import libcore.util.CountryZonesFinder; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import libcore.util.CountryTimeZones; +import libcore.util.CountryTimeZones.TimeZoneMapping; +import libcore.util.CountryZonesFinder; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java index b6a93227262ddae3fe8d327f8b7c3822ae09cee2..9e72d9896aadcf43c863dc548a3f5f8a7649ba46 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java @@ -6,7 +6,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index a766aa8599e04de641f77154c2a81d5cc56969eb..8a8c5a134f5eebfa5857654ccf1eabd356d482b1 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.deletionhelper; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -29,7 +28,6 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; - import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java index 2ed09420765b07ec2531186d6939f5357f0eccf4..2c0676dd541b9b021e4a0c60459a497d5805f033 100644 --- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController - .STREAMING_LABEL_ID; - +import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController.STREAMING_LABEL_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -27,11 +25,10 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java index ef7e076e28522bee6bdc88fe29f26310356ee489..c91dea9c6e4d755305d5b0d6ef6311c88109677a 100644 --- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,9 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java index 2175f39a170a1a941231f797728e0484a2bd9f95..24acf7316ba5ffc0c0af2a59c72d162239f3c2df 100644 --- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java @@ -16,21 +16,16 @@ package com.android.settings.development; -import static com.android.settings.development.AllowAppsOnExternalPreferenceController - .SETTING_VALUE_OFF; -import static com.android.settings.development.AllowAppsOnExternalPreferenceController - .SETTING_VALUE_ON; - +import static com.android.settings.development.AllowAppsOnExternalPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.AllowAppsOnExternalPreferenceController.SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java index accd05b8a109677c2a2dd3332f4d9ba480f08ac2..e793cbbc1a465e5c27a74033fe584dbd6bf7c521 100644 --- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java @@ -16,20 +16,16 @@ package com.android.settings.development; -import static com.android.settings.development.AnimatorDurationScalePreferenceController - .ANIMATOR_DURATION_SCALE_SELECTOR; -import static com.android.settings.development.AnimatorDurationScalePreferenceController - .DEFAULT_VALUE; - +import static com.android.settings.development.AnimatorDurationScalePreferenceController.ANIMATOR_DURATION_SCALE_SELECTOR; +import static com.android.settings.development.AnimatorDurationScalePreferenceController.DEFAULT_VALUE; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.RemoteException; -import android.view.IWindowManager; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; +import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java index e1fc149a19e43bb4fcf7c7aa66a77ca30bf273fc..720c08193014f58409b8f6ab9b051a06589fee43 100644 --- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java @@ -16,21 +16,16 @@ package com.android.settings.development; -import static com.android.settings.development.AppsNotRespondingPreferenceController - .SETTING_VALUE_OFF; -import static com.android.settings.development.AppsNotRespondingPreferenceController - .SETTING_VALUE_ON; - +import static com.android.settings.development.AppsNotRespondingPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.AppsNotRespondingPreferenceController.SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java index 6878c3241079cf4b448c25583402c153c87c95d9..1e2e44eae514600ce1032089d2189ba0dd847dc5 100644 --- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java index 69c8d2b506d7aa221c6c6af9bf74edea74146adf..bf6ed9483cd74b22a5e77316c6f0ff2809632414 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java @@ -16,19 +16,16 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController - .A2DP_OFFLOAD_DISABLED_PROPERTY; - +import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController.A2DP_OFFLOAD_DISABLED_PROPERTY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java index 9cc74369beab65203af34e8987d62831a4d06f84..3da315a0b64dba94ef91a7427d756fe84c74a7d3 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java @@ -16,19 +16,15 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController - .BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY; - +import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController.BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java index a4da1973db6805ad2c7c144ad8d89866f860a111..5c24bc76f77b43d6779c6097aac4b10161f3ec94 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java index eb1737b2b64f8a316aa4e31225ac8448242e78e3..d1305971dadd5ba0037f49e0b5a0f071a337d62c 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java index 23eea32dc9cca2ca82f52b4c68f9dc599fb67d85..4f0815f367eb41b5e0e9994d775b2764fe7a8c2f 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java index 516c8b28af583cf40d22dde66013fd2791dde762..168c61aa24db13a16864629beacb596e728ee4be 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java index cb9337f4820a5289af0e4af8fdf1558dcfa5bfd4..3c62d2900f086ec780586365ffec3170de40fbff 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java index 2d0c70a938cf40a7a250691e64849f89af78cf9e..6da67ffc8e501cde9672aa7aca1bfc9da03d7eaf 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -16,18 +16,14 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController - .BLUETOOTH_AVRCP_VERSION_PROPERTY; - +import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController.BLUETOOTH_AVRCP_VERSION_PROPERTY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java index 0cab3ece6dfc0b3b4d5976dc6bf5e741ca650262..2bd3b09bfb7d7066facdf149a2099aaaea8cba06 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java @@ -16,18 +16,14 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController - .BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY; - +import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController.BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java index 030aaa2f8716f2f30f521a91d23a54131e4208de..76eb4ac57b4c39751181a8164ae92cd513d95d4f 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java @@ -16,18 +16,14 @@ package com.android.settings.development; -import static com.android.settings.development - .BluetoothMaxConnectedAudioDevicesPreferenceController.MAX_CONNECTED_AUDIO_DEVICES_PROPERTY; - +import static com.android.settings.development.BluetoothMaxConnectedAudioDevicesPreferenceController.MAX_CONNECTED_AUDIO_DEVICES_PROPERTY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java index 0d75bdb5be7a81f1757819363fcc8345bfefbcc8..98c0b8372cb35168b328545e3cb9f02ee19b7536 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java @@ -16,19 +16,15 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothSnoopLogPreferenceController - .BLUETOOTH_BTSNOOP_ENABLE_PROPERTY; - +import static com.android.settings.development.BluetoothSnoopLogPreferenceController.BLUETOOTH_BTSNOOP_ENABLE_PROPERTY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java index b4ee99cb3192a59d5b0fa1c0c00e286d69a6af79..f2593fceeef3ac50cd96a5c9303615e70e0118b0 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -16,13 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.BugReportInPowerPreferenceController - .SETTING_VALUE_OFF; -import static com.android.settings.development.BugReportInPowerPreferenceController - .SETTING_VALUE_ON; - +import static com.android.settings.development.BugReportInPowerPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.BugReportInPowerPreferenceController.SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,9 +27,8 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserManager; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java index 39fd368593abf21a6837877f61c42b784ed173d3..77bd6b868ec81f3e4ce5186c8f0bbd56b02c63a1 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index d39a8c2b8fd3ff2a8dc180f1c0b316e7430d8282..b61f49ae2f817f960f87f98ea396e3edf8076ce8 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -17,19 +17,15 @@ package com.android.settings.development; import static com.android.settings.development.CameraLaserSensorPreferenceController.ENG_BUILD; -import static com.android.settings.development.CameraLaserSensorPreferenceController - .USERDEBUG_BUILD; +import static com.android.settings.development.CameraLaserSensorPreferenceController.USERDEBUG_BUILD; import static com.android.settings.development.CameraLaserSensorPreferenceController.USER_BUILD; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java index 7dc9d34fb5ef26a3cd13569bba5038d72277a742..6f7c22414bbfd4726a2e8258323f5a0899d8ab06 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.development; -import static com.android.settings.development.ClearAdbKeysPreferenceController - .RO_ADB_SECURE_PROPERTY_KEY; - +import static com.android.settings.development.ClearAdbKeysPreferenceController.RO_ADB_SECURE_PROPERTY_KEY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -32,9 +29,8 @@ import android.content.Context; import android.hardware.usb.IUsbManager; import android.os.RemoteException; import android.os.SystemProperties; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java index 8d9549ab623eddd93c12be3fef695d007a0f0ff5..67ba7c4ed33cb24878af6dc95cae9a50623a04e6 100644 --- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java @@ -16,19 +16,15 @@ package com.android.settings.development; -import static com.android.settings.development.CoolColorTemperaturePreferenceController - .COLOR_TEMPERATURE_PROPERTY; - +import static com.android.settings.development.CoolColorTemperaturePreferenceController.COLOR_TEMPERATURE_PROPERTY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java index 3dd18d9dcee0ac91f4582eceb8b112a0e5f98fbe..9ddfc4b45e0df09018e2b120ac1c2a551aefb450 100644 --- a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.when; import android.app.UiModeManager; import android.content.Context; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java index d2019280a65ceea96f01958ca5f261c1b187ac0d..52ca56e80bab2fe24738725a25cb7cc4fbfddeda 100644 --- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java @@ -17,16 +17,14 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.view.ThreadedRenderer; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; +import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java index a3728602796fd0d693ac395af2dcee23c941abb6..fca76a4860cd73278e9d30ef646f40f1f9eddfd5 100644 --- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java @@ -17,16 +17,14 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.view.ThreadedRenderer; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; +import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java index e737077eb13b11c495f25ed2d13409d4db03cbc1..cddee7f683cacef6e14bb91c516fa8ae21002dd5 100644 --- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index fffcd4c8f0f41112db8b51537aafc503c553295e..da32ce8190922a7db0e90da35a4f9226597fefc5 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index a6d11e903d8c821f8ef3dec17c9fd3dde99e1be9..c2ad6c34615f24d0d7d937989400fb2c980e3f7e 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -18,16 +18,14 @@ package com.android.settings.development; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; +import android.app.Application; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; -import androidx.lifecycle.LifecycleOwner; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.SwitchBar; diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java index 8bc3ef68b177d03626ac7490101ea98215cb8319..3e0d118df0a83cebbc07974e04753ff5f68240dc 100644 --- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java index c90d8fbbce987180fa2b11fd892f517e5791062b..34a0581e582ad309e519910e8cbee4f4481d7178 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -17,25 +17,23 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.content.om.IOverlayManager; -import android.content.om.OverlayInfo; import android.content.pm.PackageManager; -import android.os.RemoteException; -import android.view.DisplayCutout; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; +import android.view.DisplayCutout; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.wrapper.OverlayManagerWrapper; +import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo; import org.junit.Before; import org.junit.Test; @@ -43,7 +41,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.util.ArrayList; import java.util.Arrays; @RunWith(SettingsRobolectricTestRunner.class) @@ -57,7 +54,7 @@ public class EmulateDisplayCutoutPreferenceControllerTest { @Mock private Context mContext; @Mock - private IOverlayManager mOverlayManager; + private OverlayManagerWrapper mOverlayManager; @Mock private PackageManager mPackageManager; @Mock @@ -67,7 +64,6 @@ public class EmulateDisplayCutoutPreferenceControllerTest { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - when(mContext.getSystemService(Context.OVERLAY_SERVICE)).thenReturn(mOverlayManager); mockCurrentOverlays(); when(mPackageManager.getApplicationInfo(any(), anyInt())) .thenThrow(PackageManager.NameNotFoundException.class); @@ -76,12 +72,8 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } Object mockCurrentOverlays(OverlayInfo... overlays) { - try { - return when(mOverlayManager.getOverlayInfosForTarget(eq("android"), anyInt())) - .thenReturn(Arrays.asList(overlays)); - } catch (RemoteException re) { - return new ArrayList(); - } + return when(mOverlayManager.getOverlayInfosForTarget(eq("android"), anyInt())) + .thenReturn(Arrays.asList(overlays)); } @Test @@ -154,15 +146,6 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } private static OverlayInfo createFakeOverlay(String pkg, boolean enabled) { - final int state = (enabled) ? OverlayInfo.STATE_ENABLED : OverlayInfo.STATE_DISABLED; - - return new OverlayInfo(pkg /* packageName */, - pkg + ".target" /* targetPackageName */, - DisplayCutout.EMULATION_OVERLAY_CATEGORY /* category */, - pkg + ".baseCodePath" /* baseCodePath */, - state /* state */, - 0 /* userId */, - 0 /* priority */, - true /* isStatic */); + return new OverlayInfo(pkg, DisplayCutout.EMULATION_OVERLAY_CATEGORY, enabled); } -} +} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java index 1319c979fce7cd6f882ccb3207cc94f411d1741b..c16f4538b080c23a340d3ac9ba1fc5de2d0b52f6 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java @@ -16,21 +16,16 @@ package com.android.settings.development; -import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController - .SETTING_VALUE_OFF; -import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController - .SETTING_VALUE_ON; - +import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController.SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java index 21d14ca3fa233fee7a43bc9de444b18d83bc2296..f3b57306067219ddc804e0ab01efbd975bb4480d 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java @@ -16,21 +16,16 @@ package com.android.settings.development; -import static com.android.settings.development.EnableGpuDebugLayersPreferenceController - .SETTING_VALUE_OFF; -import static com.android.settings.development.EnableGpuDebugLayersPreferenceController - .SETTING_VALUE_ON; - +import static com.android.settings.development.EnableGpuDebugLayersPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.EnableGpuDebugLayersPreferenceController.SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java index 8bbb7e2f0fbd4343dc20370ee84095a79a3c40f9..dd16a284be92d05066f76390243114c0a491e283 100644 --- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.development; -import static com.android.settings.development.FileEncryptionPreferenceController - .FILE_ENCRYPTION_PROPERTY_KEY; - +import static com.android.settings.development.FileEncryptionPreferenceController.FILE_ENCRYPTION_PROPERTY_KEY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; @@ -31,7 +28,6 @@ import android.content.Context; import android.os.RemoteException; import android.os.SystemProperties; import android.os.storage.IStorageManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java index aeda03235f04764e1e6d2fabac78aefc78c7e6de..03f874fb2c821ba804168741225b75033bf55f65 100644 --- a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java @@ -16,19 +16,15 @@ package com.android.settings.development; -import static com.android.settings.development.ForceGpuRenderingPreferenceController - .HARDWARE_UI_PROPERTY; - +import static com.android.settings.development.ForceGpuRenderingPreferenceController.HARDWARE_UI_PROPERTY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java index a238e7630e8045babd68a7de19f97ef6fe67e6a5..aceb714cf40cce943bc9d1ecf6e897caf2f66408 100644 --- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java index b58f756169ab03622a38fcaf4b49472ec5bce050..7f97adc90c3f2bda68de575b9a03255bb1437600 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -16,13 +16,10 @@ package com.android.settings.development; -import static com.android.settings.development.FreeformWindowsPreferenceController - .SETTING_VALUE_OFF; +import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_OFF; import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON; import static com.android.settings.development.FreeformWindowsPreferenceController.USER_BUILD_TYPE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,9 +27,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java index d2e2d31ce56edf25b6907f614a554386a4435092..abc1c91b273f942df0622e2d30ad22d19b1a86a9 100644 --- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java @@ -17,16 +17,14 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.view.ThreadedRenderer; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; +import android.view.ThreadedRenderer; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java index 9ab7cec4a1198a7e0f79341033248344238aa425..fcf6b898db9c77e9cffedfb510792c3158313000 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import android.view.ThreadedRenderer; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; +import android.view.ThreadedRenderer; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java index 9a69acfb220c581347821d54cdecd539cea24244..db7e54694fd7318e8122d043ea454253a05d643d 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.HardwareOverlaysPreferenceController - .SURFACE_FLINGER_READ_CODE; - +import static com.android.settings.development.HardwareOverlaysPreferenceController.SURFACE_FLINGER_READ_CODE; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -32,9 +30,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java index 9a80bea96cc83dde722b0980129a92945074b7d8..4c65431cad82de897f53875ba5a1a3b7631f2324 100644 --- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.development; -import static com.android.settings.development.HdcpCheckingPreferenceController - .HDCP_CHECKING_PROPERTY; - +import static com.android.settings.development.HdcpCheckingPreferenceController.HDCP_CHECKING_PROPERTY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -28,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java index a71f9b0848a3aae38a19cb75b78ebf411eb3bbe1..3a1cc1976a45cd6f8c767e2c73ed1443c2ed99be 100644 --- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.development; import static com.android.settings.development.KeepActivitiesPreferenceController.SETTING_VALUE_OFF; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,9 +26,8 @@ import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java index b0af1d5676e7e8e760dc4fcba4501cdbf12dcfb0..a86e18df3ed6ecb974d5734e78b0f3786a226ae8 100644 --- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java @@ -11,7 +11,6 @@ import android.app.backup.IBackupManager; import android.content.Context; import android.os.RemoteException; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java index 0fb88aaa84be20ac881723d0a7951b6ffe678542..5fd3b219add299a181f0fb1ba726b610cb81dbfd 100644 --- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.LocalTerminalPreferenceController - .TERMINAL_APP_PACKAGE; - +import static com.android.settings.development.LocalTerminalPreferenceController.TERMINAL_APP_PACKAGE; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -28,9 +26,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java index afbd806bb402d26995bf8c19e11640e904fa5176..d65e830e92fdaf587baf8d15f1841e71b35b1559 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -20,10 +20,9 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.SystemProperties; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java index aee0ba8190057e264d3a14473b36d06c07a3d2e2..f552a1706434f49e8caa44a192336fd3ce4a18b4 100644 --- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index 7424753a66ff411a61075e02daf5c2870c4c6f6a..ad3345536a2d8b65f7dc329ea8dbb2f3163f428d 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java index abdd87cd029e449c3aab1cad0ba48ae5b00baecd..d3763ae9e7bec009717ff5af7424539381334835 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java @@ -1,10 +1,7 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_MOCK_LOCATION_APP; - +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_MOCK_LOCATION_APP; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -19,7 +16,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java index 965f756d6b9422ebc23c1a182025a3ab4bc519b1..e6a2d5ce3518a89e3491a46fb8be2f9e3f1b6032 100644 --- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.development; */ import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,9 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java index 98f792bcc3ccf8d41f97a28036ec85bb486f688d..ce57fb51ddbd85369f469687bd1f99fc30ee167c 100644 --- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_CODE_ENABLE_OEM_UNLOCK; - +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_ENABLE_OEM_UNLOCK; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -34,9 +31,8 @@ import android.content.Context; import android.content.res.Resources; import android.os.UserManager; import android.service.oemlock.OemLockManager; -import android.telephony.TelephonyManager; - import androidx.preference.PreferenceScreen; +import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index 8140c324de0dda719fb771f85a7dbb1b9846ad3d..28f369fec86bbf831a12d118570769e64ea9f6a5 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -18,18 +18,15 @@ package com.android.settings.development; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.res.Resources; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java index 768ccec1c6a96b7cb297fb495471a7fdc89fe8c8..430e0ddcb19cc9bb61ded0d6297ffcfa899d1c6f 100644 --- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java index 1708068d359a992dec88eea8ebbe91ac39e36242..350122650b3a2352e38b7c715be2b40d093bb71b 100644 --- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java @@ -17,16 +17,14 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.view.ThreadedRenderer; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; +import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java index 046636b9f3219a5ac258c5d8d0e17ded35d9d534..8785cf6a5ec23ee2a5ecf9acae70e0a09d989f6a 100644 --- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; */ import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java index f79cbe0bf514fb2a1cf5d45e8b61001692522f50..8e59b84e5c78edadbe961cf23dced00c8a844bdc 100644 --- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,9 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java index 6b083da5d798c45fd1bd899c632a0023cf9a97f2..78387e39e711472bbd099edf428ed722ffb41f48 100644 --- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java @@ -17,14 +17,12 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java index 7955db70b2c4c6ad9b88cea48819fcf5d8765f42..d4cb4e03b1539e232c361d36e0a83528ed5e62d5 100644 --- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_CODE_DEBUG_APP; - +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,7 +28,6 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java index 04b0b3f1ab629db085f3df381ab68f3145c6c876..46c214740de6724566d601bd68a45538ded788f9 100644 --- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java @@ -17,16 +17,14 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.IShortcutService; import android.os.RemoteException; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java index 2acd44ad09201dce53c8c55ad0d337f62286237a..d373f1c09ada5c7425201e88f9f5b17b0b827a11 100644 --- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java @@ -16,20 +16,15 @@ package com.android.settings.development; -import static com.android.settings.development.ShowFirstCrashDialogPreferenceController - .SETTING_VALUE_OFF; -import static com.android.settings.development.ShowFirstCrashDialogPreferenceController - .SETTING_VALUE_ON; - +import static com.android.settings.development.ShowFirstCrashDialogPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.ShowFirstCrashDialogPreferenceController.SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java index 38ec01b80dea20452ff4d9ff2341fb793ba97ff3..c18857acce22b7403d4f0077c4231a91fc30269f 100644 --- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import android.view.View; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; +import android.view.View; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java index e768e522d878da1a49e3e4e31d5f8a6bd15dbd19..811550ff92e352572aab37cea848c8d9564a5cb0 100644 --- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController - .SURFACE_FLINGER_READ_CODE; - +import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController.SURFACE_FLINGER_READ_CODE; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -32,9 +30,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java index b6d02caf11e9cce50845071dfc86ce220cf28e25..d7eaecdb68251550f02b20d0e3d4b6d675f51f54 100644 --- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java index 633e8e4055de5ecfe1b5ca765330552cc17ab274..c136a29cb65ed95693d600bd5bac2009d032d805 100644 --- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java @@ -16,13 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.SimulateColorSpacePreferenceController - .SETTING_VALUE_OFF; -import static com.android.settings.development.SimulateColorSpacePreferenceController - .SETTING_VALUE_ON; - +import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,7 +26,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java index 05edd14ee49d28f2bdc73899093137858307bf82..40d439fe6d9f6995e9e225b862fbc7aea60d189f 100644 --- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -27,7 +26,6 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java index 3fceb1c79926e9aa472aa4567451872ddee0f12e..1f0c9c553e56b2b2811490ebb8ade34306b341ad 100644 --- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java @@ -17,17 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.RemoteException; import android.os.StrictMode; import android.os.SystemProperties; -import android.view.IWindowManager; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; +import android.view.IWindowManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java index e44aeb46cec927b4b10961cefaf3a9ebd9a726e5..895722e6257656b936ab6f341e1bd478b664b475 100644 --- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java index 8bd43745a7503e1585c256718a5d9ed10dc30bd3..e5c3e43abbc2f8e6f2ca0224926b26246be1f0ab 100644 --- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java @@ -16,21 +16,17 @@ package com.android.settings.development; -import static com.android.settings.development.TransitionAnimationScalePreferenceController - .DEFAULT_VALUE; -import static com.android.settings.development.TransitionAnimationScalePreferenceController - .TRANSITION_ANIMATION_SCALE_SELECTOR; - +import static com.android.settings.development.TransitionAnimationScalePreferenceController.DEFAULT_VALUE; +import static com.android.settings.development.TransitionAnimationScalePreferenceController.TRANSITION_ANIMATION_SCALE_SELECTOR; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.RemoteException; -import android.view.IWindowManager; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; +import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java index 0c82bb46574017aeb96dd625f937cad1a788bfe1..ba27bfb0b2990f98fc3222cfe6c80a435f1e984b 100644 --- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java index 471fad9c749c1fbd3b141fa76974da6e0152fd43..98ff9e4944db713854ac5fb8e2603d3fd2ecf5cd 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -16,11 +16,11 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,7 +29,6 @@ import android.content.Intent; import android.content.pm.ResolveInfo; import android.provider.Settings; import android.provider.Settings.Global; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java index 87d113504048314daead53aa7b4a5ab03e462474..b152ea7c734b2913e01181d5fbe4fc4372f1b1e5 100644 --- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java @@ -16,14 +16,10 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_CODE_DEBUG_APP; -import static com.android.settings.development.WaitForDebuggerPreferenceController - .SETTING_VALUE_OFF; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP; +import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_OFF; import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_ON; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -36,9 +32,8 @@ import android.content.Context; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java index e749ea64b3a7cc5f6240ae6222b56ca3d9dab968..e09b9d9a0d65b3541a10887cd6c85725a2338cd3 100644 --- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java @@ -16,20 +16,15 @@ package com.android.settings.development; -import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController - .SETTING_VALUE_OFF; -import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController - .SETTING_VALUE_ON; - +import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController.SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java index 742bc7fe9aca1801d8c6fe6540f9dc2ae8517f11..528f3abc6c2d542b63470f3a313bf071def4fa1a 100644 --- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java index daeff01ea633f8aad5e83a7bfa10d2b60bd3ce9d..1359e992fee6541d432d5ae74e24761e9d643192 100644 --- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java @@ -21,9 +21,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.wifi.WifiManager; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java index 322eed789368673f848806b44a7abcbbbdc51949..e2db4f95d55f5260306010d5b60456672592781a 100644 --- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java @@ -16,21 +16,17 @@ package com.android.settings.development; -import static com.android.settings.development.WindowAnimationScalePreferenceController - .DEFAULT_VALUE; -import static com.android.settings.development.WindowAnimationScalePreferenceController - .WINDOW_ANIMATION_SCALE_SELECTOR; - +import static com.android.settings.development.WindowAnimationScalePreferenceController.DEFAULT_VALUE; +import static com.android.settings.development.WindowAnimationScalePreferenceController.WINDOW_ANIMATION_SCALE_SELECTOR; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.RemoteException; -import android.view.IWindowManager; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; +import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java index 53e45043d5660e98d26ac20723e5292336906d24..5fff256035e6b23d926b1672fb70d263cc172aab 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java @@ -17,17 +17,14 @@ package com.android.settings.development.featureflags; import static androidx.lifecycle.Lifecycle.Event.ON_START; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.content.Context; - import androidx.lifecycle.LifecycleOwner; +import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java index b34c6f0a754f12a630c2fc1340a281be48cd7af6..09027050ed7cb620bbe264dd60f84e2a04cde047 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.development.qstile; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,10 +30,9 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.RemoteException; import android.service.quicksettings.TileService; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; import com.android.internal.statusbar.IStatusBarService; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java index 636b067e17d32755f66146fe646a6ab1bcdd1513..7644749daf016146c54dd2c828e70493c170f806 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java @@ -20,9 +20,7 @@ import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeT .SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE; import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace .SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java index 1560c51dd1eacad0eeb9254015be541da233c74f..b1073ac79a943814f08923fbcf45555048f615c6 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 1411251c9e2a733e51ee5de5e5642cadd6dba00f..0011b1534b7d9e4f50c899e09a8f65abe3a881eb 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -28,16 +27,15 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.Fragment; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.Build; import android.os.Process; import android.os.UserManager; import android.provider.Settings; -import android.text.BidiFormatter; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.BidiFormatter; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.search.DatabaseIndexingManager; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java index 32a0f04294459826dc2edf7dd94f4deecfac64ff..169554d7110535919a1e7293a40d304278b9c793 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java @@ -19,9 +19,7 @@ package com.android.settings.deviceinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; import static com.android.settings.deviceinfo.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT; import static com.android.settings.deviceinfo.DeviceInfoSettings.SIM_PREFERENCES_COUNT; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -32,9 +30,8 @@ import android.app.Activity; import android.content.Context; import android.os.Build; import android.os.Bundle; -import android.telephony.TelephonyManager; - import androidx.preference.PreferenceScreen; +import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index a3c6d0a680242daedd2d9e2c2140bc17083e265a..c91683e00d4ba98ee68e83572a6bfc64b1995c99 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.deviceinfo; import static com.android.settings.deviceinfo.DeviceModelPreferenceController.getDeviceModel; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; @@ -26,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java index 046bd844fb3332f26419c142a81ab2855158fed2..3e4b4e6fe2eb50db6ada7c897dd7b554e3c860e2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java index 2c2c2f28ff74cba119825c55abcd0c445bcf75e1..e6b12d73e49dc2bfad6f11caef04e8e42c7350d9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java @@ -16,12 +16,10 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index b9bd46db455f5c397653a130d6969d8314c207cc..f1e7f218631b5f36dfbc11b13fe116cf092204b0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -16,13 +16,11 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; import android.app.Fragment; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java index 7b1de47555daff37b4179495c7e72e4bedcb1cc0..c269f712b44bac84b60df5089d2eb452dbd7eb7e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java index ec04947db57847aeb074cdb7cf8ae6d3a508216f..9207e157201e214ca275cd6fb23b288be78c9920 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -30,11 +29,10 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import android.util.ArrayMap; -import androidx.preference.PreferenceScreen; - import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 4748135a461c20972abf81ba973c1854db9cae44..565cdf0d866f9cae990d49b2d84139561ea67293 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -26,11 +25,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.telephony.SubscriptionInfo; -import android.telephony.TelephonyManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.telephony.SubscriptionInfo; +import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java index bad49f2ab604eecba74a967577ed4dddc77ebdab..5f250dd0385f7bd4eaa7bbe320a6634e9c13921c 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index 24028d22ad876241b6de6620ff6aa638d3e6b632..fea58e288109f9445ab12abc8dc119778c870578 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; @@ -25,7 +24,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java index bd0eaf37fa0078fe120d705276fd024520388f82..fed2cbef516e1afcb6b2a92d9845922e9cb0fc3c 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; @@ -28,11 +27,10 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.provider.SearchIndexableResource; +import androidx.recyclerview.widget.RecyclerView; import android.util.SparseArray; import android.view.View; -import androidx.recyclerview.widget.RecyclerView; - import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper; import com.android.settings.deviceinfo.storage.StorageAsyncLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java index d42b40ff7d6936232e9c771ec6067be550a412e2..34ce2e626e12732f8d419bb608895aceffbf9d1f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java @@ -16,15 +16,13 @@ package com.android.settings.deviceinfo; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; - import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.widget.ProgressBar; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java index 61fbf1f48d56911221d9257bc997606ea90c95b3..440a6f586572706b4774a10ef13202e2daa57d4b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java @@ -16,7 +16,6 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java index 3e7ce7a93138059335670d7e6ac151a021184241..f50c725ac5a984b21bd4658d9b4525d3b8931f86 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java @@ -16,13 +16,9 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController - .BASEBAND_PROPERTY; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController - .BASEBAND_VERSION_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController - .BASEBAND_VERSION_VALUE_ID; - +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_PROPERTY; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_VALUE_ID; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java index 21388818eafadaf2e7b9644998c8fe40b70d6977..2db2e6fb8f2dc315c575c2d9bf54afeec1d4f7a2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController - .BUILD_NUMBER_VALUE_ID; - +import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController.BUILD_NUMBER_VALUE_ID; import static org.mockito.Mockito.verify; import android.os.Build; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java index 7b07db486289d74de1855929e30022e9ad376e65..6b4da5bd94944f00d73a9c20a02567990986c11a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController - .FIRMWARE_VERSION_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController - .FIRMWARE_VERSION_VALUE_ID; - +import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_VALUE_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java index d519918f401220bd3d607e55f3763e7f40497ce7..05bbdb144522a9a58540ce322b9c3d1a0633b813 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo.firmwareversion; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -27,7 +26,6 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.Build; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java index 24f4874dbe0b54b8f6799dfeb1d1f8c7907b4945..f47c07e61b1e3c9a0f41d6469eb3708a9e0f6abb 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController - .KERNEL_VERSION_VALUE_ID; - +import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController.KERNEL_VERSION_VALUE_ID; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java index ba38d77e7e0b284ab81955f8a2d310d9896bc5d9..6b26fc190a8192da07e54f44065a4572dfa57285 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java @@ -16,11 +16,8 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController - .SECURITY_PATCH_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController - .SECURITY_PATCH_VALUE_ID; - +import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_VALUE_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java index c317d2fa373d997e76f35948d545c27cb86f0ca0..658a60ad1b7f46ad8838f052073933541bceae58 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java @@ -23,7 +23,6 @@ import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_I import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MEID_NUMBER_VALUE; import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MIN_NUMBER_VALUE; import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_PRL_VERSION_VALUE; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index 2788939a7404552ac600514b4c89f09dc9910fde..c068ac76d5a1aad5fb4311ef511fc59906d4c27e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo.imei; import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import static android.telephony.TelephonyManager.PHONE_TYPE_GSM; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -30,10 +29,9 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; -import android.telephony.TelephonyManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index 649b6e2049a6e896764219db91de5e79897115ed..f612e55bb8a0ea3df715ee2e2f82644584e2fcfd 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -45,7 +45,6 @@ import static com.android.settings.deviceinfo.simstatus.SimStatusDialogControlle .SIGNAL_STRENGTH_LABEL_ID; import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController .SIGNAL_STRENGTH_VALUE_ID; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -55,6 +54,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageInfo; import android.os.PersistableBundle; @@ -66,8 +66,6 @@ import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; import android.telephony.euicc.EuiccManager; -import androidx.lifecycle.LifecycleOwner; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java index 5fe0adb39c5e482dd9ac49653056acc55f653732..8ccce3a2e02a6e0a361f1df0e871e74e461f1e1e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -27,10 +27,9 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; -import android.telephony.TelephonyManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java index 77d6f188b432c0910814fbe4a3aefbe544e45822..dea0e4f881ddfad6ecbf403c0844f85b75e79c68 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo.storage; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -32,7 +31,6 @@ import android.content.ContentResolver; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java index 5da2cb8b09534262f11ac27f5622df9b4e3390d9..9f5638847d2621ee27075c3e62a5673bdb0365fe 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java @@ -18,28 +18,21 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.CACHE_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_APP_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper - .EXTERNAL_AUDIO_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper - .EXTERNAL_IMAGE_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper - .EXTERNAL_TOTAL_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper - .EXTERNAL_VIDEO_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_AUDIO_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_IMAGE_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_TOTAL_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_VIDEO_BYTES; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.FREE_BYTES_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.GAME_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.MUSIC_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.OTHER_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.PHOTO_APPS_SIZE_KEY; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper - .SHARED_PREFERENCES_NAME; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.SHARED_PREFERENCES_NAME; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TIMESTAMP_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TOTAL_BYTES_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.USER_ID_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.VIDEO_APPS_SIZE_KEY; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java index d525501c777dddbc26352f2b4ad5bf017e50292c..1935c13a700c74e6ce9d06b437eefa4631ee08aa 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -29,11 +27,10 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; -import android.util.SparseArray; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; +import android.util.SparseArray; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java index 092d0055fe7c94985ab0b85292551118b30237ef..a4107f5b18645ffb299e9b06f942ebebe0cfcaaf 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -16,12 +16,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ID; -import static com.android.settings.applications.manageapplications.ManageApplications - .EXTRA_WORK_ONLY; +import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ONLY; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -39,12 +36,11 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.storage.VolumeInfo; +import androidx.preference.PreferenceScreen; import android.util.SparseArray; import android.view.LayoutInflater; import android.widget.LinearLayout; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java index b51ae00549b54659eeac4c2d622723d65e837b8f..c36af1b66d357a9e8a01c4e622d8f2a439a009e0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -18,9 +18,7 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.TestUtils.GIGABYTE; import static com.android.settings.TestUtils.KILOBYTE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.spy; @@ -30,14 +28,13 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.storage.VolumeInfo; +import androidx.preference.PreferenceViewHolder; import android.text.format.Formatter; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; -import androidx.preference.PreferenceViewHolder; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java index 419aab50b1e56b2a4be80c4154dd9cd7d72badab..17ac6a98a052385456c8b5154a98fccb1d12cf6e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,10 +27,9 @@ import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; -import android.util.SparseArray; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.SparseArray; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java index 1e912ba2b292fff8e0be7b155d64205e5ff16a70..7a19fdefa50cd4c572276f840c94b65556d18af0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java @@ -1,7 +1,5 @@ package com.android.settings.deviceinfo.storage; -import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -12,6 +10,8 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageVolumeProvider; +import static com.google.common.truth.Truth.assertThat; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index d3c8542fa10312e611b81c265620b98016f4d4dd..77390d34738318f75c6886f62aca6175b8039185 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.display; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -31,7 +29,6 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; - import androidx.preference.SwitchPreference; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java index def3d306f1c6aaa119b60ed143ecffa6fc880ef5..8d62d2fe5c55f6b1278e674ab5d4f88039dd6a93 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java @@ -17,13 +17,11 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java index 202873d85ca26086dc95cd01550387e4a70a3e79..4361b7c6f315a8e25bfe3318e029be3af2434ebe 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java @@ -18,6 +18,7 @@ package com.android.settings.display; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java index 05226c359de61a4d7d6e29f2eae293c97816deb0..ac3435d4812dfa1edecbfc66de14dccedcd52bf6 100644 --- a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java +++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java @@ -17,7 +17,6 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java index 9b82f05f5521abc2e690400cc1354fed7e73b431..188cb92a6467ec9b8909a0ba6a5acadfc87e8c71 100644 --- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java @@ -19,7 +19,6 @@ package com.android.settings.display; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; - import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index e4db3ee1ac5d8ffa99eb81263fdb899b1cd6fe67..5a31e3b4942dddc047036b73a92c94988b409f63 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; @@ -27,7 +26,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; import android.provider.Settings; - import androidx.preference.SwitchPreference; import com.android.internal.view.RotationPolicy; diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java index 7814d3f9fde5c7c111a7c7c6c9f1c20b03bd64bc..673abb0e93ae1dde664733edb4944e434d076d61 100644 --- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.display; import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; - import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index 4122b14b734cf76fe5ea35715b4dfe899362477e..b758531fb4998ddb4de74ef9ccb9ab716cd9e9a1 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.display; import static android.content.Context.POWER_SERVICE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.reset; @@ -31,7 +29,6 @@ import android.content.ContentResolver; import android.content.Context; import android.os.PowerManager; import android.provider.Settings.System; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java index 4be4eb8d680ce13a1010072de1f30c8680c8d72d..c7b65356c204456c6c320a8d495fe859446727b1 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index e1f133d5154617cf9022e1ba67d41093f8a7d540..40007759b10b8edfa5be251c729fac0e3bac4994 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -16,7 +16,6 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; @@ -27,7 +26,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java index 30dedb6a001b16fde5bcf87aa40961bdc96a7b77..a4b0e54362f3359f2d81add5108f22a860cfdb74 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java @@ -21,15 +21,14 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings.Secure; -import android.view.View; - import androidx.preference.PreferenceScreen; +import android.view.View; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java index 945b50f9d5c537e5c6405cb6020a368ab1e77c06..20b038092097b5f85fb7ed91e61651e3abf4963c 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java @@ -18,11 +18,9 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings.Secure; - import com.android.internal.app.ColorDisplayController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java index c49c174be42c7177e0aa0ffe99a0cd6ba6be1408..ed6618b1a600d02a44573208d440c941b2b9b1ac 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java index a38c755a65ced931bb760be956a98477efec7a80..c41300079daf000d42c4f3172360d6e2078e3b01 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java index e43e7259ffc774c210379b32bd46c0e8a9fcdca2..8168c203a5a24997d771532995a5e8dbc36886ef 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java index 99dcb5a7d96d9673ac1e8d590c670f2416c2c4ee..40101a4bd799e65c1439443248141e33b14e0b78 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java @@ -18,10 +18,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings.Secure; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java index 9c4c539c2d9ee1571ce8840e1d57cd40a1fa2d1b..7440f63d7407a5f56ed81fae67454c02c9d107cb 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java @@ -5,7 +5,6 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Application; import android.content.ComponentName; import android.provider.Settings.Secure; - import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.Settings.NightDisplaySuggestionActivity; @@ -16,8 +15,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import org.robolectric.RuntimeEnvironment; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { diff --git a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java index 80d8987abeb9f7995dd8890d0c41eca1f126a015..6942fd84d6c4d219a8eba53e903768f2da3ebb0e 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java @@ -21,8 +21,8 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settingslib.drawer.CategoryKey; +import com.android.settingslib.drawer.CategoryKey; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java deleted file mode 100644 index 082207629ea0b3898742c46b4eb9c2cb1324b9fe..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2018 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.display; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; - -import android.content.Context; - -import com.android.settings.testutils.SettingsRobolectricTestRunner; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; - -@RunWith(SettingsRobolectricTestRunner.class) -public class ScreenZoomSettingsTest { - - private ScreenZoomSettings mSettings; - private Context mContext; - - @Before - public void setUp() { - mContext = RuntimeEnvironment.application; - mSettings = spy(new ScreenZoomSettings()); - doReturn(mContext).when(mSettings).getContext(); - } - - @Test - public void getPreviewSampleResIds_default_return3Previews() { - assertThat(mSettings.getPreviewSampleResIds()).hasLength(3); - } - - @Test - @Config(qualifiers = "mcc999") - public void getPreviewSampleResIds_extraPreviewDisabled_return1Preview() { - assertThat(mSettings.getPreviewSampleResIds()).hasLength(1); - } -} diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java index a5b34498a906b62b508a0e87eaee9d9b7cde11ef..fe6686390b29b9890de40557264824937b34cb53 100644 --- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java @@ -17,12 +17,10 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - import androidx.preference.SwitchPreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java index b25e8e6e96987eac2b512d74d9037b92229dc060..ad50c2e18f335dfa0ea5ca78106defa983361f37 100644 --- a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 9d15ca06dfed02bb1863ca5147b0b276dd8aa575..47cdd35f6f6f0edb0b15a8ee06aa8b41f079f5ba 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -16,29 +16,25 @@ package com.android.settings.display; -import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.content.om.IOverlayManager; -import android.content.om.OverlayInfo; import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; - import androidx.preference.ListPreference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.wrapper.OverlayManagerWrapper; import org.junit.Before; import org.junit.Test; @@ -48,8 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import java.util.Arrays; - @RunWith(SettingsRobolectricTestRunner.class) public class ThemePreferenceControllerTest { @@ -61,8 +55,6 @@ public class ThemePreferenceControllerTest { private ApplicationInfo mApplicationInfo; @Mock private ListPreference mPreference; - @Mock - private IOverlayManager mOverlayManager; private ThemePreferenceController mController; @@ -75,28 +67,8 @@ public class ThemePreferenceControllerTest { when(mContext.getString(R.string.default_theme)) .thenReturn(RuntimeEnvironment.application.getString(R.string.default_theme)); - when(mContext.getSystemService(Context.OVERLAY_SERVICE)).thenReturn(mOverlayManager); - mController = spy(new ThemePreferenceController(mContext, mOverlayManager)); - } - - @Test - public void testAvailable_false() throws Exception { - when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( - new PackageInfo()); - when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())) - .thenReturn(Arrays.asList(new OverlayInfo("", "", "", "", 0, 0, 0, false))); - assertThat(mController.isAvailable()).isFalse(); - } - - @Test - public void testAvailable_true() throws Exception { - when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( - new PackageInfo()); - when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())) - .thenReturn(Arrays.asList( - new OverlayInfo("", "", OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true), - new OverlayInfo("", "", OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true))); - assertThat(mController.isAvailable()).isTrue(); + mController = + spy(new ThemePreferenceController(mContext, mock(OverlayManagerWrapper.class))); } @Test @@ -107,7 +79,7 @@ public class ThemePreferenceControllerTest { final String themeLabel2 = "Theme2"; final String[] themes = {pkg1, pkg2}; doReturn("pkg1.theme1").when(mController).getCurrentTheme(); - doReturn(themes).when(mController).getAvailableThemes(false /* currentThemeOnly */); + doReturn(themes).when(mController).getAvailableThemes(); when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager)) .thenReturn(themeLabel1) .thenReturn(themeLabel2); @@ -126,7 +98,7 @@ public class ThemePreferenceControllerTest { final String themeLabel2 = "Theme2"; final String[] themes = {pkg1, pkg2}; doReturn(null).when(mController).getCurrentTheme(); - doReturn(themes).when(mController).getAvailableThemes(false /* currentThemeOnly */); + doReturn(themes).when(mController).getAvailableThemes(); when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager)) .thenReturn(themeLabel1) .thenReturn(themeLabel2); @@ -137,32 +109,4 @@ public class ThemePreferenceControllerTest { .setSummary(RuntimeEnvironment.application.getString(R.string.default_theme)); verify(mPreference).setValue(null); } - - @Test - public void getCurrentTheme_withEnabledState() throws Exception { - OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android", - OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true); - OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android", - OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true); - when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn( - Arrays.asList(info1, info2)); - when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( - new PackageInfo()); - - assertThat(mController.getCurrentTheme()).isEqualTo(info1.packageName); - } - - @Test - public void testGetCurrentTheme_withoutEnabledState() throws Exception { - OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android", - OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_DISABLED, 0, 0, true); - OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android", - OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true); - when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn( - Arrays.asList(info1, info2)); - when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( - new PackageInfo()); - - assertThat(mController.getCurrentTheme()).isNull(); - } } diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java index f5c2e26b59157efc5ecb56912b24ac7a96d9b92f..8627d5f1f1e346faa505e7cab42548567479312c 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java @@ -17,12 +17,9 @@ package com.android.settings.display; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; - import static com.google.common.truth.Truth.assertThat; - import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java index b7fb5edc412b57bc010edb018dcb6ffa1c1e7d3f..963bb145b2ea74a76673e25b87bc9ad65908191d 100644 --- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java +++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java @@ -17,7 +17,6 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java index 8a24241d4f4b89edf6757bd5f972f986eae6512c..89ca00aa9748ffa3e6177e7f8738ac9f43a0840e 100644 --- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java index a26997c135a3ff8168204fc254184831b3a58037..103cb534c419952d543346daa126d7ba690f0bc5 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java @@ -17,7 +17,6 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java index db57a1e7977e96e586b1415ef89a5a6edebe4f24..44199404d73ad90ea73f93f3c566de42a42d7b46 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java index b9703e2176ba14ca684b77777b2c4b2db016aafc..07f4a9d10e9ad6c93146c93551a42c3465bc8cdd 100644 --- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java +++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java index fc7edc2827c2d2696e56d130f886413eec64245e..8aea99004815a97370948916f709fe391ea53002 100644 --- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java @@ -17,16 +17,14 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.PreferenceScreen; import android.view.View.OnClickListener; import android.widget.Button; -import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java index 17c6cedab2b5666c617dd59a7aebbabee64e5689..cf7c659bd9c77d745899243a5824c1dfb265ecbe 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java @@ -17,7 +17,6 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index e4f5cff1d76c05ca2477b011a158cf4aee3f69fe..d6e2e10b567b36302778a33a00d9114341b1a70f 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java index 1c47d914204457bc69fe3e6d48e1c052827e641d..fa9702b9167047ea0e8db20892f1ebb8d079b206 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java @@ -17,14 +17,12 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.text.format.DateUtils; - import androidx.preference.Preference; +import android.text.format.DateUtils; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 2da6a88df74ac768761dd356f49414ab8abbaa58..287d33458d8c39196310c64287c8eb51a1bb948f 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -17,14 +17,12 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index 8c704fca781140f68e7c88ee2b58572b3fcc0358..b18bf1c6ad5aedd4250ddf01384f555757449351 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -17,11 +17,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java index 759edb3708721c722edaceb4db099f1347e10fa6..e1a992621ce7f0276126214336e2becd899fc526 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -17,11 +17,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index 5c197926a2744cac4610dde1df99fd3c813b3e65..18797934baa03985c1ff5b2521511a250b4bedcc 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -17,15 +17,12 @@ package com.android.settings.enterprise; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.UserInfo; - import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index 833efd4d3dd55ba57d2bbbc36be07f510b065fa6..d2b305aa0bbcb4256fba5b2a42c419bbbca5eb45 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.enterprise; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -34,7 +32,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java index 4e6db05cb8722737c8c8df47878fa4f3ea5ad93a..72207d1b497769254c4b22c481f4a6ae9faf9130 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java @@ -17,11 +17,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java index 63c5981524bd8c01f3231408b1c371f590b2d941..a3eeb712c4d8d581beb3918362da9e014c8078f4 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java index 48bb0ce125e118b5bd86f20961020d5c230c7577..2f31b28693a371d82a48ca6be420903aa3c5c890 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import androidx.preference.Preference; diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java index 47db2c7aec052452b8aa413a249533095286729c..485ed4685393b5a54c5aebbf50237d76248910a5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java @@ -17,11 +17,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index ac3ee27d8f2c43ebd8e09513fa23c316108809ba..d7d0abd09ae61285dc9d1a43b6cbe9452c036f5f 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -17,14 +17,12 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.anyObject; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index d65f95e5629cd6989fdf25c35815cb9a5059e0d5..fb65e5da4b472bd3b8d7baaea94165e38679df68 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -17,7 +17,6 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index dc5794c85da36762841540f11a725a70bf467769..845f607c308bb14a1c3384eca3d44a45134069a0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -17,11 +17,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index d37738dfb156928cc5bdef9bb17aaab9cda4be2f..7bbe9bc1c1249f67d37b7d8ae38ccd4c8c84c67c 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 54559688401c26d5fef0d36dd937494e5cfbea91..6c5fed049105c16e82482b1ab8fb4b5b2d0e5cb4 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -17,12 +17,10 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index 2b3ed738dd73e4b78ca18ce932beeec6d298fb85..b54dc9ae4ee09b490f3a0be30f3f441456e42a74 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -33,7 +32,6 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.content.res.Resources; import android.os.UserHandle; - import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index eabd4bb7b6c5b6c2ea1cffeeb92b8ea5835874e1..442b56caab9896801641be2feda951f9623222ad 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.argThat; @@ -29,7 +28,6 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.UserInfo; import android.os.UserHandle; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java index 9dd02dea4132092750b87157f16ac0ad262ac934..0ee50cafe560c1d54f6af9e85d852c6d0bcff8b7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java @@ -17,11 +17,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index 10e569a7a7e36abc8388310e2faecc9d36259b4c..14ae7b4277a22b73ebec338e62ef0d43329c3bb0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -17,11 +17,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java index d62576065f511587f6bbd63603c020852e0cc8b6..c007d37375e41d4ae62fd611e0f3e22563d36d82 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -17,11 +17,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java index 421a99fa2316cc89224c776f6e9bce46eabb9cf2..885e8901cff014604782ce8cc2fc3b4f407db549 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -17,13 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java index 56d90f56c76db6f9681c1e49f556c0016ca9e75c..2201e69e4a400ab5c0bc13615403c6f7c8903453 100644 --- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java index 00eb3f964876a75da4841fccff7c5333b557d361..2736d5610a6dc7fa41581c75721f04ee0564b851 100644 --- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java index 73318214b4061402053e3fabab80c1d5aa06a803..8c8113be4cdcb61e2446204fb8ff07d89d6802d0 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java @@ -17,7 +17,6 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java index f054b57fcd3ac3b5cbe4595ed6154e0e153f2489..e83e93d9bc947228ee06b9816e507f3d484d3f83 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java @@ -17,7 +17,6 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java index 5b7336fe7b956666e6c17d340c5b4a0ebcdf40aa..74d4b28a1b739c93d27bc4a75ad99ee98318fbca 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java @@ -17,7 +17,6 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java index f1e2adcde6dc1add06464e8031762d05f38c9e35..01a3c1e1769e6e83a528bde25e8054ac4b7b4cb3 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java @@ -17,16 +17,14 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java index bf91578c9c375c5ecd0edd9a011e3707fb1b2d69..583428e6c0f487cd95e834378596a3d34642da5a 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.fingerprint; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java index 0e689e9e10bbba76508bfed17aa21aa03b399f46..8e94be01b471de8a8b0ab6a804c074733fa584b7 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -18,9 +18,7 @@ package com.android.settings.fingerprint; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -31,7 +29,6 @@ import android.content.pm.PackageManager; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.UserManager; - import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java index fdd47921a1b847faaab3bcc505757de31d96b5f5..ee47f2a036cc2fb245dfffc07bf0a2b10d71ac67 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java @@ -17,7 +17,6 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.RuntimeEnvironment.application; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java index a5de0533b54335acd8028e72751028ecaf785469..9e62511d6b2f344ba18dfadb2327c1c48d1b5f82 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -17,7 +17,6 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.RuntimeEnvironment.application; import android.app.KeyguardManager; @@ -28,8 +27,7 @@ import android.view.View; import android.widget.Button; import com.android.settings.R; -import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest - .ShadowStorageManagerWrapper; +import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper; import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment; import com.android.settings.password.SetupSkipDialog; import com.android.settings.password.StorageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index 2238821ac1adbbabea148847f4983fabd381d5ef..da4bddbb0a859d897779a5ccb3d2b73bdda1551e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -17,9 +17,7 @@ package com.android.settings.fuelgauge; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -43,7 +41,6 @@ import android.graphics.drawable.Drawable; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; - import androidx.preference.Preference; import androidx.recyclerview.widget.RecyclerView; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java index 4221a70a80bc4fc3327a1df7e8643fa683a87b13..551cb3e0bb085d2694d65642d30cc3cc98797872 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java index 0b6051b7ee1d17ff5e40c50fc845369bee7b0aaa..e8e688d84dc9f4da1d184cf09be872b55412e4d4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.doReturn; import android.content.Context; import android.provider.Settings; - import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java index f820e63e2177894ea25a262c4fd6682a5fdcc196..d5f3e2b58a7a82298863d4f12e60e04956f7bd3d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doNothing; @@ -33,7 +32,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index 3e2ebaf49b95f31eb9d1d303c1f07d22d72363bc..a30ddf1cfb775e1e1b11bf45dcad967f380c279c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -17,19 +17,17 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.PreferenceGroup; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.FeatureFlagUtils; import android.util.SparseArray; -import androidx.preference.PreferenceGroup; - import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsImpl; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index fb34640a803a8d665fd5dcf66b4703c69a2a0dc8..4583dd1b3b4787f57684526490fdd684e0a9f7be 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -18,7 +18,6 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java index 085e4368620a901c23a66b4c5189c27d2ca7c80b..30999cbcd00b7a50b9713387741948955c72e15e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java index fceee7ef67adb4d11ec3bcbb366f2eefc36d3acd..b89a3f0fd0e718654f8a761851e09f048412c487 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java @@ -16,7 +16,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 2374206370803485a7990a3b572a9f133bc726ad..8f94ffb64125a01d3df8bd81d73673052cd50932 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -18,9 +18,7 @@ package com.android.settings.fuelgauge; import static androidx.lifecycle.Lifecycle.Event.ON_START; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -30,15 +28,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.os.BatteryManager; -import android.widget.TextView; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; import androidx.recyclerview.widget.RecyclerView; +import android.widget.TextView; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java index d0d3129a0f3b1b2dc76e20411e549985d2965626..0da118abc79c2af43399cec7706277a9307cda95 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java @@ -16,7 +16,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; @@ -24,12 +23,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.graph.UsageView; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java index dc5834ee9c0e3a55fc6e3e91eb7a20493b1ed888..bebf31fabc74f8d6b8aef686c61e1474f70b5c01 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index 821089d4d49c99d347539b74d8060e0b02d62b17..99967f78370f786f078c9b3cd39dff356e0f07d9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.any; @@ -42,6 +41,7 @@ import com.android.settings.testutils.BatteryTestUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; +import com.android.settingslib.utils.PowerUtil; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java index b8232d41ed23b2eaf13e87361eaa5cc112762a44..bc91e17b204e6e6d0fc1032160a4f108dd40d61f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java @@ -16,7 +16,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java index 329a70dcd796c4917d394e4f5c9ae7644814a3e6..66ea56c641b0430910cedff74a1fd2d06f788462 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -26,9 +25,8 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index d22dd7b742267a74b73c3fadb21a9870cfd37312..5913d6b56f6e4b065b536f3bb9c5aa0901cacf5e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.PowerManager; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index 43ea2262a4c9e2a302ca21b5a819cb633a609c67..ac0b25a9646d633e47e5c44e67d76f6be738540e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -20,9 +20,7 @@ import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND; import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE; import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP; import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -56,6 +54,7 @@ import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.AnomalyInfo; +import com.android.settings.fuelgauge.batterytip.StatsManagerConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java index 77b6ed7ef23ff1bc85d1623e7d0399f81a42ffcc..83d8f7a81f6cfb716128a367328fe3041096e821 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java @@ -16,7 +16,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index 140a426b7e84008bb3fd013a681cb3d58f0a1e43..caaf71e28f67bc961482da58b43ba36ed937b7df 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -20,13 +20,12 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.VectorDrawable; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index 2f3cb7cf2a43c4455ede03e13fd8a09d146ada93..ffa49d4f2537be3f6de741016f6e68f698d1adcc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -28,12 +28,11 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; +import androidx.preference.PreferenceScreen; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java index 960a7beab3314a71aee91fdfa2c70ecaa2a1caee..f003a7678c54c40dca4bfbaa3115925b49387645 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java @@ -17,26 +17,23 @@ package com.android.settings.fuelgauge; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.Mockito.verify; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; -import android.util.IconDrawableFactory; - import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; +import android.util.IconDrawableFactory; import com.android.settings.SettingsActivity; import com.android.settings.fuelgauge.anomaly.Anomaly; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 7d35ae3d9ae454499d68f6fef3073c73c4991d56..8e7edf310d87c6da13ab794459592bee6e898b42 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -18,7 +18,6 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADVANCED_BATTERY; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -36,6 +35,7 @@ import static org.mockito.Mockito.when; import android.app.LoaderManager; import android.content.Context; import android.content.Intent; +import android.content.res.Resources; import android.os.Bundle; import android.util.SparseArray; import android.view.Menu; @@ -49,6 +49,8 @@ import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.LayoutPreference; +import com.android.settings.dashboard.SummaryLoader; +import com.android.settings.display.BatteryPercentagePreferenceController; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController; import com.android.settings.testutils.FakeFeatureFactory; @@ -390,6 +392,34 @@ public class PowerUsageSummaryTest { .isEqualTo("3% - Phone will shut down soon"); } + @Test + public void percentageSettingAvailable_shouldNotBeHiddenInSearch() { + final Resources resources = spy(mRealContext.getResources()); + doReturn(true).when(resources).getBoolean(anyInt()); + doReturn(resources).when(mRealContext).getResources(); + final String prefKey = new BatteryPercentagePreferenceController(mRealContext) + .getPreferenceKey(); + + final List nonIndexableKeys = + PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mRealContext); + + assertThat(nonIndexableKeys).doesNotContain(prefKey); + } + + @Test + public void percentageSettingNotAvailable_shouldBeHiddenInSearch() { + final Resources resources = spy(mRealContext.getResources()); + doReturn(false).when(resources).getBoolean(anyInt()); + doReturn(resources).when(mRealContext).getResources(); + final String prefKey = new BatteryPercentagePreferenceController(mRealContext) + .getPreferenceKey(); + + final List nonIndexableKeys = + PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mRealContext); + + assertThat(nonIndexableKeys).contains(prefKey); + } + public static class TestFragment extends PowerUsageSummary { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index 774ff071081d0d061fc22bef5759b941cc96048c..c6f885cc5bf72571bd269309cde816c702dbdb1e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java @@ -31,10 +31,10 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.R; +import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AppInfo; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java index 07435182fd6e0772b40a59e2b2f7c8e60e72adc5..c52377f172d2e6e1fbaa88d08bee9929e254fb31 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java @@ -30,11 +30,12 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; -import android.util.IconDrawableFactory; - import androidx.preference.CheckBoxPreference; +import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; +import android.util.IconDrawableFactory; +import android.widget.CheckBox; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -48,6 +49,7 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index c70b23dfed54ec0c38a36dd0295b50f559cfcf9f..163b7c5c43d4d020a9c483856754ac527e091fe3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.doReturn; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java index b2e4122b4e1a7d43cffa2c88cce486008cfac883..f209fd7ef71ae81687306380e2760ad436c9d05c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java index 92b765a07459aaaf0c520f9fd6f5d40c7c0a7b71..831b07cb3539c5a9e4b1c652533293b3b0166edd 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java index 41806127a60e9753b43ee0dddfc15b88303490cb..e2febc11bc708a123bb7c7a9307a456bdf13cf68 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java index 14d53e4db59bcec988b404013dffc6280f973062..873b512c66c627c284015ab418602485febef58d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; @@ -26,7 +25,6 @@ import static org.mockito.Mockito.when; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java index 6c11f0f679bc6d8ce3a9181954e6f33eb681e484..72abc18c490c6d16017b22088be5437f237c311d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import android.os.Build; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java index 9e1e2418d7a5a55e7435e1944023a3d8fa4e7852..20b5486db007edb6e9cc69bb1ad53dca2428ee40 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly.action; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java index 7516d56f16916958d8f203177d7185ff042d8bc3..49c679bb5477511490ae61c5a0e5a872fcbb9dbc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly.action; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java index 8a6ce6285da93bf570e0d628e2204580f5a0ffc2..f49395bdbc25cfc95ac5e1f05f3e33119bbab1fc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly.action; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java index 16f7dc5498bf7f266f1f66103c08a43aa58099d7..61cf694942d59d82cf4bf55030c082d5d44da414 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly.checker; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java index 1e66b942d5dfb3e3760bd5da1aac0071b3cbcd3d..b70dcaff0704dd08a333e5191b99bc94c14f7356 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly.checker; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java index 7792fbbbb460abc1d4394c37c0b961dee5b6a3e8..789b80b4c06fc4253f0bc785c2bf7ef9a4bf3177 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.anomaly.checker; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java index 2bc5b14dd3fe7d17bd4b17efffea10191d3ad779..89c5c0fa50924de43d25ee57243077573a00b3cf 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; - import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java index 4ff7a4f21a88568d5b595a714e55b4230f13d418..9457f091dbef8048f7c70cdfbb92268061d36f03 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java @@ -17,11 +17,10 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; -import androidx.lifecycle.LifecycleOwner; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SeekBarPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java index c09af2b817d256f74fdf42522cde376070d00d43..95c59904b3e160a596c7ce813ea0e2aa30f761cb 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -17,16 +17,14 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; import android.os.PowerManager; -import android.widget.Button; - import androidx.preference.PreferenceScreen; +import android.widget.Button; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.TwoStateButtonPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java index 8e7590bbb2ec67262b7246a2c8bb076bc3d09d2e..35b6531a5b3a1542a17ec378e3a9a4eba5529c00 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java @@ -34,6 +34,7 @@ import android.app.StatsManager; import android.app.job.JobInfo; import android.app.job.JobScheduler; import android.content.Context; +import android.content.SharedPreferences; import android.provider.Settings; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java index ab3a1df8ebeb1da9ea5b6a3782666d794c81a489..b55bf6b956cbaa7a97864ec00fb9c5b230222921 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java @@ -52,13 +52,14 @@ import android.os.UserManager; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; +import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; -import com.android.settings.testutils.shadow.ShadowPowerWhitelistBackend; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; +import com.android.settings.testutils.shadow.ShadowPowerWhitelistBackend; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java index 4097e7cf6c4f97a176ad9558008c0cced4de57cd..4623c1095557630be4657eff6db7c673eaef6aa2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.app.AppOpsManager; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java index 3a3291c7fb00299a50745874e3c0ae6b6b880a57..b0d6a7dce491dcf6c209a1c34a780652c05f3e08 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java index 2dea0faf38bfd8e2730f7203a9f280cbef7a8323..ff52a0843ab873a27719bf057e83ba1743a4222e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -28,13 +29,12 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; -import android.text.format.DateUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import android.text.format.DateUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java index 3882e8c0e85ad8ec72534728f49daed2c38d86a1..459c4e2a03fff97a601d01e2049104daa4f298e4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java index 0d6f9c55ba62879c987812557d38d066ae7c9694..836f458c752b216811519696cfcb9c125046b0ca 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java @@ -15,9 +15,12 @@ */ package com.android.settings.fuelgauge.batterytip.actions; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import android.app.AppOpsManager; +import android.content.Context; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java index c44ae786bf36ab8c34a307948ce66feda76aa7c2..7fdf46a8f47057f2d14d3744bed737f5e76712a1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java @@ -15,6 +15,8 @@ */ package com.android.settings.fuelgauge.batterytip.actions; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import android.app.AppOpsManager; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java index 24284efdd2207324c873f35543c2440cc19cc4b2..c4c3d021b185f52284f0eaee61701a8dfc21ad5e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java index 379d28f1e6cc4cbf0d8fd90d57f235b39bd9b390..d00cf875fa3a4d20c2c22052551c5a18b0041a0e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java @@ -30,6 +30,7 @@ import android.text.format.DateUtils; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; +import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java index f10ea7ee601c1878017df42519fcf53849fdf3cb..42d882246284a59295e7fef0bb8943a94ffc5257 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java index 27cb04b30721c90db8d2677f70d77c27982cb0c7..df38d34d48b5d3e19b3d019f3f75835dda592ad9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.text.format.DateUtils; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java index 371bfb45796eaca8aa18ae07817319edb6464f83..fa81300bcb6a64cb97c2f097f48325334dcee4b5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; - import androidx.annotation.IdRes; import androidx.preference.Preference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java index fe721133aea24a9ed1c2b40fae51c012dd19efb7..359d2601f81998ee46573eb10911f6a756e9f955 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java @@ -23,6 +23,7 @@ import android.content.Context; import android.os.Parcel; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java index 825cfc0776982a90b1f20a8fd14c04a024e518f5..e2c80df9a1f428ca1fc9abaaf39e310b43b837aa 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java @@ -35,6 +35,7 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java index 1c5fafcde34e18be40fa2d8975fcc104170fe034..bd96f0f4ba0b630d29bda5d9a792be79d161df4a 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 9946361baffa53aefa6e8223cbdf7b3dcefc1220..9793f7d1576e390fb51a212fab54ff494efd2b5d 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index 0181d78b570e29e561b26ed89f721a383db22fc4..8c0be96d26bc67843d0d42fb028060fe15426131 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -24,12 +24,15 @@ import static com.android.settings.gestures.DoubleTapPowerPreferenceController.i import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.when; + import android.content.ContentResolver; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; +import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController; import com.android.settings.search.InlinePayload; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index d373dc4803f08064414eb4d805cb7a10dbd3dc9d..efc9f4fe8fee2db97c430693aadfe06e7428f3fb 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.android.settings.core.BasePreferenceController.DISABLED_DEPEND import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index 0fce463007674ac9d81b6482ea7726410c98384c..0ec5ae1d5b132f9b262cdd32eeff7a490eb64b0a 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 7d1eab37864206b11d2ed6419a5693af7568749f..493e643f49601de102f999d0d888bc211509ac83 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -18,6 +18,8 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; +import static junit.framework.Assert.assertEquals; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -26,7 +28,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java index db8064ae3ac533d40db2e542ef449a408dc4665d..29d2c19e14967a6d1697e199623d0efa9542160f 100644 --- a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; - import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java index d8f800d520bb9fddcd70b21a4d0e7edcc7bad841..adee6097fa1a87958a9f3cbf4934989903ae83f6 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,7 +25,6 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java index 706f3ce59349161032ac9bb8b579d4b692668058..f609373aa79a24b195abf1d27d730ec863c8d8df 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.android.settings.core.BasePreferenceController.DISABLED_DEPEND import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java index c2ed06f29cb83e52063633e8b93fa2df20ae602a..833a09d59b084d5e477b5fbcfb4559358f76b2ab 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java @@ -19,22 +19,32 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE; import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE; import static android.provider.Settings.Secure.VOLUME_HUSH_OFF; +import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.assertEquals; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.content.ContentResolver; import android.content.Context; +import android.content.SharedPreferences; import android.provider.Settings; - import androidx.preference.ListPreference; import androidx.preference.Preference; +import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; +import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; +import com.android.settings.search.InlinePayload; +import com.android.settings.search.InlineSwitchPayload; +import com.android.settings.search.ResultPayload; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -43,6 +53,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; @RunWith(SettingsRobolectricTestRunner.class) public class PreventRingingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index fefff22bff0767aa96fe386f32d18da4a6e8569e..8522229b8ebbea985e5ba1d12883fbf3057180d3 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java index de7b73c810f779d7f7f82c80db279f5bee485d61..78e8603655ca6ff286a1471f8b72a97afe08d0bf 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java @@ -23,33 +23,28 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowUtils; +import com.android.settingslib.core.AbstractPreferenceController; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) public class SwipeToNotificationSettingsTest { + @Mock private Context mContext; private SwipeToNotificationSettings mFragment; @Before public void setUp() { - mContext = RuntimeEnvironment.application; + MockitoAnnotations.initMocks(this); mFragment = new SwipeToNotificationSettings(); - ShadowUtils.reset(); - } - - @After - public void tearDown() { - ShadowUtils.reset(); } @Test @@ -61,22 +56,10 @@ public class SwipeToNotificationSettingsTest { @Test public void testSearchIndexProvider_shouldIndexResource() { final List indexRes = - SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER - .getXmlResourcesToIndex(mContext, true /* enabled */); + SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER + .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */); assertThat(indexRes).isNotNull(); assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId()); } - - @Test - @Config(shadows = ShadowUtils.class) - public void getNonIndexableKeys_noFingerprintHardware_shouldSuppressPage() { - ShadowUtils.setFingerprintManager(null); - - final List niks = SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER - .getNonIndexableKeys(mContext); - - assertThat(niks).isNotEmpty(); - } - } diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java index b140b52411cfdbd1a1cb7aaa60e1ab1b3ae502a6..a001a4a36a967f0a26d641bab4a6b47306baf82e 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java @@ -17,11 +17,15 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; +import android.os.UserManager; +import android.provider.Settings; import com.android.internal.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,6 +35,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; diff --git a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java index 5ba64c32748f16882d6106d614df42572b27d6f0..788d130d3d8507513b87f753396b0219423b4452 100644 --- a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java +++ b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java @@ -18,7 +18,6 @@ package com.android.settings.graph; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index b672e58967fd3c18b9b14e925c726cdd391ab01e..e5ecd6d2423af2e73ad372a2c89476e2d562ce78 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -19,9 +19,7 @@ package com.android.settings.inputmethod; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index 938171d53677a1c8c9271b0cdd94b3c67562d272..ca23fa5e8ce9fe7a73d57f7fb00f50c18ccd1768 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,9 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.hardware.input.InputManager; -import android.view.InputDevice; - import androidx.preference.Preference; +import android.view.InputDevice; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index 5a1a93b8858c589764f262709ed88f49e6e2ccc2..11b3c4bdff023573442e0fd07f7414ff73769055 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -17,17 +17,15 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; +import androidx.preference.Preference; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index 0c1e44e7cc30b03c661ebd953b9fa362336db8ef..c1a963cc6789d7be5c0867ed84161d101c3b7820 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -29,11 +28,10 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; -import android.view.inputmethod.InputMethodInfo; -import android.view.inputmethod.InputMethodManager; - import androidx.core.text.BidiFormatter; import androidx.preference.Preference; +import android.view.inputmethod.InputMethodInfo; +import android.view.inputmethod.InputMethodManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 954fd5c622ae415923031da3aa00f4ba9cc96069..9e18e06d2203646edbe2e1b2d53fee21071d7f3b 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -28,6 +27,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.admin.DevicePolicyManager; +import androidx.lifecycle.LifecycleObserver; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -41,8 +41,6 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.textservice.TextServicesManager; -import androidx.lifecycle.LifecycleObserver; - import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 83b29fcdb62ed878667cb8819fd195456fca5582..8b7e8a6db27a5fa1ad4fc9ba85a7d031e8ea3d05 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -17,14 +17,12 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.AssetManager; - import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java index 8101d404b420e2e2a773f48223073f40e178e49e..9d42088a6dbd31fda764913aac965bb495c95db0 100644 --- a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java index 76b76f5944da8555a7a9308209d61a262dfe4dd2..1b07f404e5170a7a1fff2fa9300a9c8277c99c81 100644 --- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -25,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.speech.tts.TextToSpeech; import android.speech.tts.TtsEngines; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index 9451092b0a3bff5ce91d8be91ffa31ed988053c9..c20a83e8c6b27edb57bfe707a119baeafdf3a8c7 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -19,7 +19,6 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.inputmethod.UserDictionaryList; diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java index 6903bcd0c9872e2f5a5af2b642fbcef3c44ab5ce..0e5a9f6ad7112c83b2d324aaec4b015e319b787b 100644 --- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java @@ -16,14 +16,12 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; - import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java b/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java index 504583773a2b6e84e3245ce1f46e3bccb56d47f2..fb999582e495f5de76f9c7be16dd917432205846 100644 --- a/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java +++ b/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java @@ -19,7 +19,6 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index 3302d2aae7b8bb9409a36d11989742987a8f1f64..43367fe9a15334e027eeba9b073586b59e0e1f86 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -16,9 +16,7 @@ package com.android.settings.location; import static android.Manifest.permission.WRITE_SECURE_SETTINGS; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -32,6 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.ActivityManager; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; @@ -41,11 +40,10 @@ import android.os.UserManager; import android.provider.Settings; import android.text.TextUtils; -import androidx.lifecycle.LifecycleOwner; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.wrapper.LocationManagerWrapper; import org.junit.Before; import org.junit.Test; @@ -64,7 +62,7 @@ import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowSecureSettings.class, - LocationEnablerTest.ShadowLocationManager.class}) + LocationEnablerTest.ShadowLocationManagerWrapper.class}) public class LocationEnablerTest { @Mock @@ -274,8 +272,8 @@ public class LocationEnablerTest { return intent -> TextUtils.equals(expected, intent.getAction()); } - @Implements(value = LocationManager.class) - public static class ShadowLocationManager { + @Implements(value = LocationManagerWrapper.class) + public static class ShadowLocationManagerWrapper { @Implementation public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) { diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java index 00d8adb2acd2b272f9711f61a4d4d8e12852068e..727e9a7e9bd8af76a600ac0940f238aad8c7310e 100644 --- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doNothing; @@ -26,6 +25,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -37,8 +37,6 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.location.LocationManager; import android.os.Bundle; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java index 58874be9a3089d872cf168aa3fd8873f21c6b51d..92fbeb9bf99c911668928b6a88995fb62f09bf4c 100644 --- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -25,13 +24,12 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index 66ea3be3f6b95e081ddba8b64ebbdbb0196c96fe..e96dd2fe96b3ab91894295ae757c062838ab6e74 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -17,14 +17,13 @@ package com.android.settings.location; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -33,8 +32,6 @@ import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings; import android.provider.Settings.Secure; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java index 9556b617ae48142a8f8e8c5170050a49024208d5..f3958f41d596325a5186f808235c48252ae7023a 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -26,13 +25,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; @@ -42,6 +40,9 @@ import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; +import java.util.ArrayList; +import java.util.List; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -51,9 +52,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import java.util.ArrayList; -import java.util.List; - @RunWith(SettingsRobolectricTestRunner.class) @Config( shadows = { diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java index 65b2e878d6adff5cd609c1d0e4f62ec9b485d95e..5e8180edcedd3ef25ef2eeaf179cfcfe70de94ac 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java @@ -8,14 +8,7 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; - import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -28,6 +21,13 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + @RunWith(SettingsRobolectricTestRunner.class) public class LocationSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index 475cb831544969387f022010d756eb14b7d2e1e3..bd36cfaebcca429875ca6a98e450df6d2a3f47b5 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -22,11 +22,10 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; -import androidx.lifecycle.LifecycleOwner; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index 3d3dd28aa61ebb051d204c576688266c795c1e40..9a69ad76a10ec0f590580446c9114d71c2a85e05 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.location; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; @@ -29,16 +27,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import android.text.TextUtils; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; - +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -46,7 +42,8 @@ import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; - +import java.util.ArrayList; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,9 +55,6 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import java.util.ArrayList; -import java.util.List; - @RunWith(SettingsRobolectricTestRunner.class) public class RecentLocationRequestPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java index a012c51c591f8a6753f8c00c35de675bdbe4639f..1614a6cc808ad23ab06aac51fe8a6be316d1abd0 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java @@ -24,10 +24,9 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings.Secure; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java index fa0b64958a6d0acee217e95fec17cdf7288042ed..6279adfc78308270e48a2383752c3d4136a484a3 100644 --- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java @@ -16,14 +16,12 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; - import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index 91a545c595d702d42c5c2dd01a89c725ae7228e1..2bdad8287a22df810e2d5f22fb0f742d8eb004c0 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -17,26 +17,24 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.ContentResolver; import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; import android.provider.SettingsSlicesContract; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java index 09d1269f8013ec4cf5081ec94186af68c60f4204..e81bd821c444b8332f796e52cf39a1e38f7c8085 100644 --- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java +++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java @@ -32,16 +32,15 @@ import android.content.Context; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.SwitchPreference; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import androidx.preference.EditTextPreference; -import androidx.preference.ListPreference; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.SwitchPreference; - import com.android.settings.R; import com.android.settings.network.ApnEditor.ApnData; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index f27368e242beadebad75b711c3f4c23b84e412e4..11eea6dc21da3bd1547119b2d55dd9fb4ecd9164 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.network; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -27,17 +25,16 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.net.ConnectivityManager; import android.os.UserManager; import android.provider.Settings; import android.provider.Settings.Global; -import android.telephony.PhoneStateListener; -import android.telephony.TelephonyManager; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.telephony.PhoneStateListener; +import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java index 6ef798b87f7641a59074d38e27df9253484b36d9..06e334af8865afad8169ebc5670e09cf72b995a9 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; - +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -25,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.SearchIndexableResource; +import android.view.Menu; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; @@ -37,6 +38,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import org.robolectric.util.ReflectionHelpers; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java index 8b0fe98568dc6c6effa04480d9279a849d32babe..3a1833b2baf745de36625f7e22dfdb7a022914e5 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java index 35431a092157bcfc2992a457933ea1bf389743ee..92994e01ee34abf41611aa5cd7ca9bdb25ed77d9 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java @@ -17,7 +17,6 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java index 7b940456c05c5a414c5cf8ee2145f7c74fd47c4b..f6e40245177594929dc54a13767aad2f59174780 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,7 +25,6 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java index 83fa55cfe0aee0f597e3032231b745226a3e2373..8a47a80c2718f2dcb4045cdd7fb62d91605ace7d 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -16,7 +16,6 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -29,7 +28,6 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; - import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java index 76e7bcbf29b7c34b5a82fec3529ced95b74d7f81..72f36c66989fc6c047075f3acd3e9e8aac91faeb 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java @@ -20,14 +20,15 @@ import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.AlertDialog; +import android.app.Fragment; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; @@ -39,16 +40,16 @@ import android.widget.Button; import android.widget.LinearLayout; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowOs; import com.android.settingslib.CustomDialogPreference.CustomPreferenceDialogFragment; +import com.android.settings.testutils.shadow.ShadowOs; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index 0e308b2a059e6db1f03e68cb313d80eddb0346c8..eff20d34857553e6979c53e71d896deca02d3ebf 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -16,19 +16,17 @@ package com.android.settings.network; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME; import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; - -import static androidx.lifecycle.Lifecycle.Event.ON_START; -import static androidx.lifecycle.Lifecycle.Event.ON_STOP; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.atLeastOnce; @@ -36,20 +34,21 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; +import static org.mockito.Mockito.when; -import android.content.ContentResolver; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; +import android.content.ContentResolver; +import android.database.ContentObserver; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.LinkProperties; import android.net.Network; import android.os.Handler; import android.provider.Settings; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -67,6 +66,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; +import org.robolectric.shadows.ShadowServiceManager; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index e800cdd76381bdb2dd52440d8e95581125f66698..5bf675e91b0c8781d41f08f0be875b62d979800f 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -34,7 +34,6 @@ import android.content.IntentFilter; import android.database.ContentObserver; import android.net.ConnectivityManager; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index 11541ed2ab276d38fbed7118c777889cbf68860f..0455d9fbdfa9e0e159d6912fffbca0252f5b53e4 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -16,11 +16,9 @@ package com.android.settings.network; +import static com.google.common.truth.Truth.assertThat; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; - -import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -28,6 +26,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.net.ConnectivityManager; import android.net.IConnectivityManager; @@ -35,8 +34,6 @@ import android.net.NetworkRequest; import android.os.IBinder; import android.os.UserHandle; import android.provider.SettingsSlicesContract; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java index e3fc843a9b09ceff9a8dc4ea6927751e7976277f..0abd428d0270d1063a46eff6b92dc3c130fa2af5 100644 --- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java @@ -27,7 +27,6 @@ import android.nfc.NfcManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java index 5efa94aaa98fa4bb41536a7c62ef986d45318e61..9e7e4f4df0812c994b396dd6ce05c3e927c0ce5a 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java @@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.nfc.NfcAdapter; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java index 7938ad11c7e2b9ffe4224a5ef2345e4569c3dd5b..4d40b122368b3265674f1213b146114ac6bbec39 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java @@ -17,14 +17,12 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java index 026f392a5f315ce3f968ad9caa2ff72a2f118137..f65866a4a000208198b235e53783c26dcda0a7e4 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java @@ -27,7 +27,6 @@ import android.nfc.NfcAdapter; import android.nfc.NfcManager; import android.os.UserManager; import android.provider.Settings; - import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index d57993262f54a17750f8d8e5738ee481fb0338bd..6feed46dc126f5380a1a318130edeae5f092dc7f 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -18,7 +18,6 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java index 6537a405c766d6d705c7364cf6f697ded57f612d..2f383fe3c606e683ed6138f3d7c032301c8425f1 100644 --- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doCallRealMethod; @@ -28,7 +27,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.accounts.AccountRestrictionHelper; diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java index 517c94b9fe77d5c47d2470accde59741f4dfcd04..4f48b779b6c9272814263d6620f430bc59373829 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java index a9df13569e2118edc640b34137efc9c8f524661c..d89897282f2667ebe0447da2e61bfd180df5935b 100644 --- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java @@ -20,10 +20,8 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -37,7 +35,6 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java index 83c0b06b8ac6eb99ae940677588119c6903f406a..84407eb2acc7a7da8d7ef79d3926f8a3d704e336 100644 --- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java @@ -19,10 +19,8 @@ package com.android.settings.notification; import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -33,7 +31,6 @@ import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java index dc368a254b625321c049528edc20dfad6d1eadcd..96dbd623a7890cf38c9c4342bbfec831903a240a 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java @@ -21,10 +21,8 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -39,7 +37,6 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java index 2a404d6e888cb67c9185d92ba4246ed761dd929a..68991246ae10915e064763aaaf59073d3b291bd8 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java @@ -22,7 +22,6 @@ import static com.android.settings.notification.BadgingNotificationPreferenceCon import static com.android.settings.notification.BadgingNotificationPreferenceController.ON; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,7 +29,6 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java index c77fbad34a953929ca4f704e8c5fab9315ba7988..a13946e775e1d8a908240963307baf1766d95917 100644 --- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java @@ -22,11 +22,9 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java index 0aa94c7c1ab3c2046404252bc3273da0cfdee380..f2e50e9f6fc84363ccc89f4a68666456ee869951 100644 --- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java index c3c0a33b0efe96dcc6de89bbedb878fe790dfd17..f20409a6abde98629c5e4d9108584af5f7fc9487 100644 --- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index ceffe28e852b6389b595df65fe622993aab5738d..894ec07a8d5b4069f3433a70b9a52e8e08b03a37 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -26,9 +25,8 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java index 4f813bd963b3827535ba313126d0bb8d33c499a1..5f3a616a2732f98c86311e224ab3804c74c9af60 100644 --- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; @@ -31,7 +30,6 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java index 0d82fcb60896f6f47c8996279b941b54d799a3a5..8901a5df17c6ba3598a3f07015e2eee451425e2f 100644 --- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java @@ -18,10 +18,8 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -32,7 +30,6 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java index 84ed1345e2aee6c9b18517380d6523f8331b2885..881a307c88c3494caadcb8a38aaf9f006e155356 100644 --- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,10 +24,9 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.System; -import android.telephony.TelephonyManager; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; +import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java index e086e7fc64f508317cf683e80a07a4c4e50a14b1..9f90e2689617e0289fcba739bfeddcfb672190c2 100644 --- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java @@ -17,13 +17,12 @@ package com.android.settings.notification; import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; +import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -36,13 +35,13 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java index 451b78548a2d5a523ec360fe44c937b700829734..74ace1dd76440ac13bc895cbfd1c2926e911461a 100644 --- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -27,7 +26,6 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; - import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java index ade8bce631d08b86d37b61f702c9cad7a1a5dbc5..3afb343f9063c3a91235a72da6ef5f126e294ce7 100644 --- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -26,9 +25,8 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java index ef382111ce2d55b8f46e57aa8208f050e167a904..93273c862759c21fb4a25f15fdcaf3693b9dd5ae 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.eq; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java index 36b988453050a5ae49aaaf758661bcf88a5978f1..0dba467779b558cf2b2deca632b5747afdb225c3 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,10 +24,9 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import android.telephony.TelephonyManager; - import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; +import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java index cc35f6027973746cb5bdc236fd577a63ab9c6ac8..26f516508bca284cb213473e6fdeca68710c0df8 100644 --- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java @@ -17,10 +17,8 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -33,9 +31,8 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.view.View; - import androidx.preference.PreferenceFragment; +import android.view.View; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java index 0c706fbdaaf16d40d9cb109b35ff4ef739c61e52..5557cfd6dfd60cbdad1f5c12ad0478a3ad03708f 100644 --- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java @@ -20,12 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; - import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -36,10 +34,9 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.RestrictedListPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java index c2768259a32595dc3566b03a7e77941dfb3bde20..02b85e11cae8245332848be14d3958434b9042d6 100644 --- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java @@ -21,10 +21,8 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -38,7 +36,6 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java index af810ace4780500d7b5bd1e869692dd09794f3a3..0d493150f3cc6bd80eec3ca884c2226ffc82f513 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java @@ -17,19 +17,17 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.Switch; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java index c897fb54706b46c37dd30ab5cabda942e52b20cd..7eeee98982c727b2fa8a5504dc2eb016008e71b1 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java @@ -22,10 +22,8 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; @@ -39,7 +37,6 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java index cd3fad716288f24be7024fa1dc7dffeb92e757c6..9d805e8785dea93ab60259b3ab72446a32122eb8 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java index 65c60c7222b5143547c79b0568d027bf7cca68de..e429f9a292831e85c2a344fffe233b3b1dc987b1 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -29,7 +27,6 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java index 7a98386ea2485d79940ed17780553e1a95d26b12..98cbc76dc5888f487247427ac4a54985358313bd 100644 --- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java index 1cd98477238002b86c47e21279720655305cd212..119f5835bba6ee0f3d474106447e896da52f98d2 100644 --- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java @@ -17,16 +17,13 @@ package com.android.settings.notification; import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java index 71bc15c6982a1c1f999d6ddc106890dfcf14101b..9dd077f092f850a0f7eac3f30a2d72ee7f27030d 100644 --- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -41,11 +40,10 @@ import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; import android.service.notification.NotifyingApp; -import android.text.TextUtils; - import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java index 50a01bc89dc341d3222e816a85a049c57e389427..65bc7e6c40e433151336e63ea3f880e0db34c7fb 100644 --- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.app.NotificationManager; diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java index 3bd3292789507da992bca9d5a3792b07b76592ef..c6b055b04b9898ed39e25c93b5c2ff064566dc28 100644 --- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java @@ -17,14 +17,12 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; import android.media.RingtoneManager; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java index a1c6d99b4c1fdb2fc842cc746b10f2803a550443..4e91eafe2fe87538f07225cb1a1cb1f8eae1f22c 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -26,9 +25,8 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.System; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java index 5b43508f2d243778f6d7c7933e461809d3853a0f..38e91a4c9a66944d9ba7a04c2daa82b9339389e9 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,7 +27,6 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; - import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java index 3fc563a3a8e754c341134d35123a73ad7d0a2528..b98a68fadf34432700b355505d3f5e83d7cf140c 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java @@ -20,10 +20,8 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -42,10 +40,9 @@ import android.content.Intent; import android.net.Uri; import android.os.UserManager; import android.provider.Settings; -import android.util.AttributeSet; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.AttributeSet; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java index 3510a60eb1fa592fac70512663575a861016d2f1..4eef4b626fba15c973a4cda6fd8da469a40b8baa 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -27,8 +26,8 @@ import android.content.Context; import android.media.AudioManager; import android.os.Handler; import android.os.UserManager; -import android.preference.SeekBarVolumizer; +import android.preference.SeekBarVolumizer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java index 9bb380df01e5fa8747bcf62a997028afe54da332..622d5cd89672596eb3feffe3afd3281aa5e7c8ce 100644 --- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java +++ b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java @@ -16,7 +16,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.ComponentName; diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index 6c77b10909b036241f97c5ebb1c6ab32a0093142..8dd8f2453ba21271cbb8a827b9564e6083f8e7f9 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,9 +26,8 @@ import android.content.ContentResolver; import android.content.Context; import android.media.AudioManager; import android.provider.Settings.System; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java index 8c0bb456a4d124ac85352b25c5d936cbd5f28940..c391c1344ba39ffb054330e1c8bd7647dcbc51e6 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -26,9 +25,8 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Vibrator; import android.provider.Settings.System; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java index aa1824d7d53e022adaf26ffc2b2b2e5dac23861e..82357d8f6bc3566ddb2a07a0eb83afb5124dfd3b 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -30,11 +30,10 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.telephony.TelephonyManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; +import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java index 69438e221ec18f7450439cda7b75765944f82687..ce908952a86c71c8f0218c5f431656abe3d69379 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java @@ -20,10 +20,8 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -37,7 +35,6 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.os.Vibrator; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java index b9f9021e74cab74f2ade6c105ffb4f0a0619ccf5..fbc251206dcdef44f97eddc4ba177ba0bbd3b694 100644 --- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java @@ -23,10 +23,8 @@ import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -210,6 +208,31 @@ public class VisibilityPreferenceControllerTest { .contains(String.valueOf(VISIBILITY_PRIVATE))); } + @Test + public void testUpdateState_noLockScreenNotificationsGloballyInProfile() { + final int primaryUserId = 2; + final UserInfo primaryUserInfo = new UserInfo(primaryUserId, "user 2", 0); + when(mUm.getProfileParent(anyInt())).thenReturn(primaryUserInfo); + + Settings.Secure.putIntForUser(mContext.getContentResolver(), + Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, primaryUserId); + + NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + NotificationChannel channel = mock(NotificationChannel.class); + mController.onResume(appRow, channel, null, null); + + RestrictedListPreference pref = mock(RestrictedListPreference.class); + mController.updateState(pref); + + ArgumentCaptor argumentCaptor = + ArgumentCaptor.forClass(CharSequence[].class); + verify(pref, times(1)).setEntryValues(argumentCaptor.capture()); + assertFalse(toStringList(argumentCaptor.getValue()) + .contains(String.valueOf(VISIBILITY_NO_OVERRIDE))); + assertFalse(toStringList(argumentCaptor.getValue()) + .contains(String.valueOf(VISIBILITY_PRIVATE))); + } + @Test public void testUpdateState_noPrivateLockScreenNotificationsGlobally() { Settings.Secure.putInt(mContext.getContentResolver(), diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index 99a97c342e24e03bbbc402569b36a73e254ec05a..7b9af3e9a346b73da4e460e8294e938a8ee1f136 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -26,7 +25,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index 4397e71c653f2eac97ef119bfb96b9f72d6d17d4..eb6adfc71e9f326940fbabca17924a3bd60928e4 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -29,12 +28,11 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import android.telephony.TelephonyManager; - import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; +import android.telephony.TelephonyManager; import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java index c679205ee1e25136921cc4488de70bfec6e4affb..40dfc4105e7e3a433c467d70ab3b0728b74ee707 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java @@ -22,14 +22,18 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; +import android.widget.LinearLayout; import android.widget.RadioButton; - -import androidx.preference.PreferenceViewHolder; +import android.widget.Switch; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.widget.MasterSwitchPreference; +import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java index 81ed5ef0bd41d74b58d96de6ee0e552499edd07b..8c7c32608cb459b3096c918cd2f1ca5b20e7193d 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java @@ -34,7 +34,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; - import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java index 7caccf2d2fc2be0e62c8931929a833ea0e49ecfa..4325594ebcf5d55234fe63913a7eec2e7ad20a19 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,9 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java index 2dd286d82df5be2d5f7d11b4244edf48fa9541cf..552361a57840781c74fa5c6ad17c397cfd258225 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static junit.framework.Assert.assertEquals; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -26,7 +25,6 @@ import android.app.Fragment; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; - import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java index f1f1b2ea488d9b49c7e8d277bd64b37b66968aa8..b3a4b90b09893e5660592ba29b0c5a6edc359743 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java index 4170ee89f198249fd65e01c793fbcbaba7a6b3d0..0bf82144260fc7f24560463c59b33b5e534ac7d4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java @@ -21,10 +21,11 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; - import static junit.framework.Assert.assertTrue; - +import static org.junit.Assert.assertFalse; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,10 +37,9 @@ import android.content.Context; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; -import android.util.ArrayMap; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.ArrayMap; import com.android.settings.R; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java index 11cdfcc2697599af6064f65e4211a54d00f94734..e30fc71eff153be7cf74fdc6c00aefcd01692f5c 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java index c854e8ad357a47fb91fddab92207fbf0658f1a9e..d3fab8fdf26cfe9b41c9840a6d04f1a3e0c9b623 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java index 320b5f91d09ff82f48b32e7e81e967b09fa980d0..10bd641cfd14c8804cc2843f1cb8787e618b48ff 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,11 +30,10 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.view.View; -import android.widget.Button; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.view.View; +import android.widget.Button; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java index 3093b6a0c0fb4f6eaf4e0d24ac666df6179b801b..8ecc9551feb2197127c06cac292c2ce89a37de18 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java index 5c55765942e1a7d4c7eb203319e1be82fa5431bf..c03e95b672e59604d5b1684636fc7c6a91c7f445 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -39,6 +38,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java index 7d5efa7c0651af6a237a35bc2b45abf0b644f58b..c0f6768bc687d992037276ac8dc496e7fed6e971 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,9 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java index f5eca34bf62a77b622d21515d6b567bfd0a730fd..870981468e431ccbbf4f05485d46adeda38aafe4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,9 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java index 37ffd78611807c2e2ec381f4d9e737826f86b2e2..dd4b408e525b31b3470fe31ae58adb65d4294ee4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,7 +28,6 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java index aaa4d0ed30676cfd46085c41cc38a463ce06eff4..3ea4471fadcd8f9e5deb22cdbbc6cf4964c18e06 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -28,7 +27,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java index 4ddb5fca455cc5354ae54c67fd1cba7ea886a3ee..2e7f35cbf59dc396b891c07733a16f8df5ede53b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,9 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java index 4518427ad6cb0dd3c06a6d7a6fd51dd90ca0abf5..cb79d649f89010e0485c9163921350f0d1e40bb7 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,9 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java index 559ba72ec71bf82852f407defbbbc3183d597f2e..23b242a2fa0f0c9ab8c8de9f0d3bebb125ca1202 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java index b6efd78dda7892547bdb6be5073ad32806cd43a7..fcf54ead81400ebb40afa05637b3f36e5ce0acf4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java @@ -21,9 +21,7 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; - import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -38,10 +36,9 @@ import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; -import android.util.ArrayMap; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import android.util.ArrayMap; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java index 96e565829950379f75c7c29fa4e86bc607b03813..39e9271fa2fcea97fd3077b96c841f32a408ecf4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static junit.framework.Assert.assertEquals; import android.app.NotificationManager; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index bfc5c428f0583ea229084c8d32cef4c602f4fcdf..e3ba8033922c5b731d942b96e57a9000b0cb1fce 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -29,13 +29,7 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.provider.Settings; - -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; +import androidx.core.graphics.drawable.IconCompat; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -50,6 +44,13 @@ import org.robolectric.annotation.Config; import java.util.List; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + @Config(shadows = ShadowNotificationManager.class) @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java index 3926a45d96eba4dee3af3ecf6a42b9055da4fd19..754e66dbfff6316065b4042d2dc87d1958506467 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.app.NotificationManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java index 418af7880b39081ca203a55bf64f14b5396ae85e..54d6afec612bfbc56250bc9748edbad884fbcd7d 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java @@ -21,6 +21,8 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; +import static junit.framework.Assert.assertEquals; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,9 +31,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - -import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,8 +42,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; +import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java index 71720bfaffe1e285567f6629a000084768c1599c..2fb747e4b88f48688f91da6ea74a085402e7ce31 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java @@ -21,8 +21,10 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; @@ -34,13 +36,13 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; import android.content.res.Resources; - +import androidx.preference.CheckBoxPreference; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.DisabledCheckBoxPreference; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settings.widget.DisabledCheckBoxPreference; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java index 3cada1ed7930aae3fcf91acfacdc7cd4df82e275..a20b7e16d14fdbf229d403997706ff37dcab6155 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java @@ -30,18 +30,23 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent .ACTION_ZEN_SOUND_AND_VIS_EFFECTS; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.widget.DisabledCheckBoxPreference; +import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java index f3658823a4330f6ffd6ef5cf656ec8a61d4ff400..9f8e91ac7a414b6eea023e3cb7c88a712d12f0ff 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java @@ -26,16 +26,21 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OF import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_CUSTOM; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent + .ACTION_ZEN_SOUND_AND_VIS_EFFECTS; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java index 08384af610a2f6a67d95c3f3912e3d83aa478a9a..fd22166563bd575703f4778087e2fea56b716877 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java @@ -29,19 +29,23 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BA import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_SOUND_ONLY; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.widget.DisabledCheckBoxPreference; +import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java index 87cb781170f35150cd08ea1fb8502305e5076958..609b3a5ce87e75a8b26111867589a07c9fc19939 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index 3a05e77eb6842dceb69bc7a5acfad3520fb8813c..75b6bb4b14ac94591e53b1072b37aed60089561f 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -17,7 +17,6 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.RuntimeEnvironment.application; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index 575f08c699d62d4e858041386d20e69bfcb67596..e07351cd34a73b190a8b4a17212ff134f677e2ac 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -17,7 +17,6 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.RuntimeEnvironment.application; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index 5d51178b65ccec64bff78ac03508c6a2d9c8d470..2a8c406551b8c8e0a34433da2b9d6f40f2d4ea4d 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -1,7 +1,6 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java index 836311757c41518af3424ea282402a73111be055..9d72bd883da2d0c178c474bba8a91a9b4022039b 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -17,7 +17,6 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.Shadows.shadowOf; import android.content.ComponentName; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index a15fc2f6d0be1e5b5446aaee8b755dbed1a570fe..b5572574d6831c178088fac64dc8fa53de0af22c 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.password; import static android.content.pm.PackageManager.FEATURE_FINGERPRINT; - import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment .HIDE_DISABLED_PREFS; import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment @@ -25,9 +24,7 @@ import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericF import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE; - import static com.google.common.truth.Truth.assertThat; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index ded379b53582cfd4d700f57a9b9a62a3221c49aa..cef18741401b2a7fa74150f37c6d4c254643f5e0 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -17,7 +17,6 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.Shadows.shadowOf; diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java index 51988ff975e18ed14559111b8a82395ad9bdf01f..1b48da80c5135181528f54050d0a6c66fc0dc6ba 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java @@ -18,14 +18,13 @@ package com.android.settings.print; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; import android.print.PrintJob; @@ -33,8 +32,6 @@ import android.print.PrintJobInfo; import android.print.PrintManager; import android.printservice.PrintServiceInfo; -import androidx.lifecycle.LifecycleOwner; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java index 27f902a2baa0f8b2ef3cac5b6ad45e408e8ab3ae..df60654c1f006ec0f0313e7702589f2e648e81ee 100644 --- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java @@ -17,7 +17,6 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java index ff82fa32f150100fbe8fbeba9548c17bb995d626..e99b0ea4aaa4063fee51d024cf2c6676d8755a00 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java @@ -18,7 +18,6 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java index ebba3f310ce9ae57e6f6b3d948c2f60372b1e615..b49ef1d0683efef60e5f78b72990de0301dfd3c1 100644 --- a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java @@ -15,7 +15,6 @@ package com.android.settings.search; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -23,27 +22,42 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.job.JobScheduler; +import android.os.Binder; import android.provider.Settings; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.shadows.ShadowBinder; @RunWith(SettingsRobolectricTestRunner.class) public class DeviceIndexFeatureProviderTest { + @Mock + private JobScheduler mJobScheduler; private DeviceIndexFeatureProvider mProvider; private Activity mActivity; @Before public void setUp() { + MockitoAnnotations.initMocks(this); + ShadowBinder.reset(); FakeFeatureFactory.setupForTest(); mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get()); mProvider = spy(new DeviceIndexFeatureProviderImpl()); + when(mActivity.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler); + } + + @After + public void tearDown() { + ShadowBinder.reset(); } @Test @@ -51,7 +65,7 @@ public class DeviceIndexFeatureProviderTest { when(mProvider.isIndexingEnabled()).thenReturn(false); mProvider.updateIndex(mActivity, false); - verify(mProvider, never()).index(any(), any(), any(), any(), any()); + verify(mJobScheduler, never()).schedule(any()); } @Test @@ -62,19 +76,17 @@ public class DeviceIndexFeatureProviderTest { mProvider.updateIndex(mActivity, false); - verify(mProvider, never()).index(any(), any(), any(), any(), any()); + verify(mJobScheduler, never()).schedule(any()); } @Test public void updateIndex_enabled_provisioned_shouldIndex() { Settings.Global.putInt(mActivity.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1); - JobScheduler jobScheduler = mock(JobScheduler.class); when(mProvider.isIndexingEnabled()).thenReturn(true); - when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler); mProvider.updateIndex(mActivity, false); - verify(jobScheduler).schedule(any()); + verify(mJobScheduler).schedule(any()); } @Test @@ -87,12 +99,22 @@ public class DeviceIndexFeatureProviderTest { Settings.Global.putString(mActivity.getContentResolver(), DeviceIndexFeatureProvider.LANGUAGE.toString(), DeviceIndexFeatureProvider.INDEX_LANGUAGE); - JobScheduler jobScheduler = mock(JobScheduler.class); when(mProvider.isIndexingEnabled()).thenReturn(true); - when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler); mProvider.updateIndex(mActivity, false); - verify(jobScheduler).schedule(any()); + verify(mJobScheduler).schedule(any()); + } + + @Test + public void updateIndex_enabled_provisioned_differentUid_shouldNotIndex() { + Settings.Global.putInt(mActivity.getContentResolver(), + Settings.Global.DEVICE_PROVISIONED, 1); + when(mProvider.isIndexingEnabled()).thenReturn(true); + + ShadowBinder.setCallingUid(Binder.getCallingUid() + 2000); + + mProvider.updateIndex(mActivity, false); + verify(mJobScheduler, never()).schedule(any()); } @Test @@ -102,12 +124,11 @@ public class DeviceIndexFeatureProviderTest { DeviceIndexFeatureProvider.setIndexState(mActivity); Settings.Global.putString(mActivity.getContentResolver(), DeviceIndexFeatureProvider.INDEX_LANGUAGE, "new language"); - JobScheduler jobScheduler = mock(JobScheduler.class); + when(mProvider.isIndexingEnabled()).thenReturn(true); - when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler); mProvider.updateIndex(mActivity, false); - verify(jobScheduler).schedule(any()); + verify(mJobScheduler).schedule(any()); } @Test @@ -120,11 +141,8 @@ public class DeviceIndexFeatureProviderTest { // Same build and same language DeviceIndexFeatureProvider.setIndexState(mActivity); - final JobScheduler jobScheduler = mock(JobScheduler.class); - when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler); - mProvider.updateIndex(mActivity, false); - verify(jobScheduler, never()).schedule(any()); + verify(mJobScheduler, never()).schedule(any()); } } diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java index 43ce96611d02eb184b3dfac80b2944bc3494e924..1c02b99323d17d7e5f3038bab479b1ef056759a0 100644 --- a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java @@ -16,6 +16,7 @@ package com.android.settings.search; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -29,10 +30,6 @@ import android.app.Activity; import android.content.ContentResolver; import android.net.Uri; -import androidx.slice.Slice; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceViewManager; - import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,11 +37,17 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import org.robolectric.Robolectric; import java.util.ArrayList; import java.util.List; +import androidx.slice.Slice; +import androidx.slice.SliceViewManager; +import androidx.slice.SliceMetadata; + @RunWith(SettingsRobolectricTestRunner.class) public class DeviceIndexUpdateJobServiceTest { private static final Uri BASE_URI = new Uri.Builder() diff --git a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java index ffa04ecb8ddd3140bf0eedebd2e4b2f3c395ed3c..cbd68c0471203e62c254a9c392292e66f1944b9b 100644 --- a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java @@ -1,7 +1,6 @@ package com.android.settings.search; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; - import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java index add0a90202f3b6ebd00a97e67764d08c856e96f6..eb6ad6e970cc44f2afbff45cc5ad733c30599c07 100644 --- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java @@ -18,7 +18,6 @@ package com.android.settings.search; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; - import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java index 974bee07e95ab337426e9ab460f6020ce2362b48..38d90e4cfd148b7f09465d4d26de072597d09a60 100644 --- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java @@ -18,7 +18,6 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; - import static junit.framework.Assert.fail; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index eddffba82e9b2e7fde1eb5925bd78f51f04b9ce6..eeebdee96e3a760d5ea8bafb4df78d8f8836911c 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -18,7 +18,6 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index 36a0dc9f8aae65e03409b8279898dfade08dad17..eff95fe327fd408640ce56eab96431b67420d9a6 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -17,11 +17,8 @@ package com.android.settings.search; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; - import static com.google.common.truth.Truth.assertThat; - import static junit.framework.Assert.fail; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java index 89d3ac0fe4a07d44ed6e3bf94327c3aa97998307..f6e14735b37a4c4d716b2c0c08b155b7906f0b10 100644 --- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java @@ -1,7 +1,6 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java index 8d29898aabe6aeb300469293e4a3bcb709f74af5..620cb0c0ed9bd869d3a7f3cbdc98b5c1d87fec4a 100644 --- a/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java @@ -17,10 +17,6 @@ package com.android.settings.search.indexing; -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.spy; - import android.content.Context; import android.provider.SearchIndexableResource; import android.text.TextUtils; @@ -44,6 +40,10 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; + @RunWith(SettingsRobolectricTestRunner.class) @Config(qualifiers = "mcc999") public class IndexDataConverterTest { diff --git a/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java index cb78e8c2fd436132a4db84a0ff60cf44a0c01a22..18f05b694296dd4baa252064ce132b0ab492e2df 100644 --- a/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java +++ b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java @@ -18,7 +18,6 @@ package com.android.settings.search.indexing; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java index 18375908a3254a14df7b82a8b1058e6f78f05d85..6cc1704bf397aca339c2f1a575165e65350ab9c4 100644 --- a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java index ebe420512be420db3dca354fdb76f29135235fcf..493c166b14ecb1dc1c456da0a80ecabc0459b781 100644 --- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java @@ -19,7 +19,6 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; import android.content.Context; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java index 45555755255fab7b8f35422d370566a90f216222..6e49f1e394990b127a7674c112d07751cf8404e3 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java @@ -17,9 +17,7 @@ package com.android.settings.security; import static com.android.settings.security.EncryptionAndCredential.SEARCH_INDEX_DATA_PROVIDER; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index ee9fb16d1fa0959df663c42dda5de0451b5c0b3b..944f9fd4e60962806e0cbff63fc62dc88b116dfd 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -16,16 +16,12 @@ package com.android.settings.security; -import static com.android.settings.security.EncryptionStatusPreferenceController - .PREF_KEY_ENCRYPTION_DETAIL_PAGE; -import static com.android.settings.security.EncryptionStatusPreferenceController - .PREF_KEY_ENCRYPTION_SECURITY_PAGE; - +import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_DETAIL_PAGE; +import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_SECURITY_PAGE; import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.UserManager; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java index fb6503eaccc2f5194a820501baabee6e526b6cef..728fda65ab266016eefca074092fdc94cc41e571 100644 --- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java @@ -17,14 +17,12 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java index cf8bc14a71e5a4e8ea5573ca2c78fb208208e93a..3feb4a9252552f4d98dcddbca71089cf1619240c 100644 --- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java @@ -16,14 +16,12 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index 6533ae4888780e5f582402b744c42017fa23d563..5568553b7c9d243ff21baf66b9ceac506a4a6da8 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -30,7 +29,6 @@ import static org.mockito.Mockito.when; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; - import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index 6bd5e1fc34d9abbac14e4ceb312d49d00ea023f3..b41ec461a08c4bdfd3d62a4d1e1fd733ac3188c7 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; -import androidx.lifecycle.LifecycleOwner; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java index 1851ed52afbd2947df45f0909eb9152beaaf5bcd..e8906cba15e1a97d80b10204cea271b9cf485b9f 100644 --- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; - import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java index 6b968e6f195da5a10852ab41bd8f3e53c0406f76..5928587798de81337d27994e331fbcfa54be1702 100644 --- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,7 +24,6 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index f20587db2ea8fd903ebc74ae09a15ec35f2a394a..4a12c5a2397717cdc5635b545f424dacbba3756c 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.security; import static android.telephony.TelephonyManager.SIM_STATE_READY; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -27,14 +25,13 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.PersistableBundle; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java index 08fdd7d5e5165ca1e27c74f31f73f56c562e4d5c..1d65aed2015b92581a0dcea2696557188a1aa25c 100644 --- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java @@ -19,23 +19,19 @@ package com.android.settings.security; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; - import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; import android.os.UserManager; -import androidx.lifecycle.LifecycleOwner; - import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java index 0c7f3853442a5c7dc44945d3c113423952d76e70..2a4b335cfa39d8c901278cc93449353685e1d545 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.security.screenlock; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java index 6348bf2b9b8e39784bfa1937ef618537b4885657..fc555c4502ac0dd193f7dca64c41784dd5414a58 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -18,22 +18,17 @@ package com.android.settings.security.screenlock; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; - import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; - import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java index 9d7a5071bf46a782e5d569860c4bb3523c476e74..0b5d29d9284313961ad6b3235424134758537a62 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java @@ -17,13 +17,11 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; - import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java index 028145584d1b249b8d754dea49c9744ee1660d7a..c30c53ebb885b78f3957085f2b5e0e75a42ef36c 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java @@ -17,13 +17,11 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; - import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java index 6d378ef3d8907090657e000fbb11c10ac5235417..c1d7dd2479191897d001237f470790f52f993239 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java index 07269bf644837b5f2a9f2ef44b3be8ecf4c393ce..eedb2da4c07974bf538cc2121e70be412d2e7b3d 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java @@ -17,12 +17,10 @@ package com.android.settings.security.trustagent; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; - import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java index d8ace148292f767e2adc4b4c05183aca9eda5551..94298be696d57e5ec940e1220e901641e3d04562 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java @@ -16,13 +16,9 @@ package com.android.settings.security.trustagent; -import static com.android.settings.security.trustagent.TrustAgentListPreferenceController - .PREF_KEY_SECURITY_CATEGORY; -import static com.android.settings.security.trustagent.TrustAgentListPreferenceController - .PREF_KEY_TRUST_AGENT; - +import static com.android.settings.security.trustagent.TrustAgentListPreferenceController.PREF_KEY_SECURITY_CATEGORY; +import static com.android.settings.security.trustagent.TrustAgentListPreferenceController.PREF_KEY_TRUST_AGENT; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -31,10 +27,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java index 668734e14d2865ffff077f618616aff878843207..9cee3d1f1192d8269781abd61836351b7cfac2f0 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java @@ -17,7 +17,6 @@ package com.android.settings.security.trustagent; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.pm.PackageManager; diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index f139720c90caea27b5662a43951d45ade5d34102..21bef6131c97995d3b27674038784a5061dea1d1 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -18,9 +18,7 @@ package com.android.settings.slices; import static android.content.ContentResolver.SCHEME_CONTENT; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -38,8 +36,6 @@ import android.os.StrictMode; import android.provider.SettingsSlicesContract; import android.util.ArraySet; -import androidx.slice.Slice; - import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.location.LocationSliceBuilder; import com.android.settings.notification.ZenModeSliceBuilder; @@ -67,6 +63,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import androidx.slice.Slice; + /** * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider) */ diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java index 1353bc714c8390e1095eea4f01b0cab60f446993..25f0d0cb1630dba81b396ffbe9e58056d8020a11 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java @@ -19,6 +19,7 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -39,11 +40,11 @@ import android.util.Pair; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.BasePreferenceController; +import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.FakeSliderController; import com.android.settings.testutils.FakeToggleController; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java index 24979085cf6fb511869b15fd043f58e156bb2341..96e475e9fbed07c4c961f5808a611b718034a4e4 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import android.app.PendingIntent; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -33,10 +34,6 @@ import android.provider.Settings; import android.provider.SettingsSlicesContract; import android.util.Pair; -import androidx.slice.Slice; -import androidx.slice.SliceProvider; -import androidx.slice.widget.SliceLiveData; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -53,6 +50,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.robolectric.RuntimeEnvironment; +import androidx.slice.Slice; +import androidx.slice.SliceProvider; +import androidx.slice.widget.SliceLiveData; + @RunWith(SettingsRobolectricTestRunner.class) public class SliceBuilderUtilsTest { diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java index 213de11bf56aa96c11ed09f779b4a0fa588ea965..9c8b9462c9256576ac302c07428851d683a2a2c3 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java +++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java @@ -17,7 +17,6 @@ package com.android.settings.slices; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER; - import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java index a7df5a740281a27aaabfea131a794de6d72de493..674d6299a1e2205e5de11a02dbf657e679c503a2 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java @@ -33,10 +33,10 @@ import android.text.TextUtils; import com.android.settings.R; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilitySlicePreferenceController; +import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java index bea5e8933a3b8836ec53d9bb356ec586ba4e49d9..c571d85ccb0f4c42da0141bf62260ed71063a4fe 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java @@ -27,11 +27,11 @@ import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.view.accessibility.AccessibilityManager; +import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; @@ -40,13 +40,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowAccessibilityManager; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import org.robolectric.shadow.api.Shadow; + @RunWith(SettingsRobolectricTestRunner.class) public class SlicesDatabaseAccessorTest { diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java index 602a7fd8217a0d5918964507f219dcb75f949849..783ffa0c65c3647b008a2a9f48acfa4227c2c64e 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java @@ -17,7 +17,6 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 460979426e2b7e232aba71915bf69a1d921323d6..ebcf4c1634b23959e5e45f1b0584a0fccdecaaae 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -36,20 +36,20 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; + import static org.robolectric.Shadows.shadowOf; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; +import android.content.pm.PackageManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; -import android.content.pm.PackageManager; -import android.util.FeatureFlagUtils; - import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import android.util.FeatureFlagUtils; import com.android.settings.R; import com.android.settings.core.FeatureFlags; @@ -186,6 +186,8 @@ public class AudioOutputSwitchPreferenceControllerTest { AudioSwitchPreferenceController controller = new AudioSwitchPreferenceControllerTestable( mContext, TEST_KEY); + controller.onStart(); + controller.onStop(); assertThat(mLocalBluetoothManager).isNull(); } diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java index c89c068368622cb5552f136d2115b08ee53c068c..1a496520b9c1c44a586e6fc45b67c73d0590fd4c 100644 --- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java @@ -35,7 +35,6 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; - import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index 7ebc7bbcdb469658184f60757c201339ba3a7d93..a6b629174a586a0e279e3e5c74372bf093a34c9f 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -37,7 +37,6 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; - import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java index a6acf2773ebe2a7f498e84594b73db3867279493..c6583c7eb0304aead657217d4eb890c3b6283e11 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java +++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java @@ -30,6 +30,7 @@ import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity; import com.android.settings.fingerprint.FingerprintSuggestionActivity; +import com.android.settings.notification.ZenOnboardingActivity; import com.android.settings.notification.ZenSuggestionActivity; import com.android.settings.support.NewDeviceIntroSuggestionActivity; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java index c819f48560bbf852bd75c61b4e647103fb8cf008..8b03376afe37cd045d73b4c753fe6b22ef034b84 100644 --- a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java @@ -16,17 +16,14 @@ package com.android.settings.support; -import static com.android.settings.support.NewDeviceIntroSuggestionActivity - .PERMANENT_DISMISS_THRESHOLD; -import static com.android.settings.support.NewDeviceIntroSuggestionActivity - .PREF_KEY_SUGGGESTION_COMPLETE; -import static com.android.settings.support.NewDeviceIntroSuggestionActivity - .PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME; +import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PERMANENT_DISMISS_THRESHOLD; +import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_COMPLETE; +import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME; + import static com.android.settings.support.NewDeviceIntroSuggestionActivity.TIPS_PACKAGE_NAME; import static com.android.settings.support.NewDeviceIntroSuggestionActivity.isSuggestionComplete; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index dd54d6e094c3e5ede1edb1d5e5ad9696d85cc37b..b44a719624f2a4916362e2f3ea1011125885bf66 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -1,7 +1,6 @@ package com.android.settings.survey; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -13,7 +12,6 @@ import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; - import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.android.settings.core.InstrumentedPreferenceFragment; diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index 4245c96e45095e30b41a77137fc94415b85aa0a1..0c26650798a0183ed0b7d8c5ef71830023a61959 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -20,9 +20,7 @@ import static android.os.SystemUpdateManager.KEY_TITLE; import static android.os.SystemUpdateManager.STATUS_IDLE; import static android.os.SystemUpdateManager.STATUS_UNKNOWN; import static android.os.SystemUpdateManager.STATUS_WAITING_DOWNLOAD; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; @@ -30,7 +28,6 @@ import android.os.Build; import android.os.Bundle; import android.os.SystemUpdateManager; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index 176793f9e028752470414c06c2c8a2ca4b2ad168..f071f173633697e226be09bd006385add7762876 100644 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -15,6 +15,8 @@ */ package com.android.settings.testutils; +import java.net.MalformedURLException; +import java.net.URL; import org.junit.runners.model.InitializationError; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; @@ -22,8 +24,6 @@ import org.robolectric.manifest.AndroidManifest; import org.robolectric.res.Fs; import org.robolectric.res.ResourcePath; -import java.net.MalformedURLException; -import java.net.URL; import java.util.List; /** diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java index 3f0a023d4ecc36132bb00914877b0c9d161af1b2..332617b8a2f67c25fe00dc04557ba8b6985c37d6 100644 --- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java +++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java @@ -21,12 +21,22 @@ import static android.app.slice.Slice.SUBTYPE_COLOR; import static android.app.slice.SliceItem.FORMAT_INT; import static android.app.slice.SliceItem.FORMAT_TEXT; +import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; +import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; +import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; import android.app.PendingIntent; import android.content.Context; -import androidx.core.graphics.drawable.IconCompat; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import androidx.slice.Slice; import androidx.slice.SliceItem; import androidx.slice.SliceMetadata; @@ -35,16 +45,13 @@ import androidx.slice.core.SliceAction; import androidx.slice.core.SliceQuery; import androidx.slice.widget.EventInfo; +import androidx.core.graphics.drawable.IconCompat; + import com.android.settings.Utils; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBuilderUtils; import com.android.settings.slices.SliceData; -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - /** * Testing utility class to verify the contents of the different Settings Slices. * diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java index 7e8493e0efe08dedeb9a11df3741c506fed5a49a..2b27649a926159c6041327d80fd8922ed308b153 100644 --- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java @@ -1,14 +1,13 @@ package com.android.settings.testutils; -import android.content.Context; import android.content.res.Resources; import android.content.res.XmlResourceParser; + +import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Xml; - import com.android.settings.core.PreferenceXmlParserUtils; - import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java index 124b5ead8a4978357c06a51dd93cb08847a31eef..00aa9ec8244fc605301b05384c438f4bc1b13ca2 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java @@ -17,7 +17,10 @@ package com.android.settings.testutils.shadow; import android.bluetooth.BluetoothDevice; +import android.os.Parcel; +import android.os.Parcelable; +import org.robolectric.shadows.ShadowBluetoothDevice; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java index 226100238fd442f44f5f7559a05a4e8df49e95fb..b184eb2a49e45a4da6e3b9c5e04fe5288ec4abc5 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -1,7 +1,6 @@ package com.android.settings.testutils.shadow; import static android.util.TypedValue.TYPE_REFERENCE; - import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.Shadows.shadowOf; import static org.robolectric.shadow.api.Shadow.directlyOn; @@ -15,13 +14,12 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.util.SparseArray; -import android.util.TypedValue; - import androidx.annotation.ArrayRes; import androidx.annotation.ColorRes; import androidx.annotation.Nullable; +import android.util.AttributeSet; +import android.util.SparseArray; +import android.util.TypedValue; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java index c41aa8ee2232eb11eca3fad02c3704fca7811a86..12173c8f1deab4fa7ec829df3add5d4c59bd2742 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java @@ -17,7 +17,6 @@ package com.android.settings.testutils.shadow; import com.android.settings.applications.AppInfoBase; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java index cee04ca351efef72497b605f55679be4ae2af3ce..886f94157ea0e804f0e44de5ee5c8df04e87068c 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java @@ -18,9 +18,7 @@ package com.android.settings.testutils.shadow; import android.os.UserHandle; import android.os.UserManager; - import com.android.settings.notification.AudioHelper; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java index bcf90c440fb533f0f08a3a3c06fc2fe26b9a0c79..3c3714547dd4142e7ee0bdaf1554c22a7baf2d6d 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java @@ -18,12 +18,12 @@ package com.android.settings.testutils.shadow; import static android.media.AudioManager.STREAM_ACCESSIBILITY; import static android.media.AudioManager.STREAM_ALARM; -import static android.media.AudioManager.STREAM_DTMF; import static android.media.AudioManager.STREAM_MUSIC; import static android.media.AudioManager.STREAM_NOTIFICATION; import static android.media.AudioManager.STREAM_RING; import static android.media.AudioManager.STREAM_SYSTEM; import static android.media.AudioManager.STREAM_VOICE_CALL; +import static android.media.AudioManager.STREAM_DTMF; import static org.robolectric.RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java index 75526c850516c84aa08c03b5aa1699770bebf9a9..55c1c45982e6056b9632d64c22a90d6896b9ee5f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java @@ -17,9 +17,8 @@ package com.android.settings.testutils.shadow; import android.content.Context; -import android.util.AttributeSet; - import androidx.cardview.widget.CardView; +import android.util.AttributeSet; import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowFrameLayout; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java index 7c543b74b385aeba1e7745fb89e98492ce25835d..50c0330828a3587d25e1fdf45b025bf73e7a5505 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java @@ -16,18 +16,19 @@ package com.android.settings.testutils.shadow; -import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; - import android.accounts.Account; import android.content.ContentResolver; import android.content.SyncAdapterType; + import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; import android.provider.SearchIndexablesContract; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import org.robolectric.annotation.Resetter; + +import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; import java.util.HashMap; import java.util.Map; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java index 88b0b5fc0f799e29d5f0e7f876f6aeee69312010..34908ca39a8b945689c4d1398acbbd570167c48a 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java @@ -1,7 +1,6 @@ package com.android.settings.testutils.shadow; import com.android.settings.datausage.DataSaverBackend; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java index 9b8821a6b5789f8d153716e6b693029a255ccf40..73cabfb1599435b771573b2c9efb977db7c0c48f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java @@ -4,7 +4,6 @@ import android.content.Context; import android.telephony.SubscriptionManager; import com.android.settings.datausage.DataUsageUtils; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java index 8aa5dab9107a13621ff032fc7cfeb29929d48131..f8242970130d7de3db45129b38a5505b03551db7 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java @@ -19,9 +19,7 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.ResolveInfo; - import com.android.settings.search.DatabaseIndexingUtils; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java index e4be3185ea7ec92aac02f0cda0f4c535b7a77f69..f22c7d6a04539a92b3e846de2992320aa11cdfca 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java @@ -19,7 +19,6 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; - import androidx.annotation.NonNull; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java index 68c92a715692836c82bbb2d63a49c505d239f30d..faaa0f05bfd0b277dade87ad422d8a484180c69e 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java @@ -16,10 +16,10 @@ package com.android.settings.testutils.shadow; -import static org.robolectric.RuntimeEnvironment.application; - import android.media.MediaRouter; +import static org.robolectric.RuntimeEnvironment.application; + import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; import org.robolectric.shadow.api.Shadow; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java index 364083e699fae250430972eeb4ec5d4b645a3b42..8d7606335d2dc169f5d3683eb3cfa9b3a25013da 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java @@ -1,9 +1,7 @@ package com.android.settings.testutils.shadow; import android.content.Context; - import com.android.settings.network.MobileNetworkPreferenceController; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java index 35c6630ba4729a029c80f72bcfb85eb29c82c679..c11f79cc4da6ae5caa0dd8e5b47e84780458e26f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java @@ -18,10 +18,9 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.PackageManager; -import android.text.TextUtils; - import androidx.annotation.NonNull; import androidx.core.content.PermissionChecker; +import android.text.TextUtils; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java index 372116ca95d4cfc5f98692813602db6c56a4ad98..f39f10f327be0e8163321acc15ca7332633a1df4 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java @@ -1,10 +1,8 @@ package com.android.settings.testutils.shadow; import android.content.Context; - import com.android.settings.bluetooth.RestrictionUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java index d35ea5cb53589f0fedf9269b5a2ef880b045ea2f..5a71b58ec7ab0ebb084083c3073c45aac1e8760f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java @@ -18,7 +18,6 @@ package com.android.settings.testutils.shadow; import android.os.AsyncTask; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowAsyncTask; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java index f11d9e889d2266a033d5f3edaa5f23342f27fde9..834d285c955e91e9bd67d71bdff98d0ffb587e23 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java @@ -19,6 +19,7 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.permission.RuntimePermissionPresenter; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java index e5f95c37d043ee205734e658a19e00eb27cc7766..586ff488351462cadbaf3a308f184cc40ef75c46 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java @@ -19,7 +19,6 @@ package com.android.settings.testutils.shadow; import android.os.Bundle; import com.android.settings.SettingsPreferenceFragment; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java index 825e5aa3c4aa3abd25a59a7566cc757527d35808..8e24bd77a512a788c5e88ab3dec3b45bcdf40ebe 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java @@ -20,14 +20,12 @@ import static org.robolectric.RuntimeEnvironment.application; import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; - +import java.util.List; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; import org.robolectric.shadow.api.Shadow; -import java.util.List; - @Implements(ShortcutManager.class) public class ShadowShortcutManager extends org.robolectric.shadows.ShadowShortcutManager { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java index b465521448a0483b35d94b3039f6604636adf699..03991e64e3ea267b143cec03fb266c708291ee5f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java @@ -21,12 +21,10 @@ import android.os.SystemProperties; import android.provider.Settings; import android.text.TextUtils; import android.view.View; - +import java.util.Locale; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import java.util.Locale; - /** * Important: The current robolectric doesn't support API 24, so I copy the code * from API 24 here to make it compatible. Once robolectric is upgraded to 24, diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java index 12cde859cc4bc67a331245fbb6685a7760c5bd65..10b2acb9ed0cefb98a349294c359414f62b4ee4e 100644 --- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java @@ -16,19 +16,17 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; import android.provider.Settings.Global; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java index ba2095b05f8227d5a2ee1d7e7ed5576c09ce04d4..782e94d39761912728371349ecd3fcb78f32a664 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -26,10 +25,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.pm.UserInfo; import android.os.UserManager; - +import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java index c20866e186fe7391acfbdcb2add7f86b636ed347..6247feb16bac315337212d475c483198be08a93f 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -25,7 +24,6 @@ import android.app.Fragment; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java index 85a5e34ca3e8922e97486e55a002713972d822f8..176d1b0492cc025dda737312934c52f2c6bad56c 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java index e07a4ad7d63152423d8b85e8df475c8593bbd5b9..d85f2fa8732ec294e44cadb5f24f97a0736f540d 100644 --- a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java +++ b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java @@ -17,7 +17,6 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java index abdf4f513ff8c28a936621d9e1b9a4bb134e3a23..2eeecaa4d4fdb1babfc4270ca1b9a2f32479a873 100644 --- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java @@ -17,7 +17,6 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java index ed79cf22ea9b84790a3e9eceddf0d74ae8207e8a..ef8fae65344e08ee39c8847319e02d1d6c0c6ba3 100644 --- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java @@ -17,7 +17,6 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index 6f5b404b843e789a7d5dee1d0570ee1149c56918..a7fe91677ea62a6dd583cdb16ff796b662da4161 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java index f8c08eaf27ef6f0bc89e3ed087db20aa03cf09e1..fd41c3682ee6d5650ae051662d841618aa983b1d 100644 --- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java @@ -17,7 +17,6 @@ package com.android.settings.vpn2; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java index 9ae0e549477558fc4fbd8817759b2d90d0b90c36..fc708eff63bfe67997b00f0040d7512e3c5336f2 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java @@ -17,7 +17,6 @@ package com.android.settings.wallpaper; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java index 2713e92e02c060dc3954a0dd6435dae968b4dd68..82412403c5ae4d4ec2017507bfb33c070414239c 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java @@ -1,7 +1,6 @@ package com.android.settings.wallpaper; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -11,7 +10,6 @@ import static org.robolectric.RuntimeEnvironment.application; import android.app.Activity; import android.content.Intent; - import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java index ee532582de516b33c20e8fba2b6ed210b1392ad5..2a95bc2e95a5bcbf9c6ff1650d907451d5446d58 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -17,9 +17,7 @@ package com.android.settings.webview; import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java index 3ae29d36bd6d9ade497bad60daecae9c4c98fd23..a387d7870e0ea1f57cb449f0c940dbacfdae33e4 100644 --- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.wfd; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index 454813fb14fcce058cb9a566b4f670a5346c8583..6b4df47ea3ffc80915d35457cb70cc3e99dec53c 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -18,9 +18,7 @@ package com.android.settings.widget; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -28,10 +26,9 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; -import android.view.View; - import androidx.lifecycle.LifecycleOwner; import androidx.recyclerview.widget.RecyclerView; +import android.view.View; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java index a66f6d55ca08866c41b215af9c6656a63a3bc6eb..f34c60baa93248538c5593597f2edc2e96815dfc 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -25,11 +24,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.Button; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java index c75d8fd463f0c0ba450c7d54ae0a7afeb760863a..9ce63179ccfbf83fa88f2d6251d0b430ab912ea2 100644 --- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java @@ -19,9 +19,8 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.view.View; - import androidx.preference.PreferenceViewHolder; +import android.view.View; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java index ce366fe78de227018fb7b2f51988a0e68c708953..6cb4f3d023425315d457dfcb2f73fe8aff18eb09 100644 --- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java @@ -19,9 +19,8 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.view.View; - import androidx.preference.PreferenceViewHolder; +import android.view.View; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java index 02add358f97062bc8950ff2ab6c28242290b1254..90470f64a1dfd0e88ff2103a46605050af18e257 100644 --- a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java @@ -27,11 +27,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.view.LayoutInflater; import android.view.View; -import android.widget.LinearLayout; - -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,6 +35,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.R; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import android.widget.LinearLayout; + @RunWith(SettingsRobolectricTestRunner.class) public class DisabledCheckBoxPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index 0300b71bfd6fc0270d167be1ec14ffb77e4ba2c3..3337bd4f8b5c86bf283e17b5eba5b380a35a59b8 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -37,14 +36,13 @@ import android.content.pm.PackageInfo; import android.content.pm.ResolveInfo; import android.graphics.drawable.ColorDrawable; import android.os.UserHandle; +import androidx.preference.Preference; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index 3cbbbbec7d5d4dd8c817894d8b23efe22ce83304..48e918d9de07571898c7583a547a391dd4cfe75a 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -20,13 +20,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index 79f344d92205df4a8839de14f6f341b1d9b60ff8..d952324a3033a1cf6bc1f1a2c19b79a3284a6c07 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -30,12 +29,11 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.view.View; - import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; +import android.view.View; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java deleted file mode 100644 index ed97e55a4bf46413b2d1f50bb12ec04223f40cb8..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright (C) 2018 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.widget; - -import static com.android.settingslib.CustomDialogPreference.CustomPreferenceDialogFragment; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.app.AlertDialog; -import android.content.Context; -import android.net.wifi.WifiConfiguration; -import android.os.Parcelable; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.Button; -import android.widget.LinearLayout; - -import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; - -@RunWith(SettingsRobolectricTestRunner.class) -public class HotspotApBandSelectionPreferenceTest { - private HotspotApBandSelectionPreference mPreference; - private Context mContext; - private Button mSaveButton; - private View mLayout; - - @Before - public void setUp() { - mContext = RuntimeEnvironment.application; - mSaveButton = spy(new Button(mContext)); - - final CustomPreferenceDialogFragment fragment = mock(CustomPreferenceDialogFragment.class); - final AlertDialog dialog = mock(AlertDialog.class); - when(fragment.getDialog()).thenReturn(dialog); - when(dialog.getButton(anyInt())).thenReturn(mSaveButton); - - mPreference = new HotspotApBandSelectionPreference(mContext); - ReflectionHelpers.setField(mPreference, "mFragment", fragment); - - final LayoutInflater inflater = LayoutInflater.from(mContext); - mLayout = inflater.inflate(R.layout.hotspot_ap_band_selection_dialog, - new LinearLayout(mContext), false); - } - - @Test - public void getWifiBand_updatesBandPresetConfigProvided() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_ANY); - mPreference.onBindDialogView(mLayout); - - // check that the boxes are set correctly when a pre-existing config is set - assertThat(mPreference.getWifiBand()).isEqualTo(WifiConfiguration.AP_BAND_ANY); - } - - @Test - public void getWifiBand_updatesBandWhenBoxesToggled() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_ANY); - mPreference.onBindDialogView(mLayout); - - assertThat(mPreference.getWifiBand()).isEqualTo(WifiConfiguration.AP_BAND_ANY); - - // make sure we have the expected box then toggle it - mPreference.mBox2G.setChecked(false); - - // check that band is updated - assertThat(mPreference.getWifiBand()).isEqualTo(WifiConfiguration.AP_BAND_5GHZ); - } - - @Test - public void onSaveInstanceState_skipWhenDialogGone() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ); - mPreference.onBindDialogView(mLayout); - // remove the fragment to make the dialog unavailable - ReflectionHelpers.setField(mPreference, "mFragment", null); - - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_ANY); - mPreference.onBindDialogView(mLayout); - - // state should only be saved when the dialog is available - Parcelable parcelable = mPreference.onSaveInstanceState(); - mPreference.onRestoreInstanceState(parcelable); - assertThat(mPreference.mShouldRestore).isFalse(); - } - - @Test - public void onSaveInstanceState_doesNotCrashWhenViewGone() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ); - mPreference.onBindDialogView(mLayout); - // When the device dozes the view and dialog can become null - mPreference.mBox5G = null; - mPreference.mBox2G = null; - ReflectionHelpers.setField(mPreference, "mFragment", null); - - // make sure it does not crash and state is not restored - Parcelable parcelable = mPreference.onSaveInstanceState(); - mPreference.onRestoreInstanceState(parcelable); - assertThat(mPreference.mShouldRestore).isFalse(); - } - - @Test - public void onSaveInstanceState_presentWhenDialogPresent() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ); - mPreference.onBindDialogView(mLayout); - - Parcelable parcelable = mPreference.onSaveInstanceState(); - mPreference.onRestoreInstanceState(parcelable); - assertThat(mPreference.mShouldRestore).isTrue(); - } - - @Test - public void positiveButton_updatedCorrectly() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_ANY); - mPreference.onBindDialogView(mLayout); - - // button is enabled whole time so far since we have a pre-existing selection - verify(mSaveButton, never()).setEnabled(false); - - // clear all boxes and make sure it stays enabled until empty - mPreference.mBox2G.setChecked(false); - mPreference.mBox5G.setChecked(false); - - // button should be disabled now - verify(mSaveButton, times(1)).setEnabled(false); - } -} diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java index 07a0aa97ba10410c115fa1271da3b35ea519c007..37d055e4576e39b173c125a7a31786da6d9fec0c 100644 --- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java index e5cff2172a18c270d64760622f1440c0d446c33c..b21090dacc9afcab42b8ae591bdfd24d1fc804fc 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java @@ -17,19 +17,17 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.CheckBox; import android.widget.LinearLayout; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index 04b30892558f66846b0bc74b4761bec13ca42bfb..f96519a4a1bb89552554f0f62f076e2ecc214d2d 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -17,19 +17,17 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.Switch; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java index 92f75e99e3e7c2ade98ff5707bdbcd1d68b5073f..5895db25a701ea3b71ca0941f592cf0c0e8c2d38 100644 --- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index 64352d966388fbd36d1e1492ecebb076a8758a21..29cc1796930e5c080f560336e77f6acc2fb98c19 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,7 +25,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.UserManager; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java index 5d914a2f2737bd8548258e25bff60acea3b08dfd..80af1f92bff90585644d96e62ff8e91181258efd 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java @@ -17,16 +17,14 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static junit.framework.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.Application; -import android.view.View; - import androidx.preference.PreferenceViewHolder; +import android.view.View; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index 7edfd0be636c54ddfc341212e12ecff87463a70a..f7c96ed559088145943556160addefe0e3cf8a1b 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -19,12 +19,11 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.os.Parcelable; +import androidx.viewpager.widget.PagerAdapter; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; -import androidx.viewpager.widget.PagerAdapter; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java index cafff056868bf1a93000c0347077d1904fa165c6..77e18acae41454a8a01b96a0ee79f08ff62c6c6d 100644 --- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java +++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java index ebfe74c358113f69759f348e0e248348cc1efc0e..818daecd26d8ba494669aff5877aaff3fca6b7a1 100644 --- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.RuntimeEnvironment.application; import android.content.Context; @@ -26,8 +25,8 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java index e1c500211ea8e532c604f0ac75e514ddf7b40674..c88e7f87d00f675bc22f93f3d165c000a3234f1c 100644 --- a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java index ae55217b6990d163244ee8929b89c0470b9e6b53..c55ee9f56a9b79ecdae0e5f713ad6f388e146b43 100644 --- a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java @@ -18,13 +18,9 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; - import android.content.Context; -import android.widget.ArrayAdapter; - import androidx.preference.ListPreference; - +import android.widget.ArrayAdapter; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; @@ -38,6 +34,8 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; +import static org.mockito.Mockito.spy; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowBluetoothUtils.class) public class UpdatableListPreferenceDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index ca7fab5ee51d57dc45fc1e54034d9639ce97a79a..4e2ec7b2af1eb3955e8b79ed976755f1d54cab62 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -25,14 +25,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.preference.PreferenceViewHolder; import android.text.InputType; import android.text.TextWatcher; import android.view.View; import android.widget.EditText; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -41,6 +40,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) public class ValidatedEditTextPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java index 57f0679dbc8e4fbb03ce494c52d5838b3db559f9..a2f859c6321b61a71f592b7e98049c4af4a7f95f 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -22,9 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.media.MediaPlayer; -import android.view.LayoutInflater; - import androidx.preference.PreferenceViewHolder; +import android.view.LayoutInflater; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java index b65e5aefc0b7e8d1ee3033e8c53caba8fcc75f1f..d49c019aeb66e15c6d90cc0f4f63cc2fcbb068c0 100644 --- a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java +++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java @@ -16,11 +16,10 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; -import android.Manifest; import android.content.pm.PackageInfo; +import android.Manifest; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java index e12053cd4acde260ec83658fd1e98afbe29b0b7d..eb58452c60e4cf117b54fd997dfa5aefb08752c1 100644 --- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java index 6d8996068e4c003fd2999a6c3b879a68d0954b04..012a76386de8ec1bc845761151fa39d1acb5230e 100644 --- a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java @@ -16,7 +16,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java index be8eeae93d54b760718e6de7202920bdcb8850b8..a0befc0e2de4d62e1deb5e149cf8c48c51cc8da5 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -1,7 +1,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java index 94f10ddd88bca674a21066886ef5b90900b82d4d..5ec598a4a79e2138a10b34d884c54bfa2ae4302d 100644 --- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java @@ -19,13 +19,12 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.preference.PreferenceViewHolder; - import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index c9be0f6324e1451c43e06895d0e4bff626e74289..de629d83eccad08bd278bb7abe0e7e78088d322f 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -17,17 +17,14 @@ package com.android.settings.wifi; import static android.provider.Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index 84297919b4efd903e230a628454879eb9265160a..bc99fc24acf1dec5b3a89c158209b8ba15f89aef 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -18,12 +18,9 @@ package com.android.settings.wifi; import static android.content.Context.NETWORK_SCORE_SERVICE; import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE; - import static com.android.settings.wifi.UseOpenWifiPreferenceController .REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -38,9 +35,8 @@ import android.content.Intent; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index 5e8dd28ba1ff5542a90caaf5a1400f016f2e7962..43e87d83050cf60e2a040d0a5c884ee42c95bfd5 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.anyInt; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index a6a13b30f1b0418e9578a6ce23d831425b271a33..8cdecff0258229eae5046dc55be28cfb8d8e2bd6 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java index 71a729815136bf1a6117737dfa0dd3e64d32f8ac..75c9bb14a5e045bc3d225db406d0b17320ba09a9 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java @@ -19,6 +19,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index d16647f320730708eddb9530273f634ccacd8095..19565f39bfcba0ecfe62873461efafe96283b2f9 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -18,22 +18,19 @@ package com.android.settings.wifi; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index 06d347940790bd1b4fcac4cbd7c2e4b189ed773b..57ecfd0c37ef3735faf4d996766b3c37fdf162af 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -31,7 +31,6 @@ import android.net.NetworkRequest; import android.net.NetworkScoreManager; import android.net.wifi.WifiManager; import android.os.Handler; - import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index 610874a7a377dd5e8feb9475322d5d0ef93bd42b..ed312f4de70260884e3d2f6ab971e6af5af29885 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -16,7 +16,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java index 7b95a46a8458a51c9d72ae0b73d77a8194974c25..0cd6bee16cfa35b1cf46c74c5ed0f35aeae43e59 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java @@ -24,22 +24,16 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; -import android.net.wifi.WifiManager; - -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; +import android.content.Intent; +import android.content.res.Resources; +import android.net.wifi.WifiManager; +import androidx.core.graphics.drawable.IconCompat; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,6 +41,13 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java index d40ead143be49d4b1322d5376ee72168df6b7acd..f55c57f865807ff285fba16d93562aea7ebe052a 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java index 806399d191fac0f1d04d56a61a572ff728251ce4..1f49654c40217fb50b5a4e307374ba71d614457e 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java @@ -29,7 +29,7 @@ public class WifiUtilsTest { @Test public void testSSID() { assertThat(WifiUtils.isSSIDTooLong("123")).isFalse(); - assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue(); + assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue(); assertThat(WifiUtils.isSSIDTooShort("123")).isFalse(); assertThat(WifiUtils.isSSIDTooShort("")).isTrue(); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index ffe1d8fe84d3ce885ad7f448e8d22c123b33ad2d..38118f58586067604a939ffc5e7eaef8b79bc147 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -18,19 +18,18 @@ package com.android.settings.wifi; import static android.provider.Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE; import static android.provider.Settings.Global.WIFI_WAKEUP_ENABLED; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import android.app.Fragment; import android.content.Context; import android.location.LocationManager; import android.provider.Settings; - -import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java index a322dc2ab2d23e5def5ec8b10fd9680407fd0a07..170cf53c1c331ec327df04ce288a7faa086399ba 100644 --- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java index ea8fd00d594b1450169e7454e110c6934b267df6..21f6daa342847d80e920326f49b232f76a7e47e4 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java @@ -26,6 +26,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.content.Context; @@ -46,6 +47,7 @@ import com.android.ims.ImsManager; import com.android.settings.R; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; +import com.android.settings.slices.SliceBuilderUtils; import com.android.settings.slices.SliceData; import com.android.settings.slices.SlicesFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 8b5c67f6a977dde1031060c9423ce0ea1c820e17..435882b1790b5c106f2ae583c3b2be1e2449190e 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; @@ -31,6 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -51,14 +51,12 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; import android.provider.Settings; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java index dd5dcc9a7b71ead474e02395ee142b76218937ca..13dc51dcd690e0db829ea86e5b03718ecd6a3111 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java @@ -16,13 +16,11 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; import android.net.wifi.WifiConfiguration; - import androidx.preference.DropDownPreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java index 8921311b7609e9d61b61cb38fb332e5f51857763..41b70e2674c600b73fd62a272d1fe316557a39b6 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java index 849c35acc8862eae991a186e5b3d8f1bf38288d8..9741f4fd7351044783d95801100b8e68c7e032f4 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java @@ -17,12 +17,10 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.net.wifi.p2p.WifiP2pDevice; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java index 75c5ffc26911cf62258abcf1c2b9546d1b64f36b..fb4ffc354e2ff8eebe61bae0cc8e3f642141a126 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -17,22 +17,19 @@ package com.android.settings.wifi.p2p; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java index fb7bef183ad168fc352c4a98f7fe04677c604733..b6bf7e798dafd0a578361416cdb6028a14a9bbfd 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java @@ -16,7 +16,6 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index e1e872dacb77966ea05d047a57345a6c3de6a4fa..e007f60c22269b5ea06ac63caecc7a8df719d631 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -17,8 +17,8 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,17 +27,15 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; - +import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.HotspotApBandSelectionPreference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; @@ -45,8 +43,9 @@ import org.robolectric.RuntimeEnvironment; @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherApBandPreferenceControllerTest { - private static final String ALL_BANDS = "2.4 GHz and 5.0 GHz"; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private static final String ALL_BANDS = "5.0 GHz Band preferred"; + private static final String TWO_GHZ_STRING = "2.4 GHz Band"; + private static final String FIVE_GHZ_STRING = "5.0 GHz Band"; private Context mContext; @Mock private ConnectivityManager mConnectivityManager; @@ -58,12 +57,13 @@ public class WifiTetherApBandPreferenceControllerTest { private PreferenceScreen mScreen; private WifiTetherApBandPreferenceController mController; - private HotspotApBandSelectionPreference mPreference; + private ListPreference mPreference; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mPreference = new HotspotApBandSelectionPreference(RuntimeEnvironment.application); + mContext = spy(RuntimeEnvironment.application); + mPreference = new ListPreference(RuntimeEnvironment.application); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) .thenReturn(mConnectivityManager); @@ -73,6 +73,7 @@ public class WifiTetherApBandPreferenceControllerTest { WifiConfiguration config = new WifiConfiguration(); config.apBand = WifiConfiguration.AP_BAND_ANY; when(mWifiManager.getWifiApConfiguration()).thenReturn(new WifiConfiguration()); + when(mWifiManager.isDualModeSupported()).thenReturn(false); mController = new WifiTetherApBandPreferenceController(mContext, mListener); } @@ -81,9 +82,10 @@ public class WifiTetherApBandPreferenceControllerTest { public void display_5GhzSupported_shouldDisplayFullList() { when(mWifiManager.getCountryCode()).thenReturn("US"); when(mWifiManager.isDualBandSupported()).thenReturn(true); + when(mWifiManager.isDualModeSupported()).thenReturn(true); mController.displayPreference(mScreen); - mController.onPreferenceChange(mPreference, -1); + mController.onPreferenceChange(mPreference, "-1"); assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS); } @@ -102,6 +104,7 @@ public class WifiTetherApBandPreferenceControllerTest { @Test public void display_5GhzNotSupported_shouldDisable() { + when(mWifiManager.getCountryCode()).thenReturn("US"); when(mWifiManager.isDualBandSupported()).thenReturn(false); mController.displayPreference(mScreen); @@ -112,37 +115,71 @@ public class WifiTetherApBandPreferenceControllerTest { } @Test - public void changePreference_shouldUpdateValue() { - when(mWifiManager.is5GHzBandSupported()).thenReturn(true); + public void changePreference_noDualModeWith5G_shouldUpdateValue() { + when(mWifiManager.getCountryCode()).thenReturn("US"); + when(mWifiManager.isDualBandSupported()).thenReturn(true); + + mController.displayPreference(mScreen); + + // -1 is WifiConfiguration.AP_BAND_ANY, for 'Auto' option. This should be prevented from + // being set since it is invalid for this configuration + mController.onPreferenceChange(mPreference, "-1"); + assertThat(mController.getBandIndex()).isEqualTo(1); + assertThat(mPreference.getSummary()).isEqualTo(FIVE_GHZ_STRING); + verify(mListener, times(1)).onTetherConfigUpdated(); + + // set to 5 Ghz + mController.onPreferenceChange(mPreference, "1"); + assertThat(mController.getBandIndex()).isEqualTo(1); + assertThat(mPreference.getSummary()).isEqualTo(FIVE_GHZ_STRING); + verify(mListener, times(2)).onTetherConfigUpdated(); + + // set to 2 Ghz + mController.onPreferenceChange(mPreference, "0"); + assertThat(mController.getBandIndex()).isEqualTo(0); + assertThat(mPreference.getSummary()).isEqualTo(TWO_GHZ_STRING); + verify(mListener, times(3)).onTetherConfigUpdated(); + } + + @Test + public void changePreference_dualModeWith5G_shouldUpdateValue() { + when(mWifiManager.getCountryCode()).thenReturn("US"); + when(mWifiManager.isDualBandSupported()).thenReturn(true); + when(mWifiManager.isDualModeSupported()).thenReturn(true); mController.displayPreference(mScreen); // -1 is WifiConfiguration.AP_BAND_ANY, for 'Auto' option. - mController.onPreferenceChange(mPreference, -1); + mController.onPreferenceChange(mPreference, "-1"); assertThat(mController.getBandIndex()).isEqualTo(-1); assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS); + verify(mListener, times(1)).onTetherConfigUpdated(); - mController.onPreferenceChange(mPreference, 1); - assertThat(mController.getBandIndex()).isEqualTo(1); - assertThat(mPreference.getSummary()).isEqualTo("5.0 GHz"); + // should revert to the default for 5 Ghz only since this is not supported with this config + mController.onPreferenceChange(mPreference, "1"); + assertThat(mController.getBandIndex()).isEqualTo(-1); + assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS); + verify(mListener, times(2)).onTetherConfigUpdated(); - mController.onPreferenceChange(mPreference, 0); + // set to 2 Ghz + mController.onPreferenceChange(mPreference, "0"); assertThat(mController.getBandIndex()).isEqualTo(0); - assertThat(mPreference.getSummary()).isEqualTo("2.4 GHz"); - + assertThat(mPreference.getSummary()).isEqualTo(TWO_GHZ_STRING); verify(mListener, times(3)).onTetherConfigUpdated(); } @Test public void updateDisplay_shouldUpdateValue() { + when(mWifiManager.getCountryCode()).thenReturn("US"); + when(mWifiManager.isDualBandSupported()).thenReturn(true); + // Set controller band index to 1 and verify is set. - when(mWifiManager.is5GHzBandSupported()).thenReturn(true); mController.displayPreference(mScreen); - mController.onPreferenceChange(mPreference, 1); + mController.onPreferenceChange(mPreference, "1"); assertThat(mController.getBandIndex()).isEqualTo(1); // Disable 5Ghz band - when(mWifiManager.is5GHzBandSupported()).thenReturn(false); + when(mWifiManager.isDualBandSupported()).thenReturn(false); // Call updateDisplay and verify it's changed. mController.updateDisplay(); diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java index 519aa54e4a5b4756fbbeb8c8eb8de7c8ae8d2f12..06373539f2e27f555a96fa1b89b952451e3f97cb 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; - import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java index 1b063d0ff86d8a2264961dbac3fefb10d112fe76..a790d52aa854f5ab9c0fa0711c6553e5f1f2ea69 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -27,7 +26,6 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java index c81c490ed127bf9842eb5af34fabbe52ac45a78b..9df86b879b39b49ed69e6770720af315ea3524d9 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -16,23 +16,27 @@ package com.android.settings.wifi.tether; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; - +import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; - -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java index a9d4a43c4fe25eee648048e861609cbae518b7e7..bbd57cba34bc1e6d48cdb4287ac2a6c3d59b2135 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -27,7 +26,6 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; - import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java index f8131850fe30951cab3160230fe46b7da4150f0c..86f03e0fdf4694271e1032cee5b3e2cbc5955ca8 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java @@ -10,7 +10,6 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; - import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; @@ -19,6 +18,7 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java index d22776f647f190a97d4ef684d81d3bfea68d4d09..f5ac697fcf8be9f6b29c55cb1a999bc489e024c8 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java index b1e5ea7450713aa2bf790b357fb7e9ad1fcbd266..56552132515bcfedeaf556624437de91321b8636 100644 --- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -27,7 +26,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ContextWrapper; -import android.content.om.IOverlayManager; import android.content.om.OverlayInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -37,6 +35,8 @@ import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import androidx.preference.ListPreference; +import com.android.settings.wrapper.OverlayManagerWrapper; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,14 +48,14 @@ import java.util.ArrayList; @RunWith(AndroidJUnit4.class) public class ThemePreferenceControllerTest { - private IOverlayManager mMockOverlayManager; + private OverlayManagerWrapper mMockOverlayManager; private ContextWrapper mContext; private ThemePreferenceController mPreferenceController; private PackageManager mMockPackageManager; @Before public void setup() { - mMockOverlayManager = mock(IOverlayManager.class); + mMockOverlayManager = mock(OverlayManagerWrapper.class); mMockPackageManager = mock(PackageManager.class); mContext = new ContextWrapper(InstrumentationRegistry.getTargetContext()) { @Override @@ -69,9 +69,9 @@ public class ThemePreferenceControllerTest { @Test public void testUpdateState() throws Exception { OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android", - OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true); + "", "", OverlayInfo.STATE_ENABLED, 0, 0, true); OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android", - OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true); + "", "", 0, 0, 0, true); when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> { ApplicationInfo info = mock(ApplicationInfo.class); if ("com.android.Theme1".equals(inv.getArguments()[0])) { @@ -105,9 +105,9 @@ public class ThemePreferenceControllerTest { @Test public void testUpdateState_withStaticOverlay() throws Exception { OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android", - OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true); + "", "", OverlayInfo.STATE_ENABLED, 0, 0, true); OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android", - OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true); + "", "", OverlayInfo.STATE_ENABLED, 0, 0, true); when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> { ApplicationInfo info = mock(ApplicationInfo.class); if ("com.android.Theme1".equals(inv.getArguments()[0])) { @@ -140,10 +140,29 @@ public class ThemePreferenceControllerTest { verify(pref).setValue(eq("com.android.Theme2")); } - private ArrayList list(OverlayInfo... infos) { - ArrayList list = new ArrayList<>(); + @Test + public void testAvailable_false() throws Exception { + when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( + new PackageInfo()); + when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt())) + .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0, 0, false))); + assertThat(mPreferenceController.isAvailable()).isFalse(); + } + + @Test + public void testAvailable_true() throws Exception { + when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( + new PackageInfo()); + when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt())) + .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0, 0, true), + new OverlayInfo("", "", "", "", 0, 0, 0, true))); + assertThat(mPreferenceController.isAvailable()).isTrue(); + } + + private ArrayList list(OverlayInfo... infos) { + ArrayList list = new ArrayList<>(); for (OverlayInfo info : infos) { - list.add(info); + list.add(new OverlayManagerWrapper.OverlayInfo(info)); } return list; }