diff options
author | Becky Qiu <xuqiu@google.com> | 2022-09-23 21:31:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-09-23 21:31:15 +0000 |
commit | dd002b87e01701c643b07ba3569de52f10d680e9 (patch) | |
tree | 308a6974fcd7d6eef02f5584b78d32b3c3c11916 | |
parent | dea0a2466b4237d5063a8824734226ca9a0e6bf4 (diff) | |
parent | 3aec5d59dcadd25b245b74687b033547ab66ddab (diff) | |
download | Launcher3-dd002b87e01701c643b07ba3569de52f10d680e9.tar.gz |
Merge "[Toast] Change toast qpr1 feature flags to all apps device config." into tm-qpr-dev
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/config/FeatureFlags.java | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 5e2187e844..a6831aafa9 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -480,7 +480,6 @@ public class Launcher extends StatefulActivity<LauncherState> mAppWidgetHost = createAppWidgetHost(); mAppWidgetHost.startListening(); - inflateRootView(R.layout.launcher); setupViews(); crossFadeWithPreviousAppearance(); mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots); @@ -1259,6 +1258,7 @@ public class Launcher extends StatefulActivity<LauncherState> * Finds all the views we need and configure them properly. */ protected void setupViews() { + inflateRootView(R.layout.launcher); mDragLayer = findViewById(R.id.drag_layer); mFocusHandler = mDragLayer.getFocusIndicatorHelper(); mWorkspace = mDragLayer.findViewById(R.id.workspace); diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 7df6d8f510..4a47e98bc1 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -94,9 +94,6 @@ public final class FeatureFlags { getDebugFlag("ENABLE_FLOATING_SEARCH_BAR", false, "Keep All Apps search bar at the bottom (but above keyboard if open)"); - public static final BooleanFlag ENABLE_QUICK_SEARCH = new DeviceFlag("ENABLE_QUICK_SEARCH", - true, "Use quick search behavior."); - public static final BooleanFlag ENABLE_HIDE_HEADER = new DeviceFlag("ENABLE_HIDE_HEADER", true, "Hide header on keyboard before typing in all apps"); @@ -281,14 +278,6 @@ public final class FeatureFlags { "FOLDABLE_WORKSPACE_REORDER", true, "In foldables, when reordering the icons and widgets, is now going to use both sides"); - public static final BooleanFlag SHOW_SEARCH_EDUCARD_QSB = new DeviceFlag( - "SHOW_SEARCH_EDUCARD_QSB", false, "Shows Search Educard for QSB entry in OneSearch."); - - public static final BooleanFlag ENABLE_IME_LATENCY_LOGGER = getDebugFlag( - "ENABLE_IME_LATENCY_LOGGER", false, - "Enable option to log the keyboard latency for both atomic and controlled keyboard " - + "animations on an EditText"); - public static final BooleanFlag ENABLE_WIDGET_PICKER_DEPTH = new DeviceFlag( "ENABLE_WIDGET_PICKER_DEPTH", false, "Enable changing depth in widget picker."); |