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

Commit f832101e authored by Jiaming Cheng's avatar Jiaming Cheng Committed by Android (Google) Code Review
Browse files

Merge "[QSDetailedView] Add the `InternetDetailsContentManager`" into main

parents 4688c6e3 d5d8ca0d

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ filegroup { 
        "tests/src/**/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java",

        "tests/src/**/systemui/shared/system/RemoteTransitionTest.java",

        "tests/src/**/systemui/qs/tiles/dialog/InternetDetailsContentControllerTest.java",

        "tests/src/**/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt",

        "tests/src/**/systemui/qs/external/TileLifecycleManagerTest.java",

        "tests/src/**/systemui/ScreenDecorationsTest.java",

        "tests/src/**/systemui/statusbar/policy/BatteryControllerStartableTest.java",

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

+0 −1
Original line number Diff line number Diff line
@@ -373,7 +373,6 @@ public class InternetDetailsContentController implements AccessPointController.A 
        mConnectivityManager.setAirplaneMode(false);

    }



    @VisibleForTesting

    protected int getDefaultDataSubscriptionId() {

        return mSubscriptionManager.getDefaultDataSubscriptionId();

    }

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManager.kt

0 → 100644
+991 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailedViewModel.kt→packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsViewModel.kt

+0 −0

File moved.

View file

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

+3 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import com.android.systemui.accessibility.floatingmenu.AnnotationLinkSpan; 
import com.android.systemui.animation.DialogTransitionAnimator;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.qs.flags.QsDetailedView;

import com.android.systemui.res.R;

import com.android.systemui.shade.ShadeDisplayAware;

import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor;
@@ -207,7 +208,8 @@ public class InternetDialogDelegateLegacy implements 
            KeyguardStateController keyguardStateController,

            SystemUIDialog.Factory systemUIDialogFactory,

            ShadeDialogContextInteractor shadeDialogContextInteractor) {

        // TODO: b/377388104 QsDetailedView.assertInLegacyMode();

        // If `QsDetailedView` is enabled, it should show the details view.

        QsDetailedView.assertInLegacyMode();



        mAboveStatusBar = aboveStatusBar;

        mSystemUIDialogFactory = systemUIDialogFactory;