diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml index 8a649e6b5db..f17c3383cf6 100644 --- a/res/values-bs/arrays.xml +++ b/res/values-bs/arrays.xml @@ -362,9 +362,9 @@ "Zadano" "Sans-serif" "Sans-serif kondenzovani" - "Sans-serif fiksnog razmaka" + "Sans-serif monospace" "Serif" - "Serif fiksnog razmaka" + "Serif monospace" "Casual" "Kurziv" "Mala početna slova" diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml index 6b8103fb494..a4454cd2dcb 100644 --- a/res/values-ca/arrays.xml +++ b/res/values-ca/arrays.xml @@ -380,7 +380,7 @@ "Predeterminat" "Cap" "Contorn" - "Ombra paral·lela" + "Ombra" "Elevat" "Enfonsat" diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml index ff5120fbc9d..b14ea4135ea 100644 --- a/res/values-eu/arrays.xml +++ b/res/values-eu/arrays.xml @@ -350,7 +350,7 @@ "Idatzi memorian" "Aktibatu pantaila" "Lortu kontuak" - "Abiarazi atzeko planoan" + "Exekutatu atzeko planoan" "Erabilerraztasun-eginbideen bolumena" @@ -443,7 +443,7 @@ "Garrantzitsua (atzeko planokoa)" "Babeskopiak" "Handia" - "Zerbitzua (abian)" + "Zerbitzua (exekutatzen)" "Zerbitzua (berrabiarazten)" "Hargailua" "Hasiera" diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml index 52b96757d86..cad7583d6f8 100644 --- a/res/values-fr/arrays.xml +++ b/res/values-fr/arrays.xml @@ -485,7 +485,7 @@ "Oui" - "Foncé" + "Sombre" "Clair" diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml index 80f3100eab0..98deee95c54 100644 --- a/res/values-hi/arrays.xml +++ b/res/values-hi/arrays.xml @@ -239,7 +239,7 @@ "मैसेज (एसएमएस) पाएं" "आपातकालीन मैसेज (एसएमएस) पाएं" "मल्टीमीडिया मैसेज (एमएमएस) पाएं" - "WAP पुश प्राप्त करें" + "WAP पुश पाएं" "मैसेज (एसएमएस) भेजें" "ICC मैसेज (एसएमएस) पढ़ें" "ICC मैसेज (एसएमएस) लिखें" @@ -263,7 +263,7 @@ "सचेत रखें" "जगह की निगरानी करें" "उच्च पावर वाली जगह की निगरानी करें" - "उपयोग के आंकड़े प्राप्त करें" + "उपयोग के आंकड़े पाएं" "माइक्रोफ़ोन म्यूट/अनम्यूट करें" "टोस्ट दिखाएं" "प्रोजेक्ट मीडिया" @@ -282,7 +282,7 @@ "मेमोरी पढ़ें" "मेमोरी लिखें" "स्क्रीन चालू करें" - "खाते प्राप्त करें" + "खाते पाएं" "पृष्ठभूमि में चलाएं" "सुलभता सुविधाओं के लिए आवाज़" @@ -330,7 +330,7 @@ "सचेत रखें" "जगह" "जगह" - "उपयोग के आंकड़े प्राप्त करें" + "उपयोग के आंकड़े पाएं" "माइक्रोफ़ोन म्यूट/अनम्यूट करें" "टोस्ट दिखाएं" "प्रोजेक्ट मीडिया" @@ -349,7 +349,7 @@ "मेमोरी पढ़ें" "मेमोरी लिखें" "स्क्रीन चालू करें" - "खाते प्राप्त करें" + "खाते पाएं" "पृष्ठभूमि में चलाएं" "सुलभता सुविधाओं के लिए आवाज़" @@ -359,7 +359,7 @@ "ज़्यादा" - "सामान्य" + "डिफ़ॉल्ट" "Sans-serif" "Sans-serif condensed" "Sans-serif monospace" diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml index 3037194277a..1b35ec4986c 100644 --- a/res/values-hy/arrays.xml +++ b/res/values-hy/arrays.xml @@ -88,7 +88,7 @@ "Միացված է %1$s-ին" "Անջատված" "Անջատվում է %1$s-ից…" - "Անջատած է" + "Անջատված է" "Անհաջող" "Արգելափակված" "Վատ ցանցից ժամանակավոր խուսափում" diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml index c0700e6cceb..7c6ab9e9c15 100644 --- a/res/values-in/arrays.xml +++ b/res/values-in/arrays.xml @@ -441,7 +441,7 @@ "Aktivitas teratas" "Penting (latar depan)" "Penting (latar belakang)" - "Backup" + "Cadangan" "Beban berat" "Layanan (berjalan)" "Layanan (memulai ulang)" diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml index e6ac03c6261..bd35c42fc43 100644 --- a/res/values-ne/arrays.xml +++ b/res/values-ne/arrays.xml @@ -473,7 +473,7 @@ "स्वतः पत्ता लगाउनुहोस्" - "सशुल्क वाइफाइका रूपमा लिनुहोस्" + "मिटर गरिएको रूपमा व्यवहार गर्नुहोस्" "मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्" diff --git a/res/values-ta-nokeys/strings.xml b/res/values-ta-nokeys/strings.xml index 6ca99f2ddb2..ab09083f0a3 100644 --- a/res/values-ta-nokeys/strings.xml +++ b/res/values-ta-nokeys/strings.xml @@ -16,5 +16,5 @@ - "பயன்பாடுகளை நிர்வகித்தல்" + "ஆப்ஸை நிர்வகித்தல்" diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml index c293c7d5461..fd1ce3e5652 100644 --- a/res/values-ta/arrays.xml +++ b/res/values-ta/arrays.xml @@ -372,7 +372,7 @@ "மிகச் சிறியது" "சிறியது" - "இயல்பானது" + "சராசரி" "பெரியது" "மிகப் பெரியது" diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml index eb0b2c30201..f446ac4287d 100644 --- a/res/values-zh-rTW/arrays.xml +++ b/res/values-zh-rTW/arrays.xml @@ -270,7 +270,7 @@ "啟用 VPN" "寫入桌布" "輔助結構" - "輔助螢幕擷取畫面" + "輔助螢幕截圖" "讀取手機狀態" "新增語音留言" "使用 SIP" @@ -298,7 +298,7 @@ "讀取日曆" "修改日曆" "位置" - "發佈通知" + "發布通知" "位置" "撥打電話" "讀取簡訊/MMS" @@ -337,7 +337,7 @@ "啟用 VPN" "寫入桌布" "輔助結構" - "輔助螢幕擷取畫面" + "輔助螢幕截圖" "讀取手機狀態" "新增語音留言" "使用 SIP" diff --git a/src/com/android/settings/development/BubbleGlobalPreferenceController.java b/src/com/android/settings/development/BubbleGlobalPreferenceController.java index 86d7be10460..2f22d098f44 100644 --- a/src/com/android/settings/development/BubbleGlobalPreferenceController.java +++ b/src/com/android/settings/development/BubbleGlobalPreferenceController.java @@ -16,8 +16,6 @@ package com.android.settings.development; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; - import android.content.Context; import android.provider.Settings; @@ -42,7 +40,7 @@ public class BubbleGlobalPreferenceController extends DeveloperOptionsPreference @Override public String getPreferenceKey() { - return NOTIFICATION_BUBBLES; + return Settings.Global.NOTIFICATION_BUBBLES; } @Override @@ -64,12 +62,12 @@ public class BubbleGlobalPreferenceController extends DeveloperOptionsPreference } private boolean isEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), - NOTIFICATION_BUBBLES, OFF) == ON; + return Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.NOTIFICATION_BUBBLES, OFF) == ON; } private void writeSetting(boolean isEnabled) { - Settings.Secure.putInt(mContext.getContentResolver(), - NOTIFICATION_BUBBLES, isEnabled ? ON : OFF); + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.NOTIFICATION_BUBBLES, isEnabled ? ON : OFF); } } diff --git a/src/com/android/settings/notification/BubblePreferenceController.java b/src/com/android/settings/notification/BubblePreferenceController.java index b68f11db0c8..b57a91100a4 100644 --- a/src/com/android/settings/notification/BubblePreferenceController.java +++ b/src/com/android/settings/notification/BubblePreferenceController.java @@ -16,7 +16,7 @@ package com.android.settings.notification; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import android.annotation.Nullable; import android.content.Context; @@ -113,7 +113,7 @@ public class BubblePreferenceController extends NotificationPreferenceController } private boolean isGloballyEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), + return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON; } @@ -124,7 +124,7 @@ public class BubblePreferenceController extends NotificationPreferenceController backend.setAllowBubbles(pkg, uid, false); // changing the global settings will cause the observer on the host page to reload // correct preference state - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); } @@ -134,7 +134,7 @@ public class BubblePreferenceController extends NotificationPreferenceController backend.setAllowBubbles(pkg, uid, true); // changing the global settings will cause the observer on the host page to reload // correct preference state - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); } } diff --git a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java index b1632c4d1e1..cc687cf107c 100644 --- a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java +++ b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java @@ -16,7 +16,7 @@ package com.android.settings.notification; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import android.app.settings.SettingsEnums; import android.content.Context; @@ -100,7 +100,7 @@ public class BubbleSummaryPreferenceController extends NotificationPreferenceCon } private boolean isGloballyEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), + return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON; } } diff --git a/src/com/android/settings/notification/GentleNotificationsPreferenceController.java b/src/com/android/settings/notification/GentleNotificationsPreferenceController.java index ea16e726846..67a4707e4f4 100644 --- a/src/com/android/settings/notification/GentleNotificationsPreferenceController.java +++ b/src/com/android/settings/notification/GentleNotificationsPreferenceController.java @@ -16,8 +16,6 @@ package com.android.settings.notification; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; - import android.content.Context; import android.provider.Settings; diff --git a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java b/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java index 398931dc518..0118a95deb2 100644 --- a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java +++ b/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java @@ -47,8 +47,8 @@ public class GlobalBubblePermissionObserverMixin extends ContentObserver { public void onStart() { mContext.getContentResolver().registerContentObserver( - Settings.Secure.getUriFor( - Settings.Secure.NOTIFICATION_BUBBLES), + Settings.Global.getUriFor( + Settings.Global.NOTIFICATION_BUBBLES), false /* notifyForDescendants */, this /* observer */); } diff --git a/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java index 11ca63f58c1..9e52a8829c9 100644 --- a/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.development; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import static com.android.settings.development.BubbleGlobalPreferenceController.OFF; import static com.android.settings.development.BubbleGlobalPreferenceController.ON; @@ -77,7 +77,7 @@ public class BubbleGlobalPreferenceControllerTest { @Test public void updateState_settingEnabled_preferenceShouldBeChecked() { - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 1 /* enabled */); mController.updateState(mPreference); @@ -86,7 +86,7 @@ public class BubbleGlobalPreferenceControllerTest { @Test public void updateState_settingReset_defaultDisabled_preferenceShouldNotBeChecked() { - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 0 /* enabled */); mController.updateState(mPreference); @@ -104,7 +104,7 @@ public class BubbleGlobalPreferenceControllerTest { } private boolean isSettingEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, OFF /* default off */) == ON; } diff --git a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java index aafefb51823..470cc27e6f2 100644 --- a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java @@ -20,7 +20,7 @@ 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 android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_OFF; import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_ON; @@ -103,7 +103,7 @@ public class BubblePreferenceControllerTest { @Test public void testIsAvailable_notIfAppBlocked() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.banned = true; mController.onResume(appRow, mock(NotificationChannel.class), null, null); @@ -112,7 +112,7 @@ public class BubblePreferenceControllerTest { @Test public void testIsAvailable_notIfChannelBlocked() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_NONE); @@ -122,7 +122,7 @@ public class BubblePreferenceControllerTest { @Test public void testIsAvailable_channel_notIfAppOff() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = false; NotificationChannel channel = mock(NotificationChannel.class); @@ -136,7 +136,7 @@ public class BubblePreferenceControllerTest { public void testIsNotAvailable_ifOffGlobally_app() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertFalse(mController.isAvailable()); @@ -148,7 +148,7 @@ public class BubblePreferenceControllerTest { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertFalse(mController.isAvailable()); @@ -158,7 +158,7 @@ public class BubblePreferenceControllerTest { public void testIsAvailable_app_evenIfOffGlobally() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mAppPageController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertTrue(mAppPageController.isAvailable()); @@ -168,7 +168,7 @@ public class BubblePreferenceControllerTest { public void testIsAvailable_app() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -181,7 +181,7 @@ public class BubblePreferenceControllerTest { when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -193,7 +193,7 @@ public class BubblePreferenceControllerTest { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -205,7 +205,7 @@ public class BubblePreferenceControllerTest { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertFalse(mController.isAvailable()); } @@ -225,7 +225,7 @@ public class BubblePreferenceControllerTest { @Test public void testUpdateState_channelNotBlockable() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true); @@ -239,7 +239,7 @@ public class BubblePreferenceControllerTest { @Test public void testUpdateState_channel() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.canBubble()).thenReturn(true); @@ -259,7 +259,7 @@ public class BubblePreferenceControllerTest { @Test public void testUpdateState_app() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.label = "App!"; appRow.allowBubbles = true; @@ -281,7 +281,7 @@ public class BubblePreferenceControllerTest { @Test public void testUpdateState_app_offGlobally() { - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.label = "App!"; @@ -295,7 +295,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_on_channel() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = true; NotificationChannel channel = @@ -315,7 +315,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_off_channel() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = true; NotificationChannel channel = @@ -335,7 +335,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_on_app() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = false; mController.onResume(appRow, null, null, null); @@ -353,7 +353,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_off_app() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = true; mController.onResume(appRow, null, null, null); @@ -371,7 +371,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_on_app_offGlobally() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = false; diff --git a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java index 04c8e4e985b..2710203c143 100644 --- a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java @@ -20,7 +20,7 @@ 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 android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_OFF; import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON; @@ -98,7 +98,7 @@ public class BubbleSummaryPreferenceControllerTest { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertFalse(mController.isAvailable()); @@ -108,7 +108,7 @@ public class BubbleSummaryPreferenceControllerTest { public void testIsAvailable_app() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -117,7 +117,7 @@ public class BubbleSummaryPreferenceControllerTest { public void testIsNotAvailable_app_globalOff() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertFalse(mController.isAvailable()); @@ -131,7 +131,7 @@ public class BubbleSummaryPreferenceControllerTest { when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -149,18 +149,18 @@ public class BubbleSummaryPreferenceControllerTest { @Test public void testGetSummary() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = true; mController.onResume(appRow, null, null, null); assertEquals("On", mController.getSummary()); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertEquals("Off", mController.getSummary()); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); appRow.allowBubbles = false; mController.onResume(appRow, null, null, null); diff --git a/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java index 4821322cff7..bd013799416 100644 --- a/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java @@ -16,8 +16,6 @@ package com.android.settings.notification; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; - import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF; import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;