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

Commit dc75ebf1 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes I000811e5,Idab6285b into udc-dev 

* changes:
  [Central Surfaces] Migrate TapAgainView(&Controller) to singleton.
  [Central Surfaces] Make LockIconView(&Controller) a singleton.
parents ed2f72bc c3a0c5fc

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+2 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.systemui.R; 
import com.android.systemui.biometrics.AuthController;

import com.android.systemui.biometrics.AuthRippleController;

import com.android.systemui.biometrics.UdfpsController;

import com.android.systemui.dagger.SysUISingleton;

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

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;
@@ -66,7 +67,6 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent;

import com.android.systemui.statusbar.policy.ConfigurationController;

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

import com.android.systemui.util.ViewController;
@@ -84,7 +84,7 @@ import javax.inject.Inject; 
 * For devices with UDFPS, the lock icon will show at the sensor location. Else, the lock

 * icon will show a set distance from the bottom of the device.

 */

@CentralSurfacesComponent.CentralSurfacesScope

@SysUISingleton

public class LockIconViewController extends ViewController<LockIconView> implements Dumpable {

    private static final String TAG = "LockIconViewController";

    private static final float sDefaultDensity =

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

+0 −7
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ import android.util.AttributeSet; 
import android.view.MotionEvent;

import android.widget.FrameLayout;



import com.android.systemui.R;

import com.android.systemui.statusbar.phone.TapAgainView;



/** The shade view. */

public final class NotificationPanelView extends FrameLayout {

    static final boolean DEBUG = false;
@@ -93,10 +90,6 @@ public final class NotificationPanelView extends FrameLayout { 
        mRtlChangeListener = listener;

    }



    public TapAgainView getTapAgainView() {

        return findViewById(R.id.shade_falsing_tap_again);

    }



    /** Sets the touch handler for this view. */

    public void setOnTouchListener(NotificationPanelViewController.TouchHandler touchHandler) {

        super.setOnTouchListener(touchHandler);

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

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ public class NotificationShadeWindowViewController { 
        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

        mStatusBarWindowStateController = statusBarWindowStateController;

        mLockIconViewController = lockIconViewController;

        mLockIconViewController.init();

        mService = centralSurfaces;

        mNotificationShadeWindowController = controller;

        mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;

packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt

+20 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.shade



import android.view.LayoutInflater

import com.android.keyguard.LockIconView

import com.android.systemui.CoreStartable

import com.android.systemui.R

import com.android.systemui.biometrics.AuthRippleController
@@ -24,6 +25,7 @@ import com.android.systemui.biometrics.AuthRippleView 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.statusbar.LightRevealScrim

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout

import com.android.systemui.statusbar.phone.TapAgainView

import dagger.Binds

import dagger.Module

import dagger.Provides
@@ -89,5 +91,23 @@ abstract class ShadeModule { 
        ): AuthRippleView? {

            return notificationShadeWindowView.findViewById(R.id.auth_ripple)

        }



        // TODO(b/277762009): Only allow this view's controller to inject the view. See above.

        @Provides

        @SysUISingleton

        fun providesLockIconView(

            notificationShadeWindowView: NotificationShadeWindowView,

        ): LockIconView {

            return notificationShadeWindowView.findViewById(R.id.lock_icon_view)

        }



        // TODO(b/277762009): Only allow this view's controller to inject the view. See above.

        @Provides

        @SysUISingleton

        fun providesTapAgainView(

            notificationPanelView: NotificationPanelView,

        ): TapAgainView {

            return notificationPanelView.findViewById(R.id.shade_falsing_tap_again)

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+0 −1
Original line number Diff line number Diff line
@@ -1662,7 +1662,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mShadeController.setNotificationPanelViewController(npvc);

        mShadeController.setNotificationShadeWindowViewController(

                mNotificationShadeWindowViewController);

        mCentralSurfacesComponent.getLockIconViewController().init();

        mStackScrollerController =

                mCentralSurfacesComponent.getNotificationStackScrollLayoutController();

        mQsController = mCentralSurfacesComponent.getQuickSettingsController();