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

Commit 177fe7ec authored by Michael Kwan's avatar Michael Kwan Committed by android-build-merger
Browse files

Tweak AlertDialog and Preference layout for nonround watches. 

am: 6c8e3bb4

Change-Id: I8403f321396198d1c8b481c920c52448f2c024d0
parents 1563f499 6c8e3bb4

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

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="?attr/dialogPreferredPadding"

        android:paddingBottom="8dp"

        android:orientation="vertical"

        android:gravity="top|center_horizontal"

        android:minHeight="@dimen/alert_dialog_title_height">

        android:gravity="center_horizontal|top">

    <ImageView android:id="@+id/icon"

            android:adjustViewBounds="true"

            android:maxHeight="24dp"

            android:maxWidth="24dp"

            android:layout_marginTop="8dp"

            android:layout_marginStart="8dp"

            android:layout_marginBottom="8dp"

            android:layout_width="wrap_content"
@@ -33,7 +33,6 @@ 
            android:src="@null" />

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

            style="?android:attr/windowTitleStyle"

            android:layout_marginBottom="8dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

</LinearLayout>

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

+1 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
        xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingBottom="8dp"

        android:orientation="vertical"

        android:gravity="top|center_horizontal">

    <FrameLayout
@@ -30,7 +31,6 @@ 
                android:maxHeight="24dp"

                android:maxWidth="24dp"

                android:layout_marginTop="@dimen/screen_percentage_10"

                android:layout_marginBottom="8dp"

                android:layout_gravity="center_horizontal"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"
@@ -38,7 +38,6 @@ 
    </FrameLayout>

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

            style="?android:attr/windowTitleStyle"

            android:layout_marginBottom="8dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

</LinearLayout>

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

+1 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
                <TextView android:id="@+id/message"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:gravity="@integer/config_dialogTextGravity"

                        android:gravity="center_horizontal|top"

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

                        android:paddingStart="?dialogPreferredPadding"

                        android:paddingEnd="?dialogPreferredPadding"
@@ -80,7 +80,6 @@ 
                        android:layout_height="wrap_content"

                        android:layout_gravity="bottom"

                        android:orientation="vertical"

                        android:minHeight="@dimen/alert_dialog_button_bar_height"

                        android:paddingBottom="?dialogPreferredPadding"

                        style="?android:attr/buttonBarStyle"

                        android:measureWithLargestChild="true">

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
                android:paddingEnd="@dimen/dialog_padding_material"

                android:paddingBottom="8dp"

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

                android:gravity="center" />

                android:gravity="center_horizontal|top" />

        </com.android.internal.widget.WatchHeaderListView>

    </FrameLayout>

core/res/res/layout/select_dialog_multichoice_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,5 +26,5 @@ 
    android:paddingStart="@dimen/select_dialog_padding_start_material"

    android:paddingEnd="?attr/dialogPreferredPadding"

    android:drawableStart="?attr/listChoiceIndicatorMultiple"

    android:drawablePadding="20dp"

    android:drawablePadding="@dimen/select_dialog_drawable_padding_start_material"

    android:ellipsize="marquee" />