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

Commit 35994af8 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Tweak dialog layout of EditTextPreference" into tm-dev am: 13c6ef8e

parents 081bc9fe 13c6ef8e
Loading
Loading
Loading
Loading
+53 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
    Copyright (C) 2022 The Android Open Source Project

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
  -->
<!--Synced from androidx preference/preference/res/layout/preference_dialog_edittext.xml-->
<ScrollView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_marginTop="48dp"
    android:layout_marginBottom="48dp"
    android:overScrollMode="ifContentScrolls">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical">

        <TextView
            android:id="@android:id/message"
            style="?android:attr/textAppearanceSmall"
            android:layout_marginLeft="24dp"
            android:layout_marginRight="24dp"
            android:layout_marginStart="24dp"
            android:layout_marginEnd="24dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:textColor="?android:attr/textColorSecondary"/>

        <EditText
            android:id="@android:id/edit"
            android:layout_marginLeft="20dp"
            android:layout_marginRight="20dp"
            android:layout_marginStart="20dp"
            android:layout_marginEnd="20dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:minHeight = "48dp" />

    </LinearLayout>
</ScrollView>
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@
    <style name="SettingsEditTextPreference.SettingsLib"
           parent="@style/Preference.DialogPreference.EditTextPreference.Material">
        <item name="layout">@layout/settingslib_preference</item>
        <item name="dialogLayout">@layout/settingslib_preference_dialog_edittext</item>
        <item name="iconSpaceReserved">@bool/settingslib_config_icon_space_reserved</item>
    </style>