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

Merge "Switch 7 inch tablets to single-pane preferences, like phones." into jb-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-05-08 10:30:01 -07:00
committed by Android (Google) Code Review
parent c4eb11db04 1aba409f2f
commit 369d78f128
10 changed files with 77 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/res/values-h720dp/dimens.xml
View File

@@ -19,12 +19,4 @@
<resources> <resources>
<!-- Dialog button bar height --> <!-- Dialog button bar height -->
<dimen name="alert_dialog_button_bar_height">54dip</dimen> <dimen name="alert_dialog_button_bar_height">54dip</dimen>
<!-- Preference fragment padding, bottom -->
<dimen name="preference_fragment_padding_bottom">16dp</dimen>
<dimen name="preference_screen_header_padding_side">0dip</dimen>
<integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
<integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
</resources> </resources>

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

@@ -15,9 +15,7 @@
--> -->
<resources> <resources>
<!-- Increase size (used to be 0 for dual pane --> <dimen name="preference_screen_header_padding_side">48dp</dimen>
<!-- Preference activity side margins --> <!-- Preference fragment padding, sides -->
<dimen name="preference_screen_side_margin">48dp</dimen> <dimen name="preference_fragment_padding_side">48dp</dimen>
<!-- Preference activity side margins negative-->
<dimen name="preference_screen_side_margin_negative">-52dp</dimen>
</resources> </resources>

1
core/res/res/values-sw600dp/bools.xml
View File

@@ -15,6 +15,5 @@
--> -->
<resources> <resources>
<bool name="preferences_prefer_dual_pane">true</bool>
<bool name="target_honeycomb_needs_options_menu">false</bool> <bool name="target_honeycomb_needs_options_menu">false</bool>
</resources> </resources>

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

@@ -47,12 +47,6 @@
<!-- Size of status line font in LockScreen. --> <!-- Size of status line font in LockScreen. -->
<dimen name="keyguard_pattern_unlock_status_line_font_size">14sp</dimen> <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">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>
<!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. --> <!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. -->
<dimen name="default_app_widget_padding_left">12dp</dimen> <dimen name="default_app_widget_padding_left">12dp</dimen>
<dimen name="default_app_widget_padding_top">4dp</dimen> <dimen name="default_app_widget_padding_top">4dp</dimen>
@@ -78,5 +72,9 @@
<!-- Height of the bottom navigation bar in portrait; on sw600dp devices <!-- Height of the bottom navigation bar in portrait; on sw600dp devices
this is a bit taller --> this is a bit taller -->
<dimen name="navigation_bar_height_portrait">56dp</dimen> <dimen name="navigation_bar_height_portrait">56dp</dimen>
<!-- Preference fragment padding, sides -->
<dimen name="preference_fragment_padding_side">24dp</dimen>
<dimen name="preference_screen_header_padding_side">24dip</dimen>
</resources> </resources>

8
core/res/res/values-sw600dp/styles.xml
View File

@@ -25,12 +25,4 @@
<item name="android:measureWithLargestChild">true</item> <item name="android:measureWithLargestChild">true</item>
<item name="android:tabLayout">@android:layout/tab_indicator_holo</item> <item name="android:tabLayout">@android:layout/tab_indicator_holo</item>
</style> </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> </resources>

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

19
core/res/res/values-sw720dp/bools.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 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>
<bool name="preferences_prefer_dual_pane">true</bool>
</resources>

26
core/res/res/values-sw720dp/dimens.xml
View File

@@ -38,6 +38,32 @@
<dimen name="thumbnail_width">230dp</dimen> <dimen name="thumbnail_width">230dp</dimen>
<!-- The height that is used when creating thumbnails of applications. --> <!-- The height that is used when creating thumbnails of applications. -->
<dimen name="thumbnail_height">135dp</dimen> <dimen name="thumbnail_height">135dp</dimen>
<!-- 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>
<!-- Preference fragment padding, bottom -->
<dimen name="preference_fragment_padding_bottom">16dp</dimen>
<dimen name="preference_screen_header_padding_side">0dip</dimen>
<integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
<!-- Preference fragment padding, sides -->
<dimen name="preference_fragment_padding_side">32dp</dimen>
<!-- Padding to the left of the preference panel breadcrumb -->
<dimen name="preference_breadcrumb_paddingLeft">32dp</dimen>
<!-- Padding to the right of the preference panel breadcrumb -->
<dimen name="preference_breadcrumb_paddingRight">32dp</dimen>
<!-- Weight of the left pane in a multi-pane preference layout. -->
<integer name="preferences_left_pane_weight">1</integer>
<!-- Weight of the right pane in a multi-pane preference layout. So the split is 1:2 -->
<integer name="preferences_right_pane_weight">2</integer>
<!-- Minimum space to allocate to the left of a preference item for an icon.
This helps in aligning titles when some items have icons and some don't. When space is
at a premium, we don't pre-allocate any space. -->
<dimen name="preference_icon_minWidth">56dp</dimen>
</resources> </resources>

25
core/res/res/values-sw720dp/styles.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 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">@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>

37
core/res/res/values-w720dp/dimens.xml
View File

@@ -1,37 +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>
<!-- Preference fragment padding, sides -->
<dimen name="preference_fragment_padding_side">32dp</dimen>
<!-- Padding to the left of the preference panel breadcrumb -->
<dimen name="preference_breadcrumb_paddingLeft">32dp</dimen>
<!-- Padding to the right of the preference panel breadcrumb -->
<dimen name="preference_breadcrumb_paddingRight">32dp</dimen>
<!-- Weight of the left pane in a multi-pane preference layout. -->
<integer name="preferences_left_pane_weight">1</integer>
<!-- Weight of the right pane in a multi-pane preference layout. So the split is 1:2 -->
<integer name="preferences_right_pane_weight">2</integer>
<!-- Minimum space to allocate to the left of a preference item for an icon.
This helps in aligning titles when some items have icons and some don't. When space is
at a premium, we don't pre-allocate any space. -->
<dimen name="preference_icon_minWidth">56dp</dimen>
<dimen name="preference_screen_header_padding_side">0dip</dimen>
<integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
<integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
</resources>