diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/user_folder.xml | 13 | ||||
| -rw-r--r-- | res/layout/user_folder_icon_normalized.xml | 16 | ||||
| -rw-r--r-- | res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | res/values/dimens.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
5 files changed, 27 insertions, 15 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" diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 3cfaf02d0..3423835a9 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -25,7 +25,8 @@ <attr name="iconDisplay" format="integer"> <enum name="workspace" value="0" /> <enum name="all_apps" value="1" /> - <enum name="widget_section" value="2" /> + <enum name="folder" value="2" /> + <enum name="widget_section" value="3" /> </attr> <attr name="deferShadowGeneration" format="boolean" /> <attr name="customShadows" format="boolean" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 1ae468557..33466a813 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -137,6 +137,12 @@ <dimen name="folder_preview_padding">6dp</dimen> <dimen name="page_indicator_dot_size">8dp</dimen> + <dimen name="folder_cell_x_padding">9dp</dimen> + <dimen name="folder_cell_y_padding">8dp</dimen> + <dimen name="folder_child_text_size">13sp</dimen> + <dimen name="folder_label_padding">12dp</dimen> + <dimen name="folder_label_text_size">14sp</dimen> + <!-- Sizes for managed profile badges --> <dimen name="profile_badge_size">24dp</dimen> <dimen name="profile_badge_margin">5dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index f0297654b..ecc11b0ee 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -74,7 +74,11 @@ <item name="android:background">@null</item> <item name="android:textColor">@color/quantum_panel_text_color</item> <item name="android:shadowRadius">0</item> + <item name="android:textSize">@dimen/folder_child_text_size</item> + <item name="android:gravity">center</item> + <item name="android:includeFontPadding">false</item> <item name="customShadows">false</item> + <item name="iconDisplay">folder</item> </style> <style name="Icon.DeepShortcut"> |