| commit | 4aeb5216cc512e3548b74b17340425cd2756047a | [log] [tgz] |
|---|---|---|
| author | Andy Wickham <awickham@google.com> | Thu Feb 25 21:44:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 25 21:44:48 2021 +0000 |
| tree | 17d9051a864dea1ba42f3ffaa5d0fe9c0635a0a1 | |
| parent | 2341776fd82bb68bdd2cd65dd140d05166f9070b [diff] | |
| parent | d6844dcb7f067e25bf1c7425783ab2533d819139 [diff] |
Merge "Revert "Changes ENABLE_SMARTSPACE_ENHANCED to be a DeviceFlag."" into sc-dev am: d6844dcb7f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13700879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6a2bfabd40a441ee4c442e67bae24f51f86dab99
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 1d0a466..ef7bdf4 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -158,7 +158,7 @@ "ENABLE_SMARTSPACE_UNIVERSAL", false, "Replace Smartspace with a version rendered by System UI."); - public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = new DeviceFlag( + public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = getDebugFlag( "ENABLE_SMARTSPACE_ENHANCED", false, "Replace Smartspace with the enhanced version. " + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");