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

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

Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-v2-dev 

* changes:
  [RESTRICT AUTOMERGE] [Provider Model] Support 2+ lines instead of marque for Mobile data and Wi-Fi
  [RESTRICT AUTOMERGE] [Provider Model] Fix WiFi SSID disappear issue
  [RESTRICT AUTOMERGE] [Provider Model] Enforce DISALLOW_CONFIG_WIFI in Internet Panel
  [RESTRICT AUTOMERGE] [Provider Model] Correct Wi-Fi toggle title color in Dark Theme
parents d1436f18 fc0d0bc3

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+23 −23
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ 
        style="@style/Widget.SliceView.Panel"

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

        android:gravity="center_vertical|center_horizontal"

        android:gravity="center_vertical|center_horizontal"

        android:layout_marginTop="24dp"

        android:layout_marginTop="24dp"

        android:layout_marginBottom="16dp"

        android:layout_marginBottom="@dimen/internet_dialog_network_layout_margin"

        android:orientation="vertical">

        android:orientation="vertical">





        <TextView

        <TextView
@@ -57,7 +57,7 @@ 
    <LinearLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

        android:layout_marginBottom="@dimen/internet_dialog_network_layout_margin"

        android:orientation="vertical">

        android:orientation="vertical">





        <View

        <View
@@ -101,8 +101,8 @@ 
                    android:background="?android:attr/selectableItemBackground"

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

                    android:layout_gravity="center_vertical|start"

                    android:layout_gravity="center_vertical|start"

                    android:orientation="horizontal"

                    android:orientation="horizontal"

                    android:layout_marginEnd="@dimen/settingslib_switchbar_margin"

                    android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"

                    android:layout_marginStart="@dimen/settingslib_switchbar_margin"

                    android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"

                    android:paddingStart="22dp"

                    android:paddingStart="22dp"

                    android:paddingEnd="22dp">

                    android:paddingEnd="22dp">
@@ -130,24 +130,24 @@ 
                        <TextView

                        <TextView

                            android:id="@+id/mobile_title"

                            android:id="@+id/mobile_title"

                            android:textDirection="locale"

                            android:textDirection="locale"

                            android:layout_marginStart="16dp"

                            android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"

                            android:layout_marginEnd="7dp"

                            android:layout_width="wrap_content"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical|start"

                            android:layout_gravity="center_vertical|start"

                            android:ellipsize="end"

                            android:ellipsize="end"

                            android:maxLines="1"

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

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

                            android:textSize="16sp"

                            android:textSize="16sp"

                            android:fontFamily="google-sans"/>

                            android:fontFamily="google-sans"/>

                        <TextView

                        <TextView

                            android:id="@+id/mobile_summary"

                            android:id="@+id/mobile_summary"

                            android:textDirection="locale"

                            android:textDirection="locale"

                            android:layout_marginStart="16dp"

                            android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"

                            android:layout_marginEnd="34dp"

                            android:layout_width="wrap_content"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical|start"

                            android:layout_gravity="center_vertical|start"

                            android:ellipsize="end"

                            android:ellipsize="end"

                            android:maxLines="1"

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

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

                            android:textSize="14sp"

                            android:textSize="14sp"

                            android:fontFamily="google-sans"/>

                            android:fontFamily="google-sans"/>
@@ -179,8 +179,8 @@ 
                    android:background="?android:attr/selectableItemBackground"

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

                    android:gravity="center"

                    android:gravity="center"

                    android:orientation="horizontal"

                    android:orientation="horizontal"

                    android:layout_marginEnd="@dimen/settingslib_switchbar_margin"

                    android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"

                    android:layout_marginStart="@dimen/settingslib_switchbar_margin"

                    android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"

                    android:paddingStart="22dp"

                    android:paddingStart="22dp"

                    android:paddingEnd="22dp">

                    android:paddingEnd="22dp">
@@ -191,6 +191,7 @@ 
                        android:layout_width="wrap_content"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent">

                        android:layout_height="match_parent">

                        <TextView

                        <TextView

                            android:id="@+id/wifi_toggle_title"

                            android:text="@string/turn_on_wifi"

                            android:text="@string/turn_on_wifi"

                            android:textDirection="locale"

                            android:textDirection="locale"

                            android:layout_width="wrap_content"

                            android:layout_width="wrap_content"
@@ -229,10 +230,10 @@ 
                    android:visibility="gone"

                    android:visibility="gone"

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

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

                    android:orientation="horizontal"

                    android:orientation="horizontal"

                    android:layout_marginEnd="@dimen/settingslib_switchbar_margin"

                    android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"

                    android:layout_marginStart="@dimen/settingslib_switchbar_margin"

                    android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"

                    android:paddingStart="22dp"

                    android:paddingStart="20dp"

                    android:paddingEnd="22dp">

                    android:paddingEnd="24dp">





                    <FrameLayout

                    <FrameLayout

                        android:layout_width="24dp"

                        android:layout_width="24dp"
