Removing account manager calls
Change-Id: Ic88139f6ef34046eb3b551d8a75d5f97e1fe3d52
This commit is contained in:
parent
317698bd01
commit
c679ed6233
|
@ -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" />
|
||||
|
|
|
@ -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)) {
|
||||
|
|
Loading…
Reference in New Issue