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

Commit 0cab65a5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove discovery bounce for demo users" into ub-launcher3-dorval-polish2

parents 59adaabd 39933480

src/com/android/launcher3/Launcher.java

+4 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ import com.android.launcher3.anim.AnimationLayerSet; 
import com.android.launcher3.compat.AppWidgetManagerCompat;

import com.android.launcher3.compat.LauncherAppsCompat;

import com.android.launcher3.compat.LauncherAppsCompatVO;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.dragndrop.DragController;

import com.android.launcher3.dragndrop.DragLayer;
@@ -137,6 +138,7 @@ import com.android.launcher3.widget.WidgetAddFlowHandler; 
import com.android.launcher3.widget.WidgetHostViewLoader;

import com.android.launcher3.widget.WidgetsContainerView;





import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;
@@ -3893,7 +3895,8 @@ public class Launcher extends BaseActivity 
    }



    private boolean shouldShowDiscoveryBounce() {

        return mState == State.WORKSPACE && !mSharedPrefs.getBoolean(APPS_VIEW_SHOWN, false);

        UserManagerCompat um = UserManagerCompat.getInstance(this);

        return mState == State.WORKSPACE && !mSharedPrefs.getBoolean(APPS_VIEW_SHOWN, false) && !um.isDemoUser();

    }



    protected void moveWorkspaceToDefaultScreen() {