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

Commit e454d516 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge changes I566dfa75,Id0d372cf,Ifb79e402,Ic80ed7f8,I40ff3ed0 into sc-qpr1-dev 

* changes:
  [Provider Model] Fix the condition about admin user
  [Provider Model] 1.Only admin can config mobile data 2.Do not connect to mobile data when device is locked
  [Provider Model] Fix the toggle's size and dialog's width
  [Provider Model] Correct the connected Wi-Fi UI
  [Provider Model] Should not show Wi-Fi entries under lockscreen
parents a1c0da71 fb37824e

packages/SystemUI/res/drawable/settingslib_thumb_off.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:top="@dimen/settingslib_switch_thumb_margin"

        android:left="@dimen/settingslib_switch_thumb_margin"

        android:right="@dimen/settingslib_switch_thumb_margin"

        android:bottom="@dimen/settingslib_switch_thumb_margin">

        <shape android:shape="oval">

            <size

packages/SystemUI/res/drawable/settingslib_thumb_on.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:top="@dimen/settingslib_switch_thumb_margin"

        android:left="@dimen/settingslib_switch_thumb_margin"

        android:right="@dimen/settingslib_switch_thumb_margin"

        android:bottom="@dimen/settingslib_switch_thumb_margin">

        <shape android:shape="oval">

            <size

packages/SystemUI/res/drawable/settingslib_track_off_background.xml

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
    android:shape="rectangle"

    android:width="@dimen/settingslib_switch_track_width"

    android:height="@dimen/settingslib_switch_track_height">

    <padding android:left="@dimen/settingslib_switch_thumb_margin"

             android:right="@dimen/settingslib_switch_thumb_margin"/>

    <solid android:color="@color/settingslib_track_off_color"/>

    <corners android:radius="@dimen/settingslib_switch_track_radius"/>

</shape>

packages/SystemUI/res/drawable/settingslib_track_on_background.xml

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
    android:shape="rectangle"

    android:width="@dimen/settingslib_switch_track_width"

    android:height="@dimen/settingslib_switch_track_height">

    <padding android:left="@dimen/settingslib_switch_thumb_margin"

             android:right="@dimen/settingslib_switch_thumb_margin"/>

    <solid android:color="@color/settingslib_track_on_color"/>

    <corners android:radius="@dimen/settingslib_switch_track_radius"/>

</shape>

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+38 −38
Original line number Diff line number Diff line
@@ -19,18 +19,18 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:id="@+id/internet_connectivity_dialog"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_width="@dimen/internet_dialog_list_max_width"

    android:layout_height="@dimen/internet_dialog_list_max_height"

    android:background="@drawable/internet_dialog_rounded_top_corner_background"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

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

        android:gravity="center_vertical|center_horizontal"

        android:layout_marginTop="24dp"

        android:layout_marginBottom="16dp"

        android:layout_height="wrap_content"

        android:orientation="vertical">



        <TextView
@@ -54,6 +54,12 @@ 
            android:textSize="14sp"/>

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

        android:orientation="vertical">



        <View

            android:id="@+id/divider"

            android:layout_gravity="center_vertical|center_horizontal"
@@ -69,6 +75,7 @@ 
            android:layout_gravity="center_horizontal"

            android:visibility="gone"

            style="@style/TrimmedHorizontalProgressBar"/>

    </LinearLayout>



    <androidx.core.widget.NestedScrollView

        android:id="@+id/scroll_view"
@@ -96,7 +103,6 @@ 
                    android:orientation="horizontal"

                    android:layout_marginEnd="@dimen/settingslib_switchbar_margin"

                    android:layout_marginStart="@dimen/settingslib_switchbar_margin"

                    android:layout_marginTop="16dp"

                    android:paddingStart="22dp"

                    android:paddingEnd="22dp">
@@ -148,14 +154,15 @@ 
                    </LinearLayout>



                    <FrameLayout

                        android:layout_width="48dp"

                        android:layout_width="@dimen/settingslib_switch_track_width"

                        android:layout_height="48dp"

                        android:layout_gravity="end|center_vertical">

                        <Switch

                            android:id="@+id/mobile_toggle"

                            android:switchMinWidth="@dimen/settingslib_switch_track_width"

                            android:layout_gravity="center"

                            android:layout_width="48dp"

                            android:layout_height="wrap_content"

                            android:layout_width="@dimen/settingslib_switch_track_width"

                            android:layout_height="@dimen/settingslib_switch_track_height"

                            android:track="@drawable/settingslib_track_selector"

                            android:thumb="@drawable/settingslib_thumb_selector"

                            android:theme="@style/MainSwitch.Settingslib"/>
@@ -195,15 +202,16 @@ 
                    </FrameLayout>



                    <FrameLayout

                        android:layout_width="48dp"

                        android:layout_width="@dimen/settingslib_switch_track_width"

                        android:layout_height="48dp"

                        android:layout_marginTop="10dp"

                        android:layout_marginBottom="10dp">

                        <Switch

                            android:id="@+id/wifi_toggle"

                            android:switchMinWidth="@dimen/settingslib_switch_track_width"

                            android:layout_gravity="center"

                            android:layout_width="48dp"

                            android:layout_height="wrap_content"

                            android:layout_width="@dimen/settingslib_switch_track_width"

                            android:layout_height="@dimen/settingslib_switch_track_height"

                            android:track="@drawable/settingslib_track_selector"

                            android:thumb="@drawable/settingslib_thumb_selector"

                            android:theme="@style/MainSwitch.Settingslib"/>
@@ -343,31 +351,23 @@ 


            </LinearLayout>



            <Space

                android:id="@+id/space"

                android:layout_width="match_parent"

                android:layout_height="28dp"

                android:visibility="gone"/>



            <LinearLayout

            <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="48dp"

                android:layout_marginBottom="25dp"

                android:gravity="end"

                android:orientation="horizontal">

                android:layout_marginBottom="40dp">

                <Button

                    style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"

                    android:id="@+id/done"

                    android:layout_width="60dp"

                    android:layout_height="30dp"

                    android:layout_width="67dp"

                    android:layout_height="36dp"

                    android:layout_marginEnd="24dp"

                    android:layout_gravity="end"

                    android:layout_gravity="end|center_vertical"

                    android:background="@drawable/internet_dialog_footer_background"

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

                    android:text="@string/inline_done_button"

                    android:textSize="14sp"

                    android:fontFamily="google-sans"/>

            </LinearLayout>

            </FrameLayout>

        </LinearLayout>

    </androidx.core.widget.NestedScrollView>

</LinearLayout>