diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-03-19 13:49:20 +0100 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-08-17 02:35:26 -0700 |
| commit | 68aff9440977dbc724b8c5eb0deec902079a93d5 (patch) | |
| tree | 1e06267288ec080cfa0cd95ad07a73d5b14362b7 /src/com/cyanogenmod | |
| parent | 84725ce59c6659758fa568f0275686781280116d (diff) | |
| download | android_packages_apps_Trebuchet-68aff9440977dbc724b8c5eb0deec902079a93d5.tar.gz android_packages_apps_Trebuchet-68aff9440977dbc724b8c5eb0deec902079a93d5.tar.bz2 android_packages_apps_Trebuchet-68aff9440977dbc724b8c5eb0deec902079a93d5.zip | |
Hide clings in child mode
Bug: 8349525
Change-Id: Ie92153e77f1714b88986813a689a4fa7e444d1dc
Diffstat (limited to 'src/com/cyanogenmod')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Launcher.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java index 3cdc61df1..11dd6d965 100644 --- a/src/com/cyanogenmod/trebuchet/Launcher.java +++ b/src/com/cyanogenmod/trebuchet/Launcher.java @@ -67,7 +67,11 @@ import android.os.Handler; import android.os.Message; import android.os.StrictMode; import android.os.SystemClock; +<<<<<<< HEAD:src/com/cyanogenmod/trebuchet/Launcher.java import android.os.UserHandle; +======= +import android.os.UserManager; +>>>>>>> e233a8b... Hide clings in child mode:src/com/android/launcher2/Launcher.java import android.provider.Settings; import android.speech.RecognizerIntent; import android.text.Selection; @@ -4269,8 +4273,17 @@ public final class Launcher extends Activity /* Cling related */ private boolean isClingsEnabled() { // disable clings when running in a test harness - return !ActivityManager.isRunningInTestHarness(); + 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; } private Cling initCling(int clingId, int[] positionData, boolean animate, int delay) { |