Migrate ENABLE_CURSOR_HOVER_STATES to aconfig
- Keeping FeatureFlags.ENABLE_CURSOR_HOVER_STATES for local testing until aconfig is available in FlagFlipper - Still reference ENABLE_CURSOR_HOVER_STATES in tests as aconfig still can't be mocked Bug: 300054410 Test: manual Change-Id: Id385e8ee32ccf8b920b9b7f9cc620af32def589f
This commit is contained in:
1 parent
7ef2d061cd
commit
c49d60b946
7 files changed
+25
-13
No files matched your search
@@ -19,7 +19,7 @@ import static android.view.MotionEvent.INVALID_POINTER_ID;
|
||||
|
||||
import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent;
|
||||
import static com.android.launcher3.Utilities.squaredHypot;
|
||||
import static com.android.launcher3.config.FeatureFlags.ENABLE_CURSOR_HOVER_STATES;
|
||||
import static com.android.launcher3.config.FeatureFlags.enableCursorHoverStates;
|
||||
import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TOUCHING;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -276,7 +276,7 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer {
|
||||
*/
|
||||
@Override
|
||||
public void onHoverEvent(MotionEvent ev) {
|
||||
if (!ENABLE_CURSOR_HOVER_STATES.get() || mTaskbarActivityContext == null
|
||||
if (!enableCursorHoverStates() || mTaskbarActivityContext == null
|
||||
|| !mTaskbarActivityContext.isTaskbarStashed()) {
|
||||
return;
|
||||
}
|
||||
@@ -331,7 +331,7 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer {
|
||||
private boolean isStashedTaskbarHovered(int x, int y) {
|
||||
if (!mTaskbarActivityContext.isTaskbarStashed()
|
||||
|| mTaskbarActivityContext.isTaskbarAllAppsOpen()
|
||||
|| !ENABLE_CURSOR_HOVER_STATES.get()) {
|
||||
|| !enableCursorHoverStates()) {
|
||||
return false;
|
||||
}
|
||||
DeviceProfile dp = mTaskbarActivityContext.getDeviceProfile();
|
||||
|
||||
Reference in new issue
Block a user