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

Snap for 5590748 from 23aa7a78ef to qt-c2f2-release

Browse Source 
Change-Id: I819cdffeeedb2e75acfcb0a76306954b30858db2
This commit is contained in:
android-build-team Robot
2019-05-22 03:09:48 +00:00
parent bdf2d1295a 23aa7a78ef
commit b7f3d0ff5f
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/drawable/circle_outline.xml
View File

@@ -16,6 +16,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@android:color/white"/>
<stroke
android:width="1dp"
android:color="@color/circle_outline_color"/>

4
src/com/android/settings/development/OverlayCategoryPreferenceController.java
View File

@@ -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);
}

2
src/com/android/settings/network/telephony/NetworkOperatorPreference.java
View File

@@ -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);
}
}

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

@@ -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;

4
tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
View File

@@ -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());
}