summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-10-02 21:07:21 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-02 21:07:21 (GMT)
commit0cab65a5b68229205f5cda5063239f4987996903 (patch)
tree71bc2b7af27cec9b7b271a90897f67bcecc87942
parent59adaabd518da4d21222915b200df95885d0901b (diff)
parent3993348043a950c7decc5c151b8e8165750f0f3c (diff)
downloadandroid_packages_apps_Trebuchet-0cab65a5b68229205f5cda5063239f4987996903.zip
android_packages_apps_Trebuchet-0cab65a5b68229205f5cda5063239f4987996903.tar.gz
android_packages_apps_Trebuchet-0cab65a5b68229205f5cda5063239f4987996903.tar.bz2
Merge "Remove discovery bounce for demo users" into ub-launcher3-dorval-polish2
-rw-r--r--src/com/android/launcher3/Launcher.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 522e96a..32af059 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;
@@ -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() {