Merge "Flip the cross profile apps animation" into pi-dev
am: 1bbe397856
Change-Id: I8975eff01f27d8e5c7f4e51db08a8ee3ecbfb749
This commit is contained in:
committed by
android-build-merger
commit
b7a3f9ccb3
@@ -0,0 +1,76 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
** Copyright 2018, 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.
|
||||
*/
|
||||
-->
|
||||
<!-- This should be kept in sync with task_open_enter.xml -->
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shareInterpolator="false" android:zAdjustment="top">
|
||||
|
||||
<alpha
|
||||
android:fromAlpha="1"
|
||||
android:toAlpha="1.0"
|
||||
android:fillEnabled="true"
|
||||
android:fillBefore="true"
|
||||
android:fillAfter="true"
|
||||
android:interpolator="@interpolator/linear"
|
||||
android:startOffset="67"
|
||||
android:duration="217"/>
|
||||
|
||||
<translate
|
||||
android:fromXDelta="-105%"
|
||||
android:toXDelta="0"
|
||||
android:fillEnabled="true"
|
||||
android:fillBefore="true"
|
||||
android:fillAfter="true"
|
||||
android:interpolator="@interpolator/aggressive_ease"
|
||||
android:startOffset="50"
|
||||
android:duration="383"/>
|
||||
|
||||
<scale
|
||||
android:fromXScale="1.0526"
|
||||
android:toXScale="1"
|
||||
android:fromYScale="1.0526"
|
||||
android:toYScale="1"
|
||||
android:pivotX="50%"
|
||||
android:pivotY="50%"
|
||||
android:fillEnabled="true"
|
||||
android:fillBefore="true"
|
||||
android:fillAfter="true"
|
||||
android:interpolator="@interpolator/fast_out_slow_in"
|
||||
android:duration="283"/>
|
||||
|
||||
<scale
|
||||
android:fromXScale="0.95"
|
||||
android:toXScale="1"
|
||||
android:fromYScale="0.95"
|
||||
android:toYScale="1"
|
||||
android:pivotX="50%"
|
||||
android:pivotY="50%"
|
||||
android:fillEnabled="true"
|
||||
android:fillBefore="true"
|
||||
android:fillAfter="true"
|
||||
android:interpolator="@interpolator/fast_out_slow_in"
|
||||
android:startOffset="283"
|
||||
android:duration="317"/>
|
||||
|
||||
<!-- To keep the thumbnail around longer and fade out the thumbnail -->
|
||||
<alpha android:fromAlpha="1.0" android:toAlpha="0"
|
||||
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
|
||||
android:interpolator="@interpolator/decelerate_quint"
|
||||
android:startOffset="717"
|
||||
android:duration="200"/>
|
||||
</set>
|
||||
@@ -31,7 +31,7 @@
|
||||
android:duration="217"/>
|
||||
|
||||
<translate
|
||||
android:fromXDelta="-105%"
|
||||
android:fromXDelta="105%"
|
||||
android:toXDelta="0"
|
||||
android:fillEnabled="true"
|
||||
android:fillBefore="true"
|
||||
|
||||
Reference in New Issue
Block a user