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

Commit 44ff1e1d authored by Michael Kwan's avatar Michael Kwan
Browse files

Resolve issues with AlertDialog layout for watch devices. 

- Ensure button bar always snaps to bottom
- Set message TextAppearance to use Subhead styling
- Added additional bottom padding to title panel

Bug: 30483771
Change-Id: I515e0096f3dc49b56753b3426f8eda5193d4255c
parent 755d3c31

core/res/res/layout-notround-watch/alert_dialog_header_micro.xml→core/res/res/layout-notround-watch/alert_dialog_title_material.xml

+2 −5
Original line number Diff line number Diff line
@@ -30,12 +30,9 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@null" />

    <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"

    <TextView android:id="@+id/alertTitle"

            style="?android:attr/windowTitleStyle"

            android:ellipsize="end"

            android:layout_marginStart="8dp"

            android:layout_marginBottom="8dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAlignment="viewStart" />

            android:layout_height="wrap_content" />

</LinearLayout>

core/res/res/layout-round-watch/alert_dialog_header_micro.xml→core/res/res/layout-round-watch/alert_dialog_title_material.xml

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

            android:layout_height="wrap_content"

            android:src="@null" />

    <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"

    <TextView android:id="@+id/alertTitle"

            style="?android:attr/windowTitleStyle"

            android:ellipsize="end"

            android:layout_marginTop="36dp"

            android:layout_marginBottom="4dp"

            android:layout_marginBottom="8dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAlignment="center" />

            android:layout_height="wrap_content" />

</FrameLayout>

core/res/res/layout-watch/alert_dialog_material.xml

+4 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
                <include android:id="@+id/title_template"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        layout="@layout/alert_dialog_header_micro"/>

                        layout="@layout/alert_dialog_title_material"/>

            </FrameLayout>



            <!-- Content Panel -->
@@ -50,7 +50,8 @@ 
                <TextView android:id="@+id/message"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:textAppearance="@style/TextAppearance.Material.Body1"

                        android:gravity="@integer/config_dialogTextGravity"

                        android:textAppearance="@style/TextAppearance.Material.Subhead"

                        android:paddingStart="?dialogPreferredPadding"

                        android:paddingEnd="?dialogPreferredPadding"

                        android:paddingTop="8dip"
@@ -77,6 +78,7 @@ 
                <LinearLayout

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:layout_gravity="bottom"

                        android:orientation="vertical"

                        android:minHeight="@dimen/alert_dialog_button_bar_height"

                        android:paddingBottom="?dialogPreferredPadding"

core/res/res/values-notround-watch/styles_material.xml→core/res/res/values-notround-watch/config_material.xml

+10 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,13 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources>

    <style name="TextAppearance.Material.AlertDialogMessage" parent="TextAppearance.Material.Body1"/>



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds, only for Material theme.  Do not translate.



     NOTE: The naming convention is "config_camelCaseValue".  -->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Gravity that should be used for dialog text styles. Equivalent to: Gravity.START | Gravity.TOP -->

    <integer name="config_dialogTextGravity">0x00800033</integer>

</resources>

core/res/res/values-round-watch/config_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -19,4 +19,7 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Don't clip on round screens so the list can scroll past the rounded edges. -->

    <bool name="config_preferenceFragmentClipToPadding">false</bool>



    <!-- Gravity that should be used for dialog text styles. Equivalent to: Gravity.CENTER_HORIZONTAL | Gravity.TOP -->

    <integer name="config_dialogTextGravity">0x00000031</integer>

</resources>