diff --git a/Android.mk b/Android.mk index 8d50bd6196..351954130e 100644 --- a/Android.mk +++ b/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) -LOCAL_SDK_VERSION := 17 +LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := Launcher2 LOCAL_CERTIFICATE := shared diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 545ee2e6c6..9e651c60c5 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -63,6 +63,7 @@ import android.os.Handler; import android.os.Message; import android.os.StrictMode; import android.os.SystemClock; +import android.os.UserManager; import android.provider.Settings; import android.speech.RecognizerIntent; import android.text.Selection; @@ -3686,6 +3687,14 @@ public final class Launcher extends Activity // disable clings when running in a test harness if(ActivityManager.isRunningInTestHarness()) return false; + // Restricted secondary users (child mode) will potentially have very few apps + // seeded when they start up for the first time. Clings won't work well with that + boolean supportsRestrictedUsers = + android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2; + if (supportsRestrictedUsers) { + final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE); + if (um.isUserRestricted()) return false; + } return true; }