From 4afe9b31f51022538b30646fe83780e83bf22490 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 27 Jul 2011 17:46:20 -0700
Subject: Adding ability to add to hotseat from spring loaded mode (5064141).

- Fixing regression where folder items had no text in tablet ui and assets
- Fixing spring loaded frame sizing (5067335)
- Making the cells 80x80 for testing again on the phone ui (5085986)

Change-Id: I52a0f5eaf2dcf4adaf57c5a71da3903892c490a8
---
 res/drawable-large-hdpi/portal_ring_inner_holo.png | Bin 0 -> 13791 bytes
 res/drawable-large-hdpi/portal_ring_outer_holo.png | Bin 0 -> 18745 bytes
 .../portal_container_holo.9.png                    | Bin 5894 -> 0 bytes
 res/drawable-large-mdpi/portal_ring_inner_holo.png | Bin 7253 -> 7477 bytes
 res/drawable-large-mdpi/portal_ring_outer_holo.png | Bin 11634 -> 10248 bytes
 .../portal_ring_inner_holo.png                     | Bin 0 -> 22040 bytes
 .../portal_ring_outer_holo.png                     | Bin 0 -> 30592 bytes
 res/layout-large/workspace.xml                     |   4 ++--
 res/layout-port/launcher.xml                       |   2 ++
 res/layout/workspace_screen.xml                    |   3 +--
 res/values-land/dimens.xml                         |   7 ++++--
 res/values-land/styles.xml                         |   5 ++++
 res/values-large-land/dimens.xml                   |   9 +++----
 res/values-large/dimens.xml                        |   6 ++++-
 res/values-port/dimens.xml                         |   8 +++----
 res/values-port/styles.xml                         |  26 +++++++++++++++++++++
 res/values/dimens.xml                              |   2 +-
 17 files changed, 56 insertions(+), 16 deletions(-)
 create mode 100644 res/drawable-large-hdpi/portal_ring_inner_holo.png
 create mode 100644 res/drawable-large-hdpi/portal_ring_outer_holo.png
 delete mode 100644 res/drawable-large-mdpi/portal_container_holo.9.png
 create mode 100644 res/drawable-large-xhdpi/portal_ring_inner_holo.png
 create mode 100644 res/drawable-large-xhdpi/portal_ring_outer_holo.png
 create mode 100644 res/values-port/styles.xml

(limited to 'res')

diff --git a/res/drawable-large-hdpi/portal_ring_inner_holo.png b/res/drawable-large-hdpi/portal_ring_inner_holo.png
new file mode 100644
index 000000000..1e89e781c
Binary files /dev/null and b/res/drawable-large-hdpi/portal_ring_inner_holo.png differ
diff --git a/res/drawable-large-hdpi/portal_ring_outer_holo.png b/res/drawable-large-hdpi/portal_ring_outer_holo.png
new file mode 100644
index 000000000..275777989
Binary files /dev/null and b/res/drawable-large-hdpi/portal_ring_outer_holo.png differ
diff --git a/res/drawable-large-mdpi/portal_container_holo.9.png b/res/drawable-large-mdpi/portal_container_holo.9.png
deleted file mode 100644
index 7eef5d7c5..000000000
Binary files a/res/drawable-large-mdpi/portal_container_holo.9.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/portal_ring_inner_holo.png b/res/drawable-large-mdpi/portal_ring_inner_holo.png
index c22224f25..c787b01b3 100644
Binary files a/res/drawable-large-mdpi/portal_ring_inner_holo.png and b/res/drawable-large-mdpi/portal_ring_inner_holo.png differ
diff --git a/res/drawable-large-mdpi/portal_ring_outer_holo.png b/res/drawable-large-mdpi/portal_ring_outer_holo.png
index b94c948f4..1cac4539b 100644
Binary files a/res/drawable-large-mdpi/portal_ring_outer_holo.png and b/res/drawable-large-mdpi/portal_ring_outer_holo.png differ
diff --git a/res/drawable-large-xhdpi/portal_ring_inner_holo.png b/res/drawable-large-xhdpi/portal_ring_inner_holo.png
new file mode 100644
index 000000000..f937012f6
Binary files /dev/null and b/res/drawable-large-xhdpi/portal_ring_inner_holo.png differ
diff --git a/res/drawable-large-xhdpi/portal_ring_outer_holo.png b/res/drawable-large-xhdpi/portal_ring_outer_holo.png
new file mode 100644
index 000000000..f34706134
Binary files /dev/null and b/res/drawable-large-xhdpi/portal_ring_outer_holo.png differ
diff --git a/res/layout-large/workspace.xml b/res/layout-large/workspace.xml
index abed5a8f5..327afaf00 100644
--- a/res/layout-large/workspace.xml
+++ b/res/layout-large/workspace.xml
@@ -15,11 +15,11 @@
 -->
 
 <!-- The workspace contains 5 screens of cells -->
+
 <com.android.launcher2.Workspace
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:paddingTop="?android:attr/actionBarSize"
-    android:paddingBottom="10dp"
+    android:paddingTop="@dimen/workspace_content_large_only_top_margin"
     launcher:defaultScreen="2"
     launcher:pageSpacing="@dimen/workspace_page_spacing">
       <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 2f8d99529..8a5d4aeb6 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -51,6 +51,8 @@
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingTop="@dimen/qsb_bar_height"
+        android:paddingBottom="@dimen/button_bar_height"
         launcher:defaultScreen="2"
         launcher:cellCountX="4"
         launcher:cellCountY="4"
diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml
index ede0d9907..c7d30ced7 100644
--- a/res/layout/workspace_screen.xml
+++ b/res/layout/workspace_screen.xml
@@ -17,9 +17,8 @@
 <com.android.launcher2.CellLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    style="@style/WorkspaceScreen"
 
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     android:paddingLeft="@dimen/workspace_left_padding"
     android:paddingRight="@dimen/workspace_right_padding"
     android:paddingTop="@dimen/workspace_top_padding"
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index c715bfb85..b413c5343 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -20,8 +20,11 @@
     <dimen name="toolbar_button_horizontal_padding">10dip</dimen>
 
 <!-- Workspace -->
-    <dimen name="workspace_left_padding">@dimen/qsb_bar_height</dimen>
-    <dimen name="workspace_right_padding">@dimen/button_bar_height</dimen>
+    <!-- Block spacing on each side of the screen -->
+    <dimen name="workspace_left_padding">12dp</dimen>
+    <dimen name="workspace_right_padding">12dp</dimen>
+    <!-- We need top/bottom padding for portals to look right, but
+         really only in spring loaded mode... -->
     <dimen name="workspace_top_padding">0dp</dimen>
     <dimen name="workspace_bottom_padding">0dp</dimen>
     <dimen name="workspace_page_spacing">8dp</dimen>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index ea79a5a4d..437a51110 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -18,6 +18,11 @@
 -->
 
 <resources>
+<!-- Workspace -->
+    <style name="WorkspaceScreen">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
 <!-- Search Bar -->
     <style name="SearchDropTargetBar">
         <item name="android:orientation">vertical</item>
diff --git a/res/values-large-land/dimens.xml b/res/values-large-land/dimens.xml
index 12fc8b309..4358ff940 100644
--- a/res/values-large-land/dimens.xml
+++ b/res/values-large-land/dimens.xml
@@ -16,10 +16,11 @@
 
 <resources>
 <!-- Workspace -->
-    <dimen name="workspace_left_padding">25dip</dimen>
-    <dimen name="workspace_right_padding">25dip</dimen>
-    <dimen name="workspace_top_padding">15dip</dimen>
-    <dimen name="workspace_bottom_padding">15dip</dimen>
+    <dimen name="workspace_left_padding">24dip</dimen>
+    <dimen name="workspace_right_padding">24dip</dimen>
+    <!-- We need padding on the screens for portals to look right -->
+    <dimen name="workspace_top_padding">12dip</dimen>
+    <dimen name="workspace_bottom_padding">12dip</dimen>
     <dimen name="workspace_width_gap">32dp</dimen>
     <dimen name="workspace_height_gap">2dp</dimen>
     <dimen name="workspace_page_spacing">50dp</dimen>
diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml
index a0fc814c6..234fcdb0a 100644
--- a/res/values-large/dimens.xml
+++ b/res/values-large/dimens.xml
@@ -21,9 +21,13 @@
 
 <!-- Workspace -->
     <dimen name="qsb_bar_height">56dp</dimen>
-
+    <!-- This should be @dimen/qsb_bar_height - @dimen/workspace_top_padding
+         to fix the extra space given to draw portals -->
+    <dimen name="workspace_content_large_only_top_margin">36dp</dimen>
     <dimen name="workspace_cell_width">96dip</dimen>
     <dimen name="workspace_cell_height">96dip</dimen>
+    <dimen name="folder_cell_width">96dp</dimen>
+    <dimen name="folder_cell_height">96dp</dimen>
 
 <!-- AppsCustomize -->
     <dimen name="apps_customize_tab_bar_height">56dp</dimen>
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml
index 2d27321ef..9add35759 100644
--- a/res/values-port/dimens.xml
+++ b/res/values-port/dimens.xml
@@ -18,10 +18,10 @@
 <!-- Workspace -->
     <dimen name="workspace_left_padding">0dp</dimen>
     <dimen name="workspace_right_padding">0dp</dimen>
-    <!-- We use the qsb_bar_height (48dp) + 12dp extra padding -->
-    <dimen name="workspace_top_padding">60dp</dimen>
-    <!-- We use the button_bar_height (80dp) + 12dp extra padding -->
-    <dimen name="workspace_bottom_padding">96dp</dimen>
+    <!-- Block spacing on each side of the screen.  And also padding
+         for the portals to look right. -->
+    <dimen name="workspace_top_padding">12dp</dimen>
+    <dimen name="workspace_bottom_padding">12dp</dimen>
     <dimen name="workspace_page_spacing">8dp</dimen>
 
     <integer name="apps_customize_cellCountX">4</integer>
diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml
new file mode 100644
index 000000000..66a4ca728
--- /dev/null
+++ b/res/values-port/styles.xml
@@ -0,0 +1,26 @@
+<?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.
+*/
+-->
+
+<resources>
+<!-- Workspace -->
+    <style name="WorkspaceScreen">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 309bf6db4..cb354b4b3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -21,7 +21,7 @@
     <dimen name="workspace_cell_height">80dp</dimen>
     <dimen name="workspace_width_gap">-1dp</dimen>
     <dimen name="workspace_height_gap">-1dp</dimen>
-    <dimen name="workspace_max_gap">8dp</dimen>
+    <dimen name="workspace_max_gap">16dp</dimen>
     <dimen name="folder_cell_width">74dp</dimen>
     <dimen name="folder_cell_height">80dp</dimen>
     <dimen name="workspace_divider_padding_left">12dp</dimen>
-- 
cgit v1.2.3