Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update trackpad related feature flags in SysUI" into udc-dev

Browse Source
This commit is contained in:
Tracy Zhou
2023-03-17 04:10:35 +00:00
committed by Android (Google) Code Review
parent bd73765b69 f9a0c46f51
commit 3e21fcb396
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -531,7 +531,7 @@ object Flags {
// TODO(b/270987164): Tracking Bug // TODO(b/270987164): Tracking Bug
@JvmField @JvmField
val TRACKPAD_GESTURE_BACK = unreleasedFlag(1205, "trackpad_gesture_back", teamfood = true) val TRACKPAD_GESTURE_FEATURES = unreleasedFlag(1205, "trackpad_gesture_features", teamfood = true)
// TODO(b/263826204): Tracking Bug // TODO(b/263826204): Tracking Bug
@JvmField @JvmField
@@ -553,6 +553,10 @@ object Flags {
val WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM = val WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM =
unreleasedFlag(1209, "persist.wm.debug.predictive_back_qs_dialog_anim", teamfood = true) unreleasedFlag(1209, "persist.wm.debug.predictive_back_qs_dialog_anim", teamfood = true)
// TODO(b/273800936): Tracking Bug
@JvmField
val TRACKPAD_GESTURE_COMMON = releasedFlag(1210, "trackpad_gesture_common")
// 1300 - screenshots // 1300 - screenshots
// TODO(b/254513155): Tracking Bug // TODO(b/254513155): Tracking Bug
@JvmField @JvmField

4
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
View File

@@ -67,7 +67,6 @@ import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.flags.Flags; import com.android.systemui.flags.Flags;
import com.android.systemui.model.SysUiState; import com.android.systemui.model.SysUiState;
import com.android.systemui.navigationbar.NavigationBarView;
import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.navigationbar.NavigationModeController;
import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.plugins.NavigationEdgeBackPlugin; import com.android.systemui.plugins.NavigationEdgeBackPlugin;
@@ -591,7 +590,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
// Add a nav bar panel window // Add a nav bar panel window
mIsNewBackAffordanceEnabled = mFeatureFlags.isEnabled(Flags.NEW_BACK_AFFORDANCE); mIsNewBackAffordanceEnabled = mFeatureFlags.isEnabled(Flags.NEW_BACK_AFFORDANCE);
mIsTrackpadGestureBackEnabled = mFeatureFlags.isEnabled(Flags.TRACKPAD_GESTURE_BACK); mIsTrackpadGestureBackEnabled = mFeatureFlags.isEnabled(
Flags.TRACKPAD_GESTURE_FEATURES);
resetEdgeBackPlugin(); resetEdgeBackPlugin();
mPluginManager.addPluginListener( mPluginManager.addPluginListener(
this, NavigationEdgeBackPlugin.class, /*allowMultiple=*/ false); this, NavigationEdgeBackPlugin.class, /*allowMultiple=*/ false);

2
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -849,7 +849,7 @@ public final class NotificationPanelViewController implements Dumpable {
mLayoutInflater = layoutInflater; mLayoutInflater = layoutInflater;
mFeatureFlags = featureFlags; mFeatureFlags = featureFlags;
mAnimateBack = mFeatureFlags.isEnabled(Flags.WM_SHADE_ANIMATE_BACK_GESTURE); mAnimateBack = mFeatureFlags.isEnabled(Flags.WM_SHADE_ANIMATE_BACK_GESTURE);
mTrackpadGestureBack = mFeatureFlags.isEnabled(Flags.TRACKPAD_GESTURE_BACK); mTrackpadGestureBack = mFeatureFlags.isEnabled(Flags.TRACKPAD_GESTURE_FEATURES);
mFalsingCollector = falsingCollector; mFalsingCollector = falsingCollector;
mPowerManager = powerManager; mPowerManager = powerManager;
mWakeUpCoordinator = coordinator; mWakeUpCoordinator = coordinator;

8
packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
View File

@@ -16,7 +16,7 @@
package com.android.systemui.shade; package com.android.systemui.shade;
import static com.android.systemui.flags.Flags.TRACKPAD_GESTURE_BACK; import static com.android.systemui.flags.Flags.TRACKPAD_GESTURE_COMMON;
import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow; import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;
import android.app.StatusBarManager; import android.app.StatusBarManager;
@@ -96,7 +96,7 @@ public class NotificationShadeWindowViewController {
private final NotificationInsetsController mNotificationInsetsController; private final NotificationInsetsController mNotificationInsetsController;
private final AlternateBouncerInteractor mAlternateBouncerInteractor; private final AlternateBouncerInteractor mAlternateBouncerInteractor;
private final UdfpsOverlayInteractor mUdfpsOverlayInteractor; private final UdfpsOverlayInteractor mUdfpsOverlayInteractor;
private final boolean mIsTrackpadGestureBackEnabled; private final boolean mIsTrackpadCommonEnabled;
private GestureDetector mPulsingWakeupGestureHandler; private GestureDetector mPulsingWakeupGestureHandler;
private View mBrightnessMirror; private View mBrightnessMirror;
private boolean mTouchActive; private boolean mTouchActive;
@@ -172,7 +172,7 @@ public class NotificationShadeWindowViewController {
mNotificationInsetsController = notificationInsetsController; mNotificationInsetsController = notificationInsetsController;
mAlternateBouncerInteractor = alternateBouncerInteractor; mAlternateBouncerInteractor = alternateBouncerInteractor;
mUdfpsOverlayInteractor = udfpsOverlayInteractor; mUdfpsOverlayInteractor = udfpsOverlayInteractor;
mIsTrackpadGestureBackEnabled = featureFlags.isEnabled(TRACKPAD_GESTURE_BACK); mIsTrackpadCommonEnabled = featureFlags.isEnabled(TRACKPAD_GESTURE_COMMON);
// This view is not part of the newly inflated expanded status bar. // This view is not part of the newly inflated expanded status bar.
mBrightnessMirror = mView.findViewById(R.id.brightness_mirror_container); mBrightnessMirror = mView.findViewById(R.id.brightness_mirror_container);
@@ -474,7 +474,7 @@ public class NotificationShadeWindowViewController {
if (mTouchActive) { if (mTouchActive) {
final long now = mClock.uptimeMillis(); final long now = mClock.uptimeMillis();
final MotionEvent event; final MotionEvent event;
if (mIsTrackpadGestureBackEnabled) { if (mIsTrackpadCommonEnabled) {
event = MotionEvent.obtain(mDownEvent); event = MotionEvent.obtain(mDownEvent);
event.setDownTime(now); event.setDownTime(now);
event.setAction(MotionEvent.ACTION_CANCEL); event.setAction(MotionEvent.ACTION_CANCEL);

3
packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt
View File

@@ -127,7 +127,8 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
.thenReturn(emptyFlow<TransitionStep>()) .thenReturn(emptyFlow<TransitionStep>())
val featureFlags = FakeFeatureFlags() val featureFlags = FakeFeatureFlags()
featureFlags.set(Flags.TRACKPAD_GESTURE_BACK, false) featureFlags.set(Flags.TRACKPAD_GESTURE_COMMON, true)
featureFlags.set(Flags.TRACKPAD_GESTURE_FEATURES, false)
featureFlags.set(Flags.DUAL_SHADE, false) featureFlags.set(Flags.DUAL_SHADE, false)
val inputProxy = MultiShadeInputProxy() val inputProxy = MultiShadeInputProxy()

3
packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt
View File

@@ -139,7 +139,8 @@ class NotificationShadeWindowViewTest : SysuiTestCase() {
.thenReturn(emptyFlow()) .thenReturn(emptyFlow())
val featureFlags = FakeFeatureFlags() val featureFlags = FakeFeatureFlags()
featureFlags.set(Flags.TRACKPAD_GESTURE_BACK, false) featureFlags.set(Flags.TRACKPAD_GESTURE_COMMON, true)
featureFlags.set(Flags.TRACKPAD_GESTURE_FEATURES, false)
featureFlags.set(Flags.DUAL_SHADE, false) featureFlags.set(Flags.DUAL_SHADE, false)
val inputProxy = MultiShadeInputProxy() val inputProxy = MultiShadeInputProxy()
testScope = TestScope() testScope = TestScope()