diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-02 21:07:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-02 21:07:21 +0000 |
| commit | ec21a599f4cf68c74a2f7aad6797c0ba6d7409ad (patch) | |
| tree | 2773cd94cbadd0b176e0fd18afab77b78299744d /src/com/android/launcher3/Launcher.java | |
| parent | fca6bc9dce9f78981a972a22a2e195e0e1f0a4cf (diff) | |
| parent | ea8e140328072ac6588af283f2272c95bbac280b (diff) | |
| download | android_packages_apps_Trebuchet-ec21a599f4cf68c74a2f7aad6797c0ba6d7409ad.tar.gz android_packages_apps_Trebuchet-ec21a599f4cf68c74a2f7aad6797c0ba6d7409ad.tar.bz2 android_packages_apps_Trebuchet-ec21a599f4cf68c74a2f7aad6797c0ba6d7409ad.zip | |
Merge changes from topic "am-337c344f-ec88-4e4e-9ad7-07a92571f781" into ub-launcher3-master
* changes:
[automerger] Remove discovery bounce for demo users am: 3993348043
Remove discovery bounce for demo users
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d1c84b30e..8702660d2 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -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(); } /** |