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

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

Merge changes Ib5ac6ee9,Ib127ad43,I37a423f3 into sc-qpr1-dev am: 1902c78c 

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

Change-Id: Ie4205d1c9d12d1ea6d93d8b05fdcd5aea755efc4
parents 46de3e6b 1902c78c

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+286 −271
Original line number Diff line number Diff line
@@ -27,15 +27,16 @@ 
        android:layout_width="match_parent"

        style="@style/Widget.SliceView.Panel"

        android:gravity="center_vertical|center_horizontal"

        android:layout_marginTop="20dp"

        android:layout_height="64dp"

        android:layout_marginTop="24dp"

        android:layout_marginBottom="24dp"

        android:layout_height="wrap_content"

        android:orientation="vertical">



        <TextView

            android:id="@+id/internet_dialog_title"

            android:gravity="center_vertical|center_horizontal"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="32dp"

            android:textColor="?android:attr/textColorPrimary"

            android:fontFamily="google-sans"

            android:textSize="24sp"/>
@@ -44,7 +45,8 @@ 
            android:id="@+id/internet_dialog_subtitle"

            android:gravity="center_vertical|center_horizontal"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="20dp"

            android:layout_marginTop="8dp"

            android:ellipsize="end"

            android:maxLines="1"

            android:fontFamily="google-sans"
@@ -56,6 +58,15 @@ 
        android:layout_height="1dp"

        android:background="?android:attr/listDivider"/>



    <androidx.core.widget.NestedScrollView

        android:id="@+id/scroll_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <LinearLayout

            android:id="@+id/scroll_layout"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            <LinearLayout

                android:id="@+id/internet_list"

                android:layout_width="match_parent"
@@ -69,18 +80,18 @@ 
                    android:clickable="true"

                    android:focusable="true"

                    android:background="?android:attr/selectableItemBackground"

            android:gravity="center_vertical|center_horizontal"

                    android:layout_gravity="center_vertical|start"

                    android:orientation="horizontal"

                    android:layout_marginRight="@dimen/settingslib_switchbar_margin"

                    android:layout_marginLeft="@dimen/settingslib_switchbar_margin"

                    android:layout_marginTop="4dp"

                    android:layout_marginBottom="4dp"

            android:paddingStart="@dimen/settingslib_switchbar_padding_left"

                    android:paddingStart="19dp"

                    android:paddingEnd="@dimen/settingslib_switchbar_padding_right">



                    <FrameLayout

                android:layout_width="36dp"

                android:layout_height="36dp"

                        android:layout_width="24dp"

                        android:layout_height="24dp"

                        android:clickable="false"

                        android:layout_gravity="center_vertical|start">

                        <ImageView
@@ -95,12 +106,12 @@ 
                        android:id="@+id/mobile_network_list"

                        android:orientation="vertical"

                        android:clickable="false"

                android:layout_marginLeft="3dp"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:gravity="start|center_vertical">

                        <TextView

                            android:id="@+id/mobile_title"

                            android:layout_marginLeft="17dp"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical"
@@ -111,6 +122,7 @@ 
                            android:fontFamily="google-sans"/>

                        <TextView

                            android:id="@+id/mobile_summary"

                            android:layout_marginLeft="17dp"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical"
@@ -123,7 +135,8 @@ 


                    <FrameLayout

                        android:layout_width="48dp"

                android:layout_height="48dp">

                        android:layout_height="48dp"

                        android:layout_gravity="end|center_vertical">

                        <Switch

                            android:id="@+id/mobile_toggle"

                            android:layout_gravity="center"
@@ -155,6 +168,7 @@ 
                    android:gravity="center"

                    android:orientation="horizontal"

                    android:layout_marginTop="8dp"

                    android:layout_marginBottom="8dp"

                    android:layout_marginRight="@dimen/settingslib_switchbar_margin"

                    android:layout_marginLeft="@dimen/settingslib_switchbar_margin"

                    android:paddingStart="@dimen/settingslib_switchbar_padding_left"
@@ -203,7 +217,6 @@ 
                    android:visibility="gone"

                    android:background="?android:attr/selectableItemBackground"

                    android:orientation="horizontal"

            android:layout_marginTop="8dp"

                    android:layout_marginRight="@dimen/settingslib_switchbar_margin"

                    android:layout_marginLeft="@dimen/settingslib_switchbar_margin"

                    android:paddingStart="@dimen/settingslib_switchbar_padding_left"
