Merge "Only show OOBE once" into sc-dev am: 0569375610

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If875b2b4b6e958e8f00bff09050a9ff826a1b2fe
This commit is contained in:
Samuel Fufa authored and Automerger Merge Worker committed 2021-02-05 17:08:10 +00:00
commit 41221363e3
1 file changed
+7 -9
@@ -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;
}
}