Skip to content

Commit 369d78f

Browse files
Amith YamasaniAndroid (Google) Code Review
Amith Yamasani
authored and
Android (Google) Code Review
committed
Merge "Switch 7 inch tablets to single-pane preferences, like phones." into jb-dev
2 parents c4eb11d + 1aba409 commit 369d78f

File tree

10 files changed

+77
-65
lines changed

10 files changed

+77
-65
lines changed

‎core/res/res/values-h720dp/dimens.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,4 @@
1919
<resources>
2020
<!-- Dialog button bar height -->
2121
<dimen name="alert_dialog_button_bar_height">54dip</dimen>
22-
<!-- Preference fragment padding, bottom -->
23-
<dimen name="preference_fragment_padding_bottom">16dp</dimen>
24-
25-
<dimen name="preference_screen_header_padding_side">0dip</dimen>
26-
27-
<integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
28-
<integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
29-
3022
</resources>

core/res/res/values-sw600dp-w1024dp/dimens.xml renamed to core/res/res/values-sw600dp-w960dp/dimens.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
-->
1616

1717
<resources>
18-
<!-- Increase size (used to be 0 for dual pane -->
19-
<!-- Preference activity side margins -->
20-
<dimen name="preference_screen_side_margin">48dp</dimen>
21-
<!-- Preference activity side margins negative-->
22-
<dimen name="preference_screen_side_margin_negative">-52dp</dimen>
18+
<dimen name="preference_screen_header_padding_side">48dp</dimen>
19+
<!-- Preference fragment padding, sides -->
20+
<dimen name="preference_fragment_padding_side">48dp</dimen>
2321
</resources>

‎core/res/res/values-sw600dp/bools.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
-->
1616

1717
<resources>
18-
<bool name="preferences_prefer_dual_pane">true</bool>
1918
<bool name="target_honeycomb_needs_options_menu">false</bool>
2019
</resources>

‎core/res/res/values-sw600dp/dimens.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@
4747
<!-- Size of status line font in LockScreen. -->
4848
<dimen name="keyguard_pattern_unlock_status_line_font_size">14sp</dimen>
4949

50-
<!-- Preference activity, vertical padding for the header list -->
51-
<dimen name="preference_screen_header_vertical_padding">32dp</dimen>
52-
<dimen name="preference_screen_side_margin">0dp</dimen>
53-
<!-- Compensate for double margin : preference_screen_side_margin + 4 (frame background shadow) = -preference_screen_side_margin_negative -->
54-
<dimen name="preference_screen_side_margin_negative">-4dp</dimen>
55-
5650
<!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. -->
5751
<dimen name="default_app_widget_padding_left">12dp</dimen>
5852
<dimen name="default_app_widget_padding_top">4dp</dimen>
@@ -78,5 +72,9 @@
7872
<!-- Height of the bottom navigation bar in portrait; on sw600dp devices
7973
this is a bit taller -->
8074
<dimen name="navigation_bar_height_portrait">56dp</dimen>
75+
76+
<!-- Preference fragment padding, sides -->
77+
<dimen name="preference_fragment_padding_side">24dp</dimen>
78+
<dimen name="preference_screen_header_padding_side">24dip</dimen>
8179
</resources>
8280

‎core/res/res/values-sw600dp/styles.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,4 @@
2525
<item name="android:measureWithLargestChild">true</item>
2626
<item name="android:tabLayout">@android:layout/tab_indicator_holo</item>
2727
</style>
28-
29-
<style name="PreferencePanel">
30-
<item name="android:layout_marginLeft">@dimen/preference_screen_side_margin</item>
31-
<item name="android:layout_marginRight">@dimen/preference_screen_side_margin</item>
32-
<item name="android:layout_marginTop">@dimen/preference_screen_top_margin</item>
33-
<item name="android:layout_marginBottom">@dimen/preference_screen_bottom_margin</item>
34-
<item name="android:background">?attr/detailsElementBackground</item>
35-
</style>
3628
</resources>

core/res/res/values-sw600dp-w1280dp/dimens.xml renamed to core/res/res/values-sw720dp-w1280dp/dimens.xml

File renamed without changes.

‎core/res/res/values-sw720dp/bools.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (C) 2012 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
17+
<resources>
18+
<bool name="preferences_prefer_dual_pane">true</bool>
19+
</resources>

‎core/res/res/values-sw720dp/dimens.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,32 @@
3838
<dimen name="thumbnail_width">230dp</dimen>
3939
<!-- The height that is used when creating thumbnails of applications. -->
4040
<dimen name="thumbnail_height">135dp</dimen>
41+
42+
<!-- Preference activity, vertical padding for the header list -->
43+
<dimen name="preference_screen_header_vertical_padding">32dp</dimen>
44+
<dimen name="preference_screen_side_margin">0dp</dimen>
45+
<!-- Compensate for double margin : preference_screen_side_margin + 4 (frame background shadow) = -preference_screen_side_margin_negative -->
46+
<dimen name="preference_screen_side_margin_negative">-4dp</dimen>
47+
48+
<!-- Preference fragment padding, bottom -->
49+
<dimen name="preference_fragment_padding_bottom">16dp</dimen>
50+
<dimen name="preference_screen_header_padding_side">0dip</dimen>
51+
<integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
52+
53+
<!-- Preference fragment padding, sides -->
54+
<dimen name="preference_fragment_padding_side">32dp</dimen>
55+
<!-- Padding to the left of the preference panel breadcrumb -->
56+
<dimen name="preference_breadcrumb_paddingLeft">32dp</dimen>
57+
<!-- Padding to the right of the preference panel breadcrumb -->
58+
<dimen name="preference_breadcrumb_paddingRight">32dp</dimen>
59+
<!-- Weight of the left pane in a multi-pane preference layout. -->
60+
<integer name="preferences_left_pane_weight">1</integer>
61+
<!-- Weight of the right pane in a multi-pane preference layout. So the split is 1:2 -->
62+
<integer name="preferences_right_pane_weight">2</integer>
63+
<!-- Minimum space to allocate to the left of a preference item for an icon.
64+
This helps in aligning titles when some items have icons and some don't. When space is
65+
at a premium, we don't pre-allocate any space. -->
66+
<dimen name="preference_icon_minWidth">56dp</dimen>
4167
</resources>
4268

4369

‎core/res/res/values-sw720dp/styles.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (C) 2012 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
17+
<resources>
18+
<style name="PreferencePanel">
19+
<item name="android:layout_marginLeft">@dimen/preference_screen_side_margin</item>
20+
<item name="android:layout_marginRight">@dimen/preference_screen_side_margin</item>
21+
<item name="android:layout_marginTop">@dimen/preference_screen_top_margin</item>
22+
<item name="android:layout_marginBottom">@dimen/preference_screen_bottom_margin</item>
23+
<item name="android:background">?attr/detailsElementBackground</item>
24+
</style>
25+
</resources>

‎core/res/res/values-w720dp/dimens.xml‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)