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

Commit 53cb3e44 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 75289664: Merge "Speed up recents -> app" into mnc-dev

* commit '75289664':
  Speed up recents -> app
parents 5b30174b 75289664
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
        <include layout="@layout/recents_task_view_header" />
        <FrameLayout
        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout
            android:id="@+id/lock_to_app_fab"
            android:layout_width="@dimen/recents_lock_to_app_size"
            android:layout_height="@dimen/recents_lock_to_app_size"
@@ -42,7 +42,7 @@
                android:layout_height="@dimen/recents_lock_to_app_icon_size"
                android:layout_gravity="center"
                android:src="@drawable/recents_lock_to_app_pin" />
        </FrameLayout>
        </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
    </FrameLayout>
</com.android.systemui.recents.views.TaskView>

+5 −0
Original line number Diff line number Diff line
@@ -73,4 +73,9 @@ public class FixedSizeImageView extends ImageView {
        mAllowRelayout = true;
        mAllowInvalidate = true;
    }

    @Override
    public boolean hasOverlappingRendering() {
        return false;
    }
}
+3 −1
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ import android.provider.Settings;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewStub;
import android.view.WindowInsets;
import android.widget.FrameLayout;

import com.android.systemui.R;
import com.android.systemui.recents.Constants;
import com.android.systemui.recents.RecentsAppWidgetHostView;
@@ -443,6 +443,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
    @Override
    public void onTaskViewClicked(final TaskStackView stackView, final TaskView tv,
                                  final TaskStack stack, final Task task, final boolean lockToTask) {

        // Notify any callbacks of the launching of a new task
        if (mCb != null) {
            mCb.onTaskViewClicked();
@@ -483,6 +484,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
                float scale = tv.getScaleX();
                int fromHeaderWidth = (int) (tv.mHeaderView.getMeasuredWidth() * scale);
                int fromHeaderHeight = (int) (tv.mHeaderView.getMeasuredHeight() * scale);

                b = Bitmap.createBitmap(fromHeaderWidth, fromHeaderHeight,
                        Bitmap.Config.ARGB_8888);
                if (Constants.DebugFlags.App.EnableTransitionThumbnailDebugMode) {
+0 −2
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,
                .setStartDelay(delay)
                .setDuration(duration)
                .setInterpolator(PhoneStatusBar.ALPHA_IN)
                .withLayer()
                .start();
    }

@@ -416,7 +415,6 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,
                    .setStartDelay(0)
                    .setDuration(mConfig.taskViewExitToAppDuration)
                    .setInterpolator(mConfig.fastOutLinearInInterpolator)
                    .withLayer()
                    .start();
        } else {
            // Hide the dismiss button
+0 −2
Original line number Diff line number Diff line
@@ -266,7 +266,6 @@ public class TaskViewHeader extends FrameLayout {
                    .setStartDelay(0)
                    .setInterpolator(mConfig.fastOutSlowInInterpolator)
                    .setDuration(mConfig.taskViewExitToAppDuration)
                    .withLayer()
                    .start();
        }
    }
@@ -281,7 +280,6 @@ public class TaskViewHeader extends FrameLayout {
                    .setStartDelay(0)
                    .setInterpolator(mConfig.fastOutLinearInInterpolator)
                    .setDuration(mConfig.taskViewEnterFromAppDuration)
                    .withLayer()
                    .start();
        }
    }