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

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

Merge changes from topic "am-337c344f-ec88-4e4e-9ad7-07a92571f781" into ub-launcher3-master 

* changes:
  [automerger] Remove discovery bounce for demo users am: 39933480
  Remove discovery bounce for demo users
parents fca6bc9d ea8e1403

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;
@@ -139,6 +140,7 @@ import com.android.launcher3.widget.WidgetHostViewLoader; 
import com.android.launcher3.widget.WidgetsContainerView;

import com.android.launcher3.widget.custom.CustomWidgetParser;





import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;
@@ -3704,7 +3706,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();

    }



    /**