From 81d15f029a31036a8f8dfa8a18200b99c7ed0f75 Mon Sep 17 00:00:00 2001 From: Lei Yu Date: Fri, 17 May 2019 14:47:01 -0700 Subject: [PATCH 1/4] Set some BT icon background to white Fixes: 132992480 Test: Manual Change-Id: I22aad1ab327dd34ad67b9bbac10f6f2e3c9ec139 --- res/drawable/circle_outline.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/res/drawable/circle_outline.xml b/res/drawable/circle_outline.xml index 1b2631d522d..829d6b9f0a4 100644 --- a/res/drawable/circle_outline.xml +++ b/res/drawable/circle_outline.xml @@ -16,6 +16,7 @@ --> + From 72bdef07816db010393c78ac367fd45bd154730e Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Mon, 20 May 2019 14:03:07 -0400 Subject: [PATCH 2/4] Fix hiding of channel fields When channel is off Test: atest Bug: 132971502 Change-Id: I5772266e022e5ebb5dbf20f231ca30fad95e3db7 --- .../notification/NotificationPreferenceController.java | 4 +++- .../notification/NotificationPreferenceControllerTest.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java index d09ea4dc3dc..2ae7019ea3c 100644 --- a/src/com/android/settings/notification/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/NotificationPreferenceController.java @@ -74,7 +74,9 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc return false; } if (mChannelGroup != null) { - return !mChannelGroup.isBlocked(); + if (mChannelGroup.isBlocked()) { + return false; + } } if (mChannel != null) { return mChannel.getImportance() != IMPORTANCE_NONE; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java index cde5b900cf1..b024cee3632 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java @@ -105,10 +105,12 @@ public class NotificationPreferenceControllerTest { @Test public void isAvailable_notIfChannelBlocked() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + NotificationChannelGroup group = mock(NotificationChannelGroup.class); + when(group.isBlocked()).thenReturn(false); NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_NONE); - mController.onResume(appRow, channel, null, null); + mController.onResume(appRow, channel, group, null); assertFalse(mController.isAvailable()); } From 8c6098e5cf671122edd196be1582fa97575ceb25 Mon Sep 17 00:00:00 2001 From: Antony Sargent Date: Mon, 20 May 2019 17:20:31 -0700 Subject: [PATCH 3/4] Fix signal strength display in 'Choose network' list For GSM networks, the "Choose network" page allows you to manually pick from among different cell networks, and shows signal strength and network type (LTE, 3g, etc.) for available ones. The signal strength wedges were transparent and not visible to the user - this CL fixes that. Bug: 132895135 Test: visual (Insert SIM with GSM service, then go to Settings -> Network & internet -> Mobile network -> Advanced -> Automatically select network) Change-Id: Ibbbc60b590b09e4b4f5e31b49fe578769dcdbc4d --- .../settings/network/telephony/NetworkOperatorPreference.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java index a334aeb72fb..2359399478e 100644 --- a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java +++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java @@ -30,6 +30,7 @@ import android.view.Gravity; import androidx.preference.Preference; import com.android.settings.R; +import com.android.settings.Utils; import com.android.settingslib.graph.SignalDrawable; import java.util.List; @@ -144,6 +145,7 @@ public class NetworkOperatorPreference extends Preference { // Set the signal strength icon at the bottom right icons.setLayerGravity(1 /* index of SignalDrawable */, Gravity.BOTTOM | Gravity.RIGHT); icons.setLayerSize(1 /* index of SignalDrawable */, iconSize, iconSize); + icons.setTintList(Utils.getColorAttr(context, android.R.attr.colorControlNormal)); setIcon(icons); } } From 66dba9479749b8dcdf16627ac2fcab65652e783e Mon Sep 17 00:00:00 2001 From: Amin Shaikh Date: Mon, 20 May 2019 21:36:57 +0000 Subject: [PATCH 4/4] Remove unnecessary STOPSHIP. THEME_CUSTOMIZATION_OVERLAY_PACKAGES will no be set in Q. When it is set, these developer settings will be removed entirely. Change-Id: Ic33bb68a4e4a0fabc6731169ef96ecd386dc441e Fixes: 122308197 Test: presubmit --- .../development/OverlayCategoryPreferenceController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/development/OverlayCategoryPreferenceController.java b/src/com/android/settings/development/OverlayCategoryPreferenceController.java index 7a2ee08020f..6e0b2d00f6b 100644 --- a/src/com/android/settings/development/OverlayCategoryPreferenceController.java +++ b/src/com/android/settings/development/OverlayCategoryPreferenceController.java @@ -198,8 +198,8 @@ public class OverlayCategoryPreferenceController extends DeveloperOptionsPrefere @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); - // STOPSHIP b/122308197: reset the overlays to the set in - // Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES + // TODO b/133222035: remove these developer settings when the + // Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES setting is used setOverlay(PACKAGE_DEVICE_DEFAULT); updateState(mPreference); }