diff options
author | Michael Jurka <mikejurka@google.com> | 2012-05-22 23:39:29 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-22 23:39:29 -0700 |
commit | a4fe21285b33301ffed4d91ff03886ec5d30481a (patch) | |
tree | c3436e9b5779eea6790c19ef624261250549a8bc | |
parent | 51726adc25b0b32e79bbf7dd912d5ebb69682767 (diff) | |
parent | 974c3864bb438fc924913e0017385f873332d052 (diff) | |
download | android_packages_apps_Trebuchet-a4fe21285b33301ffed4d91ff03886ec5d30481a.tar.gz android_packages_apps_Trebuchet-a4fe21285b33301ffed4d91ff03886ec5d30481a.tar.bz2 android_packages_apps_Trebuchet-a4fe21285b33301ffed4d91ff03886ec5d30481a.zip |
Merge "Skip custom Play cling if no accounts are set up" into jb-dev
-rw-r--r-- | AndroidManifest.xml | 1 | ||||
-rw-r--r-- | src/com/android/launcher2/Cling.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 17 |
3 files changed, 21 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a0ebe6fbb..20c4a9dae 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -57,6 +57,7 @@ <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="com.android.launcher.permission.READ_SETTINGS" /> <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" /> diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher2/Cling.java index 5cde0b447..c83ee2fde 100644 --- a/src/com/android/launcher2/Cling.java +++ b/src/com/android/launcher2/Cling.java @@ -115,6 +115,10 @@ public class Cling extends FrameLayout { mIsInitialized = false; } + public String getDrawIdentifier() { + return mDrawIdentifier; + } + private int[] getPunchThroughPositions() { if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT)) { return new int[]{getMeasuredWidth() / 2, getMeasuredHeight() - (mButtonBarHeight / 2)}; diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 84b5003eb..d01de9c77 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -17,6 +17,8 @@ package com.android.launcher2; +import android.accounts.Account; +import android.accounts.AccountManager; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; @@ -3516,10 +3518,23 @@ public final class Launcher extends Activity }); } } + + private boolean skipCustomClingIfNoAccounts() { + Cling cling = (Cling) findViewById(R.id.workspace_cling); + boolean customCling = cling.getDrawIdentifier().equals("workspace_custom"); + if (customCling) { + AccountManager am = AccountManager.get(this); + Account[] accounts = am.getAccountsByType("com.google"); + return accounts.length == 0; + } + return false; + } + public void showFirstRunWorkspaceCling() { // Enable the clings only if they have not been dismissed before if (isClingsEnabled() && - !mSharedPrefs.getBoolean(Cling.WORKSPACE_CLING_DISMISSED_KEY, false)) { + !mSharedPrefs.getBoolean(Cling.WORKSPACE_CLING_DISMISSED_KEY, false) && + !skipCustomClingIfNoAccounts() ) { initCling(R.id.workspace_cling, null, false, 0); } else { removeCling(R.id.workspace_cling); |