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

Commit 87f06fa5 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am 1c3203e8: Merge "Update Settings redlines per UX request" into lmp-preview-dev 

* commit '1c3203e8':
  Update Settings redlines per UX request
parents 69323ad9 1c3203e8

res/layout/dashboard_category.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <TextView android:id="@+id/category_title"

            android:layout_width="match_parent"

            android:layout_height="@dimen/dashboard_category_title_height"

            android:paddingStart="@dimen/dashboard_category_title_padding_start"

            android:layout_marginStart="@dimen/dashboard_category_title_margin_start"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:gravity="center_vertical"

res/layout/switch_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
              android:layout_height="wrap_content"

              android:layout_width="0dp"

              android:layout_weight="1"

              android:paddingStart="@dimen/switchbar_padding_start"

              android:layout_marginStart="?attr/switchBarMarginStart"

              android:layout_gravity="center_vertical"

              android:textAppearance="@style/TextAppearance.Switch"

              android:textAlignment="viewStart" />
@@ -32,6 +32,6 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:paddingEnd="@dimen/switchbar_padding_end" />

            android:layout_marginEnd="?attr/switchBarMarginEnd" />

</merge>

res/values-sw600dp/dimens.xml

+10 −6
Original line number Diff line number Diff line
@@ -41,18 +41,22 @@ 


    <!-- ActionBar contentInsetStart -->

    <dimen name="actionbar_contentInsetStart">24dp</dimen>

    <dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>



    <!-- Dashboard category title padding start -->

    <dimen name="dashboard_category_title_padding_start">24dp</dimen>

    <!-- Dashboard category title margin start -->

    <dimen name="dashboard_category_title_margin_start">23dp</dimen>



    <!-- Dashboard tile image padding start / end -->

    <dimen name="dashboard_tile_image_margin_start">24dp</dimen>

    <dimen name="dashboard_tile_image_margin_end">32dp</dimen>



    <!-- SwitchBar padding start -->

    <dimen name="switchbar_padding_start">24dp</dimen>

    <!-- SwitchBar padding end -->

    <dimen name="switchbar_padding_end">24dp</dimen>

    <!-- SwitchBar margin start / end -->

    <dimen name="switchbar_margin_start">24dp</dimen>

    <dimen name="switchbar_margin_end">24dp</dimen>



    <!-- SwitchBar sub settings margin start / end -->

    <dimen name="switchbar_subsettings_margin_start">80dp</dimen>

    <dimen name="switchbar_subsettings_margin_end">24dp</dimen>



    <!-- Search title (recent / results) padding start -->

    <dimen name="search_title_padding_start">24dp</dimen>

res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -96,4 +96,8 @@ 
    <declare-styleable name="Preference">

        <attr name="keywords" format="string" />

    </declare-styleable>



    <attr name="switchBarMarginStart" format="dimension" />

    <attr name="switchBarMarginEnd" format="dimension" />



</resources>

res/values/dimens.xml

+10 −6
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 


    <!-- ActionBar contentInsetStart -->

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

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



    <!-- Dashboard padding between each tiles within the layout -->

    <dimen name="dashboard_cell_gap">1dp</dimen>
@@ -104,8 +105,8 @@ 
    <!-- Dashboard category title layout height -->

    <dimen name="dashboard_category_title_height">48dp</dimen>



    <!-- Dashboard category title padding start -->

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

    <!-- Dashboard category title margin start -->

    <dimen name="dashboard_category_title_margin_start">15dp</dimen>



    <!-- Dashboard tile minimum height -->

    <dimen name="dashboard_tile_minimum_height">72dp</dimen>
@@ -117,10 +118,13 @@ 
    <dimen name="dashboard_tile_image_margin_start">16dp</dimen>

    <dimen name="dashboard_tile_image_margin_end">32dp</dimen>



    <!-- SwitchBar padding start -->

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

    <!-- SwitchBar padding end. Should be n x @*android:dimen/preference_fragment_padding_side -->

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

    <!-- SwitchBar margin start / end -->

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

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



    <!-- SwitchBar sub settings margin start / end -->

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

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



    <!-- Search Results padding in its container -->

    <dimen name="search_results_padding_start">1dp</dimen>