Initial Changes for Dynamic Grid

Change-Id: I9e6f1e5167791cf8dc140778dfa447f86424e9bf

5 files changed, 13 insertions, 115 deletions

diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml
deleted file mode 100644
index 4dcc774d7..000000000
--- a/res/layout-port/application.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
-   style="@style/WorkspaceIcon.Portrait"
-   android:focusable="true"
-   android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml
deleted file mode 100644
index 686fb170c..000000000
--- a/res/layout-port/folder_icon.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.launcher3.FolderIcon
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:focusable="true"
-    android:background="@drawable/focusable_view_bg">
-    <ImageView
-        android:id="@+id/preview_background"
-        android:layout_gravity="center_horizontal"
-        android:layout_width="@dimen/folder_preview_size"
-        android:layout_height="@dimen/folder_preview_size"
-        android:src="@drawable/portal_ring_inner_holo"/>
-    <com.android.launcher3.BubbleTextView
-        android:id="@+id/folder_icon_name"
-        style="@style/WorkspaceIcon.Portrait.Folder"/>
-</com.android.launcher3.FolderIcon>
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
deleted file mode 100644
index cab20b2da..000000000
--- a/res/layout-port/hotseat.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.Hotseat
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
-    launcher:cellCountX="@integer/hotseat_cell_count"
-    launcher:cellCountY="1">
-    <com.android.launcher3.CellLayout
-        android:id="@+id/layout"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:paddingTop="@dimen/button_bar_height_top_padding"
-        android:paddingBottom="@dimen/button_bar_height_bottom_padding"
-        android:paddingStart="@dimen/button_bar_width_left_padding"
-        android:paddingEnd="@dimen/button_bar_width_right_padding"
-
-        launcher:cellWidth="@dimen/hotseat_cell_width"
-        launcher:cellHeight="@dimen/hotseat_cell_height"
-        launcher:widthGap="@dimen/hotseat_width_gap"
-        launcher:heightGap="@dimen/hotseat_height_gap"
-        launcher:maxGap="@dimen/workspace_max_gap" />
-</com.android.launcher3.Hotseat>
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"
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 1e12e9eb8..69dd61aa2 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -17,9 +17,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
     style="@style/SearchDropTargetBar"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/search_bar_height"
-    android:layout_gravity="bottom|center_horizontal"
     android:background="@drawable/search_frame">
    <!-- Global search icon -->
    <com.android.launcher3.HolographicLinearLayout
@@ -29,8 +26,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
         android:layout_toStartOf="@+id/voice_button_container"
         android:paddingStart="8dp"
         android:onClick="onClickSearchButton"
@@ -41,7 +38,8 @@
             android:id="@+id/search_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:scaleType="fitStart"
+            android:layout_gravity="start"
+            android:scaleType="fitCenter"
             android:src="@drawable/ic_home_search_normal_holo"
             android:adjustViewBounds="true" />
     </com.android.launcher3.HolographicLinearLayout>
@@ -51,22 +49,22 @@
         style="@style/SearchButton"
         launcher:sourceImageViewId="@+id/voice_button"
         android:id="@+id/voice_button_container"
-        android:layout_width="@dimen/search_bar_height"
+        android:layout_width="@dimen/app_icon_size"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentTop="true"
         android:paddingEnd="8dp"
-        android:gravity="end"
         android:onClick="onClickVoiceButton"
         android:focusable="true"
         android:clickable="true"
         android:contentDescription="@string/accessibility_voice_search_button">
         <ImageView
             android:id="@+id/voice_button"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="fitEnd"
+            android:layout_gravity="end"
+            android:scaleType="fitCenter"
             android:src="@drawable/ic_home_voice_search_holo"
             android:adjustViewBounds="true" />
     </com.android.launcher3.HolographicLinearLayout>