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

Commit a0cefd0a authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[ProviderModel] Should no set the subtitle as gone when airplane mode... 

Merge "[ProviderModel] Should no set the subtitle as gone when airplane mode is ON" into sc-v2-dev am: 8758ec14 am: 59b0e876

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16432820

Change-Id: Iba53f3ff11c1d66509ed735983dbecfb5dceeb50
parents f96aa9e8 59b0e876

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java

+5 −9
Original line number Diff line number Diff line
@@ -303,15 +303,11 @@ public class InternetDialog extends SystemUIDialog implements 
        if (DEBUG) {

            Log.d(TAG, "updateDialog");

        }

        if (mInternetDialogController.isAirplaneModeEnabled()) {

            mInternetDialogSubTitle.setVisibility(View.GONE);

            mAirplaneModeLayout.setVisibility(View.VISIBLE);

        } else {

        mInternetDialogTitle.setText(getDialogTitleText());

            mInternetDialogSubTitle.setVisibility(View.VISIBLE);

        mInternetDialogSubTitle.setText(getSubtitleText());

            mAirplaneModeLayout.setVisibility(View.GONE);

        }

        mAirplaneModeLayout.setVisibility(

                mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE);



        updateEthernet();

        if (shouldUpdateMobileNetwork) {

            setMobileDataLayout(mInternetDialogController.activeNetworkIsCellular(),

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class InternetDialogTest extends SysuiTestCase { 


        mInternetDialog.updateDialog(true);



        assertThat(mSubTitle.getVisibility()).isEqualTo(View.GONE);

        assertThat(mSubTitle.getVisibility()).isEqualTo(View.VISIBLE);

    }



    @Test