summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-05-15 13:54:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-15 13:54:03 -0700
commitad88c743f1a4818838a6f5c55d788cf75391946a (patch)
tree492370e8924428ddf2f897e1fddb7c56c99574f2
parent1a1318d9a061981469735d9164585f75830164fe (diff)
parentff94e5fca347a009b112e98e9470391b278f31a3 (diff)
downloadframeworks_base-ad88c743f1a4818838a6f5c55d788cf75391946a.zip
frameworks_base-ad88c743f1a4818838a6f5c55d788cf75391946a.tar.gz
frameworks_base-ad88c743f1a4818838a6f5c55d788cf75391946a.tar.bz2
am ff94e5fc: am 0a283346: Merge "Adjusting default widget padding for sw600 dp devices (issue 6491977)" into jb-dev
* commit 'ff94e5fca347a009b112e98e9470391b278f31a3': Adjusting default widget padding for sw600 dp devices (issue 6491977)
-rw-r--r--core/res/res/values-sw600dp/dimens.xml6
-rw-r--r--core/res/res/values-sw720dp/dimens.xml6
2 files changed, 6 insertions, 6 deletions
diff --git a/core/res/res/values-sw600dp/dimens.xml b/core/res/res/values-sw600dp/dimens.xml
index c5727ea..d26666e 100644
--- a/core/res/res/values-sw600dp/dimens.xml
+++ b/core/res/res/values-sw600dp/dimens.xml
@@ -51,12 +51,6 @@
<!-- Size of status line font in LockScreen. -->
<dimen name="keyguard_pattern_unlock_status_line_font_size">14sp</dimen>
- <!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. -->
- <dimen name="default_app_widget_padding_left">12dp</dimen>
- <dimen name="default_app_widget_padding_top">4dp</dimen>
- <dimen name="default_app_widget_padding_right">12dp</dimen>
- <dimen name="default_app_widget_padding_bottom">20dp</dimen>
-
<!-- Minimum width for an action button in the menu area of an action bar -->
<dimen name="action_button_min_width">64dip</dimen>
diff --git a/core/res/res/values-sw720dp/dimens.xml b/core/res/res/values-sw720dp/dimens.xml
index 34c7ea3..fc336ae 100644
--- a/core/res/res/values-sw720dp/dimens.xml
+++ b/core/res/res/values-sw720dp/dimens.xml
@@ -50,6 +50,12 @@
<dimen name="preference_screen_header_padding_side">0dip</dimen>
<integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
+ <!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. -->
+ <dimen name="default_app_widget_padding_left">12dp</dimen>
+ <dimen name="default_app_widget_padding_top">4dp</dimen>
+ <dimen name="default_app_widget_padding_right">12dp</dimen>
+ <dimen name="default_app_widget_padding_bottom">20dp</dimen>
+
<!-- Preference fragment padding, sides -->
<dimen name="preference_fragment_padding_side">32dp</dimen>
<!-- Padding to the left of the preference panel breadcrumb -->