Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17369586

Change-Id: I518571b453da11de87901d29b71b9e2f8ec8c008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Edgar Wang
2022-03-26 09:26:35 +00:00
committed by Automerger Merge Worker
parent fbbc1cfd29 13c6ef8e69
commit 159cdc0c6f
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference_dialog_edittext.xml Normal file
View File

@@ -0,0 +1,53 @@
<?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>

1
packages/SettingsLib/SettingsTheme/res/values-v31/style_preference.xml
View File

@@ -47,6 +47,7 @@
<style name="SettingsEditTextPreference.SettingsLib" <style name="SettingsEditTextPreference.SettingsLib"
parent="@style/Preference.DialogPreference.EditTextPreference.Material"> parent="@style/Preference.DialogPreference.EditTextPreference.Material">
<item name="layout">@layout/settingslib_preference</item> <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> <item name="iconSpaceReserved">@bool/settingslib_config_icon_space_reserved</item>
</style> </style>