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

Commit e494aaf7 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Initial changes to support AllApps on various form factors." into jb-ub-now-jetsonic

parents c44a0c07 67ca7e4c

res/layout-land/launcher.xml

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

            android:layout_height="match_parent"

            android:layout_gravity="center"

            launcher:defaultScreen="@integer/config_workspaceDefaultScreen"

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

            launcher:defaultScreen="@integer/config_workspaceDefaultScreen" />



        <include layout="@layout/hotseat"

            android:id="@+id/hotseat"

res/layout-port/launcher.xml

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

            android:layout_height="match_parent"

            launcher:defaultScreen="@integer/config_workspaceDefaultScreen"

            launcher:pageIndicator="@id/page_indicator">

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

        </com.android.launcher3.Workspace>



        <include layout="@layout/hotseat"

res/layout/apps_customize_pane.xml

+3 −5
Original line number Diff line number Diff line
@@ -56,13 +56,12 @@ 
                android:id="@+id/apps_customize_pane_content"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_marginBottom="@dimen/apps_customize_page_indicator_offset"

                launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x"

                launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y"

                launcher:clingFocusedX="@integer/apps_customize_cling_focused_x"

                launcher:clingFocusedY="@integer/apps_customize_cling_focused_y"

                launcher:maxGap="@dimen/workspace_max_gap"

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

                launcher:pageIndicator="@+id/apps_customize_page_indicator" />

            <FrameLayout

                android:id="@+id/animation_buffer"

                android:layout_width="match_parent"
@@ -70,12 +69,11 @@ 
                android:background="#FF000000"

                android:visibility="gone" />

            <include

                android:id="@+id/page_indicator"

                android:id="@+id/apps_customize_page_indicator"

                layout="@layout/page_indicator"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="bottom|center_horizontal"

                android:layout_marginBottom="@dimen/apps_customize_page_indicator_margin" />

                android:layout_gravity="center_horizontal|bottom" />

        </FrameLayout>

    </LinearLayout>

</com.android.launcher3.AppsCustomizeTabHost>

res/values-sw600dp-land/dimens.xml

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



<resources>

<!-- AppsCustomize -->

    <dimen name="apps_customize_pageLayoutWidthGap">36dp</dimen>

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

    <dimen name="apps_customize_pageLayoutPaddingTop">20dp</dimen>

    <dimen name="apps_customize_pageLayoutPaddingBottom">14dp</dimen>



<!-- QSB -->

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

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

res/values/config.xml

+6 −0
Original line number Diff line number Diff line 
<resources>

<!-- Dynamic Grid -->

    <integer name="config_dynamic_grid_max_long_edge_cell_count">6</integer>

    <integer name="config_dynamic_grid_max_short_edge_cell_count">5</integer>

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



<!-- Miscellaneous -->

    <bool name="config_largeHeap">false</bool>

    <bool name="is_tablet">false</bool>

    <bool name="is_large_tablet">false</bool>