summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorVineet Patil <vpatil@cyngn.com>2015-11-17 14:23:05 -0800
committerVineet Patil <vpatil@cyngn.com>2015-11-18 13:39:02 -0800
commit35614fdc7d13179ba9cbc80f15eca6d63cf3229d (patch)
treedfde8498c0ea5a2adb1635120c4f98323f5956ce /res/values
parent5fcaab43e603ceabd1d71ec355c8a0b59aac8cf0 (diff)
downloadandroid_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/values')
-rw-r--r--res/values/attrs.xml14
-rw-r--r--res/values/dimens.xml11
-rw-r--r--res/values/strings.xml5
-rw-r--r--res/values/styles.xml2
4 files changed, 29 insertions, 3 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 827332ad7..7ffebce9b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -113,7 +113,19 @@
<attr name="indicatorSize" format="dimension" />
</declare-styleable>
+ <attr name="layout_ignoreInsets" format="boolean" />
+ <attr name="layout_ignoreBottomInsets" format="boolean" />
+ <attr name="layout_ignoreTopInsets" format="boolean" />
+
<declare-styleable name="InsettableFrameLayout_Layout">
- <attr name="layout_ignoreInsets" format="boolean" />
+ <attr name="layout_ignoreInsets" />
+ <attr name="layout_ignoreTopInsets" />
+ <attr name="layout_ignoreBottomInsets" />
+ </declare-styleable>
+
+ <declare-styleable name="InsettableLinearLayout_Layout">
+ <attr name="layout_ignoreInsets" />
+ <attr name="layout_ignoreTopInsets" />
+ <attr name="layout_ignoreBottomInsets" />
</declare-styleable>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 36721797e..e3c81941c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -121,6 +121,13 @@
<!-- Folders -->
<!-- The amount that the preview contents are inset from the preview background -->
<dimen name="folder_preview_padding">4dp</dimen>
+ <dimen name="folder_lock_margin">6dp</dimen>
+ <dimen name="folder_name_padding">10dp</dimen>
+ <dimen name="folder_lock_icon">48dp</dimen>
+
+ <!-- Folder icon dimens -->
+ <dimen name="folder_icon">64dp</dimen>
+ <dimen name="folder_icon_app_preview">22dp</dimen>
<!-- Sizes for managed profile badges -->
<dimen name="profile_badge_size">24dp</dimen>
@@ -137,4 +144,8 @@
<dimen name="pending_widget_min_padding">8dp</dimen>
<dimen name="pending_widget_elevation">2dp</dimen>
+<!-- Folder open animation -->
+ <integer name="folder_translate_y_dist">300</integer>
+ <integer name="folder_icon_translate_y_dist">100</integer>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fefadef28..b54478860 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,7 +31,7 @@
<string name="receive_first_load_broadcast_permission" translatable="false">com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST</string>
<!-- Application name -->
- <string name="application_name">Launcher3</string>
+ <string name="app_name">Launcher3</string>
<!-- Default folder name -->
<string name="folder_name"></string>
<!-- Work folder name -->
@@ -103,6 +103,9 @@
<string name="permdesc_write_settings">Allows the app to change the settings and
shortcuts in Home.</string>
+ <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
+ <string name="msg_no_phone_permission"><xliff:g id="app_name" example="Launcher3">%1$s</xliff:g> is not allowed to make phone calls</string>
+
<!-- Widgets: -->
<skip />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7d60cbe0a..9104bc92d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -49,7 +49,7 @@
<style name="Icon.Folder">
<item name="android:background">@null</item>
- <item name="android:textColor">@color/quantum_panel_text_color</item>
+ <item name="android:textColor">@color/workspace_icon_text_color</item>
<item name="android:shadowRadius">0</item>
<item name="customShadows">false</item>
</style>