Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b065caf authored by Matthew Fritze's avatar Matthew Fritze
Browse files

Disable Moblie Data Slice in AP mode 

When airplane mode is enabled, users should not be able to
change the value of mobile data. Thus, when airplane mode is enabled,
replace the Slice with a no-op slice explaining why it cannot be
changed.

Fixes:
Fixes: 126726036
Test: robotests
Change-Id: I1c6d95dbb9d0c51247709b9867506c800f5872cd
parent 94956549

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -10640,6 +10640,9 @@ 
    <!-- Title for the Volume dialog (settings panel) with all volume streams[CHAR LIMIT=50] -->

    <string name="volume_connectivity_panel_title">Volume</string>









    <!-- Subtitle explaining that mobile data cannot be used while airplane mode is on [CHAR LIMIT=50] -->









    <string name="mobile_data_ap_mode_disabled">Unavailable during airplane mode</string>

















    <!-- UI debug setting: force desktop mode [CHAR LIMIT=50] -->









    <string name="force_desktop_mode">Force desktop mode</string>









    <!-- UI debug setting: force desktop mode summary [CHAR LIMIT=NONE] -->

























src/com/android/settings/network/telephony/MobileDataSlice.java



+20
−6






























Original line number
Diff line number
Diff line







@@ -74,8 +74,27 @@ public class MobileDataSlice implements CustomSliceable {







        final IconCompat icon = IconCompat.createWithResource(mContext,









                R.drawable.ic_network_cell);









        final String title = mContext.getText(R.string.mobile_data_settings_title).toString();









        final CharSequence summary = getSummary();









        @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);



















        // Return a Slice without the mobile data toggle when airplane mode is on.









        if (isAirplaneModeEnabled()) {









            final CharSequence summary = mContext.getText(R.string.mobile_data_ap_mode_disabled);









            // Intent does nothing, but we have to pass an intent to the Row.









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









        }



















        final CharSequence summary = getSummary();









        final PendingIntent toggleAction = getBroadcastIntent(mContext);









        final PendingIntent primaryAction = getPrimaryAction();









        final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon,








@@ -101,11 +120,6 @@ public class MobileDataSlice implements CustomSliceable {

















    @Override









    public void onNotifyChange(Intent intent) {









        // Don't make a change if we are in Airplane Mode.









        if (isAirplaneModeEnabled()) {









            return;









        }



















        final boolean newState = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,









                    isMobileDataEnabled());










































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



+24
−0






























Original line number
Diff line number
Diff line







@@ -24,6 +24,7 @@ import static org.mockito.Mockito.spy;







import static org.mockito.Mockito.times;









import static org.mockito.Mockito.verify;



















import android.app.PendingIntent;









import android.content.Context;









import android.content.Intent;









import android.provider.Settings;








@@ -162,4 +163,27 @@ public class MobileDataSliceTest {

















        assertThat(isMobileDataEnabled).isEqualTo(seed);









    }



















    @Test









    public void airplaneModeEnabled_slicePrimaryActionIsEmpty() {









        doReturn(true).when(mMobileDataSlice).isAirplaneModeEnabled();









        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);









        final Slice mobileData = mMobileDataSlice.getSlice();



















        final SliceMetadata metadata = SliceMetadata.from(mContext, mobileData);









        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.getAction()).isNull();









    }









}