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

Commit 4456c9e9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Panlingual] set direction and textAlignment for the locale dialog"... 

Merge "[Panlingual] set direction and textAlignment for the locale dialog" into udc-dev am: ef65b4c5

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



Change-Id: I20f0d47ee4db8b98ea81edef21f7c1cff0a2d7c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cfcef716 ef65b4c5

res/layout/locale_dialog.xml

+8 −4
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 
    android:paddingStart="@dimen/admin_details_dialog_padding"

    android:paddingEnd="@dimen/admin_details_dialog_padding"

    android:paddingBottom="@dimen/admin_details_dialog_padding_bottom"

    android:orientation="vertical">

    android:orientation="vertical"

    android:layoutDirection="locale"

    android:textDirection="locale">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -41,7 +43,8 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:gravity="center_horizontal"

            android:textAppearance="@style/TextAppearance.AdminDialogTitle"/>

            android:textAppearance="@style/TextAppearance.AdminDialogTitle"

            android:textAlignment="textStart"/>

    </LinearLayout>



    <ScrollView
@@ -51,15 +54,16 @@ 
        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:orientation="vertical">

            <TextView

                android:id="@+id/dialog_msg"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:maxLength="200"

                android:gravity="left"

                android:autoLink="email|phone|web"

                android:textColor="?android:attr/textColorSecondary"/>

                android:textColor="?android:attr/textColorSecondary"

                android:textAlignment="textStart"/>

        </LinearLayout>

    </ScrollView>

</LinearLayout>