PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev

Browse Source
This commit is contained in:
Mady Mellor
2019-09-16 21:55:52 +00:00
committed by Android (Google) Code Review
parent 1ae748b09f 91ba8e9b66
commit eac42583a1
13 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values-bs/arrays.xml
View File

@@ -362,9 +362,9 @@
<item msgid="1319652728542138112">"Zadano"</item> <item msgid="1319652728542138112">"Zadano"</item>
<item msgid="1016452621833735880">"Sans-serif"</item> <item msgid="1016452621833735880">"Sans-serif"</item>
<item msgid="2496277987934654454">"Sans-serif kondenzovani"</item> <item msgid="2496277987934654454">"Sans-serif kondenzovani"</item>
<item msgid="7247838127505318669">"Sans-serif fiksnog razmaka"</item> <item msgid="7247838127505318669">"Sans-serif monospace"</item>
<item msgid="4478414822462359763">"Serif"</item> <item msgid="4478414822462359763">"Serif"</item>
<item msgid="7502451783483660829">"Serif fiksnog razmaka"</item> <item msgid="7502451783483660829">"Serif monospace"</item>
<item msgid="639503332147461010">"Casual"</item> <item msgid="639503332147461010">"Casual"</item>
<item msgid="7967169925231332424">"Kurziv"</item> <item msgid="7967169925231332424">"Kurziv"</item>
<item msgid="561832997193039673">"Mala početna slova"</item> <item msgid="561832997193039673">"Mala početna slova"</item>

2
res/values-ca/arrays.xml
View File

@@ -380,7 +380,7 @@
<item msgid="4733815704128258753">"Predeterminat"</item> <item msgid="4733815704128258753">"Predeterminat"</item>
<item msgid="3217099060748617005">"Cap"</item> <item msgid="3217099060748617005">"Cap"</item>
<item msgid="7467615139904599420">"Contorn"</item> <item msgid="7467615139904599420">"Contorn"</item>
<item msgid="5623165557468608975">"Ombra paral·lela"</item> <item msgid="5623165557468608975">"Ombra"</item>
<item msgid="8088451174058214588">"Elevat"</item> <item msgid="8088451174058214588">"Elevat"</item>
<item msgid="3821418743395480313">"Enfonsat"</item> <item msgid="3821418743395480313">"Enfonsat"</item>
</string-array> </string-array>

4
res/values-eu/arrays.xml
View File

@@ -350,7 +350,7 @@
<item msgid="2404067308793740341">"Idatzi memorian"</item> <item msgid="2404067308793740341">"Idatzi memorian"</item>
<item msgid="5832543806893763620">"Aktibatu pantaila"</item> <item msgid="5832543806893763620">"Aktibatu pantaila"</item>
<item msgid="5258373962467495905">"Lortu kontuak"</item> <item msgid="5258373962467495905">"Lortu kontuak"</item>
<item msgid="334625385979270703">"Abiarazi atzeko planoan"</item> <item msgid="334625385979270703">"Exekutatu atzeko planoan"</item>
<item msgid="9039213578110332702">"Erabilerraztasun-eginbideen bolumena"</item> <item msgid="9039213578110332702">"Erabilerraztasun-eginbideen bolumena"</item>
</string-array> </string-array>
<string-array name="long_press_timeout_selector_titles"> <string-array name="long_press_timeout_selector_titles">
@@ -443,7 +443,7 @@
<item msgid="3396458970745718652">"Garrantzitsua (atzeko planokoa)"</item> <item msgid="3396458970745718652">"Garrantzitsua (atzeko planokoa)"</item>
<item msgid="5214825238247511992">"Babeskopiak"</item> <item msgid="5214825238247511992">"Babeskopiak"</item>
<item msgid="311372689168254967">"Handia"</item> <item msgid="311372689168254967">"Handia"</item>
<item msgid="7438189122367820362">"Zerbitzua (abian)"</item> <item msgid="7438189122367820362">"Zerbitzua (exekutatzen)"</item>
<item msgid="918687422516982498">"Zerbitzua (berrabiarazten)"</item> <item msgid="918687422516982498">"Zerbitzua (berrabiarazten)"</item>
<item msgid="6807727069641853029">"Hargailua"</item> <item msgid="6807727069641853029">"Hargailua"</item>
<item msgid="6782857406100845127">"Hasiera"</item> <item msgid="6782857406100845127">"Hasiera"</item>

2
res/values-ne/arrays.xml
View File

@@ -473,7 +473,7 @@
</string-array> </string-array>
<string-array name="wifi_metered_entries"> <string-array name="wifi_metered_entries">
<item msgid="5200910605264415911">"स्वतः पत्ता लगाउनुहोस्"</item> <item msgid="5200910605264415911">"स्वतः पत्ता लगाउनुहोस्"</item>
<item msgid="8745603368609022803">"सशुल्क वाइफाइका रूपमा लिनुहोस्"</item> <item msgid="8745603368609022803">"मिटर गरिएको रूपमा व्यवहार गर्नुहोस्"</item>
<item msgid="2266114985518865625">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item> <item msgid="2266114985518865625">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>
</string-array> </string-array>
<string-array name="wifi_privacy_entries"> <string-array name="wifi_privacy_entries">

