Moving DisplayController to dagger
Separating various overrides to individual modules so that they can be reused in tests Removing ContextualEduStatsManager and directly using SysUiProxy as all the usescases are only in quickstep/ This avoids additional Module definition and delegation Bug: 361850561 Test: Presubmit Flag: EXEMPT dagger Change-Id: I096459d638553991ed01766002b874589c6b976e
This commit is contained in:
1 parent
8fa43b3bb1
commit
55dc2d1c31
27 files changed
+271
-280
No files matched your search
@@ -51,7 +51,6 @@ import androidx.annotation.Nullable;
|
||||
import androidx.annotation.StringRes;
|
||||
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.contextualeducation.ContextualEduStatsManager;
|
||||
import com.android.launcher3.logging.StatsLogManager;
|
||||
import com.android.launcher3.testing.TestLogging;
|
||||
import com.android.launcher3.testing.shared.TestProtocol;
|
||||
@@ -120,7 +119,6 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa
|
||||
private final Context mContext;
|
||||
private final TaskbarNavButtonCallbacks mCallbacks;
|
||||
private final SystemUiProxy mSystemUiProxy;
|
||||
private final ContextualEduStatsManager mContextualEduStatsManager;
|
||||
private final Handler mHandler;
|
||||
private final ContextualSearchInvoker mContextualSearchInvoker;
|
||||
@Nullable private StatsLogManager mStatsLogManager;
|
||||
@@ -131,13 +129,11 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa
|
||||
Context context,
|
||||
TaskbarNavButtonCallbacks callbacks,
|
||||
SystemUiProxy systemUiProxy,
|
||||
ContextualEduStatsManager contextualEduStatsManager,
|
||||
Handler handler,
|
||||
ContextualSearchInvoker contextualSearchInvoker) {
|
||||
mContext = context;
|
||||
mCallbacks = callbacks;
|
||||
mSystemUiProxy = systemUiProxy;
|
||||
mContextualEduStatsManager = contextualEduStatsManager;
|
||||
mHandler = handler;
|
||||
mContextualSearchInvoker = contextualSearchInvoker;
|
||||
}
|
||||
@@ -159,13 +155,13 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa
|
||||
break;
|
||||
case BUTTON_HOME:
|
||||
logEvent(LAUNCHER_TASKBAR_HOME_BUTTON_TAP);
|
||||
mContextualEduStatsManager.updateEduStats(/* isTrackpadGesture= */ false,
|
||||
mSystemUiProxy.updateContextualEduStats(/* isTrackpadGesture= */ false,
|
||||
GestureType.HOME);
|
||||
navigateHome();
|
||||
break;
|
||||
case BUTTON_RECENTS:
|
||||
logEvent(LAUNCHER_TASKBAR_OVERVIEW_BUTTON_TAP);
|
||||
mContextualEduStatsManager.updateEduStats(/* isTrackpadGesture= */ false,
|
||||
mSystemUiProxy.updateContextualEduStats(/* isTrackpadGesture= */ false,
|
||||
GestureType.OVERVIEW);
|
||||
navigateToOverview();
|
||||
break;
|
||||
@@ -364,7 +360,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa
|
||||
private void executeBack(@Nullable KeyEvent keyEvent) {
|
||||
if (keyEvent == null || (keyEvent.getAction() == ACTION_UP && !keyEvent.isCanceled())) {
|
||||
logEvent(LAUNCHER_TASKBAR_BACK_BUTTON_TAP);
|
||||
mContextualEduStatsManager.updateEduStats(/* isTrackpadGesture= */ false,
|
||||
mSystemUiProxy.updateContextualEduStats(/* isTrackpadGesture= */ false,
|
||||
GestureType.BACK);
|
||||
}
|
||||
mSystemUiProxy.onBackEvent(keyEvent);
|
||||
|
||||
Reference in new issue
Block a user