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

Commit 6828cbb7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Landscape grid changes for Workspace/All Apps." into ub-launcher3-dorval-polish

parents 9314b7c0 b28c4fcf

res/layout-land/launcher.xml

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ 
        <com.android.launcher3.pageindicators.PageIndicatorCaretLandscape

            android:id="@+id/page_indicator"

            android:theme="@style/HomeScreenElementTheme"

            android:layout_width="@dimen/dynamic_grid_page_indicator_height"

            android:layout_height="@dimen/dynamic_grid_page_indicator_height"

            android:layout_width="@dimen/dynamic_grid_page_indicator_size"

            android:layout_height="@dimen/dynamic_grid_page_indicator_size"

            android:layout_gravity="bottom|left"/>



        <include layout="@layout/widgets_view"

res/layout/all_apps.xml

+1 −3
Original line number Diff line number Diff line
@@ -53,9 +53,7 @@ 
            android:clipToPadding="false"

            android:overScrollMode="never"

            android:descendantFocusability="afterDescendants"

            android:focusable="true"

            android:paddingStart="@dimen/dynamic_grid_edge_margin"

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

            android:focusable="true" />



        <!-- Fast scroller popup -->

        <TextView

res/layout/page_indicator.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:theme="@style/HomeScreenElementTheme"

    android:layout_width="match_parent"

    android:layout_height="@dimen/dynamic_grid_page_indicator_height">

    android:layout_height="@dimen/dynamic_grid_page_indicator_size">

        <ImageView

            android:id="@+id/all_apps_handle"

            android:layout_width="48dp"

res/values-land/dimens.xml

+11 −0
Original line number Diff line number Diff line
@@ -24,4 +24,15 @@ 
    <dimen name="fastscroll_popup_padding">10dp</dimen>

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



    <!-- Dynamic grid -->

    <dimen name="dynamic_grid_overview_bar_item_width">120dp</dimen>

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

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

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



    <!-- Hotseat -->

    <dimen name="dynamic_grid_hotseat_land_left_nav_bar_right_padding">18dp</dimen>

    <dimen name="dynamic_grid_hotseat_land_right_nav_bar_right_padding">6dp</dimen>

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

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

</resources>

res/values/attrs.xml

+2 −2
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ 
        <attr name="numHotseatIcons" format="integer" />



        <attr name="iconSize" format="float" />

        <!-- landscapeIconSize defaults to iconSize, if not specified -->

        <attr name="landscapeIconSize" format="float" />

        <attr name="iconTextSize" format="float" />

        <!-- hotseatIconSize defaults to iconSize, if not specified -->

        <attr name="hotseatIconSize" format="float" />



        <attr name="defaultLayoutId" format="reference" />

    </declare-styleable>