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

2 files changed, 30 insertions, 4 deletions

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>