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

Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3

Browse Source 
am: 60a1dc1609

Change-Id: Ia745e49ee270f2a2d0c114d3a23e8cff48bf5681
This commit is contained in:
Matthew Fritze
2019-06-18 20:40:10 -07:00
committed by android-build-merger
parent 246a514a5e 60a1dc1609
commit a57687b50f
2 changed files with 7 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/network/telephony/MobileDataSlice.java
View File

@@ -78,16 +78,14 @@ public class MobileDataSlice implements CustomSliceable {
final String title = mContext.getText(R.string.mobile_data_settings_title).toString(); final String title = mContext.getText(R.string.mobile_data_settings_title).toString();
@ColorInt final int color = Utils.getColorAccentDefaultColor(mContext); @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
// Return a Slice without the mobile data toggle when airplane mode is on. // Return null until we can show a disabled-action Slice, blaming Airplane mode.
if (isAirplaneModeEnabled()) { if (isAirplaneModeEnabled()) {
return buildUnavailableMobileDataSlice(title, return null;
mContext.getText(R.string.mobile_data_ap_mode_disabled), icon, color);
} }
// Return a Slice without the mobile data toggle when mobile data disabled. // Return null until we can show a disabled-action Slice.
if (!isMobileDataAvailable()) { if (!isMobileDataAvailable()) {
return buildUnavailableMobileDataSlice(title, return null;
mContext.getText(R.string.sim_cellular_data_unavailable), icon, color);
} }
final CharSequence summary = getSummary(); final CharSequence summary = getSummary();
@@ -201,22 +199,6 @@ public class MobileDataSlice implements CustomSliceable {
return mTelephonyManager.isDataEnabled(); return mTelephonyManager.isDataEnabled();
} }
private Slice buildUnavailableMobileDataSlice(String title, CharSequence summary,
IconCompat icon, int color) {
final PendingIntent intent = PendingIntent.getActivity(mContext, 0 /* requestCode */,
new Intent(), 0 /* flags */);
final SliceAction deadAction =
SliceAction.create(intent, icon, ListBuilder.ICON_IMAGE, title);
final ListBuilder listBuilder = new ListBuilder(mContext, getUri(),
ListBuilder.INFINITY)
.setAccentColor(color)
.addRow(new ListBuilder.RowBuilder()
.setTitle(title)
.setSubtitle(summary)
.setPrimaryAction(deadAction));
return listBuilder.build();
}
/** /**
* Listener for mobile data state changes. * Listener for mobile data state changes.
* *

48
tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
View File

@@ -174,21 +174,7 @@ public class MobileDataSliceTest {
doReturn(new ArrayList<>()).when(mSubscriptionManager).getSelectableSubscriptionInfoList(); doReturn(new ArrayList<>()).when(mSubscriptionManager).getSelectableSubscriptionInfoList();
final Slice mobileData = mMobileDataSlice.getSlice(); final Slice mobileData = mMobileDataSlice.getSlice();
final SliceMetadata metadata = SliceMetadata.from(mContext, mobileData); assertThat(mobileData).isNull();
assertThat(metadata.getTitle())
.isEqualTo(mContext.getString(R.string.mobile_data_settings_title));
assertThat(metadata.getSubtitle())
.isEqualTo(mContext.getString(R.string.sim_cellular_data_unavailable));
final List<SliceAction> toggles = metadata.getToggles();
assertThat(toggles).hasSize(0);
final SliceAction primaryAction = metadata.getPrimaryAction();
final PendingIntent pendingIntent = primaryAction.getAction();
final Intent actionIntent = pendingIntent.getIntent();
assertThat(actionIntent).isNull();
} }
@Test @Test
@@ -196,21 +182,7 @@ public class MobileDataSliceTest {
doReturn(null).when(mSubscriptionManager).getSelectableSubscriptionInfoList(); doReturn(null).when(mSubscriptionManager).getSelectableSubscriptionInfoList();
final Slice mobileData = mMobileDataSlice.getSlice(); final Slice mobileData = mMobileDataSlice.getSlice();
final SliceMetadata metadata = SliceMetadata.from(mContext, mobileData); assertThat(mobileData).isNull();
assertThat(metadata.getTitle())
.isEqualTo(mContext.getString(R.string.mobile_data_settings_title));
assertThat(metadata.getSubtitle())
.isEqualTo(mContext.getString(R.string.sim_cellular_data_unavailable));
final List<SliceAction> toggles = metadata.getToggles();
assertThat(toggles).hasSize(0);
final SliceAction primaryAction = metadata.getPrimaryAction();
final PendingIntent pendingIntent = primaryAction.getAction();
final Intent actionIntent = pendingIntent.getIntent();
assertThat(actionIntent).isNull();
} }
@Test @Test
@@ -219,20 +191,6 @@ public class MobileDataSliceTest {
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
final Slice mobileData = mMobileDataSlice.getSlice(); final Slice mobileData = mMobileDataSlice.getSlice();
final SliceMetadata metadata = SliceMetadata.from(mContext, mobileData); assertThat(mobileData).isNull();
assertThat(metadata.getTitle())
.isEqualTo(mContext.getString(R.string.mobile_data_settings_title));
assertThat(metadata.getSubtitle())
.isEqualTo(mContext.getString(R.string.mobile_data_ap_mode_disabled));
final List<SliceAction> toggles = metadata.getToggles();
assertThat(toggles).hasSize(0);
final SliceAction primaryAction = metadata.getPrimaryAction();
final PendingIntent pendingIntent = primaryAction.getAction();
final Intent actionIntent = pendingIntent.getIntent();
assertThat(actionIntent).isNull();
} }
} }