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

Commit 245fecde authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Relayout Reset Wifi page" into sc-dev am: 677e59cb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758083

Change-Id: I14f1bfc19922600e3bb5e6169c0bce0c8b416716
parents 7ca21801 677e59cb

res/layout/reset_esim_checkbox.xml

+2 −2
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ 
        android:orientation="vertical">



        <TextView

            style="@style/TextAppearance.SudGlifItemTitle"

            style="@style/TextAppearance.PreferenceTitle.SettingsLib"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/reset_esim_title"/>



        <TextView

            style="@style/TextAppearance.SudGlifItemSummary"

            style="?android:attr/textAppearanceSmall"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/reset_esim_desc"/>

res/layout/reset_network.xml

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:orientation="vertical" >

    <androidx.core.widget.NestedScrollView

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_marginStart="@dimen/reset_network_margin_start"

        android:layout_marginEnd="@dimen/reset_network_margin_end"

        android:layout_marginTop="12dp"

        android:layout_weight="1">

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

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textSize="18sp"

                android:textAppearance="@style/TextAppearance.PreferenceTitle.SettingsLib"

                android:textDirection="locale"

                android:text="@string/reset_network_desc" />

            <include layout="@layout/reset_esim_checkbox"/>

res/layout/reset_network_confirm.xml

+3 −3
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
        android:layout_width="wrap_content"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:layout_marginStart="@dimen/reset_network_margin_start"

        android:layout_marginEnd="@dimen/reset_network_margin_end"

        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"

        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"

        android:layout_marginTop="12dp"

        android:textSize="18sp"

        android:textAppearance="@style/TextAppearance.PreferenceTitle.SettingsLib"

        android:text="@string/reset_network_final_desc" />

    <Button

        android:id="@+id/execute_reset_network"

res/values/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -409,7 +409,9 @@ 
        <item name="android:scaleY">0.5</item>

    </style>



    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>

    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored">

        <item name="android:theme">@style/RoundedCornerThemeOverlay</item>

    </style>

    <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>



    <style name="RoundedCornerThemeOverlay">