Layout tweaks in Launcher
-Removed All apps and Configure toolbar buttons
from Customization Drawer, removed Configure
button from All apps and added Market icon
to All apps
-Changed spacing of CellLayouts when scrolling
-Modified gap spacing in workspace layout
-Made workspace invisible in All apps but touching
the place where the workspace was takes you back
to workspace
Change-Id: I6e2579bfebeb8f1f80fdae07da442f6d399abe33
diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml
index 89a3104..8a0e8b8 100644
--- a/res/layout-xlarge-land/all_apps_tabbed.xml
+++ b/res/layout-xlarge-land/all_apps_tabbed.xml
@@ -20,13 +20,24 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <TabWidget
- android:id="@android:id/tabs"
+ <RelativeLayout
android:layout_width="952dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:background="@drawable/tab_unselected_holo"
- android:tabStripEnabled="false" />
+ android:background="@drawable/tab_unselected_holo">
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:tabStripEnabled="false" />
+ <ImageView
+ android:id="@+id/market_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:onClick="onClickAppMarketButton" />
+ </RelativeLayout>
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="match_parent"
@@ -34,7 +45,7 @@
<com.android.launcher2.AllAppsPagedView
android:id="@+id/all_apps_paged_view"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
launcher:cellCountX="7"
launcher:cellCountY="5"
launcher:pageLayoutWidthGap="36dp"
diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml
index e5ba393..8e6f1fe 100644
--- a/res/layout-xlarge-land/launcher.xml
+++ b/res/layout-xlarge-land/launcher.xml
@@ -22,23 +22,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <include
- layout="@layout/all_apps_tabbed"
- android:id="@+id/all_apps_view"
- android:layout_width="match_parent"
- android:layout_height="600dp"
- android:layout_gravity="top"/>
-
<!-- The workspace contains 5 screens of cells -->
<com.android.launcher2.Workspace
android:id="@+id/workspace"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="?android:attr/actionBarSize"
+ android:paddingBottom="10dp"
launcher:defaultScreen="2"
launcher:cellCountX="8"
launcher:cellCountY="7"
- launcher:pageSpacing="32dp">
+ launcher:pageSpacing="50dp">
<include android:id="@+id/cell1" layout="@layout/workspace_screen" />
<include android:id="@+id/cell2" layout="@layout/workspace_screen" />
@@ -47,6 +41,13 @@
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
</com.android.launcher2.Workspace>
+ <include
+ layout="@layout/all_apps_tabbed"
+ android:id="@+id/all_apps_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="top" />
+
<RelativeLayout
android:id="@+id/all_apps_button_cluster"
android:layout_width="fill_parent"
@@ -92,25 +93,12 @@
android:focusable="true"
android:clickable="true" />
- <!-- The button to bring up the installed app market.
- The icon for this button will be dynamically set. -->
- <ImageView
- android:id="@+id/market_button"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_alignLeft="@id/all_apps_button"
-
- android:onClick="onClickAppMarketButton"
- android:focusable="false"
- android:clickable="false"
- android:visibility="gone"/>
-
<com.android.launcher2.DeleteZone
android:id="@+id/delete_zone"
android:src="@drawable/delete_zone_selector"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_alignLeft="@id/all_apps_button"
+ android:layout_alignRight="@id/all_apps_button"
android:visibility="gone"
launcher:direction="horizontal" />
diff --git a/res/layout-xlarge-land/workspace_screen.xml b/res/layout-xlarge-land/workspace_screen.xml
index 64de05e..e983b79 100644
--- a/res/layout-xlarge-land/workspace_screen.xml
+++ b/res/layout-xlarge-land/workspace_screen.xml
@@ -26,7 +26,7 @@
launcher:cellHeight="@dimen/workspace_cell_height"
launcher:widthGap="@dimen/workspace_width_gap"
launcher:heightGap="@dimen/workspace_height_gap"
- launcher:yAxisStartPadding="25dip"
- launcher:yAxisEndPadding="25dip"
- launcher:xAxisStartPadding="40dip"
- launcher:xAxisEndPadding="40dip" />
+ launcher:yAxisStartPadding="15dip"
+ launcher:yAxisEndPadding="15dip"
+ launcher:xAxisStartPadding="25dip"
+ launcher:xAxisEndPadding="25dip" />