diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-05 23:12:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-05 23:12:34 +0000 |
| commit | c3ea7e39e51beeac824e3a204e0b5486dca38e91 (patch) | |
| tree | 4116a018c31ac04630c2d61997320ae647400cd6 | |
| parent | 0a4c2646f4b72fdc78299dbb3dd86a7aecefff08 (diff) | |
| parent | eb6f3f885154914eec6a747265d1f568ae50380c (diff) | |
| download | frameworks_base-c3ea7e39e51beeac824e3a204e0b5486dca38e91.zip frameworks_base-c3ea7e39e51beeac824e3a204e0b5486dca38e91.tar.gz frameworks_base-c3ea7e39e51beeac824e3a204e0b5486dca38e91.tar.bz2 | |
am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev
automerge: eb6f3f8
* commit 'eb6f3f885154914eec6a747265d1f568ae50380c':
Update preference dialog padding to Material
| -rw-r--r-- | core/res/res/layout/preference_dialog_edittext_material.xml | 44 | ||||
| -rw-r--r-- | core/res/res/values/styles_material.xml | 2 |
2 files changed, 45 insertions, 1 deletions
diff --git a/core/res/res/layout/preference_dialog_edittext_material.xml b/core/res/res/layout/preference_dialog_edittext_material.xml new file mode 100644 index 0000000..df76f7f --- /dev/null +++ b/core/res/res/layout/preference_dialog_edittext_material.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<!-- Layout used as the dialog's content View for EditTextPreference. --> +<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:id="@+id/edittext_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="20dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/message" + android:layout_marginBottom="48dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingStart="4dp" + android:paddingEnd="4dp" + android:textColor="?attr/textColorSecondary" + style="?attr/textAppearanceSmall" /> + + </LinearLayout> + +</ScrollView> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 6220a1b..419beba 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -88,7 +88,7 @@ please see styles_device_defaults.xml. </style> <style name="Preference.Material.DialogPreference.EditTextPreference"> - <item name="dialogLayout">@layout/preference_dialog_edittext</item> + <item name="dialogLayout">@layout/preference_dialog_edittext_material</item> </style> <style name="Preference.Material.RingtonePreference"> |