| commit | 4b48e712246b98ce404f3012f07cb62f18851fb1 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Sat Mar 13 02:59:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Mar 13 02:59:41 2021 +0000 |
| tree | f2ec00923d19e0c3ef2c56fbc0729b7b47c55e71 | |
| parent | a3cbd05b693a07dd40676e82560611fcefbab866 [diff] | |
| parent | 8ecb59189f23f7b6065cc0658b90c5ac3742db82 [diff] |
Merge "Make ENABLE_TASKBAR and ENABLE_OVERVIEW_GRID DebugFlags instead of DeviceFlags" into sc-dev am: 8ecb59189f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13856294 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia223a54b2e1f55ab7a14769a9cda5a1ad09c0978
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index e406e9b..3657e89 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -198,10 +198,10 @@ "ENABLE_APP_PREDICTIONS_WHILE_VISIBLE", true, "Allows app " + "predictions to be updated while they are visible to the user."); - public static final BooleanFlag ENABLE_TASKBAR = new DeviceFlag( + public static final BooleanFlag ENABLE_TASKBAR = getDebugFlag( "ENABLE_TASKBAR", false, "Allows a system Taskbar to be shown on larger devices."); - public static final BooleanFlag ENABLE_OVERVIEW_GRID = new DeviceFlag( + public static final BooleanFlag ENABLE_OVERVIEW_GRID = getDebugFlag( "ENABLE_OVERVIEW_GRID", false, "Uses grid overview layout. " + "Only applicable on large screen devices.");