From 5f8afe6280eae34620067696173e71943e1a30a3 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 12 Aug 2013 16:19:28 -0700
Subject: Initial Changes for Dynamic Grid

Change-Id: I9e6f1e5167791cf8dc140778dfa447f86424e9bf
---
 res/layout-port/launcher.xml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'res/layout-port/launcher.xml')

diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index a2e829819..dd3ad47e4 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -35,25 +35,15 @@
             android:id="@+id/workspace"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:paddingStart="@dimen/workspace_left_padding"
-            android:paddingEnd="@dimen/workspace_right_padding"
-            android:paddingTop="@dimen/workspace_top_padding"
-            android:paddingBottom="@dimen/workspace_bottom_padding"
             launcher:defaultScreen="@integer/config_workspaceDefaultScreen"
-            launcher:cellCountX="@integer/cell_count_x"
-            launcher:cellCountY="@integer/cell_count_y"
             launcher:pageSpacing="@dimen/workspace_page_spacing"
-            launcher:pageIndicator="@id/page_indicator"
-            launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left"
-            launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right">
+            launcher:pageIndicator="@id/page_indicator">
         </com.android.launcher3.Workspace>
 
         <include layout="@layout/hotseat"
             android:id="@+id/hotseat"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/button_bar_height_plus_padding"
-            android:layout_gravity="bottom" />
+            android:layout_height="match_parent" />
 
         <include layout="@layout/overview_panel"
             android:id="@+id/overview_panel"
@@ -66,8 +56,7 @@
             layout="@layout/page_indicator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center_horizontal"
-            android:layout_marginBottom="@dimen/button_bar_height_plus_padding" />
+            android:layout_gravity="center_horizontal" />
 
         <include
             android:id="@+id/qsb_bar"
@@ -90,8 +79,8 @@
 
         <com.android.launcher3.DrawableStateProxyView
             android:id="@+id/voice_button_proxy"
-            android:layout_width="80dp"
-            android:layout_height="@dimen/qsb_bar_height"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:layout_gravity="top|end"
             android:clickable="true"
             android:onClick="onClickVoiceButton"
-- 
cgit v1.2.3