diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-03-29 16:06:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-29 16:06:13 -0700 |
| commit | a819b2c526d6abb7b212ee21dc64d4ac832f2c95 (patch) | |
| tree | eab24bcbb89fec32238ee6dd7e313e51708ba4c1 | |
| parent | 43b78d0418360d0bd50cb075a4d6504bd914025a (diff) | |
| parent | 55d1fe8a903c5c065825616f752660aacfd8eeb3 (diff) | |
| download | android_packages_apps_Trebuchet-a819b2c526d6abb7b212ee21dc64d4ac832f2c95.tar.gz android_packages_apps_Trebuchet-a819b2c526d6abb7b212ee21dc64d4ac832f2c95.tar.bz2 android_packages_apps_Trebuchet-a819b2c526d6abb7b212ee21dc64d4ac832f2c95.zip | |
am 55d1fe8a: am e233a8bf: Hide clings in child mode
* commit '55d1fe8a903c5c065825616f752660aacfd8eeb3':
Hide clings in child mode
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 8d50bd619..351954130 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 545ee2e6c..9e651c60c 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; } |