diff options
| -rw-r--r-- | core/res/res/layout-sw600dp/preference_list_content.xml | 123 | ||||
| -rw-r--r-- | core/res/res/layout/preference_list_content.xml | 6 | ||||
| -rw-r--r-- | core/res/res/layout/preference_list_content_single.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values-h720dp/dimens.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values-large/styles.xml | 25 | ||||
| -rw-r--r-- | core/res/res/values-sw600dp/dimens.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values-sw600dp/styles.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/dimens.xml | 2 |
8 files changed, 15 insertions, 164 deletions
diff --git a/core/res/res/layout-sw600dp/preference_list_content.xml b/core/res/res/layout-sw600dp/preference_list_content.xml deleted file mode 100644 index 08f645389f67..000000000000 --- a/core/res/res/layout-sw600dp/preference_list_content.xml +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/layout/list_content.xml -** -** Copyright 2006, 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. -*/ ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_height="match_parent" - android:layout_width="match_parent"> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_marginTop="@dimen/preference_screen_top_margin" - android:layout_marginBottom="@dimen/preference_screen_bottom_margin" - android:layout_weight="1"> - - <LinearLayout - android:id="@+id/headers" - android:orientation="vertical" - android:layout_width="0px" - android:layout_height="match_parent" - android:layout_marginRight="@dimen/preference_screen_side_margin_negative" - android:layout_marginLeft="@dimen/preference_screen_side_margin" - android:layout_weight="@integer/preferences_left_pane_weight"> - - <ListView android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="1" - android:paddingLeft="@dimen/preference_screen_header_padding_side" - android:paddingRight="@dimen/preference_screen_header_padding_side" - android:paddingTop="@dimen/preference_screen_header_vertical_padding" - android:paddingBottom="@dimen/preference_screen_header_vertical_padding" - android:scrollbarStyle="@integer/preference_screen_header_scrollbarStyle" - android:drawSelectorOnTop="false" - android:cacheColorHint="@android:color/transparent" - android:listPreferredItemHeight="48dp" - android:scrollbarAlwaysDrawVerticalTrack="true" /> - - <FrameLayout android:id="@+id/list_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" /> - - </LinearLayout> - - <LinearLayout - android:id="@+id/prefs_frame" - android:layout_width="0px" - android:layout_height="match_parent" - android:layout_weight="@integer/preferences_right_pane_weight" - android:layout_marginLeft="@dimen/preference_screen_side_margin" - android:layout_marginRight="@dimen/preference_screen_side_margin" - android:background="?attr/detailsElementBackground" - android:orientation="vertical" - android:visibility="gone" > - - <!-- Breadcrumb inserted here, in certain screen sizes. In others, it will be an - empty layout or just padding, and PreferenceActivity will put the breadcrumbs in - the action bar. --> - <include layout="@layout/breadcrumbs_in_fragment" /> - - <android.preference.PreferenceFrameLayout android:id="@+id/prefs" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" - /> - </LinearLayout> - </LinearLayout> - - <RelativeLayout android:id="@+id/button_bar" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_weight="0" - android:visibility="gone"> - - <Button android:id="@+id/back_button" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:layout_alignParentLeft="true" - android:text="@string/back_button_label" - /> - <LinearLayout - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true"> - - <Button android:id="@+id/skip_button" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:text="@string/skip_button_label" - android:visibility="gone" - /> - - <Button android:id="@+id/next_button" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:text="@string/next_button_label" - /> - </LinearLayout> - </RelativeLayout> -</LinearLayout> diff --git a/core/res/res/layout/preference_list_content.xml b/core/res/res/layout/preference_list_content.xml index 62181b54ae69..70bc59a6ca37 100644 --- a/core/res/res/layout/preference_list_content.xml +++ b/core/res/res/layout/preference_list_content.xml @@ -27,8 +27,6 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="0px" - android:layout_marginTop="@dimen/preference_screen_top_margin" - android:layout_marginBottom="@dimen/preference_screen_bottom_margin" android:layout_weight="1"> <LinearLayout @@ -48,6 +46,7 @@ android:paddingRight="@dimen/preference_screen_header_padding_side" android:paddingTop="@dimen/preference_screen_header_vertical_padding" android:paddingBottom="@dimen/preference_screen_header_vertical_padding" + android:clipToPadding="false" android:scrollbarStyle="@integer/preference_screen_header_scrollbarStyle" android:drawSelectorOnTop="false" android:cacheColorHint="@android:color/transparent" @@ -63,11 +62,10 @@ <LinearLayout android:id="@+id/prefs_frame" + style="?attr/preferencePanelStyle" android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="@integer/preferences_right_pane_weight" - android:layout_marginLeft="@dimen/preference_screen_side_margin" - android:layout_marginRight="@dimen/preference_screen_side_margin" android:orientation="vertical" android:visibility="gone" > diff --git a/core/res/res/layout/preference_list_content_single.xml b/core/res/res/layout/preference_list_content_single.xml index 6902ffdb63b0..259869d7dc3c 100644 --- a/core/res/res/layout/preference_list_content_single.xml +++ b/core/res/res/layout/preference_list_content_single.xml @@ -39,6 +39,9 @@ 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" android:scrollbarAlwaysDrawVerticalTrack="true" /> diff --git a/core/res/res/values-h720dp/dimens.xml b/core/res/res/values-h720dp/dimens.xml index 7efe32262fcc..6e991836bf8e 100644 --- a/core/res/res/values-h720dp/dimens.xml +++ b/core/res/res/values-h720dp/dimens.xml @@ -21,10 +21,6 @@ <dimen name="alert_dialog_button_bar_height">54dip</dimen> <!-- Preference fragment padding, bottom --> <dimen name="preference_fragment_padding_bottom">16dp</dimen> - <!-- Preference activity top margin --> - <dimen name="preference_screen_top_margin">16dp</dimen> - <!-- Preference activity bottom margin --> - <dimen name="preference_screen_bottom_margin">16dp</dimen> <dimen name="preference_screen_header_padding_side">0dip</dimen> diff --git a/core/res/res/values-large/styles.xml b/core/res/res/values-large/styles.xml deleted file mode 100644 index 5206d7c60b5e..000000000000 --- a/core/res/res/values-large/styles.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<resources> - <style name="PreferencePanel"> - <item name="android:layout_marginLeft">@dimen/preference_screen_side_margin</item> - <item name="android:layout_marginRight">@dimen/preference_screen_side_margin</item> - <item name="android:layout_marginTop">48dip</item> - <item name="android:layout_marginBottom">48dip</item> - <item name="android:background">?attr/detailsElementBackground</item> - </style> -</resources> diff --git a/core/res/res/values-sw600dp/dimens.xml b/core/res/res/values-sw600dp/dimens.xml index 24d5d8d19cd5..792066efa99c 100644 --- a/core/res/res/values-sw600dp/dimens.xml +++ b/core/res/res/values-sw600dp/dimens.xml @@ -45,13 +45,7 @@ <dimen name="keyguard_pattern_unlock_status_line_font_size">14sp</dimen> <!-- Preference activity, vertical padding for the header list --> - <dimen name="preference_screen_header_vertical_padding">16dp</dimen> - - <!-- Reduce the margin when using dual pane --> - <!-- 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_header_vertical_padding">32dp</dimen> </resources> diff --git a/core/res/res/values-sw600dp/styles.xml b/core/res/res/values-sw600dp/styles.xml index 7dea9b89b500..f9e95b7ad2c4 100644 --- a/core/res/res/values-sw600dp/styles.xml +++ b/core/res/res/values-sw600dp/styles.xml @@ -25,4 +25,12 @@ <item name="android:measureWithLargestChild">true</item> <item name="android:tabLayout">@android:layout/tab_indicator_holo</item> </style> + + <style name="PreferencePanel"> + <item name="android:layout_marginLeft">@dimen/preference_screen_side_margin</item> + <item name="android:layout_marginRight">@dimen/preference_screen_side_margin</item> + <item name="android:layout_marginTop">@dimen/preference_screen_top_margin</item> + <item name="android:layout_marginBottom">@dimen/preference_screen_bottom_margin</item> + <item name="android:background">?attr/detailsElementBackground</item> + </style> </resources> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index c522c1e90027..62a2187ea072 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -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">0dp</dimen> + <dimen name="preference_screen_side_margin_negative">-4dp</dimen> <!-- Preference activity top margin --> <dimen name="preference_screen_top_margin">0dp</dimen> <!-- Preference activity bottom margin --> |