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

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

Merge "[Settings] Dialog does not show full msg and title in landscape mode"... 

Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e062

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



Change-Id: Ic68000e73a6ea830c39820400ca5da9aec2d3435
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 518a3ae5 06a4e062

res/layout/locale_dialog.xml

+36 −31
Original line number Diff line number Diff line
@@ -13,9 +13,16 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

<ScrollView

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

    android:layout_width="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:fadeScrollbars="false"

    android:scrollbarStyle="outsideOverlay"

    android:fillViewport="true">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="@dimen/admin_details_dialog_padding"

        android:paddingStart="@dimen/admin_details_dialog_padding"
@@ -39,18 +46,15 @@ 
                android:contentDescription="@null"/>

            <TextView

                android:id="@+id/dialog_title"

            android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

            android:gravity="center_horizontal"

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

            android:textAlignment="textStart"/>

                android:gravity="center"

                android:textSize="20sp"

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

                android:fontFamily="@*android:string/config_headlineFontFamilyMedium"/>

        </LinearLayout>



    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:fadeScrollbars="false">

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -60,10 +64,11 @@ 
                android:id="@+id/dialog_msg"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textSize="16sp"

                android:maxLength="200"

                android:autoLink="email|phone|web"

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

                android:textAlignment="textStart"/>

        </LinearLayout>

    </ScrollView>

    </LinearLayout>

</ScrollView>