Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 20edd053: Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev

Browse Source 
automerge: 35bedd1

* commit '35bedd19d4b8a1b902be38bc4765de29376df9e4':
  fixed jank on activity close exit with better alpha interpolation
This commit is contained in:
Ari Sachter-Zeltzer
2014-10-28 09:48:40 +00:00
committed by android-build-merger
parent e9810e8d53 35bedd19d4
commit 0b695be179
7 changed files with 23 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/anim/activity_close_exit.xml
View File

@@ -20,13 +20,13 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false" android:zAdjustment="top">
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:interpolator="@interpolator/accelerate_quart"
android:interpolator="@interpolator/linear"
android:fillEnabled="true"
android:fillBefore="false" android:fillAfter="true"
android:startOffset="100"
android:duration="150"/>
<translate android:fromYDelta="0%" android:toYDelta="5%"
<translate android:fromYDelta="0%" android:toYDelta="8%"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quint"
android:interpolator="@interpolator/accelerate_quart"
android:duration="250"/>
</set>

11
core/res/res/animator/fragment_close_enter.xml
View File

@@ -13,13 +13,14 @@
** 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.
** limitations under the License.
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">
<objectAnimator
android:interpolator="@interpolator/decelerate_quad"
android:valueFrom="0.0" android:valueTo="1.0"
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0"
android:valueTo="1"
android:valueType="floatType"
android:propertyName="alpha"
android:duration="300"/>

21
core/res/res/animator/fragment_close_exit.xml
View File

@@ -13,25 +13,14 @@
** 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.
** limitations under the License.
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="top">
<objectAnimator
android:interpolator="@interpolator/decelerate_quad"
android:valueFrom="1.0" android:valueTo="0.8"
android:valueType="floatType"
android:propertyName="scaleY"
android:duration="300"/>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:interpolator="@interpolator/decelerate_quad"
android:valueFrom="1.0" android:valueTo="0.8"
android:valueType="floatType"
android:propertyName="scaleX"
android:duration="300"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_quad"
android:valueFrom="1.0" android:valueTo="0.0"
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="1"
android:valueTo="0"
android:valueType="floatType"
android:propertyName="alpha"
android:duration="300"/>

3
core/res/res/animator/fragment_fade_enter.xml
View File

@@ -16,8 +16,7 @@
** limitations under the License.
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:zAdjustment="top">
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0"

3
core/res/res/animator/fragment_fade_exit.xml
View File

@@ -16,8 +16,7 @@
** limitations under the License.
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:zAdjustment="normal">
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="1"

17
core/res/res/animator/fragment_open_enter.xml
View File

@@ -13,25 +13,14 @@
** 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.
** limitations under the License.
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0.95" android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="scaleY"
android:duration="300"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0.95" android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="scaleX"
android:duration="300"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0.0" android:valueTo="1.0"
android:valueFrom="0"
android:valueTo="1"
android:valueType="floatType"
android:propertyName="alpha"
android:duration="300"/>

7
core/res/res/animator/fragment_open_exit.xml
View File

@@ -13,13 +13,14 @@
** 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.
** limitations under the License.
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="1.0" android:valueTo="0.0"
android:valueFrom="1"
android:valueTo="0"
android:valueType="floatType"
android:propertyName="alpha"
android:duration="300"/>