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

Merge "Show greyed out icon when Wi-Fi network is restricted to configurate" into tm-qpr-dev am: 74a748ece8 am: dd238fd0ad

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19967514

Change-Id: I951c95aa7d5f9385de3776c2b7b5e62ee509b534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-19 05:06:26 +00:00
committed by Automerger Merge Worker
parent 4203f40c00 dd238fd0ad
commit dd79717247
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/wifi/WifiEntryPreference.java
View File

@@ -201,7 +201,8 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
return accent ? android.R.attr.colorAccent : android.R.attr.colorControlNormal; return accent ? android.R.attr.colorAccent : android.R.attr.colorControlNormal;
} }
private void updateIcon(boolean showX, int level) { @VisibleForTesting
void updateIcon(boolean showX, int level) {
if (level == -1) { if (level == -1) {
setIcon(null); setIcon(null);
return; return;
@@ -209,7 +210,9 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
final Drawable drawable = mIconInjector.getIcon(showX, level); final Drawable drawable = mIconInjector.getIcon(showX, level);
if (drawable != null) { if (drawable != null) {
drawable.setTint(Utils.getColorAttrDefaultColor(getContext(), getIconColorAttr())); // Must use Drawable#setTintList() instead of Drawable#setTint() to show the grey
// icon when the preference is disabled.
drawable.setTintList(Utils.getColorAttr(getContext(), getIconColorAttr()));
setIcon(drawable); setIcon(drawable);
} else { } else {
setIcon(null); setIcon(null);

12
tests/robotests/src/com/android/settings/wifi/WifiEntryPreferenceTest.java
View File

@@ -17,6 +17,8 @@ package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
@@ -252,4 +254,14 @@ public class WifiEntryPreferenceTest {
assertThat(view.findViewById(R.id.icon_button).getVisibility()).isEqualTo(View.GONE); assertThat(view.findViewById(R.id.icon_button).getVisibility()).isEqualTo(View.GONE);
} }
@Test
public void updateIcon_ShouldSetTintListForDrawable() {
WifiEntryPreference pref =
new WifiEntryPreference(mContext, mMockWifiEntry, mMockIconInjector);
pref.updateIcon(false /* showX */, 4 /* level */);
verify(mMockDrawable4).setTintList(any());
}
} }