From 93065f0a05e024e8f620ce32a4a817467a1c61d6 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 5 Oct 2011 16:37:26 -0700
Subject: [PATCH] Updating folder cling text position for Crespo. (Bug:
 5346951)

Change-Id: Iaa0794c84766d02f1091442e2e76418ba57002d8
---
 res/layout-port/folder_cling.xml   | 2 +-
 res/values-sw340dp-land/dimens.xml | 3 +++
 res/values-sw340dp-port/dimens.xml | 3 +++
 res/values/dimens.xml              | 1 +
 res/values/styles.xml              | 2 --
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml
index 9a7969cf2e..d2796a0e5d 100644
--- a/res/layout-port/folder_cling.xml
+++ b/res/layout-port/folder_cling.xml
@@ -22,7 +22,7 @@
         android:layout_height="match_parent"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="10dp"
-        android:layout_marginTop="70dp">
+        android:layout_marginTop="@dimen/folderClingMarginTop">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/values-sw340dp-land/dimens.xml b/res/values-sw340dp-land/dimens.xml
index e6b40db813..a723dcc0ab 100644
--- a/res/values-sw340dp-land/dimens.xml
+++ b/res/values-sw340dp-land/dimens.xml
@@ -15,6 +15,9 @@
 -->
 
 <resources>
+<!-- Clings -->
+    <dimen name="folderClingMarginTop">50dp</dimen>
+
 <!-- Workspace -->
     <dimen name="workspace_width_gap">0dp</dimen>
     <dimen name="workspace_height_gap">0dp</dimen>
diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml
index ab8cfecaff..a6ba6ed9e2 100644
--- a/res/values-sw340dp-port/dimens.xml
+++ b/res/values-sw340dp-port/dimens.xml
@@ -15,6 +15,9 @@
 -->
 
 <resources>
+<!-- Clings -->
+    <dimen name="folderClingMarginTop">70dp</dimen>
+
 <!-- Workspace -->
     <dimen name="workspace_width_gap">0dp</dimen>
     <dimen name="workspace_height_gap">0dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ab24d5bc9a..97f922f6e3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,6 +17,7 @@
 <resources>
 <!-- Cling -->
     <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
+    <dimen name="folderClingMarginTop">20dp</dimen>
 
 <!-- Workspace -->
     <dimen name="qsb_bar_height">40dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c8fe0246a2..05a83b2839 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -124,8 +124,6 @@
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
         <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
-        <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item>
-        <item name="android:paddingRight">@dimen/toolbar_button_horizontal_padding</item>
     </style>
     <style name="SearchButtonDivider">
         <item name="android:layout_width">wrap_content</item>