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

Commit c3a0c5fc authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Central Surfaces] Migrate TapAgainView(&Controller) to singleton. 

Bug: 277762009
Test: verified tap again view still shows when false tap on lock screen
Change-Id: I000811e58c4f390fa847deb4f6164835973bfac9
parent e288c066

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/ShadeModule.kt

+10 −0
Original line number Diff line number Diff line
@@ -25,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
@@ -99,5 +100,14 @@ abstract class ShadeModule { 
        ): 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/TapAgainViewController.java

+3 −3
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.systemui.statusbar.phone; 
import static com.android.systemui.classifier.FalsingModule.DOUBLE_TAP_TIMEOUT_MS;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.dagger.SysUISingleton;

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

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

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

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

import com.android.systemui.util.ViewController;
@@ -32,7 +32,7 @@ import javax.inject.Named; 
/**

 * Controller for {@link TapAgainView}.

 */

@CentralSurfacesComponent.CentralSurfacesScope

@SysUISingleton

public class TapAgainViewController extends ViewController<TapAgainView> {

    private final DelayableExecutor mDelayableExecutor;

    private final ConfigurationController mConfigurationController;
@@ -84,7 +84,7 @@ public class TapAgainViewController extends ViewController<TapAgainView> { 
    }



    /** Hides the associated view, possibly animating it. */

    public void hide() {

    private void hide() {

        mHideCanceler = null;

        mView.animateOut();

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java

+0 −8
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ import com.android.systemui.statusbar.phone.StatusBarIconController; 
import com.android.systemui.statusbar.phone.StatusBarLocationPublisher;

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

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

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

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment;

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragmentLogger;

import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent;
@@ -205,13 +204,6 @@ public abstract class StatusBarViewModule { 


    }



    /** */

    @Provides

    @CentralSurfacesComponent.CentralSurfacesScope

    public static TapAgainView getTapAgainView(NotificationPanelView npv) {

        return npv.getTapAgainView();

    }



    /** */

    @Provides

    @CentralSurfacesComponent.CentralSurfacesScope