summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJonathan Miranda <jonmiranda@google.com>2017-07-26 18:16:01 +0000
committerJonathan Miranda <jonmiranda@google.com>2017-07-26 18:16:01 +0000
commitf2974a5c2ac6bf35cef3435e672fecdbc18619d2 (patch)
tree02286d97e95e8b80303f09c1793b4e89f9698c62 /res
parentcab2e0e8a1ac529227a4b89646e44ba197087de2 (diff)
parent9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b (diff)
downloadandroid_packages_apps_Trebuchet-f2974a5c2ac6bf35cef3435e672fecdbc18619d2.tar.gz
android_packages_apps_Trebuchet-f2974a5c2ac6bf35cef3435e672fecdbc18619d2.tar.bz2
android_packages_apps_Trebuchet-f2974a5c2ac6bf35cef3435e672fecdbc18619d2.zip
[automerger] Revert "Update Folders to match spec." am: 9ad87463a8
Change-Id: I75ad19eba41a0bab0461a0255954092a4790c617
Diffstat (limited to 'res')
-rw-r--r--res/layout/folder_application.xml7
-rw-r--r--res/values/dimens.xml7
2 files changed, 4 insertions, 10 deletions
diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml
index 9d4af0d9c..de861a0ad 100644
--- a/res/layout/folder_application.xml
+++ b/res/layout/folder_application.xml
@@ -19,9 +19,4 @@
xmlns:launcher="http://schemas.android.com/apk/res-auto"
style="@style/BaseIcon"
android:includeFontPadding="false"
- android:paddingLeft="@dimen/folder_cell_x_padding"
- android:paddingTop="@dimen/folder_cell_y_padding"
- android:paddingRight="@dimen/folder_cell_x_padding"
- android:paddingBottom="@dimen/folder_cell_y_padding"
- launcher:centerVertically="true"
- launcher:iconDisplay="folder"/>
+ launcher:iconDisplay="folder" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0eb3982ca..356de7869 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -138,11 +138,10 @@
<dimen name="folder_preview_padding">10dp</dimen>
<dimen name="page_indicator_dot_size">8dp</dimen>
- <dimen name="folder_cell_x_padding">8dp</dimen>
- <dimen name="folder_cell_y_padding">8dp</dimen>
+ <dimen name="folder_cell_x_padding">9dp</dimen>
+ <dimen name="folder_cell_y_padding">6dp</dimen>
<dimen name="folder_child_text_size">13sp</dimen>
- <dimen name="folder_child_icon_drawable_padding">8dp</dimen>
- <dimen name="folder_label_padding_top">12dp</dimen>
+ <dimen name="folder_label_padding_top">4dp</dimen>
<dimen name="folder_label_padding_bottom">12dp</dimen>
<dimen name="folder_label_text_size">14sp</dimen>