From ea0c40079ca7c0e6d6c36ec6080c52daa87a761e Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Fri, 8 Aug 2014 14:48:18 -0700
Subject: [PATCH] Use margin instead of padding to work around ICS/JB bug

b/16897364

Change-Id: I777446331efcf7735a4d3de9eeedd7fa57dc8d36
---
 res/values-w600dp/dimensions.xml | 6 +++---
 res/values/dimensions.xml        | 6 +++---
 res/values/styles.xml            | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/values-w600dp/dimensions.xml b/res/values-w600dp/dimensions.xml
index 3c8aeee28..e5efb6c6d 100644
--- a/res/values-w600dp/dimensions.xml
+++ b/res/values-w600dp/dimensions.xml
@@ -42,9 +42,9 @@
     <dimen name="setup_lower_headline_margin_bottom">10dp</dimen>
 
     <!-- Account setup checkboxes padding -->
-    <dimen name="setup_checkbox_padding_side">8dp</dimen>
-    <dimen name="setup_checkbox_padding_top">16dp</dimen>
-    <dimen name="setup_checkbox_padding_bottom">16dp</dimen>
+    <dimen name="setup_checkbox_margin_side">8dp</dimen>
+    <dimen name="setup_checkbox_margin_top">16dp</dimen>
+    <dimen name="setup_checkbox_margin_bottom">16dp</dimen>
 
     <!-- Account setup basics -->
     <dimen name="setup_basics_logo_margin_top">28dp</dimen>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index f23e07e9c..8b3dba70c 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -75,9 +75,9 @@
 
     <!-- Account setup checkboxes padding -->
     <!-- see also w600dp -->
-    <dimen name="setup_checkbox_padding_side">0dp</dimen>
-    <dimen name="setup_checkbox_padding_top">8dp</dimen>
-    <dimen name="setup_checkbox_padding_bottom">8dp</dimen>
+    <dimen name="setup_checkbox_margin_side">0dp</dimen>
+    <dimen name="setup_checkbox_margin_top">8dp</dimen>
+    <dimen name="setup_checkbox_margin_bottom">8dp</dimen>
 
     <!-- Account setup basics -->
     <!-- See also w600dp -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 84013b20f..f78a14eb4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -101,10 +101,10 @@
 
     <!-- Account setup checkboxes -->
     <style name="account_setup_checkbox">
-        <item name="android:paddingTop">@dimen/setup_checkbox_padding_top</item>
-        <item name="android:paddingBottom">@dimen/setup_checkbox_padding_bottom</item>
-        <item name="android:paddingLeft">@dimen/setup_checkbox_padding_side</item>
-        <item name="android:paddingRight">@dimen/setup_checkbox_padding_side</item>
+        <item name="android:layout_marginTop">@dimen/setup_checkbox_margin_top</item>
+        <item name="android:layout_marginBottom">@dimen/setup_checkbox_margin_bottom</item>
+        <item name="android:layout_marginLeft">@dimen/setup_checkbox_margin_side</item>
+        <item name="android:layout_marginRight">@dimen/setup_checkbox_margin_side</item>
     </style>
 
     <!-- Client certificate UI. See also values in styles-ldrtl.xml -->