diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-08-01 22:04:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-01 22:04:11 +0000 |
commit | f8d2a70e0fc00559266aaab078aaefde8e34f3a7 (patch) | |
tree | 7e464886c77aa9d9b4a7676c18acec5a4b26403d /src/com/android/launcher3/compat | |
parent | 0843675e939088d7974616f442ab8cad03f286e3 (diff) | |
parent | d3b87ef1963fb96177ca85bcd6a25879e27e419c (diff) | |
download | android_packages_apps_Trebuchet-f8d2a70e0fc00559266aaab078aaefde8e34f3a7.tar.gz android_packages_apps_Trebuchet-f8d2a70e0fc00559266aaab078aaefde8e34f3a7.tar.bz2 android_packages_apps_Trebuchet-f8d2a70e0fc00559266aaab078aaefde8e34f3a7.zip |
Merge "Adding quiet mode support for shortcuts" into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/compat')
4 files changed, 19 insertions, 30 deletions
diff --git a/src/com/android/launcher3/compat/LauncherAppsCompat.java b/src/com/android/launcher3/compat/LauncherAppsCompat.java index 3c1013db4..645e68a8f 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompat.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompat.java @@ -31,15 +31,6 @@ import java.util.List; public abstract class LauncherAppsCompat { - public static final String ACTION_MANAGED_PROFILE_ADDED = - "android.intent.action.MANAGED_PROFILE_ADDED"; - public static final String ACTION_MANAGED_PROFILE_REMOVED = - "android.intent.action.MANAGED_PROFILE_REMOVED"; - public static final String ACTION_MANAGED_PROFILE_AVAILABLE = - "android.intent.action.MANAGED_PROFILE_AVAILABLE"; - public static final String ACTION_MANAGED_PROFILE_UNAVAILABLE = - "android.intent.action.MANAGED_PROFILE_UNAVAILABLE"; - public interface OnAppsChangedCallbackCompat { void onPackageRemoved(String packageName, UserHandleCompat user); void onPackageAdded(String packageName, UserHandleCompat user); diff --git a/src/com/android/launcher3/compat/UserManagerCompat.java b/src/com/android/launcher3/compat/UserManagerCompat.java index 978f9229d..29ed5d9ba 100644 --- a/src/com/android/launcher3/compat/UserManagerCompat.java +++ b/src/com/android/launcher3/compat/UserManagerCompat.java @@ -57,4 +57,5 @@ public abstract class UserManagerCompat { public abstract CharSequence getBadgedLabelForUser(CharSequence label, UserHandleCompat user); public abstract long getUserCreationTime(UserHandleCompat user); public abstract boolean isQuietModeEnabled(UserHandleCompat user); + public abstract boolean isUserUnlocked(UserHandleCompat user); } diff --git a/src/com/android/launcher3/compat/UserManagerCompatV16.java b/src/com/android/launcher3/compat/UserManagerCompatV16.java index a006efd50..e678ffa3d 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatV16.java +++ b/src/com/android/launcher3/compat/UserManagerCompatV16.java @@ -55,4 +55,9 @@ public class UserManagerCompatV16 extends UserManagerCompat { public boolean isQuietModeEnabled(UserHandleCompat user) { return false; } + + @Override + public boolean isUserUnlocked(UserHandleCompat user) { + return true; + } } diff --git a/src/com/android/launcher3/compat/UserManagerCompatVN.java b/src/com/android/launcher3/compat/UserManagerCompatVN.java index ae41e68a3..771d141c3 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVN.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVN.java @@ -16,15 +16,11 @@ package com.android.launcher3.compat; +import android.annotation.TargetApi; import android.content.Context; -import android.os.UserHandle; -import android.os.UserManager; -import android.util.Log; +import android.os.Build; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -//TODO: Once gogole3 SDK is updated to N, add @TargetApi(Build.VERSION_CODES.N) +@TargetApi(Build.VERSION_CODES.N) public class UserManagerCompatVN extends UserManagerCompatVL { private static final String TAG = "UserManagerCompatVN"; @@ -35,21 +31,17 @@ public class UserManagerCompatVN extends UserManagerCompatVL { @Override public boolean isQuietModeEnabled(UserHandleCompat user) { - if (user != null) { - try { - //TODO: Replace with proper API call once google3 SDK is updated. - Method isQuietModeEnabledMethod = UserManager.class.getMethod("isQuietModeEnabled", - UserHandle.class); - return (boolean) isQuietModeEnabledMethod.invoke(mUserManager, user.getUser()); - } catch (NoSuchMethodError | NoSuchMethodException | IllegalAccessException - | InvocationTargetException e) { - Log.e(TAG, "Running on N without isQuietModeEnabled", e); - } catch (IllegalArgumentException e) { - // TODO remove this when API is fixed to not throw this - // when called on user that isn't a managed profile. - } + return mUserManager.isQuietModeEnabled(user.getUser()); + } + + @Override + public boolean isUserUnlocked(UserHandleCompat user) { + // TODO: Remove the try-catch block when the API permission has been relaxed (b/30475753) + try { + return mUserManager.isUserUnlocked(user.getUser()); + } catch (RuntimeException e) { + return !isQuietModeEnabled(user); } - return false; } } |