commit ea8e140328072ac6588af283f2272c95bbac280b
author Android Build Merger (Role) <android-build-merger@google.com> Mon Oct 02 20:49:45 2017 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> Mon Oct 02 20:49:45 2017 +0000
tree 480224d18bcfdb30c2c2c9c638cd7b1bf629de8c
parent 4a6e5858e93f8e4789e7eabfa841f57fa59e90fc
parent 3993348043a950c7decc5c151b8e8165750f0f3c

[automerger] Remove discovery bounce for demo users am: 3993348043

Change-Id: Id561b960f1b080ef9bf5d6245513401e859e2afb

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 99f3803..10597da 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -91,6 +91,7 @@
 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;
@@ -138,6 +139,7 @@
 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;
@@ -3752,7 +3754,8 @@
     }
 
     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();
     }
 
     /**