-> Set grid to 8x7 with proper spacing for landscape/portrait

-> Added a button to the top left of Launcher which switches
   between landscape and portrait. For testing purposes only.

Change-Id: I01f8cfcf92c8ba7727eeba0e59a0b8ff055598fe

2 files changed, 26 insertions, 38 deletions

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 6eb9318..a1879ef 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -36,7 +36,7 @@
         android:layout_height="match_parent"
         launcher:defaultScreen="2"
         launcher:cellCountX="8"
-        launcher:cellCountY="4">
+        launcher:cellCountY="7">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
@@ -45,21 +45,39 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <ImageView
-        android:id="@+id/search_button"
+    <RelativeLayout
+        android:id="@+id/search_button_cluster"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/search_button"
+        android:layout_gravity="top|left">
+
+        <ImageView
+            android:id="@+id/search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/search_button"
+
+            android:onClick="onClickSearchButton"
+            android:focusable="true"
+            android:clickable="true"/>
+        <ImageView
+            android:id="@+id/rotate_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/rotate_button"
+
+            android:onClick="onClickRotateButton"
+            android:focusable="true"
+            android:clickable="true"
+            android:layout_toRightOf="@id/search_button" />
+    </RelativeLayout>
 
-        android:onClick="onClickSearchButton"
-        android:focusable="true"
-        android:clickable="true"
-        android:layout_gravity="top|left"/>
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right">
+
         <ImageView
             android:id="@+id/configure_button"
             android:layout_width="wrap_content"
diff --git a/res/layout-xlarge/workspace_screen.xml b/res/layout-xlarge/workspace_screen.xml
deleted file mode 100644
index 6a34975..0000000
--- a/res/layout-xlarge/workspace_screen.xml
+++ /dev/null
@@ -1,30 +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.launcher2.CellLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:hapticFeedbackEnabled="false"
-
-    launcher:cellWidth="@dimen/workspace_cell_width"
-    launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:yAxisStartPadding="8dip"
-    launcher:yAxisEndPadding="8dip"
-    launcher:xAxisStartPadding="8dip"
-    launcher:xAxisEndPadding="8dip"/>