diff options
author | Adam Cohen <adamcohen@google.com> | 2015-04-02 11:53:23 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2015-04-02 11:53:48 -0700 |
commit | 68fdeaadc621b7a9200f5c75790eb756a1983d02 (patch) | |
tree | fda66c357d53c99cf4ef828db8d7b8da0dd5b95d | |
parent | 67c3086163593db47e57b8cf4fcb034334374000 (diff) | |
download | android_packages_apps_Trebuchet-68fdeaadc621b7a9200f5c75790eb756a1983d02.tar.gz android_packages_apps_Trebuchet-68fdeaadc621b7a9200f5c75790eb756a1983d02.tar.bz2 android_packages_apps_Trebuchet-68fdeaadc621b7a9200f5c75790eb756a1983d02.zip |
Stop using custom activity transition, rely on system default in these cases
-> workaround for platform issue related to this resource, but also
a decent code cleanup
issue 20006693
Change-Id: Iea3a2fb14be5ed78d882ddf9d970b12d177f4249
-rw-r--r-- | res/anim/fade_in_fast.xml | 23 | ||||
-rw-r--r-- | res/anim/fade_out_fast.xml | 23 | ||||
-rw-r--r-- | res/anim/no_anim.xml | 18 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 7 |
4 files changed, 4 insertions, 67 deletions
diff --git a/res/anim/fade_in_fast.xml b/res/anim/fade_in_fast.xml deleted file mode 100644 index 4fa9847aa..000000000 --- a/res/anim/fade_in_fast.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:anim/accelerate_interpolator" - - android:fromAlpha="0.0" - android:toAlpha="1.0" - - android:duration="@android:integer/config_mediumAnimTime" /> diff --git a/res/anim/fade_out_fast.xml b/res/anim/fade_out_fast.xml deleted file mode 100644 index a061a6ca9..000000000 --- a/res/anim/fade_out_fast.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:anim/accelerate_interpolator" - - android:fromAlpha="1.0" - android:toAlpha="0.0" - - android:duration="@android:integer/config_mediumAnimTime" /> diff --git a/res/anim/no_anim.xml b/res/anim/no_anim.xml deleted file mode 100644 index 02b162519..000000000 --- a/res/anim/no_anim.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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. ---> - -<alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="417" /> diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0414a5b1e..5b8eaef50 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2939,9 +2939,10 @@ public class Launcher extends Activity } Bundle optsBundle = null; - if (useLaunchAnimation) { - ActivityOptions opts = Utilities.isLmpOrAbove() ? - ActivityOptions.makeCustomAnimation(this, R.anim.task_open_enter, R.anim.no_anim) : + if (useLaunchAnimation && !Utilities.isLmpOrAbove()) { + // On pre-L devices, we use the scale up transition. + // Otherwise we use system default. + ActivityOptions opts = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.getMeasuredWidth(), v.getMeasuredHeight()); optsBundle = opts.toBundle(); } |