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

Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev

Browse Source 
am: 8bc21da216

Change-Id: Ibc6bbef7f4f257cb0a144daaff0774b088392784
This commit is contained in:
Jason Chiu
2019-05-13 22:14:04 -07:00
committed by android-build-merger
parent 761dc8cc6e 8bc21da216
commit 28d513fc32
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/wifi/slice/WifiSlice.java
View File

@@ -149,7 +149,6 @@ public class WifiSlice implements CustomSliceable {
final IconCompat icon = IconCompat.createWithResource(mContext, final IconCompat icon = IconCompat.createWithResource(mContext,
R.drawable.ic_settings_wireless); R.drawable.ic_settings_wireless);
final String title = mContext.getString(R.string.wifi_settings); final String title = mContext.getString(R.string.wifi_settings);
final CharSequence summary = getSummary();
final PendingIntent toggleAction = getBroadcastIntent(mContext); final PendingIntent toggleAction = getBroadcastIntent(mContext);
final PendingIntent primaryAction = getPrimaryAction(); final PendingIntent primaryAction = getPrimaryAction();
final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon, final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon,
@@ -162,7 +161,6 @@ public class WifiSlice implements CustomSliceable {
.setKeywords(getKeywords()) .setKeywords(getKeywords())
.addRow(new ListBuilder.RowBuilder() .addRow(new ListBuilder.RowBuilder()
.setTitle(title) .setTitle(title)
.setSubtitle(summary)
.addEndItem(toggleSliceAction) .addEndItem(toggleSliceAction)
.setPrimaryAction(primarySliceAction)); .setPrimaryAction(primarySliceAction));
} }
@@ -338,20 +336,6 @@ public class WifiSlice implements CustomSliceable {
} }
} }
private CharSequence getSummary() {
switch (mWifiManager.getWifiState()) {
case WifiManager.WIFI_STATE_ENABLED:
case WifiManager.WIFI_STATE_ENABLING:
return mContext.getText(R.string.switch_on_text);
case WifiManager.WIFI_STATE_DISABLED:
case WifiManager.WIFI_STATE_DISABLING:
return mContext.getText(R.string.switch_off_text);
case WifiManager.WIFI_STATE_UNKNOWN:
default:
return null;
}
}
private PendingIntent getPrimaryAction() { private PendingIntent getPrimaryAction() {
final Intent intent = getIntent(); final Intent intent = getIntent();
return PendingIntent.getActivity(mContext, 0 /* requestCode */, return PendingIntent.getActivity(mContext, 0 /* requestCode */,

11
tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
View File

@@ -238,20 +238,13 @@ public class WifiSliceTest {
setWorkerResults(createAccessPoint(AP1_NAME, true, true)); setWorkerResults(createAccessPoint(AP1_NAME, true, true));
doReturn(makeCaptivePortalNetworkCapabilities()).when(mConnectivityManager) doReturn(makeCaptivePortalNetworkCapabilities()).when(mConnectivityManager)
.getNetworkCapabilities(any()); .getNetworkCapabilities(any());
final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
R.drawable.ic_settings_accent);
final Slice wifiSlice = mWifiSlice.getSlice(); final Slice wifiSlice = mWifiSlice.getSlice();
final List<SliceItem> sliceItems = wifiSlice.getItems(); final List<SliceItem> sliceItems = wifiSlice.getItems();
SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME); SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
assertCaptivePortalItems(sliceItems);
}
private void assertCaptivePortalItems(List<SliceItem> sliceItems) {
final String expectedSummary = mContext.getString(R.string.switch_on_text);
SliceTester.assertAnySliceItemContainsSubtitle(sliceItems, expectedSummary);
final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
R.drawable.ic_settings_accent);
SliceTester.assertAnySliceItemContainsIcon(sliceItems, expectedIcon); SliceTester.assertAnySliceItemContainsIcon(sliceItems, expectedIcon);
} }