Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68fdeaad authored by Adam Cohen's avatar Adam Cohen
Browse files

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
parent 67c30861

res/anim/fade_in_fast.xml

deleted100644 → 0
+0 −23
Original line number Original line Diff line number Diff line 
<?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" />

res/anim/fade_out_fast.xml

deleted100644 → 0
+0 −23
Original line number Original line Diff line number Diff line 
<?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" />

res/anim/no_anim.xml

deleted100644 → 0
+0 −18
Original line number Original line Diff line number Diff line 
<?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" />

src/com/android/launcher3/Launcher.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -2939,9 +2939,10 @@ public class Launcher extends Activity 
            }

            }





            Bundle optsBundle = null;

            Bundle optsBundle = null;

            if (useLaunchAnimation) {

            if (useLaunchAnimation && !Utilities.isLmpOrAbove()) {

                ActivityOptions opts = Utilities.isLmpOrAbove() ?

                // On pre-L devices, we use the scale up transition.

                        ActivityOptions.makeCustomAnimation(this, R.anim.task_open_enter, R.anim.no_anim) :

                // Otherwise we use system default.

                ActivityOptions opts =

                        ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.getMeasuredWidth(), v.getMeasuredHeight());

                        ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.getMeasuredWidth(), v.getMeasuredHeight());

                optsBundle = opts.toBundle();

                optsBundle = opts.toBundle();

            }

            }