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

Commit 76ab31ac authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Reduce vertical margins in landscape add controls"

parents 7439dfc9 a3a7c45f
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="72dp">
        android:layout_height="@dimen/controls_management_footer_height">

        <View
            android:layout_width="match_parent"
@@ -61,7 +61,8 @@
        <androidx.constraintlayout.widget.ConstraintLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:padding="@dimen/controls_management_footer_side_margin">
            android:paddingHorizontal="@dimen/controls_management_footer_side_margin"
            android:paddingVertical="@dimen/controls_management_footer_top_margin" >

            <Button
                android:id="@+id/other_apps"
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/controls_management_page_indicator_height"
        android:layout_gravity="center"
        android:layout_marginTop="@dimen/controls_management_list_margin"
        android:layout_marginTop="@dimen/controls_management_indicator_top_margin"
        android:visibility="invisible" />

    <androidx.viewpager2.widget.ViewPager2
+1 −1
Original line number Diff line number Diff line
@@ -21,4 +21,4 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:layout_marginTop="@dimen/controls_management_zone_top_margin"/>
 No newline at end of file
    android:layout_marginTop="@dimen/controls_management_favorites_top_margin"/>
 No newline at end of file
+11 −0
Original line number Diff line number Diff line
@@ -47,4 +47,15 @@

    <dimen name="global_actions_power_dialog_item_height">130dp</dimen>
    <dimen name="global_actions_power_dialog_item_bottom_margin">35dp</dimen>

    <dimen name="controls_management_top_padding">12dp</dimen>
    <dimen name="controls_management_titles_margin">8dp</dimen>
    <dimen name="controls_management_indicator_top_margin">8dp</dimen>
    <dimen name="controls_management_list_margin">4dp</dimen>
    <dimen name="controls_management_footer_height">56dp</dimen>
    <dimen name="controls_management_zone_top_margin">24dp</dimen>

    <!-- (footer_height -48dp)/2 -->
    <dimen name="controls_management_footer_top_margin">4dp</dimen>
    <dimen name="controls_management_favorites_top_margin">8dp</dimen>
</resources>
+4 −0
Original line number Diff line number Diff line
@@ -1321,15 +1321,19 @@
    <dimen name="controls_management_side_padding">16dp</dimen>
    <dimen name="controls_management_titles_margin">16dp</dimen>
    <dimen name="controls_management_footer_side_margin">8dp</dimen>
    <dimen name="controls_management_footer_top_margin">@dimen/controls_management_footer_side_margin</dimen>
    <dimen name="controls_management_list_margin">16dp</dimen>
    <dimen name="controls_management_indicator_top_margin">@dimen/controls_management_list_margin</dimen>
    <dimen name="controls_management_apps_list_margin">64dp</dimen>
    <dimen name="controls_management_editing_list_margin">48dp</dimen>
    <dimen name="controls_management_editing_divider_margin">24dp</dimen>
    <dimen name="controls_management_apps_extra_side_margin">8dp</dimen>
    <dimen name="controls_management_zone_top_margin">32dp</dimen>
    <dimen name="controls_management_favorites_top_margin">@dimen/controls_management_zone_top_margin</dimen>
    <dimen name="controls_management_status_side_margin">16dp</dimen>
    <dimen name="controls_management_page_indicator_height">24dp</dimen>
    <dimen name="controls_management_checkbox_size">25dp</dimen>
    <dimen name="controls_management_footer_height">72dp</dimen>
    <dimen name="controls_title_size">24sp</dimen>
    <dimen name="controls_subtitle_size">16sp</dimen>