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

am 48b39148: Merge "Fix preference screen padding for legacy apps (non Holo)."

Browse Source 
* commit '48b391480519c5d6cb4428af6b29b1e3405e4601':
  Fix preference screen padding for legacy apps (non Holo).
This commit is contained in:
Amith Yamasani
2011-09-11 15:59:47 -07:00
committed by Android Git Automerger
parent eaa24ce9aa 48b3914805
commit da286299f4
8 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/layout/preference_list_content_single.xml
View File

@@ -35,12 +35,11 @@
android:layout_height="match_parent">
<ListView android:id="@android:id/list"
style="?attr/preferenceFragmentStyle"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:drawSelectorOnTop="false"
android:paddingLeft="@dimen/preference_fragment_padding_side"
android:paddingRight="@dimen/preference_fragment_padding_side"
android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"
android:cacheColorHint="@android:color/transparent"
android:listPreferredItemHeight="48dp"

0
core/res/res/values-w1024dp/dimens.xml → core/res/res/values-sw600dp-w1024dp/dimens.xml
View File

0
core/res/res/values-w1280dp/dimens.xml → core/res/res/values-sw600dp-w1280dp/dimens.xml
View File

3
core/res/res/values-sw600dp/dimens.xml
View File

@@ -50,6 +50,9 @@
<!-- Preference activity, vertical padding for the header list -->
<dimen name="preference_screen_header_vertical_padding">32dp</dimen>
<dimen name="preference_screen_side_margin">0dp</dimen>
<!-- Compensate for double margin : preference_screen_side_margin + 4 (frame background shadow) = -preference_screen_side_margin_negative -->
<dimen name="preference_screen_side_margin_negative">-4dp</dimen>
</resources>

2
core/res/res/values/attrs.xml
View File

@@ -705,6 +705,8 @@
<!-- Default style for PreferenceScreen. -->
<attr name="preferenceScreenStyle" format="reference" />
<!-- Default style for Headers pane in PreferenceActivity. -->
<attr name="preferenceFragmentStyle" format="reference" />
<!-- Default style for PreferenceCategory. -->
<attr name="preferenceCategoryStyle" format="reference" />
<!-- Default style for Preference. -->

2
core/res/res/values/dimens.xml
View File

@@ -78,7 +78,7 @@
<!-- Preference activity side margins -->
<dimen name="preference_screen_side_margin">0dp</dimen>
<!-- Preference activity side margins negative-->
<dimen name="preference_screen_side_margin_negative">-4dp</dimen>
<dimen name="preference_screen_side_margin_negative">0dp</dimen>
<!-- Preference activity top margin -->
<dimen name="preference_screen_top_margin">0dp</dimen>
<!-- Preference activity bottom margin -->

12
core/res/res/values/styles.xml
View File

@@ -910,7 +910,12 @@ please see styles_device_defaults.xml.
<style name="Preference">
<item name="android:layout">@android:layout/preference</item>
</style>
<style name="PreferenceFragment">
<item name="android:paddingLeft">0dp</item>
<item name="android:paddingRight">0dp</item>
</style>
<style name="Preference.Information">
<item name="android:layout">@android:layout/preference_information</item>
<item name="android:enabled">false</item>
@@ -961,6 +966,11 @@ please see styles_device_defaults.xml.
<item name="android:layout">@android:layout/preference_holo</item>
</style>
<style name="PreferenceFragment.Holo">
<item name="android:paddingLeft">@dimen/preference_fragment_padding_side</item>
<item name="android:paddingRight">@dimen/preference_fragment_padding_side</item>
</style>
<style name="Preference.Holo.Information">
<item name="android:layout">@android:layout/preference_information_holo</item>
<item name="android:enabled">false</item>

3
core/res/res/values/themes.xml
View File

@@ -275,6 +275,7 @@ please see themes_device_defaults.xml.
<!-- Preference styles -->
<item name="preferenceScreenStyle">@android:style/Preference.PreferenceScreen</item>
<item name="preferenceFragmentStyle">@style/PreferenceFragment</item>
<item name="preferenceCategoryStyle">@android:style/Preference.Category</item>
<item name="preferenceStyle">@android:style/Preference</item>
<item name="preferenceInformationStyle">@android:style/Preference.Information</item>
@@ -1071,6 +1072,7 @@ please see themes_device_defaults.xml.
<!-- Preference styles -->
<item name="preferenceScreenStyle">@android:style/Preference.Holo.PreferenceScreen</item>
<item name="preferenceFragmentStyle">@style/PreferenceFragment.Holo</item>
<item name="preferenceCategoryStyle">@android:style/Preference.Holo.Category</item>
<item name="preferenceStyle">@android:style/Preference.Holo</item>
<item name="preferenceInformationStyle">@android:style/Preference.Holo.Information</item>
@@ -1378,6 +1380,7 @@ please see themes_device_defaults.xml.
<!-- Preference styles -->
<item name="preferenceScreenStyle">@android:style/Preference.Holo.PreferenceScreen</item>
<item name="preferenceFragmentStyle">@style/PreferenceFragment.Holo</item>
<item name="preferenceCategoryStyle">@android:style/Preference.Holo.Category</item>
<item name="preferenceStyle">@android:style/Preference.Holo</item>
<item name="preferenceInformationStyle">@android:style/Preference.Holo.Information</item>