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

Commit b474cafc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9284490 from 463531ee to tm-qpr2-release 

Change-Id: Ia877b2a820a2e5eb5fef423c2645cd0261722e8f
parents be6cf1ad 463531ee

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ java_library { 
    visibility: [

        // DO NOT ADD ANY MORE ENTRIES TO THIS LIST

        "//external/robolectric-shadows:__subpackages__",

        //This will eventually replace the item above, and serves the

        //same purpose.

        "//external/robolectric:__subpackages__",

        "//frameworks/layoutlib:__subpackages__",

    ],

}

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+5 −0
Original line number Diff line number Diff line
@@ -190,6 +190,11 @@ 


                </LinearLayout>



                <ViewStub android:id="@+id/secondary_mobile_network_stub"

                  android:inflatedId="@+id/secondary_mobile_network_layout"

                  android:layout="@layout/qs_dialog_secondary_mobile_network"

                  style="@style/InternetDialog.Network"/>



                <LinearLayout

                    android:id="@+id/turn_on_wifi_layout"

                    style="@style/InternetDialog.Network"

packages/SystemUI/res/layout/qs_dialog_secondary_mobile_network.xml

0 → 100644
+63 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<LinearLayout

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

    style="@style/InternetDialog.Network">



    <FrameLayout

	android:layout_width="24dp"

	android:layout_height="24dp"

	android:clickable="false"

	android:layout_gravity="center_vertical|start">

	<ImageView

	    android:id="@+id/secondary_signal_icon"

	    android:autoMirrored="true"

	    android:layout_width="wrap_content"

	    android:layout_height="wrap_content"

	    android:layout_gravity="center"/>

    </FrameLayout>



    <LinearLayout

	android:layout_weight="1"

	android:orientation="vertical"

	android:clickable="false"

	android:layout_width="match_parent"

	android:layout_height="match_parent"

	android:gravity="start|center_vertical">

	<TextView

	    android:id="@+id/secondary_mobile_title"

	    android:maxLines="1"

	    style="@style/InternetDialog.NetworkTitle"/>

	<TextView

	    android:id="@+id/secondary_mobile_summary"

	    style="@style/InternetDialog.NetworkSummary"/>

    </LinearLayout>



    <FrameLayout

	android:layout_width="24dp"

	android:layout_height="match_parent"

	android:clickable="false"

	android:layout_gravity="end|center_vertical"

	android:gravity="center">

	<ImageView

	    android:id="@+id/secondary_settings_icon"

	    android:src="@drawable/ic_settings_24dp"

	    android:layout_width="24dp"

	    android:layout_gravity="end|center_vertical"

	    android:layout_height="wrap_content"/>

    </FrameLayout>

</LinearLayout>

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -1478,10 +1478,12 @@ 


    <!-- Dream overlay complications related dimensions -->

    <dimen name="dream_overlay_complication_clock_time_text_size">86sp</dimen>

    <dimen name="dream_overlay_complication_clock_time_padding">20dp</dimen>

    <dimen name="dream_overlay_complication_clock_subtitle_text_size">24sp</dimen>

    <dimen name="dream_overlay_complication_preview_text_size">36sp</dimen>

    <dimen name="dream_overlay_complication_preview_icon_padding">28dp</dimen>

    <dimen name="dream_overlay_complication_shadow_padding">2dp</dimen>

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



    <!-- The position of the end guide, which dream overlay complications can align their start with

         if their end is aligned with the parent end. Represented as the percentage over from the

packages/SystemUI/res/values/strings.xml

+15 −0
Original line number Diff line number Diff line
@@ -2041,6 +2041,15 @@ 
    <!-- Text used to refer to the user's current carrier in mobile_data_disable_message if the users's mobile network carrier name is not available [CHAR LIMIT=NONE] -->

    <string name="mobile_data_disable_message_default_carrier">your carrier</string>



    <!-- Title of the dialog to turn off data usage [CHAR LIMIT=NONE] -->

    <string name="auto_data_switch_disable_title">Switch back to <xliff:g id="carrier" example="T-Mobile">%s</xliff:g>?</string>

    <!-- Message body of the dialog to turn off data usage [CHAR LIMIT=NONE] -->

    <string name="auto_data_switch_disable_message">Mobile data won\’t automatically switch based on availability</string>

    <!-- Negative button title of the quick settings switch back to DDS dialog [CHAR LIMIT=NONE] -->

    <string name="auto_data_switch_dialog_negative_button">No thanks</string>

    <!-- Positive button title of the quick settings switch back to DDS dialog [CHAR LIMIT=NONE] -->

    <string name="auto_data_switch_dialog_positive_button">Yes, switch</string>



    <!-- Warning shown when user input has been blocked due to another app overlaying screen

     content. Since we don't know what the app is showing on top of the input target, we

     can't verify user consent. [CHAR LIMIT=NONE] -->
@@ -2510,6 +2519,12 @@ 
    <!-- Provider Model:

         Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->

    <string name="mobile_data_connection_active">Connected</string>

    <!-- Provider Model:

         Summary indicating that a SIM is temporarily connected to mobile data [CHAR LIMIT=50] -->

    <string name="mobile_data_temp_connection_active">Temporarily connected</string>

    <!-- Provider Model:

     Summary indicating that a SIM is temporarily connected to mobile data [CHAR LIMIT=50] -->

    <string name="mobile_data_poor_connection">Poor connection</string>

    <!-- Provider Model:

     Summary indicating that a SIM has no mobile data connection [CHAR LIMIT=50] -->

    <string name="mobile_data_off_summary">Mobile data won\u0027t auto\u2011connect</string>