Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b3a1b62 authored Aug 24, 2023 by Treehugger Robot Committed by Automerger Merge Worker Aug 24, 2023

Merge "Re-enable ALL_APPS_GONE_VISIBILITY and ENABLE_ALL_APPS_RV_PREINFLATION"...

Merge "Re-enable ALL_APPS_GONE_VISIBILITY and ENABLE_ALL_APPS_RV_PREINFLATION" into udc-qpr-dev am: 05776a70

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24516480

Change-Id: Ic37a1515f6ed5c745196aee1cb533ebbe0ab15d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents f17a1d43 05776a70

src/com/android/launcher3/config/FeatureFlags.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -409,12 +409,12 @@ public final class FeatureFlags {

	// TODO(Block 33): Clean up flags		// TODO(Block 33): Clean up flags
	public static final BooleanFlag ENABLE_ALL_APPS_RV_PREINFLATION = getDebugFlag(288161355,		public static final BooleanFlag ENABLE_ALL_APPS_RV_PREINFLATION = getDebugFlag(288161355,
	"ENABLE_ALL_APPS_RV_PREINFLATION", DISABLED,		"ENABLE_ALL_APPS_RV_PREINFLATION", ENABLED,
	"Enables preinflating all apps icons to avoid scrolling jank.");		"Enables preinflating all apps icons to avoid scrolling jank.");

	// TODO(Block 34): Clean up flags		// TODO(Block 34): Clean up flags
	public static final BooleanFlag ALL_APPS_GONE_VISIBILITY = getDebugFlag(291651514,		public static final BooleanFlag ALL_APPS_GONE_VISIBILITY = getDebugFlag(291651514,
	"ALL_APPS_GONE_VISIBILITY", DISABLED,		"ALL_APPS_GONE_VISIBILITY", ENABLED,
	"Set all apps container view's hidden visibility to GONE instead of INVISIBLE.");		"Set all apps container view's hidden visibility to GONE instead of INVISIBLE.");

	// TODO(Block 35): Empty block		// TODO(Block 35): Empty block

tests/src/com/android/launcher3/util/TestUtil.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,7 @@ public class TestUtil {
	private static final String TAG = "TestUtil";		private static final String TAG = "TestUtil";

	public static final String DUMMY_PACKAGE = "com.example.android.aardwolf";		public static final String DUMMY_PACKAGE = "com.example.android.aardwolf";
			public static final String DUMMY_CLASS_NAME = "com.example.android.aardwolf.Activity1";
	public static final long DEFAULT_UI_TIMEOUT = 10000;		public static final long DEFAULT_UI_TIMEOUT = 10000;

	public static void installDummyApp() throws IOException {		public static void installDummyApp() throws IOException {