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

Commit fc6175df authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fixing up PagedView to work in landscape mode" into jb-ub-now-jetsonic

parents 49ac59cb 3b185e25

res/layout-land/launcher.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ 
            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:layout_gravity="center"

            launcher:defaultScreen="@integer/config_workspaceDefaultScreen"

            launcher:defaultScreen="@integer/config_workspaceDefaultScreen"

            launcher:pageSpacing="@dimen/workspace_page_spacing"

            launcher:pageIndicator="@id/page_indicator" />

            launcher:pageIndicator="@id/page_indicator" />





        <include layout="@layout/hotseat"

        <include layout="@layout/hotseat"

res/layout-port/launcher.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ 
            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            launcher:defaultScreen="@integer/config_workspaceDefaultScreen"

            launcher:defaultScreen="@integer/config_workspaceDefaultScreen"

            launcher:pageSpacing="@dimen/workspace_page_spacing"

            launcher:pageIndicator="@id/page_indicator">

            launcher:pageIndicator="@id/page_indicator">

        </com.android.launcher3.Workspace>

        </com.android.launcher3.Workspace>

res/layout-sw720dp/launcher.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ 
            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            launcher:defaultScreen="@integer/config_workspaceDefaultScreen"

            launcher:defaultScreen="@integer/config_workspaceDefaultScreen"

            launcher:pageSpacing="@dimen/workspace_page_spacing"

            launcher:pageIndicator="@id/page_indicator">

            launcher:pageIndicator="@id/page_indicator">

        </com.android.launcher3.Workspace>

        </com.android.launcher3.Workspace>

res/values-land/dimens.xml

+0 −5
Original line number Original line Diff line number Diff line
@@ -19,11 +19,6 @@ 
    <dimen name="toolbar_button_vertical_padding">8dip</dimen>

    <dimen name="toolbar_button_vertical_padding">8dip</dimen>

    <dimen name="toolbar_button_horizontal_padding">0dip</dimen>

    <dimen name="toolbar_button_horizontal_padding">0dip</dimen>





<!-- Workspace -->

    <!-- We really want the page spacing to be the max of either the button bar

     height or the qsb bar height -->

    <dimen name="workspace_page_spacing">-1dp</dimen>



<!-- AppsCustomize -->

<!-- AppsCustomize -->

    <dimen name="apps_customize_tab_bar_height">42dp</dimen>

    <dimen name="apps_customize_tab_bar_height">42dp</dimen>

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

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

res/values-port/dimens.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -15,9 +15,6 @@ 
-->

-->





<resources>

<resources>

<!-- Workspace -->

    <dimen name="workspace_page_spacing">-1dp</dimen>



<!-- AppsCustomize -->

<!-- AppsCustomize -->

    <integer name="apps_customize_cling_focused_x">1</integer>

    <integer name="apps_customize_cling_focused_x">1</integer>

    <integer name="apps_customize_cling_focused_y">1</integer>

    <integer name="apps_customize_cling_focused_y">1</integer>