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

Commit 8358498a authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Layout changes in Settings"

parents 9397bb94 88160de2

core/res/res/layout-sw600dp/preference_list_content.xml

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
                android:layout_weight="1"

                android:paddingTop="16dp"

                android:paddingBottom="16dp"



                android:drawSelectorOnTop="false"

                android:cacheColorHint="@android:color/transparent"

                android:listPreferredItemHeight="48dp"

core/res/res/values-land/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
    <dimen name="password_keyboard_key_height_numeric">60dip</dimen>

    <!-- Default correction for the space key in the password keyboard -->

    <dimen name="password_keyboard_spacebar_vertical_correction">2dip</dimen>

    <dimen name="preference_screen_side_margin">16dp</dimen>

    <dimen name="preference_screen_side_margin_negative">-20dp</dimen>

    <dimen name="preference_widget_width">72dp</dimen>



    <!-- Default height of an action bar. -->

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

+8 −1
Original line number Diff line number Diff line
@@ -45,6 +45,13 @@ 
    <dimen name="keyguard_pattern_unlock_status_line_font_size">14sp</dimen>



    <!-- Preference activity, vertical padding for the header list -->

    <dimen name="reference_screen_header_vertical_padding">16dp</dimen>

    <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>



</resources>

core/res/res/values-w1024dp/dimens.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?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>

    <!-- 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>

</resources>

core/res/res/values-w1280dp/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
-->

<resources>

    <dimen name="preference_screen_side_margin">96dp</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">-100dp</dimen>

    <dimen name="preference_widget_width">64dp</dimen>

    <!-- Preference fragment padding, bottom -->