chrome/android/java/res/values-v21/styles.xml - Issue 872023002: Use floating labels for preference forms

Side by Side Diff: chrome/android/java/res/values-v21/styles.xml

Issue 872023002: Use floating labels for preference forms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Actually commit AddressField.java Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« chrome/android/java/res/layout/preference_float_label_layout.xml ('K') | « chrome/android/java/res/values-v21/dimens.xml ('k') | chrome/android/java/res/values/attrs.xml » ('j') | chrome/android/java/res/values/dimens.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- Copyright 2014 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2014 The Chromium Authors. All rights reserved.

3 Use of this source code is governed by a BSD-style license that can be	3 Use of this source code is governed by a BSD-style license that can be

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5	5

6 <resources>	6 <resources>

7 <!-- Preferences -->	7 <!-- Preferences -->

8 <style name="PreferencesTheme" parent="ThemeWithActionBar">	8 <style name="PreferencesTheme" parent="ThemeWithActionBar">

9 <item name="android:textColorLink">@color/pref_accent_color</item>	9 <item name="android:textColorLink">@color/pref_accent_color</item>

10 <item name="android:buttonStyle">@style/PreferenceButtonStyle</item>	10 <item name="android:buttonStyle">@style/PreferenceButtonStyle</item>

11 <item name="android:alertDialogTheme">@style/PreferencesDialogTheme</ite m>	11 <item name="android:alertDialogTheme">@style/PreferencesDialogTheme</ite m>

12 <item name="android:colorButtonNormal">@color/btn_default_preferences</i tem>	12 <item name="android:colorButtonNormal">@color/btn_default_preferences</i tem>

13 <item name="android:editTextBackground">@drawable/abc_edit_text_material </item>	13 <item name="android:editTextBackground">@drawable/abc_edit_text_material </item>

14 <item name="android:editTextStyle">@style/PreferenceEditTextStyle</item>	14 <item name="android:editTextStyle">@style/PreferenceEditTextStyle</item>

	15 <item name="floatLabelTextAppearance">@style/PreferenceFloatLabelTextApp earance</item>

15 </style>	16 </style>

16 <style name="PreferencesDialogTheme" parent="@android:style/Theme.Material.L ight.Dialog.Alert">	17 <style name="PreferencesDialogTheme" parent="@android:style/Theme.Material.L ight.Dialog.Alert">

17 <item name="android:colorAccent">@color/pref_accent_color</item>	18 <item name="android:colorAccent">@color/pref_accent_color</item>

18 </style>	19 </style>

19 <style name="PreferenceButtonStyle" parent="@android:style/Widget.Material.L ight.Button">	20 <style name="PreferenceButtonStyle" parent="@android:style/Widget.Material.L ight.Button">

20 <item name="android:textColor">#fff</item>	21 <item name="android:textColor">#fff</item>

21 </style>	22 </style>

22 <style name="PreferenceCategoryWithButtonStyle">	23 <style name="PreferenceCategoryWithButtonStyle">

23 <item name="android:paddingStart">?android:attr/listPreferredItemPadding Start</item>	24 <item name="android:paddingStart">?android:attr/listPreferredItemPadding Start</item>

24 <item name="android:paddingEnd">4dp</item>	25 <item name="android:paddingEnd">4dp</item>

(...skipping 19 matching lines...) Expand all Loading...
44 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item>	45 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item>

45 <item name="android:minHeight">?android:attr/listPreferredItemHeightSmal l</item>	46 <item name="android:minHeight">?android:attr/listPreferredItemHeightSmal l</item>

46 <item name="android:paddingTop">16dp</item>	47 <item name="android:paddingTop">16dp</item>

47 <item name="android:paddingBottom">16dp</item>	48 <item name="android:paddingBottom">16dp</item>

48 <item name="android:paddingStart">?android:attr/listPreferredItemPadding Start</item>	49 <item name="android:paddingStart">?android:attr/listPreferredItemPadding Start</item>

49 <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEn d</item>	50 <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEn d</item>

50 </style>	51 </style>

51 <style name="PreferenceLayout" parent="PreferenceLayoutBase" />	52 <style name="PreferenceLayout" parent="PreferenceLayoutBase" />

52	53

53 </resources>	54 </resources>

OLD	NEW