@@ -349,3 +362,5 @@ 
                    android:fontFamily="google-sans"/>

            </LinearLayout>

        </LinearLayout>

    </androidx.core.widget.NestedScrollView>

</LinearLayout>

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

+1 −4
Original line number Diff line number Diff line
@@ -174,10 +174,7 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern 
                    Html.fromHtml(wifiEntry.getSummary(false), Html.FROM_HTML_MODE_LEGACY));



            mWifiListLayout.setOnClickListener(v -> {

                if (!isOpenNetwork(security)) {

                    // Popup Wi-Fi password dialog condition:

                    // 1. The access point is a non-open network.

                    // 2. The Wi-Fi connection is not connected with this access point.

                if (wifiEntry.shouldEditBeforeConnect()) {

                    final Intent intent = new Intent(ACTION_WIFI_DIALOG);

                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                    intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);

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

+10 −9
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
 */

package com.android.systemui.qs.tiles.dialog;



import static android.view.WindowInsets.Type.navigationBars;

import static android.view.WindowInsets.Type.statusBars;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;



import static com.android.systemui.Prefs.Key.QS_HAS_TURNED_OFF_MOBILE_DATA;
@@ -166,7 +165,6 @@ public class InternetDialog extends SystemUIDialog implements 
        if (!aboveStatusBar) {

            getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);

        }

        show();

    }



    @Override
@@ -179,16 +177,19 @@ public class InternetDialog extends SystemUIDialog implements 
        mDialogView = LayoutInflater.from(mContext).inflate(R.layout.internet_connectivity_dialog,

                null);

        final Window window = getWindow();

        final WindowManager.LayoutParams lp = window.getAttributes();

        lp.gravity = Gravity.BOTTOM;

        lp.setFitInsetsTypes(statusBars() | navigationBars());

        lp.setFitInsetsSides(WindowInsets.Side.all());

        lp.setFitInsetsIgnoringVisibility(true);

        window.setAttributes(lp);

        final WindowManager.LayoutParams layoutParams = window.getAttributes();

        layoutParams.gravity = Gravity.BOTTOM;

        // Move down the dialog to overlay the navigation bar.

        layoutParams.setFitInsetsTypes(

                layoutParams.getFitInsetsTypes() & ~WindowInsets.Type.navigationBars());

        layoutParams.setFitInsetsSides(WindowInsets.Side.all());

        layoutParams.setFitInsetsIgnoringVisibility(true);

        window.setAttributes(layoutParams);

        window.setContentView(mDialogView);

        window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);

        window.setWindowAnimations(R.style.Animation_InternetDialog);

        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

        window.addFlags(FLAG_LAYOUT_NO_LIMITS);



        mInternetDialogTitle = mDialogView.requireViewById(R.id.internet_dialog_title);

        mInternetDialogSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle);

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

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ class InternetDialogFactory @Inject constructor( 
        } else {

            internetDialog = InternetDialog(context, this, internetDialogController, aboveStatusBar,

                    uiEventLogger, handler)

            internetDialog?.show()

        }

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ public class InternetDialogTest extends SysuiTestCase { 
        MockitoAnnotations.initMocks(this);

        mInternetDialog = new MockInternetDialog(mContext, mInternetDialogFactory,

                mInternetDialogController, true, mUiEventLogger, mHandler);

        mInternetDialog.show();

        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);

        when(mMockWifiManager.isWifiEnabled()).thenReturn(true);

        when(mMockWifiManager.getConnectionInfo()).thenReturn(mWifiInfo);
@@ -177,8 +178,8 @@ public class InternetDialogTest extends SysuiTestCase { 
        private String mConnectedWifiSummary;



        MockInternetDialog(Context context, InternetDialogFactory internetDialogFactory,

                InternetDialogController internetDialogController,

                boolean aboveStatusBar, UiEventLogger uiEventLogger, @Main Handler handler) {

                InternetDialogController internetDialogController, boolean aboveStatusBar,

                UiEventLogger uiEventLogger, @Main Handler handler) {

            super(context, internetDialogFactory, internetDialogController, aboveStatusBar,

                    uiEventLogger, handler);

            mAdapter = mInternetAdapter;