diff options
| author | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
|---|---|---|
| committer | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
| commit | 826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec (patch) | |
| tree | 1ba6f2151cba45b5e7d07cd61a44f6b59a3f828f /res/values/styles.xml | |
| parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
| parent | a3e22d6a362260d5b81feefbc91e4757e3d58958 (diff) | |
| download | android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.gz android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.bz2 android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.zip | |
resolved conflicts for merge of a3e22d6a to master
Change-Id: I8770574acf86e280a9d15d4309686111260e09d9
Diffstat (limited to 'res/values/styles.xml')
| -rw-r--r-- | res/values/styles.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 909887c44..f5224d2eb 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -63,13 +63,13 @@ <item name="android:singleLine">true</item> <item name="android:ellipsize">marquee</item> <item name="android:textSize">12sp</item> - <item name="android:textColor">#FFF</item> + <item name="android:textColor">@color/workspace_icon_text_color</item> <item name="android:shadowRadius">2.0</item> <item name="android:shadowColor">#B0000000</item> </style> <style name="WorkspaceIcon.Portrait"> - <item name="android:drawablePadding">8dp</item> + <item name="android:drawablePadding">@dimen/app_icon_drawable_padding</item> <item name="android:paddingLeft">4dp</item> <item name="android:paddingRight">4dp</item> <item name="android:paddingTop">@dimen/app_icon_padding_top</item> @@ -86,7 +86,7 @@ <style name="WorkspaceIcon.Portrait.Folder"> <item name="android:drawablePadding">0dp</item> - <item name="android:paddingTop">2dp</item> + <item name="android:paddingTop">@dimen/folder_icon_padding_top</item> </style> <style name="WorkspaceIcon.Landscape.Folder"> <item name="android:drawablePadding">0dp</item> |