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

Commit eb135e21 authored by Chelsea Hao's avatar Chelsea Hao Committed by Android (Google) Code Review
Browse files

Merge "Fix transition from Internet Tile to Share Wifi" into main

parents 4960efea 66beac5b

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

+2 −5
Original line number Diff line number Diff line
@@ -1348,15 +1348,12 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
        mDefaultDataSubId = defaultDataSubId;

    }



    boolean mayLaunchShareWifiSettings(WifiEntry wifiEntry) {

    boolean mayLaunchShareWifiSettings(WifiEntry wifiEntry, View view) {

        Intent intent = getConfiguratorQrCodeGeneratorIntentOrNull(wifiEntry);

        if (intent == null) {

            return false;

        }

        if (mCallback != null) {

            mCallback.dismissDialog();

        }

        mActivityStarter.startActivity(intent, false /* dismissShade */);

        startActivity(intent, view);

        return true;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ public class InternetDialogDelegate implements 
                });

        mDoneButton.setOnClickListener(v -> dialog.dismiss());

        mShareWifiButton.setOnClickListener(v -> {

            if (mInternetDialogController.mayLaunchShareWifiSettings(mConnectedWifiEntry)) {

            if (mInternetDialogController.mayLaunchShareWifiSettings(mConnectedWifiEntry, v)) {

                mUiEventLogger.log(InternetDialogEvent.SHARE_WIFI_QS_BUTTON_CLICKED);

            }

        });