am e233a8bf: Hide clings in child mode

* commit 'e233a8bf79d624c5419805fde4bb0e025c66b020':
  Hide clings in child mode
This commit is contained in:
Michael Jurka
2013-03-29 16:02:58 -07:00
committed by Android Git Automerger
2 changed files with 10 additions and 1 deletions
+1 -1
View File
@@ -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
+9
View File
@@ -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;
}