@@ -247,12 +248,13 @@ 
                    </FrameLayout>

                    </FrameLayout>





                    <LinearLayout

                    <LinearLayout

                        android:layout_weight="3"

                        android:id="@+id/wifi_connected_list"

                        android:id="@+id/wifi_connected_list"

                        android:orientation="vertical"

                        android:orientation="vertical"

                        android:clickable="false"

                        android:clickable="false"

                        android:layout_width="wrap_content"

                        android:layout_width="wrap_content"

                        android:layout_height="72dp"

                        android:layout_height="72dp"

                        android:layout_marginEnd="30dp"

                        android:layout_weight="1"

                        android:gravity="start|center_vertical">

                        android:gravity="start|center_vertical">

                        <TextView

                        <TextView

                            android:id="@+id/wifi_connected_title"

                            android:id="@+id/wifi_connected_title"
@@ -260,9 +262,8 @@ 
                            android:layout_width="wrap_content"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical|start"

                            android:layout_gravity="center_vertical|start"

                            android:layout_marginStart="16dp"

                            android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"

                            android:ellipsize="end"

                            android:ellipsize="end"

                            android:maxLines="1"

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

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

                            android:textSize="14sp"

                            android:textSize="14sp"

                            android:fontFamily="google-sans"/>

                            android:fontFamily="google-sans"/>
@@ -272,9 +273,8 @@ 
                            android:layout_width="wrap_content"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical|start"

                            android:layout_gravity="center_vertical|start"

                            android:layout_marginStart="16dp"

                            android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"

                            android:ellipsize="end"

                            android:ellipsize="end"

                            android:maxLines="1"

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

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

                            android:textSize="14sp"

                            android:textSize="14sp"

                            android:fontFamily="google-sans"/>

                            android:fontFamily="google-sans"/>
@@ -283,14 +283,14 @@ 
                    <FrameLayout

                    <FrameLayout

                        android:layout_width="24dp"

                        android:layout_width="24dp"

                        android:layout_height="match_parent"

                        android:layout_height="match_parent"

                        android:layout_marginEnd="5dp"

                        android:clickable="false"

                        android:clickable="false"

                        android:layout_gravity="end|center_vertical"

                        android:gravity="center">

                        android:gravity="center">

                        <ImageView

                        <ImageView

                            android:id="@+id/wifi_settings_icon"

                            android:id="@+id/wifi_settings_icon"

                            android:src="@drawable/ic_settings_24dp"

                            android:src="@drawable/ic_settings_24dp"

                            android:layout_width="24dp"

                            android:layout_width="24dp"

                            android:layout_gravity="center"

                            android:layout_gravity="end|center_vertical"

                            android:layout_height="wrap_content"/>

                            android:layout_height="wrap_content"/>

                    </FrameLayout>

                    </FrameLayout>
@@ -323,7 +323,7 @@ 
                    android:layout_height="24dp"

                    android:layout_height="24dp"

                    android:clickable="false"

                    android:clickable="false"

                    android:layout_gravity="center_vertical|start"

                    android:layout_gravity="center_vertical|start"

                    android:layout_marginStart="16dp">

                    android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">

                    <ImageView

                    <ImageView

                        android:id="@+id/arrow_forward"

                        android:id="@+id/arrow_forward"

                        android:src="@drawable/ic_arrow_forward"

                        android:src="@drawable/ic_arrow_forward"
@@ -337,7 +337,7 @@ 
                    android:clickable="false"

                    android:clickable="false"

                    android:layout_width="match_parent"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:layout_height="match_parent"

                    android:layout_marginStart="16dp">

                    android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">

                    <TextView

                    <TextView

                        android:text="@string/see_all_networks"

                        android:text="@string/see_all_networks"

                        android:textDirection="locale"

                        android:textDirection="locale"

packages/SystemUI/res/layout/internet_list_item.xml

+15 −21
Original line number Original line Diff line number Diff line
@@ -31,15 +31,14 @@ 
        android:focusable="true"

        android:focusable="true"

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

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

        android:orientation="horizontal"

        android:orientation="horizontal"

        android:paddingStart="22dp"

        android:paddingStart="20dp"

        android:paddingEnd="22dp">

        android:paddingEnd="40dp">



        <FrameLayout

        <FrameLayout

            android:layout_width="24dp"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_height="24dp"

            android:clickable="false"

            android:clickable="false"

            android:layout_gravity="center_vertical|start"

            android:layout_gravity="center_vertical|start"

            android:layout_marginStart="16dp">

            android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">

            <ImageView

            <ImageView

                android:id="@+id/wifi_icon"

                android:id="@+id/wifi_icon"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"
