diff options
author | Adam Cohen <adamcohen@google.com> | 2014-06-11 18:59:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 18:59:37 +0000 |
commit | f49a3e30503127511cf27165c49e8433e4031355 (patch) | |
tree | 8ed11d9905783bdbad8f65c75ff9776eef558c42 | |
parent | acb41294f4feb35b540a013fa045ead9cddf6916 (diff) | |
parent | 76308c3b6222d98e4dbc0fbabd21ad9b57f27e88 (diff) | |
download | android_packages_apps_Trebuchet-f49a3e30503127511cf27165c49e8433e4031355.tar.gz android_packages_apps_Trebuchet-f49a3e30503127511cf27165c49e8433e4031355.tar.bz2 android_packages_apps_Trebuchet-f49a3e30503127511cf27165c49e8433e4031355.zip |
am 76308c3b: am 6ea3b116: Override app launch transition for LMP preview
* commit '76308c3b6222d98e4dbc0fbabd21ad9b57f27e88':
Override app launch transition for LMP preview
-rw-r--r-- | res/anim/no_anim.xml | 18 | ||||
-rw-r--r-- | res/anim/task_open_enter.xml | 34 | ||||
-rw-r--r-- | res/interpolator/decelerate_quart.xml | 21 | ||||
-rw-r--r-- | res/interpolator/decelerate_quint.xml | 21 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 |
5 files changed, 98 insertions, 0 deletions
diff --git a/res/anim/no_anim.xml b/res/anim/no_anim.xml new file mode 100644 index 000000000..02b162519 --- /dev/null +++ b/res/anim/no_anim.xml @@ -0,0 +1,18 @@ +<?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/res/anim/task_open_enter.xml b/res/anim/task_open_enter.xml new file mode 100644 index 000000000..b2aadd7fa --- /dev/null +++ b/res/anim/task_open_enter.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 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. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top"> + + <alpha android:fromAlpha="0" android:toAlpha="1.0" + android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" + android:interpolator="@interpolator/decelerate_quart" + android:startOffset="300" + android:duration="167"/> + + <translate android:fromYDelta="110%" android:toYDelta="0" + android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" + android:interpolator="@interpolator/decelerate_quint" + android:startOffset="300" + android:duration="417" /> +</set>
\ No newline at end of file diff --git a/res/interpolator/decelerate_quart.xml b/res/interpolator/decelerate_quart.xml new file mode 100644 index 000000000..5dc5d3857 --- /dev/null +++ b/res/interpolator/decelerate_quart.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 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. +*/ +--> + +<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android" + android:factor="2" /> diff --git a/res/interpolator/decelerate_quint.xml b/res/interpolator/decelerate_quint.xml new file mode 100644 index 000000000..fa89a648e --- /dev/null +++ b/res/interpolator/decelerate_quint.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 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. +*/ +--> + +<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android" + android:factor="2.5" /> diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index e5a17c0d7..60efcea6d 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2744,6 +2744,10 @@ public class Launcher extends Activity v.getMeasuredWidth(), v.getMeasuredHeight()); optsBundle = opts.toBundle(); } + if (useLaunchAnimation && Utilities.isLmp()) { + ActivityOptions opts = ActivityOptions.makeCustomAnimation(this, R.anim.task_open_enter, R.anim.no_anim); + optsBundle = opts.toBundle(); + } if (user == null || user.equals(UserHandleCompat.myUserHandle())) { // Could be launching some bookkeeping activity |