12
src/com/android/settings/development/BubbleGlobalPreferenceController.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.development; package com.android.settings.development;
import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
@@ -42,7 +40,7 @@ public class BubbleGlobalPreferenceController extends DeveloperOptionsPreference
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return NOTIFICATION_BUBBLES; return Settings.Global.NOTIFICATION_BUBBLES;
} }
@Override @Override
@@ -64,12 +62,12 @@ public class BubbleGlobalPreferenceController extends DeveloperOptionsPreference
} }
private boolean isEnabled() { private boolean isEnabled() {
return Settings.Secure.getInt(mContext.getContentResolver(), return Settings.Global.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, OFF) == ON; Settings.Global.NOTIFICATION_BUBBLES, OFF) == ON;
} }
private void writeSetting(boolean isEnabled) { private void writeSetting(boolean isEnabled) {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, isEnabled ? ON : OFF); Settings.Global.NOTIFICATION_BUBBLES, isEnabled ? ON : OFF);
} }
} }

8
src/com/android/settings/notification/BubblePreferenceController.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.notification; 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.annotation.Nullable;
import android.content.Context; import android.content.Context;
@@ -113,7 +113,7 @@ public class BubblePreferenceController extends NotificationPreferenceController
} }
private boolean isGloballyEnabled() { private boolean isGloballyEnabled() {
return Settings.Secure.getInt(mContext.getContentResolver(), return Settings.Global.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON; NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
} }
@@ -124,7 +124,7 @@ public class BubblePreferenceController extends NotificationPreferenceController
backend.setAllowBubbles(pkg, uid, false); backend.setAllowBubbles(pkg, uid, false);
// changing the global settings will cause the observer on the host page to reload // changing the global settings will cause the observer on the host page to reload
// correct preference state // correct preference state
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
} }
@@ -134,7 +134,7 @@ public class BubblePreferenceController extends NotificationPreferenceController
backend.setAllowBubbles(pkg, uid, true); backend.setAllowBubbles(pkg, uid, true);
// changing the global settings will cause the observer on the host page to reload // changing the global settings will cause the observer on the host page to reload
// correct preference state // correct preference state
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
} }
} }

4
src/com/android/settings/notification/BubbleSummaryPreferenceController.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.notification; 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.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
@@ -100,7 +100,7 @@ public class BubbleSummaryPreferenceController extends NotificationPreferenceCon
} }
private boolean isGloballyEnabled() { private boolean isGloballyEnabled() {
return Settings.Secure.getInt(mContext.getContentResolver(), return Settings.Global.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON; NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
} }
} }

2
src/com/android/settings/notification/GentleNotificationsPreferenceController.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.notification; package com.android.settings.notification;
import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;

4
src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java
View File

@@ -47,8 +47,8 @@ public class GlobalBubblePermissionObserverMixin extends ContentObserver {
public void onStart() { public void onStart() {
mContext.getContentResolver().registerContentObserver( mContext.getContentResolver().registerContentObserver(
Settings.Secure.getUriFor( Settings.Global.getUriFor(
Settings.Secure.NOTIFICATION_BUBBLES), Settings.Global.NOTIFICATION_BUBBLES),
false /* notifyForDescendants */, false /* notifyForDescendants */,
this /* observer */); this /* observer */);
} }

8
tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.development; 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.OFF;
import static com.android.settings.development.BubbleGlobalPreferenceController.ON; import static com.android.settings.development.BubbleGlobalPreferenceController.ON;
@@ -77,7 +77,7 @@ public class BubbleGlobalPreferenceControllerTest {
@Test @Test
public void updateState_settingEnabled_preferenceShouldBeChecked() { public void updateState_settingEnabled_preferenceShouldBeChecked() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, 1 /* enabled */); NOTIFICATION_BUBBLES, 1 /* enabled */);
mController.updateState(mPreference); mController.updateState(mPreference);
@@ -86,7 +86,7 @@ public class BubbleGlobalPreferenceControllerTest {
@Test @Test
public void updateState_settingReset_defaultDisabled_preferenceShouldNotBeChecked() { public void updateState_settingReset_defaultDisabled_preferenceShouldNotBeChecked() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, 0 /* enabled */); NOTIFICATION_BUBBLES, 0 /* enabled */);
mController.updateState(mPreference); mController.updateState(mPreference);
@@ -104,7 +104,7 @@ public class BubbleGlobalPreferenceControllerTest {
} }
private boolean isSettingEnabled() { private boolean isSettingEnabled() {
return Settings.Secure.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
OFF /* default off */) == ON; OFF /* default off */) == ON;
} }

40
tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
View File

