From 9f082604b0b2e9bc5fe857e418739252e7f3e81d Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Fri, 12 Jan 2018 12:13:18 +0000 Subject: [PATCH] Rename trySetQuietModeEnabled to requestQuietModeEnabled as per ... the feedback from API council Fix: 71818127 Test: Build Change-Id: I4bfb0eecb281961e24a4f613485420e9e8b357ab --- .../launcher3/allapps/WorkModeSwitch.java | 2 +- .../launcher3/compat/UserManagerCompat.java | 2 +- .../launcher3/compat/UserManagerCompatVL.java | 2 +- .../launcher3/compat/UserManagerCompatVP.java | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java index 32c9ce3f8e..05d5e53b06 100644 --- a/src/com/android/launcher3/allapps/WorkModeSwitch.java +++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java @@ -91,7 +91,7 @@ public class WorkModeSwitch extends Switch { if (Process.myUserHandle().equals(userProfile)) { continue; } - showConfirm |= !userManager.trySetQuietModeEnabled(enabled, userProfile); + showConfirm |= !userManager.requestQuietModeEnabled(enabled, userProfile); } return showConfirm; } diff --git a/src/com/android/launcher3/compat/UserManagerCompat.java b/src/com/android/launcher3/compat/UserManagerCompat.java index 197f79836e..ddb244a175 100644 --- a/src/com/android/launcher3/compat/UserManagerCompat.java +++ b/src/com/android/launcher3/compat/UserManagerCompat.java @@ -63,5 +63,5 @@ public abstract class UserManagerCompat { public abstract boolean isUserUnlocked(UserHandle user); public abstract boolean isDemoUser(); - public abstract boolean trySetQuietModeEnabled(boolean enableQuietMode, UserHandle user); + public abstract boolean requestQuietModeEnabled(boolean enableQuietMode, UserHandle user); } diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java index e6cc3198de..5585fe46e9 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVL.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java @@ -83,7 +83,7 @@ public class UserManagerCompatVL extends UserManagerCompat { } @Override - public boolean trySetQuietModeEnabled(boolean enableQuietMode, UserHandle user) { + public boolean requestQuietModeEnabled(boolean enableQuietMode, UserHandle user) { return false; } diff --git a/src/com/android/launcher3/compat/UserManagerCompatVP.java b/src/com/android/launcher3/compat/UserManagerCompatVP.java index a0bf0ab220..2e8a8eb213 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVP.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVP.java @@ -26,29 +26,29 @@ import java.lang.reflect.Method; public class UserManagerCompatVP extends UserManagerCompatVNMr1 { private static final String TAG = "UserManagerCompatVP"; - private Method mTrySetQuietModeEnabledMethod; + private Method mRequestQuietModeEnabled; UserManagerCompatVP(Context context) { super(context); // TODO: Replace it with proper API call once SDK is ready. try { - mTrySetQuietModeEnabledMethod = UserManager.class.getDeclaredMethod( - "trySetQuietModeEnabled", boolean.class, UserHandle.class); + mRequestQuietModeEnabled = UserManager.class.getDeclaredMethod( + "requestQuietModeEnabled", boolean.class, UserHandle.class); } catch (NoSuchMethodException e) { - Log.e(TAG, "trySetQuietModeEnabled is not available", e); + Log.e(TAG, "requestQuietModeEnabled is not available", e); } } @Override - public boolean trySetQuietModeEnabled(boolean enableQuietMode, UserHandle user) { - if (mTrySetQuietModeEnabledMethod == null) { + public boolean requestQuietModeEnabled(boolean enableQuietMode, UserHandle user) { + if (mRequestQuietModeEnabled == null) { return false; } try { return (boolean) - mTrySetQuietModeEnabledMethod.invoke(mUserManager, enableQuietMode, user); + mRequestQuietModeEnabled.invoke(mUserManager, enableQuietMode, user); } catch (IllegalAccessException | InvocationTargetException e) { - Log.e(TAG, "Failed to invoke mTrySetQuietModeEnabledMethod", e); + Log.e(TAG, "Failed to invoke mRequestQuietModeEnabled", e); } return false; }