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

Commit 5442c6f6 authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge changes Ic7751887,I87828825,I223185ac into tm-qpr-dev am: ace9aa40 am: 833c5816 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19668417



Change-Id: I4e6f6a77e549a0d84a418f09fd604202af96ff21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 528282e4 833c5816

packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt

+2 −2
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ import com.android.keyguard.KeyguardUpdateMonitor 
import com.android.systemui.ActivityIntentHelper

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.shade.NotificationPanelViewController

import com.android.systemui.shared.system.ActivityManagerKt.isInForeground

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.phone.CentralSurfaces

import com.android.systemui.shade.PanelViewController

import com.android.systemui.statusbar.policy.KeyguardStateController

import java.util.concurrent.Executor

import javax.inject.Inject
@@ -117,7 +117,7 @@ class CameraGestureHelper @Inject constructor( 
                    )

                } catch (e: RemoteException) {

                    Log.w(

                        PanelViewController.TAG,

                        NotificationPanelViewController.TAG,

                        "Unable to start camera activity",

                        e

                    )

packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java

+6 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.systemui.R; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dreams.touch.BouncerSwipeTouchHandler;

import com.android.systemui.dreams.touch.DreamTouchHandler;

import com.android.systemui.shade.PanelViewController;

import com.android.systemui.shade.NotificationPanelViewController;

import com.android.wm.shell.animation.FlingAnimationUtils;



import javax.inject.Named;
@@ -77,8 +77,9 @@ public class BouncerSwipeModule { 
            Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilderProvider) {

        return flingAnimationUtilsBuilderProvider.get()

                .reset()

                .setMaxLengthSeconds(PanelViewController.FLING_CLOSING_MAX_LENGTH_SECONDS)

                .setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR)

                .setMaxLengthSeconds(

                        NotificationPanelViewController.FLING_CLOSING_MAX_LENGTH_SECONDS)

                .setSpeedUpFactor(NotificationPanelViewController.FLING_SPEED_UP_FACTOR)

                .build();

    }
@@ -91,8 +92,8 @@ public class BouncerSwipeModule { 
            Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilderProvider) {

        return flingAnimationUtilsBuilderProvider.get()

                .reset()

                .setMaxLengthSeconds(PanelViewController.FLING_MAX_LENGTH_SECONDS)

                .setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR)

                .setMaxLengthSeconds(NotificationPanelViewController.FLING_MAX_LENGTH_SECONDS)

                .setSpeedUpFactor(NotificationPanelViewController.FLING_SPEED_UP_FACTOR)

                .build();

    }

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+1361 −219

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/shade/PanelView.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.systemui.statusbar.phone.KeyguardBottomAreaView; 
public abstract class PanelView extends FrameLayout {

    public static final boolean DEBUG = false;

    public static final String TAG = PanelView.class.getSimpleName();

    private PanelViewController.TouchHandler mTouchHandler;

    private NotificationPanelViewController.TouchHandler mTouchHandler;



    protected CentralSurfaces mCentralSurfaces;

    protected HeadsUpManagerPhone mHeadsUpManager;
@@ -49,7 +49,7 @@ public abstract class PanelView extends FrameLayout { 
        super(context, attrs, defStyleAttr);

    }



    public void setOnTouchListener(PanelViewController.TouchHandler touchHandler) {

    public void setOnTouchListener(NotificationPanelViewController.TouchHandler touchHandler) {

        super.setOnTouchListener(touchHandler);

        mTouchHandler = touchHandler;

    }

packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java

deleted100644 → 0
+0 −1489

File deleted.

Preview size limit exceeded, changes collapsed.