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

Commit e153a82d authored by Robert Horvath's avatar Robert Horvath Committed by Android (Google) Code Review
Browse files

Merge changes Ib4cdfcb1,I412c837c,Icc20555e 

* changes:
  HeavyWeightSwitcher: Use selectableItemBackground
  Use system alert theme for HeavyWeightSwitcherActivity
  Add DeviceDefault.System.Dialog[.Alert] themes
parents dc64959b c3ba8ee4

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -4596,7 +4596,7 @@ 
                android:label="@string/managed_profile_label">

        </activity-alias>

        <activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity"

                android:theme="@style/Theme.DeviceDefault.Light.Dialog"

                android:theme="@style/Theme.DeviceDefault.System.Dialog.Alert"

                android:label="@string/heavy_weight_switcher_title"

                android:finishOnCloseSystemDialogs="true"

                android:excludeFromRecents="true"

core/res/res/layout/heavy_weight_switcher.xml

+9 −3
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
-->



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

    android:orientation="vertical" android:padding="24dp"

    android:orientation="vertical"

    android:paddingVertical="24dp"

    android:paddingHorizontal="16dp"

    android:gravity="center_horizontal"

    android:layout_width="wrap_content" android:layout_height="wrap_content">
@@ -23,6 +25,7 @@ 
        android:layout_width="match_parent" android:layout_height="wrap_content"

        android:layout_weight="0"

        android:paddingBottom="20dp"

        android:paddingHorizontal="8dp"

        android:textAppearance="?android:attr/textAppearanceLarge"

        android:text="@string/heavy_weight_switcher_title"/>
@@ -30,6 +33,7 @@ 
        android:layout_width="match_parent" android:layout_height="wrap_content"

        android:layout_weight="0"

        android:paddingBottom="16dp"

        android:paddingHorizontal="8dp"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:text="@string/heavy_weight_switcher_text"/>
@@ -37,8 +41,9 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="72dp"

        android:paddingHorizontal="8dp"

        android:orientation="horizontal"

        android:background="@android:drawable/list_selector_background"

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

        android:gravity="center_vertical"

        android:focusable="true" >
@@ -68,8 +73,9 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="88dp"

        android:paddingHorizontal="8dp"

        android:orientation="horizontal"

        android:background="@android:drawable/list_selector_background"

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

        android:gravity="center_vertical"

        android:focusable="true" >

core/res/res/values-television/themes_device_defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
    </style>



    <!-- TV always use dark mode -->

    <style name="Theme.DeviceDefault.System" parent="Theme.DeviceDefault" />

    <style name="Theme.DeviceDefault.System.Dialog" parent="Theme.DeviceDefault.Dialog" />

    <style name="Theme.DeviceDefault.System.Dialog.Alert" parent="Theme.DeviceDefault.Dialog.Alert" />

    <style name="Theme.DeviceDefault.Autofill.Light" parent="Theme.DeviceDefault.Autofill"/>

    <style name="Theme.DeviceDefault.Light.Autofill.Save" parent="Theme.DeviceDefault.Autofill.Save"/>

core/res/res/values-watch/themes_device_defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ a similar way. 


    <!-- Use a dark theme for watches. -->

    <style name="Theme.DeviceDefault.System" />

    <style name="Theme.DeviceDefault.System.Dialog" parent="Theme.DeviceDefault.Dialog" />

    <style name="Theme.DeviceDefault.System.Dialog.Alert" parent="Theme.DeviceDefault.Dialog.Alert" />



    <!-- DeviceDefault style for input methods, which is used by the

         {@link android.inputmethodservice.InputMethodService} class.-->

core/res/res/values/themes_device_defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -1704,6 +1704,8 @@ easier. 


    <!-- DeviceDefault theme for the default system theme.  -->

    <style name="Theme.DeviceDefault.System" parent="Theme.DeviceDefault.Light.DarkActionBar" />

    <style name="Theme.DeviceDefault.System.Dialog" parent="Theme.DeviceDefault.Light.Dialog" />

    <style name="Theme.DeviceDefault.System.Dialog.Alert" parent="Theme.DeviceDefault.Light.Dialog.Alert" />



    <style name="ThemeOverlay.DeviceDefault" />