diff options
| author | 2017-07-07 10:41:14 -0700 | |
|---|---|---|
| committer | 2017-07-10 20:52:37 +0000 | |
| commit | 11de4e44faa31d59642714937ccd74cd94ec5f62 (patch) | |
| tree | 50e640d8dc82e97f9c560cd5324804a0d0da466b | |
| parent | 4e77ab6aad0cfc5c4ea57eca9c657557378aec38 (diff) | |
Move settings preference theme to SettingsLib.
Bug: 36663882
Fix: 36605280
Test: rerun robotests
Change-Id: Iaec0aa14bb1ba6ef7af27f8c995097f304844fc2
| -rw-r--r-- | packages/SettingsLib/res/layout/preference_dropdown_material_settings.xml | 35 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/styles_support_preference.xml | 92 |
2 files changed, 127 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/layout/preference_dropdown_material_settings.xml b/packages/SettingsLib/res/layout/preference_dropdown_material_settings.xml new file mode 100644 index 000000000000..a0b8155c0818 --- /dev/null +++ b/packages/SettingsLib/res/layout/preference_dropdown_material_settings.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2017 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. + --> + + +<!-- Based off frameworks/base/core/res/res/layout/preference_dropdown_material.xml + except that icon space in this layout is always reserved --> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <Spinner + android:id="@+id/spinner" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/preference_no_icon_padding_start" + android:visibility="invisible" /> + + <include layout="@layout/preference_material"/> + +</FrameLayout>
\ No newline at end of file diff --git a/packages/SettingsLib/res/values/styles_support_preference.xml b/packages/SettingsLib/res/values/styles_support_preference.xml new file mode 100644 index 000000000000..2a5c30f3ebbd --- /dev/null +++ b/packages/SettingsLib/res/values/styles_support_preference.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2017 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. + --> + +<!-- Common style for support lib preference to look like Settings app UI --> +<resources> + + <dimen name="preference_no_icon_padding_start">72dp</dimen> + + <!-- Fragment style --> + <style name="PreferenceFragmentStyle.SettingsBase" parent="@*android:style/PreferenceFragment.Material"> + <item name="allowDividerAfterLastItem">false</item> + </style> + + <!-- Preferences --> + <style name="Preference.SettingsBase" parent="@*android:style/Preference.Material"> + <item name="allowDividerAbove">false</item> + <item name="allowDividerBelow">true</item> + <item name="singleLineTitle">false</item> + <item name="iconSpaceReserved">true</item> + </style> + + <!-- Preference category --> + <style name="Preference.Category.SettingsBase" parent="@style/Preference.Category.Material"> + <item name="allowDividerAbove">true</item> + <item name="allowDividerBelow">true</item> + <item name="android:layout">@layout/preference_category_material_settings</item> + </style> + + <!-- Preference screen --> + <style name="Preference.Screen.SettingsBase" parent="@style/Preference.PreferenceScreen.Material"> + <item name="allowDividerAbove">false</item> + <item name="allowDividerBelow">true</item> + <item name="iconSpaceReserved">true</item> + </style> + + <!-- Footer Preferences --> + <style name="Preference.FooterPreference.SettingsBase" parent="Preference.SettingsBase"> + <item name="android:layout">@layout/preference_footer</item> + <item name="allowDividerAbove">true</item> + </style> + + <!-- Dropdown Preferences --> + <style name="Preference.DropdownPreference.SettingsBase" parent="Preference.SettingsBase"> + <item name="android:layout">@layout/preference_dropdown_material_settings</item> + </style> + + <!-- Switch Preferences --> + <style name="Preference.SwitchPreference.SettingsBase" parent="@style/Preference.SwitchPreference.Material"> + <item name="allowDividerAbove">false</item> + <item name="allowDividerBelow">true</item> + <item name="iconSpaceReserved">true</item> + <item name="singleLineTitle">false</item> + </style> + + <!-- EditText Preferences --> + <style name="Preference.EditTextPreference.SettingsBase" + parent="@style/Preference.DialogPreference.EditTextPreference.Material"> + <item name="allowDividerAbove">false</item> + <item name="allowDividerBelow">true</item> + <item name="iconSpaceReserved">true</item> + <item name="singleLineTitle">false</item> + </style> + + <style name="PreferenceThemeOverlay.SettingsBase" parent="@style/PreferenceThemeOverlay.v14.Material"> + <!-- Parent path frameworks/support/v14/preference/res/values/themes.xml --> + <item name="android:scrollbars">vertical</item> + <item name="preferenceFragmentStyle">@style/PreferenceFragmentStyle.SettingsBase</item> + <item name="preferenceCategoryStyle">@style/Preference.Category.SettingsBase</item> + <item name="preferenceScreenStyle">@style/Preference.Screen.SettingsBase</item> + <item name="preferenceStyle">@style/Preference.SettingsBase</item> + <item name="dialogPreferenceStyle">@style/Preference.SettingsBase</item> + <item name="editTextPreferenceStyle">@style/Preference.EditTextPreference.SettingsBase</item> + <item name="footerPreferenceStyle">@style/Preference.FooterPreference.SettingsBase</item> + <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.SettingsBase</item> + <item name="dropdownPreferenceStyle">@style/Preference.DropdownPreference.SettingsBase</item> + </style> + +</resources>
\ No newline at end of file |