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

Commit 303b7780 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am 1b526607: Merge "Tune Dashboard layouts following UX spec - part 2" into lmp-preview-dev 

* commit '1b526607':
  Tune Dashboard layouts following UX spec - part 2
parents 5e99218c 1b526607

res/layout/dashboard_tile.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 


    <ImageView

            android:id="@+id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_width="@dimen/dashboard_tile_image_size"

            android:layout_height="@dimen/dashboard_tile_image_size"

            android:scaleType="centerInside"

            android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"

            android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"

res/values-sw600dp-land/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- Dashboard number of columns -->

    <integer name="dashboard_num_columns">3</integer>

    <integer name="dashboard_num_columns">2</integer>



</resources>

res/values-sw600dp/dimens.xml

+13 −6
Original line number Diff line number Diff line
@@ -39,15 +39,22 @@ 
    <dimen name="keyguard_appwidget_picker_margin_right">2dip</dimen>

    <integer name="keyguard_appwidget_picker_cols">2</integer>



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

    <dimen name="dashboard_cell_gap">8dp</dimen>

    <!-- ActionBar contentInsetStart -->

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



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

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



    <!-- Dashboard image tile 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">80dp</dimen>

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

    <!-- SwitchBar padding end -->

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

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



    <!-- ActionBar contentInsetStart -->

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

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

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



</resources>

res/values/dimens.xml

+4 −1
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ 
    <!-- Dashboard tile minimum height -->

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



    <!-- Dashboard image tile size -->

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



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

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

    <dimen name="dashboard_tile_image_margin_end">32dp</dimen>
@@ -120,7 +123,7 @@ 
    <dimen name="search_results_padding_end">1dp</dimen>



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

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

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



    <!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. -->

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