diff options
| author | Vineet Patil <vpatil@cyngn.com> | 2015-11-17 14:23:05 -0800 |
|---|---|---|
| committer | Vineet Patil <vpatil@cyngn.com> | 2015-11-18 13:39:02 -0800 |
| commit | 35614fdc7d13179ba9cbc80f15eca6d63cf3229d (patch) | |
| tree | dfde8498c0ea5a2adb1635120c4f98323f5956ce /res/drawable | |
| parent | 5fcaab43e603ceabd1d71ec355c8a0b59aac8cf0 (diff) | |
| download | android_packages_apps_Trebuchet-35614fdc7d13179ba9cbc80f15eca6d63cf3229d.tar.gz android_packages_apps_Trebuchet-35614fdc7d13179ba9cbc80f15eca6d63cf3229d.tar.bz2 android_packages_apps_Trebuchet-35614fdc7d13179ba9cbc80f15eca6d63cf3229d.zip | |
Implementation of folder animation changes as per cm-13.0
Folder animations in parity with cm.
Folder Layout Revision
Updated the folder layout to reflect design revisions based on community feedback
Change-Id: Ica1bb796dfccf779a954cf0903a1ae94a010ea1a
Conflicts:
res/drawable-hdpi/folder_bg.9.png
res/drawable-hdpi/folder_fill_highlight.9.png
res/drawable-mdpi/folder_bg.9.png
res/drawable-mdpi/folder_fill_highlight.9.png
res/drawable-xhdpi/folder_bg.9.png
res/drawable-xhdpi/folder_fill_highlight.9.png
res/drawable-xxhdpi/folder_bg.9.png
res/drawable-xxhdpi/folder_fill_highlight.9.png
res/layout-land/launcher.xml
res/layout-port/launcher.xml
res/layout-sw720dp/launcher.xml
res/layout/user_folder.xml
res/values/dimens.xml
src/com/android/launcher3/Folder.java
src/com/android/launcher3/FolderIcon.java
src/com/android/launcher3/Launcher.java
Folder animation changes as per cm-13.0
Change-Id: I019511a58bd9f6a60a3c9b68c826726881cec83f
Implementing folder animations
Change-Id: I83f17c996ecc894ce22fd195b9b33caf58e2e822
Diffstat (limited to 'res/drawable')
| -rw-r--r-- | res/drawable/folder_container.xml | 25 | ||||
| -rw-r--r-- | res/drawable/folder_locked.xml | 14 | ||||
| -rw-r--r-- | res/drawable/folder_unlocked.xml | 13 |
3 files changed, 52 insertions, 0 deletions
diff --git a/res/drawable/folder_container.xml b/res/drawable/folder_container.xml new file mode 100644 index 000000000..b0a1c8492 --- /dev/null +++ b/res/drawable/folder_container.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="72dp" + android:width="72dp" + android:viewportHeight="72" + android:viewportWidth="72"> + + <group + android:name="folder_container"> + <path + android:name="folder_path" + android:pathData=" M6,4 + h60 + c1.2,0 2,0.8 2,2 + v60 + c0,1.2 -0.8,2 -2,2 + h-60 + c-1.2,0 -2,-0.8 -2,-2 + v-60 + c0,-1.2 0.8,-2 2,-2 + z" + android:fillColor="#ff524e5e"/> + </group> + +</vector>
\ No newline at end of file diff --git a/res/drawable/folder_locked.xml b/res/drawable/folder_locked.xml new file mode 100644 index 000000000..8b887896d --- /dev/null +++ b/res/drawable/folder_locked.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="#fafafa" + android:pathData="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1 .9 2 2 +2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6-5.1c1.71 0 3.1 1.39 3.1 +3.1v2H9V6h-.1c0-1.71 1.39-3.1 3.1-3.1zM18 20H6V10h12v10zm-6-3c1.1 0 2-.9 +2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z" /> +</vector> diff --git a/res/drawable/folder_unlocked.xml b/res/drawable/folder_unlocked.xml new file mode 100644 index 000000000..d34d9b764 --- /dev/null +++ b/res/drawable/folder_unlocked.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="#fafafa" + android:pathData="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 +3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2H6c-1.1 0-2 .9-2 +2v10c0 1.1 .9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm0 12H6V10h12v10z" /> +</vector> |