diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-04 23:24:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-04 23:24:43 +0000 |
| commit | dc352761ae542087825227d773ec0b039f0aaaf0 (patch) | |
| tree | 2463f2acb66c43d7d72fc94a7d49c29cfce5264d | |
| parent | fb0f1095390d19d2cd6be127eb1aa3a83259b012 (diff) | |
| parent | c679ed623324954069446f50e9c4ace359fa55e7 (diff) | |
| download | android_packages_apps_Trebuchet-dc352761ae542087825227d773ec0b039f0aaaf0.tar.gz android_packages_apps_Trebuchet-dc352761ae542087825227d773ec0b039f0aaaf0.tar.bz2 android_packages_apps_Trebuchet-dc352761ae542087825227d773ec0b039f0aaaf0.zip | |
Merge "Removing account manager calls" into ub-launcher3-burnaby
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherClings.java | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1fb8e8d01..3af38f384 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -53,7 +53,6 @@ <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" /> <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.BIND_APPWIDGET" /> - <uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.BROADCAST_STICKY"/> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java index c13752cb1..c44ea6bcd 100644 --- a/src/com/android/launcher3/LauncherClings.java +++ b/src/com/android/launcher3/LauncherClings.java @@ -44,8 +44,6 @@ class LauncherClings implements OnClickListener { private static final String TAG_CROP_TOP_AND_SIDES = "crop_bg_top_and_sides"; - private static final boolean DISABLE_CLINGS = false; - private static final int SHOW_CLING_DURATION = 250; private static final int DISMISS_CLING_DURATION = 200; @@ -215,10 +213,6 @@ class LauncherClings implements OnClickListener { /** Returns whether the clings are enabled or should be shown */ @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2) private boolean areClingsEnabled() { - if (DISABLE_CLINGS) { - return false; - } - // disable clings when running in a test harness if(ActivityManager.isRunningInTestHarness()) return false; @@ -231,10 +225,7 @@ class LauncherClings implements OnClickListener { // 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 supportsLimitedUsers = - android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2; - Account[] accounts = AccountManager.get(mLauncher).getAccounts(); - if (supportsLimitedUsers && accounts.length == 0) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { UserManager um = (UserManager) mLauncher.getSystemService(Context.USER_SERVICE); Bundle restrictions = um.getUserRestrictions(); if (restrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false)) { |