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

Commit 947e02b6 authored by Adam Cohen's avatar Adam Cohen
Browse files

Adding custom slide up activity transition for L MR1 

issue 21402755

Change-Id: Id2542c0a3c38bd71aa407a3b0fe00fdee24e2f69
parent cc31d463

res/anim/no_anim.xml

0 → 100644
+18 −0
Original line number 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

+7 −0
Original line number Diff line number Diff line
@@ -2899,8 +2899,15 @@ public class Launcher extends Activity 
                    }

                }

                if (opts == null && !Utilities.isLmpOrAbove()) {

                    // Below L, we use a scale up animation

                    opts = ActivityOptions.makeScaleUpAnimation(v, 0, 0,

                                    v.getMeasuredWidth(), v.getMeasuredHeight());

                } else if (opts == null && Utilities.isLmpMR1()) {

                    // On L devices, we use the device default slide-up transition.

                    // On L MR1 devices, we a custom version of the slide-up transition which

                    // doesn't have the delay present in the device default.

                    opts = ActivityOptions.makeCustomAnimation(this,

                            R.anim.task_open_enter, R.anim.no_anim);

                }

                optsBundle = opts != null ? opts.toBundle() : null;

            }

src/com/android/launcher3/Utilities.java

+5 −0
Original line number Diff line number Diff line
@@ -123,6 +123,11 @@ public final class Utilities { 
        return Build.VERSION.SDK_INT >= 22;

    }



    public static boolean isLmpMR1() {

        // TODO(adamcohen): update to Build.VERSION_CODES.LOLLIPOP_MR1 once building against 22;

        return Build.VERSION.SDK_INT == 22;

    }



    public static Bitmap createIconBitmap(Cursor c, int iconIndex, Context context) {

        byte[] data = c.getBlob(iconIndex);

        try {