summaryrefslogtreecommitdiffstats
path: root/res/interpolator
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2017-06-29 09:20:20 -0700
committerJon Miranda <jonmiranda@google.com>2017-06-29 09:34:17 -0700
commitde0ea81442bbc3662c455c15ecbd70b421f2d8cc (patch)
treefcc8e17b20e9a129aaa21f3d30cacdcb7154636f /res/interpolator
parent985cfe9ee4db4828945b21c399bb2617a6e38d90 (diff)
downloadandroid_packages_apps_Trebuchet-de0ea81442bbc3662c455c15ecbd70b421f2d8cc.tar.gz
android_packages_apps_Trebuchet-de0ea81442bbc3662c455c15ecbd70b421f2d8cc.tar.bz2
android_packages_apps_Trebuchet-de0ea81442bbc3662c455c15ecbd70b421f2d8cc.zip
Folder animation polish.
* Use different interpolators so that the prevew items in large folders appear aligned with the rest of the folder contents longer (the preview item movements are less jumpy). * Fixed animation elevation on close. Bug: 63131666 Bug: 35064148 Change-Id: Iecb1a8d3105e630ee00b3ea4b692979efb928d7d
Diffstat (limited to 'res/interpolator')
-rw-r--r--res/interpolator/large_folder_preview_item_close_interpolator.xml24
-rw-r--r--res/interpolator/large_folder_preview_item_open_interpolator.xml (renamed from res/interpolator/large_folder_preview_item_interpolator.xml)2
2 files changed, 25 insertions, 1 deletions
diff --git a/res/interpolator/large_folder_preview_item_close_interpolator.xml b/res/interpolator/large_folder_preview_item_close_interpolator.xml
new file mode 100644
index 000000000..d28af63f8
--- /dev/null
+++ b/res/interpolator/large_folder_preview_item_close_interpolator.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+ android:controlX1="0.3"
+ android:controlY1="0"
+ android:controlX2="1"
+ android:controlY2="1"/>
diff --git a/res/interpolator/large_folder_preview_item_interpolator.xml b/res/interpolator/large_folder_preview_item_open_interpolator.xml
index dcf01579b..b5661abab 100644
--- a/res/interpolator/large_folder_preview_item_interpolator.xml
+++ b/res/interpolator/large_folder_preview_item_open_interpolator.xml
@@ -20,5 +20,5 @@
<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
android:controlX1="0"
android:controlY1="1"
- android:controlX2="0"
+ android:controlX2="0.5"
android:controlY2="1"/>