nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am fa296fa6: Merge "Move ManagedProfileUtils to overridable" 

* commit 'fa296fa625dcd67e17520c264ed506bb4728e487':
  Move ManagedProfileUtils to overridable
main
Jatin Matani 2015-03-23 20:21:10 +00:00 committed by Android Git Automerger
parent ff27916c42 fa296fa625
commit c6b279905e
4 changed files with 47 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
java-overridable/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java Normal file
View File

@ -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;
}
}

2
java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
View File

@ -132,7 +132,7 @@ public final class AccountsSettingsFragment extends SubScreenFragment {
@Override
protected Void doInBackground(Void... params) {
if (ManagedProfileUtils.getInstance().hasManagedWorkProfile(mFragment.getActivity())) {
if (ManagedProfileUtils.getInstance().hasWorkProfile(mFragment.getActivity())) {
mFragment.removeSyncPreferences();
} else {
mFragment.enableSyncPreferences();

82
java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
View File

@ -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;
}
}

6
tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
View File

@ -85,7 +85,7 @@ public class AccountsSettingsFragmentTests
}
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 class AccountsSettingsFragmentTests
}
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 class AccountsSettingsFragmentTests
}
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;