From 3a39b564349cf87d45f7181e6b3d1555ccbd1c5b Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 4 Feb 2021 13:05:07 -0600 Subject: [PATCH] Only show OOBE once Bug: 179333425 Test: Manual Change-Id: I23de8fffa31ae06b0f4feccfb75144c7c55143c2 --- .../launcher3/search/DeviceSearchEdu.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java index 425e557ecb..71270cc94a 100644 --- a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java +++ b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java @@ -73,11 +73,9 @@ public class DeviceSearchEdu extends AbstractSlideInView implements } - private void close(boolean animate, boolean markAsSeen) { - handleClose(animate); - if (markAsSeen) { - mLauncher.getOnboardingPrefs().markChecked(SEARCH_EDU_SEEN); - } + private void dismiss() { + handleClose(true); + mLauncher.getOnboardingPrefs().markChecked(SEARCH_EDU_SEEN); } @Override @@ -110,7 +108,7 @@ public class DeviceSearchEdu extends AbstractSlideInView implements findViewById(R.id.dismiss_edu).setOnClickListener((view) -> { mSwitchFocusOnDismiss = true; - close(true, true); + dismiss(); }); } @@ -176,7 +174,7 @@ public class DeviceSearchEdu extends AbstractSlideInView implements @Override public void onStateTransitionStart(LauncherState toState) { - close(true, false); + dismiss(); } @Override @@ -203,7 +201,7 @@ public class DeviceSearchEdu extends AbstractSlideInView implements if (mSearchInput != null) { mSearchInput.setText(charSequence.toString()); mSwitchFocusOnDismiss = true; - close(true, true); + dismiss(); } } @@ -215,7 +213,7 @@ public class DeviceSearchEdu extends AbstractSlideInView implements @Override public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) { mSearchInput.onEditorAction(i); - close(true, true); + dismiss(); return true; } }