@@ -48,52 +47,47 @@ 
        </FrameLayout>

        </FrameLayout>





        <LinearLayout

        <LinearLayout

            android:layout_weight="3"

            android:id="@+id/wifi_network_layout"

            android:id="@+id/wifi_network_layout"

            android:orientation="vertical"

            android:orientation="vertical"

            android:clickable="false"

            android:clickable="false"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="72dp">

            android:layout_height="72dp"

            android:layout_weight="1"

            android:gravity="start|center_vertical"

            android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">

            <TextView

            <TextView

                android:id="@+id/wifi_title"

                android:id="@+id/wifi_title"

                android:textDirection="locale"

                android:textDirection="locale"

                android:layout_weight="1"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="0dp"

                android:layout_height="20dp"

                android:layout_gravity="center_vertical|start"

                android:gravity="start|center_vertical"

                android:gravity="start|center_vertical"

                android:layout_marginStart="16dp"

                android:ellipsize="end"

                android:ellipsize="end"

                android:maxLines="1"

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

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

                android:textSize="14sp"

                android:textSize="14sp"

                android:fontFamily="google-sans"/>

                android:fontFamily="google-sans"

                android:layout_marginEnd="18dp"/>

            <TextView

            <TextView

                android:id="@+id/wifi_summary"

                android:id="@+id/wifi_summary"

                android:textDirection="locale"

                android:textDirection="locale"

                android:layout_weight="1"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="0dp"

                android:layout_height="20dp"

                android:layout_gravity="center_vertical|start"

                android:gravity="start|center_vertical"

                android:gravity="start|center_vertical"

                android:layout_marginStart="16dp"

                android:ellipsize="end"

                android:ellipsize="end"

                android:maxLines="1"

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

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

                android:textSize="14sp"

                android:textSize="14sp"

                android:fontFamily="google-sans"/>

                android:fontFamily="google-sans"

                android:layout_marginEnd="18dp"/>

        </LinearLayout>

        </LinearLayout>





        <FrameLayout

        <FrameLayout

            android:layout_width="24dp"

            android:layout_width="24dp"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/settingslib_switchbar_padding_right"

            android:clickable="false"

            android:clickable="false"

            android:gravity="center">

            android:layout_gravity="end|center_vertical">

            <ImageView

            <ImageView

                android:id="@+id/wifi_locked_icon"

                android:id="@+id/wifi_locked_icon"

                android:layout_gravity="end|center_vertical"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center"

                android:layout_height="wrap_content"/>

                android:layout_height="wrap_content"/>

        </FrameLayout>

        </FrameLayout>

packages/SystemUI/res/values-sw600dp/dimens.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -103,4 +103,7 @@ 




    <!-- When split shade is used, this panel should be aligned to the top -->

    <!-- When split shade is used, this panel should be aligned to the top -->

    <dimen name="qs_detail_margin_top">0dp</dimen>

    <dimen name="qs_detail_margin_top">0dp</dimen>



    <!-- Internet panel related dimensions -->

    <dimen name="internet_dialog_list_max_width">624dp</dimen>

</resources>
 
</resources>

packages/SystemUI/res/values/dimens.xml

+4 −3
Original line number Original line Diff line number Diff line
@@ -1602,15 +1602,16 @@ 
    <!-- Internet panel related dimensions -->

    <!-- Internet panel related dimensions -->

    <dimen name="internet_dialog_list_margin">12dp</dimen>

    <dimen name="internet_dialog_list_margin">12dp</dimen>

    <dimen name="internet_dialog_list_max_height">646dp</dimen>

    <dimen name="internet_dialog_list_max_height">646dp</dimen>

    <dimen name="internet_dialog_list_max_width">412dp</dimen>

    <dimen name="internet_dialog_list_max_width">@dimen/match_parent</dimen>





    <!-- Signal icon in internet dialog -->

    <!-- Signal icon in internet dialog -->

    <dimen name="signal_strength_icon_size">24dp</dimen>

    <dimen name="signal_strength_icon_size">24dp</dimen>





    <!-- Internet dialog related dimensions -->

    <!-- Internet dialog related dimensions -->

    <dimen name="internet_dialog_corner_radius">24dp</dimen>

    <dimen name="internet_dialog_corner_radius">24dp</dimen>



    <!-- End margin of network layout -->

    <!-- Size of internet dialog -->

    <dimen name="internet_dialog_network_layout_margin">16dp</dimen>

    <!-- Size of switch bar in internet dialog -->

    <dimen name="settingslib_switchbar_margin">16dp</dimen>

    <dimen name="settingslib_switchbar_margin">16dp</dimen>

    <!-- Minimum width of switch -->

    <!-- Minimum width of switch -->

    <dimen name="settingslib_min_switch_width">52dp</dimen>

    <dimen name="settingslib_min_switch_width">52dp</dimen>

packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -122,8 +122,9 @@ public class InternetTile extends QSTileImpl<SignalState> { 




    @Override

    @Override

    protected void handleClick(@Nullable View view) {

    protected void handleClick(@Nullable View view) {

        boolean canConfigMobileData = mAccessPointController.canConfigMobileData();

        mHandler.post(() -> mInternetDialogFactory.create(true,

        mHandler.post(() -> mInternetDialogFactory.create(true, canConfigMobileData));

                mAccessPointController.canConfigMobileData(),

                mAccessPointController.canConfigWifi()));

    }

    }





    @Override

    @Override