diff options
author | Hayden Schoen <hayden@cyngn.com> | 2015-07-09 19:58:56 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-07-14 09:52:47 -0700 |
commit | 2ee7ccecc8705f48d05104e0dcba9f118195af56 (patch) | |
tree | fac1caad6a6701e812d99e2e059e819eeb76896e /res | |
parent | 9711ba2542f4a15ed5dce442886a6a86d3ac0fa6 (diff) | |
download | android_packages_apps_Trebuchet-2ee7ccecc8705f48d05104e0dcba9f118195af56.tar.gz android_packages_apps_Trebuchet-2ee7ccecc8705f48d05104e0dcba9f118195af56.tar.bz2 android_packages_apps_Trebuchet-2ee7ccecc8705f48d05104e0dcba9f118195af56.zip |
Folder Layout Revision
Updated the folder layout to reflect design revisions based on community feedback
Change-Id: Ica1bb796dfccf779a954cf0903a1ae94a010ea1a
Diffstat (limited to 'res')
-rw-r--r--[-rwxr-xr-x] | res/drawable-hdpi/folder_bg.9.png | bin | 197 -> 823 bytes | |||
-rw-r--r--[-rwxr-xr-x] | res/drawable-hdpi/folder_fill_highlight.9.png | bin | 429 -> 14914 bytes | |||
-rw-r--r--[-rwxr-xr-x] | res/drawable-mdpi/folder_bg.9.png | bin | 149 -> 510 bytes | |||
-rw-r--r--[-rwxr-xr-x] | res/drawable-mdpi/folder_fill_highlight.9.png | bin | 324 -> 14764 bytes | |||
-rw-r--r--[-rwxr-xr-x] | res/drawable-xhdpi/folder_bg.9.png | bin | 246 -> 1023 bytes | |||
-rw-r--r--[-rwxr-xr-x] | res/drawable-xhdpi/folder_fill_highlight.9.png | bin | 594 -> 15075 bytes | |||
-rw-r--r--[-rwxr-xr-x] | res/drawable-xxhdpi/folder_bg.9.png | bin | 320 -> 1678 bytes | |||
-rw-r--r--[-rwxr-xr-x] | res/drawable-xxhdpi/folder_fill_highlight.9.png | bin | 811 -> 15836 bytes | |||
-rw-r--r-- | res/layout-land/launcher.xml | 13 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 13 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 13 | ||||
-rw-r--r-- | res/layout/user_folder.xml | 76 | ||||
-rw-r--r-- | res/values/dimens.xml | 6 |
13 files changed, 48 insertions, 73 deletions
diff --git a/res/drawable-hdpi/folder_bg.9.png b/res/drawable-hdpi/folder_bg.9.png Binary files differindex 4b2108053..ee0090c09 100755..100644 --- a/res/drawable-hdpi/folder_bg.9.png +++ b/res/drawable-hdpi/folder_bg.9.png diff --git a/res/drawable-hdpi/folder_fill_highlight.9.png b/res/drawable-hdpi/folder_fill_highlight.9.png Binary files differindex c7dde8930..b82302ba6 100755..100644 --- a/res/drawable-hdpi/folder_fill_highlight.9.png +++ b/res/drawable-hdpi/folder_fill_highlight.9.png diff --git a/res/drawable-mdpi/folder_bg.9.png b/res/drawable-mdpi/folder_bg.9.png Binary files differindex 36154e2fb..4039da560 100755..100644 --- a/res/drawable-mdpi/folder_bg.9.png +++ b/res/drawable-mdpi/folder_bg.9.png diff --git a/res/drawable-mdpi/folder_fill_highlight.9.png b/res/drawable-mdpi/folder_fill_highlight.9.png Binary files differindex 418048471..7c6a0d456 100755..100644 --- a/res/drawable-mdpi/folder_fill_highlight.9.png +++ b/res/drawable-mdpi/folder_fill_highlight.9.png diff --git a/res/drawable-xhdpi/folder_bg.9.png b/res/drawable-xhdpi/folder_bg.9.png Binary files differindex c3a30837a..1fbe1d80f 100755..100644 --- a/res/drawable-xhdpi/folder_bg.9.png +++ b/res/drawable-xhdpi/folder_bg.9.png diff --git a/res/drawable-xhdpi/folder_fill_highlight.9.png b/res/drawable-xhdpi/folder_fill_highlight.9.png Binary files differindex c1a4f702f..f5f0bd08d 100755..100644 --- a/res/drawable-xhdpi/folder_fill_highlight.9.png +++ b/res/drawable-xhdpi/folder_fill_highlight.9.png diff --git a/res/drawable-xxhdpi/folder_bg.9.png b/res/drawable-xxhdpi/folder_bg.9.png Binary files differindex d698a0750..3b2bc4253 100755..100644 --- a/res/drawable-xxhdpi/folder_bg.9.png +++ b/res/drawable-xxhdpi/folder_bg.9.png diff --git a/res/drawable-xxhdpi/folder_fill_highlight.9.png b/res/drawable-xxhdpi/folder_fill_highlight.9.png Binary files differindex c80ead243..4dc29f46c 100755..100644 --- a/res/drawable-xxhdpi/folder_fill_highlight.9.png +++ b/res/drawable-xxhdpi/folder_fill_highlight.9.png diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 4242b065d..a865bc6ca 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -29,19 +29,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" - android:alpha=".5" + android:alpha="1.0" android:clipToPadding="false"> - <View - android:id="@+id/reveal_fake_page" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/folder_background"/> - - <View - android:id="@+id/reveal_fake_folder_outline" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/folder_bg_opaque"/> <ImageView android:id="@+id/reveal_fake_folder_icon" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 9ff292824..09da8fcd7 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -29,19 +29,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" - android:alpha=".5" + android:alpha="1.0" android:clipToPadding="false"> - <View - android:id="@+id/reveal_fake_page" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/folder_background"/> - - <View - android:id="@+id/reveal_fake_folder_outline" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/folder_bg_opaque"/> <ImageView android:id="@+id/reveal_fake_folder_icon" diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index abf06ae25..3a7f8c05e 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -29,19 +29,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" - android:alpha=".5" + android:alpha="1.0" android:clipToPadding="false"> - <View - android:id="@+id/reveal_fake_page" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/folder_background"/> - - <View - android:id="@+id/reveal_fake_folder_outline" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/folder_bg_opaque"/> <ImageView android:id="@+id/reveal_fake_folder_icon" diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 2339e7a93..aae5e4bd9 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -15,30 +15,20 @@ --> <com.android.launcher3.Folder xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" + android:paddingTop="16dp" android:paddingStart="@dimen/folder_preview_padding" android:paddingEnd="@dimen/folder_preview_padding" - android:layout_gravity="center"> - - <ImageView - android:id="@+id/folder_lock" - android:layout_width="@dimen/folder_lock_icon" - android:layout_height="@dimen/folder_lock_icon" - android:paddingBottom="@dimen/folder_name_padding" - android:paddingTop="@dimen/folder_name_padding" - android:paddingLeft="@dimen/folder_name_padding" - android:paddingRight="@dimen/folder_name_padding" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="@dimen/folder_lock_margin" - android:src="@drawable/folder_unlocked" /> + android:paddingBottom="@dimen/folder_preview_padding" + android:layout_gravity="center" + android:background="@drawable/folder_bg"> <ScrollView android:id="@+id/scroll_view" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> <com.android.launcher3.CellLayout android:id="@+id/folder_content" @@ -48,24 +38,42 @@ android:hapticFeedbackEnabled="false" /> </ScrollView> - <com.android.launcher3.FolderEditText - android:id="@+id/folder_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:background="#00000000" - android:fontFamily="sans-serif-condensed" - android:gravity="center_horizontal" - android:layout_gravity="center_horizontal" - android:hint="@string/folder_hint_text" - android:imeOptions="flagNoExtractUi" - android:paddingBottom="@dimen/folder_name_padding" - android:paddingTop="@dimen/folder_name_padding" - android:singleLine="true" - android:textColor="@color/workspace_icon_text_color" - android:textColorHighlight="#ffCCCCCC" - android:textColorHint="#78ffffff" - android:textCursorDrawable="@null" - android:textSize="20sp" /> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/folder_name_lock_container"> + + <ImageView + android:id="@+id/folder_lock" + android:layout_width="@dimen/folder_lock_icon" + android:layout_height="@dimen/folder_lock_icon" + android:padding="@dimen/folder_name_padding" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" + android:src="@drawable/folder_unlocked" /> + + <com.android.launcher3.FolderEditText + android:id="@+id/folder_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:fontFamily="sans-serif-condensed" + android:hint="@string/folder_hint_text" + android:imeOptions="flagNoExtractUi" + android:paddingBottom="@dimen/folder_name_padding" + android:paddingTop="@dimen/folder_name_padding" + android:layout_marginStart="@dimen/folder_name_padding" + android:gravity="center_vertical" + android:singleLine="true" + android:textColor="@color/workspace_icon_text_color" + android:textColorHighlight="#ffCCCCCC" + android:textColorHint="#78ffffff" + android:textCursorDrawable="@null" + android:textSize="18sp" + android:layout_toStartOf="@id/folder_lock" + android:layout_alignTop="@id/folder_lock" + android:layout_alignParentStart="true" + android:layout_alignParentBottom="true"/> + </RelativeLayout> </com.android.launcher3.Folder> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b915a2876..97a12abdc 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -103,14 +103,14 @@ <!-- Folders --> <!-- The amount that the preview contents are inset from the preview background --> - <dimen name="folder_preview_padding">4dp</dimen> + <dimen name="folder_preview_padding">10dp</dimen> <dimen name="folder_lock_margin">6dp</dimen> <dimen name="folder_name_padding">10dp</dimen> - <dimen name="folder_lock_icon">50dp</dimen> + <dimen name="folder_lock_icon">48dp</dimen> <!-- Folder icon dimens --> <dimen name="folder_icon">64dp</dimen> - <dimen name="folder_icon_app_preview">26dp</dimen> + <dimen name="folder_icon_app_preview">22dp</dimen> <!-- Sizes for managed profile badges --> <dimen name="profile_badge_size">24dp</dimen> |