summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-09-14 11:26:21 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-09-16 12:05:02 -0700
commitbaec6ffae2c260180dbdf2c6b2ca2f38e1df8f1a (patch)
tree1f7308d88cdb308df0452b241dfe27927d5c767d /res/layout
parentf595f3de0fb166f5b4d43f885b63dccaaa9efd5b (diff)
downloadandroid_packages_apps_Trebuchet-baec6ffae2c260180dbdf2c6b2ca2f38e1df8f1a.tar.gz
android_packages_apps_Trebuchet-baec6ffae2c260180dbdf2c6b2ca2f38e1df8f1a.tar.bz2
android_packages_apps_Trebuchet-baec6ffae2c260180dbdf2c6b2ca2f38e1df8f1a.zip
Updating the paddings in folder cell
> Updating overall padding for the cell and adding drawable padding > Ensuring that the folder cell is always rendered properly based on available vertical space Bug: 30605958 Change-Id: I8ceb9fea5a25052b0d7461f52edca0e6a33fa085
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/user_folder.xml13
-rw-r--r--res/layout/user_folder_icon_normalized.xml16
2 files changed, 15 insertions, 14 deletions
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index d95075058..50bd89699 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -28,7 +28,7 @@
android:layout_height="match_parent"
android:paddingLeft="4dp"
android:paddingRight="4dp"
- android:paddingTop="8dp"
+ android:paddingTop="4dp"
launcher:pageIndicator="@+id/folder_page_indicator" />
<LinearLayout
@@ -37,8 +37,8 @@
android:layout_height="wrap_content"
android:clipChildren="false"
android:orientation="horizontal"
- android:paddingLeft="8dp"
- android:paddingRight="8dp" >
+ android:paddingLeft="12dp"
+ android:paddingRight="12dp" >
<com.android.launcher3.ExtendedEditText
android:id="@+id/folder_name"
@@ -51,13 +51,14 @@
android:gravity="center_horizontal"
android:hint="@string/folder_hint_text"
android:imeOptions="flagNoExtractUi"
- android:paddingBottom="8dp"
- android:paddingTop="4dp"
+ android:paddingBottom="@dimen/folder_label_padding"
+ android:paddingTop="@dimen/folder_label_padding"
android:singleLine="true"
android:textColor="#ff777777"
+ android:includeFontPadding="false"
android:textColorHighlight="#ffCCCCCC"
android:textColorHint="#ff808080"
- android:textSize="14sp" />
+ android:textSize="@dimen/folder_label_text_size" />
<com.android.launcher3.pageindicators.PageIndicatorDots
android:id="@+id/folder_page_indicator"
diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index bb6bd765b..16e618a80 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -26,9 +26,9 @@
android:id="@+id/folder_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="8dp"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
launcher:pageIndicator="@+id/folder_page_indicator" />
<LinearLayout
@@ -37,8 +37,8 @@
android:layout_height="wrap_content"
android:clipChildren="false"
android:orientation="horizontal"
- android:paddingLeft="8dp"
- android:paddingRight="8dp" >
+ android:paddingLeft="12dp"
+ android:paddingRight="12dp" >
<com.android.launcher3.ExtendedEditText
android:id="@+id/folder_name"
@@ -52,13 +52,13 @@
android:gravity="center_horizontal"
android:hint="@string/folder_hint_text"
android:imeOptions="flagNoExtractUi"
- android:paddingBottom="12dp"
- android:paddingTop="4dp"
+ android:paddingBottom="@dimen/folder_label_padding"
+ android:paddingTop="@dimen/folder_label_padding"
android:singleLine="true"
android:textColor="#EE777777"
android:textColorHighlight="#ffCCCCCC"
android:textColorHint="#ff808080"
- android:textSize="14sp" />
+ android:textSize="@dimen/folder_label_text_size" />
<com.android.launcher3.pageindicators.PageIndicatorDots
android:id="@+id/folder_page_indicator"