@@ -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_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE; 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_OFF;
import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_ON; import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_ON;
@@ -103,7 +103,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testIsAvailable_notIfAppBlocked() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true; appRow.banned = true;
mController.onResume(appRow, mock(NotificationChannel.class), null, null); mController.onResume(appRow, mock(NotificationChannel.class), null, null);
@@ -112,7 +112,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testIsAvailable_notIfChannelBlocked() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE); when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -122,7 +122,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testIsAvailable_channel_notIfAppOff() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = false; appRow.allowBubbles = false;
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
@@ -136,7 +136,7 @@ public class BubblePreferenceControllerTest {
public void testIsNotAvailable_ifOffGlobally_app() { public void testIsNotAvailable_ifOffGlobally_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null); mController.onResume(appRow, null, null, null);
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable()); assertFalse(mController.isAvailable());
@@ -148,7 +148,7 @@ public class BubblePreferenceControllerTest {
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null); mController.onResume(appRow, channel, null, null);
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable()); assertFalse(mController.isAvailable());
@@ -158,7 +158,7 @@ public class BubblePreferenceControllerTest {
public void testIsAvailable_app_evenIfOffGlobally() { public void testIsAvailable_app_evenIfOffGlobally() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mAppPageController.onResume(appRow, null, null, null); mAppPageController.onResume(appRow, null, null, null);
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
assertTrue(mAppPageController.isAvailable()); assertTrue(mAppPageController.isAvailable());
@@ -168,7 +168,7 @@ public class BubblePreferenceControllerTest {
public void testIsAvailable_app() { public void testIsAvailable_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null); 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()); assertTrue(mController.isAvailable());
} }
@@ -181,7 +181,7 @@ public class BubblePreferenceControllerTest {
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID); when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
mController.onResume(appRow, channel, null, null); 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()); assertTrue(mController.isAvailable());
} }
@@ -193,7 +193,7 @@ public class BubblePreferenceControllerTest {
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null); 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()); assertTrue(mController.isAvailable());
} }
@@ -205,7 +205,7 @@ public class BubblePreferenceControllerTest {
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null); 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()); assertFalse(mController.isAvailable());
} }
@@ -225,7 +225,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testUpdateState_channelNotBlockable() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true); when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true);
@@ -239,7 +239,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testUpdateState_channel() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.canBubble()).thenReturn(true); when(channel.canBubble()).thenReturn(true);
@@ -259,7 +259,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testUpdateState_app() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.label = "App!"; appRow.label = "App!";
appRow.allowBubbles = true; appRow.allowBubbles = true;
@@ -281,7 +281,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testUpdateState_app_offGlobally() { public void testUpdateState_app_offGlobally() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.label = "App!"; appRow.label = "App!";
@@ -295,7 +295,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testOnPreferenceChange_on_channel() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true; appRow.allowBubbles = true;
NotificationChannel channel = NotificationChannel channel =
@@ -315,7 +315,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testOnPreferenceChange_off_channel() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true; appRow.allowBubbles = true;
NotificationChannel channel = NotificationChannel channel =
@@ -335,7 +335,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testOnPreferenceChange_on_app() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = false; appRow.allowBubbles = false;
mController.onResume(appRow, null, null, null); mController.onResume(appRow, null, null, null);
@@ -353,7 +353,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testOnPreferenceChange_off_app() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true; appRow.allowBubbles = true;
mController.onResume(appRow, null, null, null); mController.onResume(appRow, null, null, null);
@@ -371,7 +371,7 @@ public class BubblePreferenceControllerTest {
@Test @Test
public void testOnPreferenceChange_on_app_offGlobally() { public void testOnPreferenceChange_on_app_offGlobally() {
Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF); SYSTEM_WIDE_OFF);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = false; appRow.allowBubbles = false;

16
tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
View File

@@ -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_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE; 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_OFF;
import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON; import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON;
@@ -98,7 +98,7 @@ public class BubbleSummaryPreferenceControllerTest {
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null); mController.onResume(appRow, channel, null, null);
Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF); SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable()); assertFalse(mController.isAvailable());
@@ -108,7 +108,7 @@ public class BubbleSummaryPreferenceControllerTest {
public void testIsAvailable_app() { public void testIsAvailable_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null); 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()); assertTrue(mController.isAvailable());
} }
@@ -117,7 +117,7 @@ public class BubbleSummaryPreferenceControllerTest {
public void testIsNotAvailable_app_globalOff() { public void testIsNotAvailable_app_globalOff() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null); mController.onResume(appRow, null, null, null);
Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF); SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable()); assertFalse(mController.isAvailable());
@@ -131,7 +131,7 @@ public class BubbleSummaryPreferenceControllerTest {
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID); when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
mController.onResume(appRow, channel, null, null); 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()); assertTrue(mController.isAvailable());
} }
@@ -149,18 +149,18 @@ public class BubbleSummaryPreferenceControllerTest {
@Test @Test
public void testGetSummary() { 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(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true; appRow.allowBubbles = true;
mController.onResume(appRow, null, null, null); mController.onResume(appRow, null, null, null);
assertEquals("On", mController.getSummary()); assertEquals("On", mController.getSummary());
Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF); SYSTEM_WIDE_OFF);
assertEquals("Off", mController.getSummary()); 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; appRow.allowBubbles = false;
mController.onResume(appRow, null, null, null); mController.onResume(appRow, null, null, null);

2
tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.notification; 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.OFF;
import static com.android.settings.notification.BadgingNotificationPreferenceController.ON; import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;