Move ManagedProfileUtils to overridable
Bug:19532354
Change-Id: I50b3ae11b6e58f07b482353b624b1a7a73eadc99
diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java b/java-overridable/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
new file mode 100644
index 0000000..ef1872b
--- /dev/null
+++ b/java-overridable/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.latin.utils;
+
+import android.content.Context;
+
+import com.android.inputmethod.annotations.UsedForTesting;
+
+public class ManagedProfileUtils {
+ private static ManagedProfileUtils INSTANCE = new ManagedProfileUtils();
+ private static ManagedProfileUtils sTestInstance;
+
+ private ManagedProfileUtils() {
+ // This utility class is not publicly instantiable.
+ }
+
+ @UsedForTesting
+ public static void setTestInstance(final ManagedProfileUtils testInstance) {
+ sTestInstance = testInstance;
+ }
+
+ public static ManagedProfileUtils getInstance() {
+ return sTestInstance == null ? INSTANCE : sTestInstance;
+ }
+
+ public boolean hasWorkProfile(final Context context) {
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
index 48361bf..39dcddb 100644
--- a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
@@ -132,7 +132,7 @@
@Override
protected Void doInBackground(Void... params) {
- if (ManagedProfileUtils.getInstance().hasManagedWorkProfile(mFragment.getActivity())) {
+ if (ManagedProfileUtils.getInstance().hasWorkProfile(mFragment.getActivity())) {
mFragment.removeSyncPreferences();
} else {
mFragment.enableSyncPreferences();
diff --git a/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java b/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
deleted file mode 100644
index 1bd8f31..0000000
--- a/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.inputmethod.latin.utils;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.util.Log;
-
-import com.android.inputmethod.annotations.UsedForTesting;
-
-import java.util.List;
-
-/**
- * Utility for determining if the device has managed profiles.
- */
-public class ManagedProfileUtils {
- private static final boolean DEBUG = false;
- private static final String TAG = ManagedProfileUtils.class.getSimpleName();
-
- private static ManagedProfileUtils INSTANCE = new ManagedProfileUtils();
- private static ManagedProfileUtils sTestInstance;
-
- private ManagedProfileUtils() {
- // This utility class is not publicly instantiable.
- }
-
- @UsedForTesting
- public static void setTestInstance(final ManagedProfileUtils testInstance) {
- sTestInstance = testInstance;
- }
-
- public static ManagedProfileUtils getInstance() {
- return sTestInstance == null ? INSTANCE : sTestInstance;
- }
-
- /**
- * Note that {@link UserManager#getUserProfiles} has been introduced
- * in API level 21 (Build.VERSION_CODES.LOLLIPOP).
- */
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
- public boolean hasManagedWorkProfile(final Context context) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- return false;
- }
-
- final UserManager userManagerService =
- (UserManager) context.getSystemService(Context.USER_SERVICE);
- if (userManagerService != null) {
- if (DEBUG) {
- Log.d(TAG, "Detecting managed profile...");
- }
- final List<UserHandle> userProfiles = userManagerService.getUserProfiles();
- if (userProfiles.size() > 1) {
- if (DEBUG) {
- Log.d(TAG, "More than one user profile => Managed profile exists.");
- }
- return true;
- }
- }
- if (DEBUG) {
- Log.d(TAG, "Managed profile not detected.");
- }
- return false;
- }
-}
diff --git a/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java b/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
index 0878e74..7a019c3 100644
--- a/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
+++ b/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
@@ -85,7 +85,7 @@
}
public void testMultipleAccounts_noSettingsForManagedProfile() {
- when(mManagedProfileUtils.hasManagedWorkProfile(any(Context.class))).thenReturn(true);
+ when(mManagedProfileUtils.hasWorkProfile(any(Context.class))).thenReturn(true);
final AccountsSettingsFragment fragment =
(AccountsSettingsFragment) getActivity().mFragment;
@@ -97,7 +97,7 @@
}
public void testMultipleAccounts_noCurrentAccount() {
- when(mManagedProfileUtils.hasManagedWorkProfile(any(Context.class))).thenReturn(false);
+ when(mManagedProfileUtils.hasWorkProfile(any(Context.class))).thenReturn(false);
final AccountsSettingsFragment fragment =
(AccountsSettingsFragment) getActivity().mFragment;
@@ -118,7 +118,7 @@
}
public void testMultipleAccounts_currentAccount() {
- when(mManagedProfileUtils.hasManagedWorkProfile(any(Context.class))).thenReturn(false);
+ when(mManagedProfileUtils.hasWorkProfile(any(Context.class))).thenReturn(false);
final AccountsSettingsFragment fragment =
(AccountsSettingsFragment) getActivity().mFragment;