Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 369d78f1 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

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

parents c4eb11db 1aba409f
Loading
Loading
Loading
Loading
+0 −8
Original line number Diff line number Diff line
@@ -19,12 +19,4 @@
<resources>
    <!-- Dialog button bar height -->
    <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>
+3 −5
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@
-->

<resources>
    <!-- Increase size (used to be 0 for dual pane -->
    <!-- Preference activity side margins -->
    <dimen name="preference_screen_side_margin">48dp</dimen>
    <!-- Preference activity side margins negative-->
    <dimen name="preference_screen_side_margin_negative">-52dp</dimen>
    <dimen name="preference_screen_header_padding_side">48dp</dimen>
    <!-- Preference fragment padding, sides -->
    <dimen name="preference_fragment_padding_side">48dp</dimen>
</resources>
+0 −1
Original line number Diff line number Diff line
@@ -15,6 +15,5 @@
-->

<resources>
    <bool name="preferences_prefer_dual_pane">true</bool>
    <bool name="target_honeycomb_needs_options_menu">false</bool>
</resources>
+4 −6
Original line number Diff line number Diff line
@@ -47,12 +47,6 @@
    <!-- Size of status line font in LockScreen. -->
    <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. -->
    <dimen name="default_app_widget_padding_left">12dp</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
         this is a bit taller -->
    <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>
+0 −8
Original line number Diff line number Diff line
@@ -25,12 +25,4 @@
        <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>
Loading