<item name="android:showDividers">middle</item>
</style>
- <style name="TextAppearance.Tab" parent="TextAppearance.Design.Tab">
+ <style name="TextAppearance.Tab" parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textAllCaps">false</item>
</style>
android:title="@string/spellcheckers_settings_for_work_title"
android:fragment="com.android.settings.inputmethod.SpellCheckersSettings"
settings:forWork="true"
- settings:controller="com.android.settings.language.UserDictionaryForWorkPreferenceController" />
+ settings:controller="com.android.settings.core.WorkPreferenceController" />
<Preference
android:key="user_dictionary_settings_for_work_pref"
android:title="@string/location_recent_location_requests_see_all"
android:icon="@drawable/ic_chevron_right_24dp"
android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
+ settings:controller="com.android.settings.core.WorkPreferenceController"
+ settings:forWork="true"
settings:searchable="false"/>
<com.android.settingslib.RestrictedSwitchPreference
+++ /dev/null
-<!--
- ~ Copyright (C) 2019 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
- -->
-
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="storage_dashboard_screen"
- android:title="@string/storage_settings"
- android:orderingFromXml="false">
- <com.android.settings.deviceinfo.storage.StorageSummaryDonutPreference
- android:key="pref_summary"
- android:order="0"
- settings:searchable="false"
- settings:controller="com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController"/>
-</PreferenceScreen>
\ No newline at end of file
}
/**
- * Returns the UserManager for a given context
- *
- * @throws IllegalStateException if no UserManager could be retrieved.
- */
- public static UserManager getUserManager(Context context) {
- final UserManager um = UserManager.get(context);
- if (um == null) {
- throw new IllegalStateException("Unable to load UserManager");
- }
- return um;
- }
-
- /**
* Returns true if Monkey is running.
*/
public static boolean isMonkeyRunning() {
* @throws SecurityException if the given userId does not belong to the current user group.
*/
public static int enforceSameOwner(Context context, int userId) {
- final UserManager um = getUserManager(context);
+ final UserManager um = UserManager.get(context);
final int[] profileIds = um.getProfileIdsWithDisabled(UserHandle.myUserId());
if (ArrayUtils.contains(profileIds, userId)) {
return userId;
* Returns the user id of the credential owner of the given user id.
*/
public static int getCredentialOwnerUserId(Context context, int userId) {
- final UserManager um = getUserManager(context);
+ final UserManager um = UserManager.get(context);
return um.getCredentialOwnerProfile(userId);
}
}
public static boolean isDemoUser(Context context) {
- return UserManager.isDeviceInDemoMode(context) && getUserManager(context).isDemoUser();
+ return UserManager.isDeviceInDemoMode(context) && UserManager.get(context).isDemoUser();
}
public static ComponentName getDeviceOwnerComponent(Context context) {
*/
package com.android.settings.core;
+import static android.content.Intent.EXTRA_USER_ID;
+
import static com.android.settings.dashboard.DashboardFragment.CATEGORY;
import android.annotation.IntDef;
import android.content.ContentResolver;
import android.content.Context;
import android.net.Uri;
+import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SettingsSlicesContract;
* The status is used for the convenience methods: {@link #isAvailable()},
* {@link #isSupported()}
* </p>
- * The inherited class doesn't need to check work profile is existed or not if
+ * The inherited class doesn't need to check work profile if
* android:forWork="true" is set in preference xml.
*/
@AvailabilityStatus
if (!mIsForWork || mWorkProfileUser == null) {
return super.handlePreferenceTreeClick(preference);
}
+ final Bundle extra = preference.getExtras();
+ extra.putInt(EXTRA_USER_ID, mWorkProfileUser.getIdentifier());
new SubSettingLauncher(preference.getContext())
.setDestination(preference.getFragment())
.setSourceMetricsCategory(preference.getExtras().getInt(CATEGORY,
* limitations under the License.
*/
-package com.android.settings.language;
+package com.android.settings.core;
import android.content.Context;
-import com.android.settings.core.BasePreferenceController;
+import androidx.annotation.CallSuper;
/**
- * Preference controller for "UserDictionary for work".
- *
- * @see UserDictionaryPreferenceController
+ * Base class to be used directly in Xml with settings:forWork="true" attribute.
+ * It is used specifically for work profile only preference
*/
-public final class UserDictionaryForWorkPreferenceController
- extends BasePreferenceController {
+public class WorkPreferenceController extends BasePreferenceController {
- public UserDictionaryForWorkPreferenceController(Context context, String preferenceKey) {
+ public WorkPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
- @AvailabilityStatus
- @Override
+ /**
+ * Only available when work profile user is existed
+ */
+ @CallSuper
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return getWorkProfileUser() != null ? AVAILABLE : DISABLED_FOR_USER;
}
}
import com.android.settings.accounts.AccountDashboardFragment;
import com.android.settings.applications.manageapplications.ManageApplications;
-import com.android.settings.deviceinfo.StorageDashboardFragment;
import com.android.settings.location.LocationSettings;
+import com.android.settings.location.RecentLocationRequestSeeAllFragment;
import java.util.Map;
ProfileSelectAccountFragment.class.getName());
FRAGMENT_MAP.put(ManageApplications.class.getName(),
ProfileSelectManageApplications.class.getName());
- FRAGMENT_MAP.put(StorageDashboardFragment.class.getName(),
- ProfileSelectStorageFragment.class.getName());
FRAGMENT_MAP.put(LocationSettings.class.getName(),
ProfileSelectLocationFragment.class.getName());
+ FRAGMENT_MAP.put(RecentLocationRequestSeeAllFragment.class.getName(),
+ ProfileSelectRecentLocationRequestFragment.class.getName());
}
}
package com.android.settings.dashboard.profileselector;
+import static android.content.Intent.EXTRA_USER_ID;
+
import android.annotation.IntDef;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
+import android.os.UserHandle;
import android.os.UserManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
+import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.recyclerview.widget.RecyclerView;
Bundle savedInstanceState) {
mContentView = (ViewGroup) super.onCreateView(inflater, container, savedInstanceState);
final Activity activity = getActivity();
- final int intentUser = activity.getIntent().getContentUserHint();
- int selectedTab = 0;
-
- // Start intent from a specific user eg: adb shell --user 10
- if (intentUser > 0 && Utils.getManagedProfile(UserManager.get(activity)).getIdentifier()
- == intentUser) {
- selectedTab = WORK_TAB;
- }
-
- // Set selected tab using fragment argument
- final int extraTab = getArguments() != null ? getArguments().getInt(
- SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB, -1) : -1;
- if (extraTab != -1) {
- selectedTab = extraTab;
- }
+ final int selectedTab = getTabId(activity, getArguments());
final View tabContainer = mContentView.findViewById(R.id.tab_container);
final ViewPager viewPager = tabContainer.findViewById(R.id.view_pager);
return TAG;
}
+ @VisibleForTesting
+ int getTabId(Activity activity, Bundle bundle) {
+ if (bundle != null) {
+ final int extraTab = bundle.getInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB, -1);
+ if (extraTab != -1) {
+ return WORK_TAB;
+ }
+ final int userId = bundle.getInt(EXTRA_USER_ID, UserHandle.SYSTEM.getIdentifier());
+ final boolean isWorkProfile = UserManager.get(activity).isManagedProfile(userId);
+ if (isWorkProfile) {
+ return WORK_TAB;
+ }
+ }
+ // Start intent from a specific user eg: adb shell --user 10
+ final int intentUser = activity.getIntent().getContentUserHint();
+ if (UserManager.get(activity).isManagedProfile(intentUser)) {
+ return WORK_TAB;
+ }
+
+ return PERSONAL_TAB;
+ }
+
static class ViewPagerAdapter extends FragmentStatePagerAdapter {
private final Fragment[] mChildFragments;
@Override
public Fragment[] getFragments() {
+
+ final Bundle workOnly = new Bundle();
+ workOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.WORK);
+ final Fragment workFragment = new LocationWorkProfileSettings();
+ workFragment.setArguments(workOnly);
+
+ final Bundle personalOnly = new Bundle();
+ personalOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.PERSONAL);
+ final Fragment personalFragment = new LocationPersonalSettings();
+ personalFragment.setArguments(personalOnly);
return new Fragment[]{
- new LocationPersonalSettings(),
- new LocationWorkProfileSettings()
+ personalFragment,
+ workFragment
};
}
}
--- /dev/null
+/*
+ * Copyright (C) 2019 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.settings.dashboard.profileselector;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import com.android.settings.location.RecentLocationRequestSeeAllFragment;
+
+/**
+ * Recent location request page for personal/managed profile.
+ */
+public class ProfileSelectRecentLocationRequestFragment extends ProfileSelectFragment {
+
+ @Override
+ public Fragment[] getFragments() {
+ final Bundle workOnly = new Bundle();
+ workOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.WORK);
+ final Fragment workFragment = new RecentLocationRequestSeeAllFragment();
+ workFragment.setArguments(workOnly);
+
+ final Bundle personalOnly = new Bundle();
+ personalOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.PERSONAL);
+ final Fragment personalFragment = new RecentLocationRequestSeeAllFragment();
+ personalFragment.setArguments(personalOnly);
+ return new Fragment[]{
+ personalFragment, //0
+ workFragment
+ };
+ }
+}
+++ /dev/null
-/*
- * Copyright (C) 2019 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.settings.dashboard.profileselector;
-
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.os.storage.VolumeInfo;
-
-import androidx.fragment.app.Fragment;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.deviceinfo.StorageDashboardFragment;
-import com.android.settings.deviceinfo.StorageProfileFragment;
-
-/**
- * Storage Setting page for personal/managed profile.
- */
-public class ProfileSelectStorageFragment extends ProfileSelectFragment {
- @Override
- public Fragment[] getFragments() {
-
- final Bundle storageBundle = new Bundle();
- storageBundle.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL);
- storageBundle.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.PERSONAL);
-
- final Fragment storageDashboardFragment = new StorageDashboardFragment();
- storageDashboardFragment.setArguments(storageBundle);
-
- final UserHandle userHandle = Utils.getManagedProfile(UserManager.get(getActivity()));
- if (userHandle != null) {
- storageBundle.putInt(StorageProfileFragment.USER_ID_EXTRA, userHandle.getIdentifier());
- }
-
- final Fragment storageProfileFragment = new StorageProfileFragment();
- storageProfileFragment.setArguments(storageBundle);
-
- return new Fragment[]{
- storageDashboardFragment,
- storageProfileFragment
- };
- }
-
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.storage_summary_donut;
- }
-}
-
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
/**
* Location Setting page for personal profile.
super.onAttach(context);
use(AppLocationPermissionPreferenceController.class).init(this);
- use(RecentLocationRequestPreferenceController.class).init(this);
use(LocationServicePreferenceController.class).init(this);
use(LocationFooterPreferenceController.class).init(this);
+
+ final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
+ final RecentLocationRequestPreferenceController controller = use(
+ RecentLocationRequestPreferenceController.class);
+ controller.init(this);
+ controller.setProfileType(profileType);
}
@Override
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
/**
* Location Setting page for managed profile.
super.onAttach(context);
use(AppLocationPermissionPreferenceController.class).init(this);
- use(RecentLocationRequestPreferenceController.class).init(this);
use(LocationServiceForWorkPreferenceController.class).init(this);
use(LocationFooterPreferenceController.class).init(this);
use(LocationForWorkPreferenceController.class).init(this);
+
+ final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
+ final RecentLocationRequestPreferenceController controller = use(
+ RecentLocationRequestPreferenceController.class);
+ controller.init(this);
+ controller.setProfileType(profileType);
}
@Override
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
+import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settingslib.location.RecentLocationApps;
import com.android.settingslib.widget.apppreference.AppPreference;
+import java.util.ArrayList;
import java.util.List;
public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController {
- private final RecentLocationApps mRecentLocationApps;
+ public static final int MAX_APPS = 3;
+ @VisibleForTesting
+ RecentLocationApps mRecentLocationApps;
private PreferenceCategory mCategoryRecentLocationRequests;
+ private int mType = ProfileSelectFragment.ProfileType.ALL;
/** Used in this class and {@link RecentLocationRequestSeeAllPreferenceController} */
static class PackageEntryClickedListener implements Preference.OnPreferenceClickListener {
super.displayPreference(screen);
mCategoryRecentLocationRequests = screen.findPreference(getPreferenceKey());
final Context prefContext = mCategoryRecentLocationRequests.getContext();
- final List<RecentLocationApps.Request> recentLocationRequests =
- mRecentLocationApps.getAppListSorted(false);
- if (recentLocationRequests.size() > 3) {
- // Display the top 3 preferences to container in original order.
- for (int i = 0; i < 3; i++) {
- mCategoryRecentLocationRequests.addPreference(
- createAppPreference(prefContext, recentLocationRequests.get(i)));
+ final List<RecentLocationApps.Request> recentLocationRequests = new ArrayList<>();
+ final UserManager userManager = UserManager.get(mContext);
+ for (RecentLocationApps.Request request : mRecentLocationApps.getAppListSorted(
+ false /* systemApps */)) {
+ if (isRequestMatchesProfileType(userManager, request, mType)) {
+ recentLocationRequests.add(request);
+ if (recentLocationRequests.size() == MAX_APPS) {
+ break;
+ }
}
- } else if (recentLocationRequests.size() > 0) {
+ }
+
+ if (recentLocationRequests.size() > 0) {
// Add preferences to container in original order (already sorted by recency).
for (RecentLocationApps.Request request : recentLocationRequests) {
mCategoryRecentLocationRequests.addPreference(
- createAppPreference(prefContext, request));
+ createAppPreference(prefContext, request, mFragment));
}
} else {
// If there's no item to display, add a "No recent apps" item.
- final Preference banner = createAppPreference(prefContext);
+ final Preference banner = new AppPreference(prefContext);
banner.setTitle(R.string.location_no_recent_apps);
banner.setSelectable(false);
mCategoryRecentLocationRequests.addPreference(banner);
mCategoryRecentLocationRequests.setEnabled(mLocationEnabler.isEnabled(mode));
}
- @VisibleForTesting
- AppPreference createAppPreference(Context prefContext) {
- return new AppPreference(prefContext);
+ /**
+ * Initialize {@link ProfileSelectFragment.ProfileType} of the controller
+ *
+ * @param type {@link ProfileSelectFragment.ProfileType} of the controller.
+ */
+ public void setProfileType(@ProfileSelectFragment.ProfileType int type) {
+ mType = type;
}
- @VisibleForTesting
- AppPreference createAppPreference(Context prefContext, RecentLocationApps.Request request) {
- final AppPreference pref = createAppPreference(prefContext);
- pref.setSummary(request.contentDescription);
+ /**
+ * Create a {@link AppPreference}
+ */
+ public static AppPreference createAppPreference(Context prefContext,
+ RecentLocationApps.Request request, DashboardFragment fragment) {
+ final AppPreference pref = new AppPreference(prefContext);
pref.setIcon(request.icon);
pref.setTitle(request.label);
pref.setOnPreferenceClickListener(new PackageEntryClickedListener(
- mFragment, request.packageName, request.userHandle));
+ fragment, request.packageName, request.userHandle));
return pref;
}
+
+ /**
+ * Return if the {@link RecentLocationApps.Request} matches current UI
+ * {@ProfileSelectFragment.ProfileType}
+ */
+ public static boolean isRequestMatchesProfileType(UserManager userManager,
+ RecentLocationApps.Request request, @ProfileSelectFragment.ProfileType int type) {
+ final boolean isWorkProfile = userManager.isManagedProfile(
+ request.userHandle.getIdentifier());
+ if (isWorkProfile && (type & ProfileSelectFragment.ProfileType.WORK) != 0) {
+ return true;
+ }
+ if (!isWorkProfile && (type & ProfileSelectFragment.ProfileType.PERSONAL) != 0) {
+ return true;
+ }
+ return false;
+ }
}
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
@Override
public void onAttach(Context context) {
super.onAttach(context);
+ final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
mController = use(RecentLocationRequestSeeAllPreferenceController.class);
mController.init(this);
+ mController.setProfileType(profileType);
}
@Override
*/
package com.android.settings.location;
+import static com.android.settings.location.RecentLocationRequestPreferenceController.createAppPreference;
+import static com.android.settings.location.RecentLocationRequestPreferenceController.isRequestMatchesProfileType;
+
import android.content.Context;
+import android.os.UserManager;
-import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settingslib.location.RecentLocationApps;
import com.android.settingslib.widget.apppreference.AppPreference;
+import java.util.ArrayList;
import java.util.List;
/** Preference controller for preference category displaying all recent location requests. */
private RecentLocationApps mRecentLocationApps;
private boolean mShowSystem = false;
private Preference mPreference;
+ private int mType = ProfileSelectFragment.ProfileType.ALL;
public RecentLocationRequestSeeAllPreferenceController(Context context, String key) {
super(context, key);
public void updateState(Preference preference) {
mCategoryAllRecentLocationRequests.removeAll();
mPreference = preference;
- List<RecentLocationApps.Request> requests = mRecentLocationApps.getAppListSorted(
- mShowSystem);
- if (requests.isEmpty()) {
+
+ final UserManager userManager = UserManager.get(mContext);
+ final List<RecentLocationApps.Request> recentLocationRequests = new ArrayList<>();
+ for (RecentLocationApps.Request request : mRecentLocationApps.getAppListSorted(
+ mShowSystem)) {
+ if (isRequestMatchesProfileType(userManager, request, mType)) {
+ recentLocationRequests.add(request);
+ }
+ }
+
+ if (recentLocationRequests.isEmpty()) {
// If there's no item to display, add a "No recent apps" item.
final Preference banner = new AppPreference(mContext);
banner.setTitle(R.string.location_no_recent_apps);
banner.setSelectable(false);
mCategoryAllRecentLocationRequests.addPreference(banner);
} else {
- for (RecentLocationApps.Request request : requests) {
- Preference appPreference = createAppPreference(preference.getContext(), request);
+ for (RecentLocationApps.Request request : recentLocationRequests) {
+ final Preference appPreference = createAppPreference(
+ preference.getContext(),
+ request, mFragment);
mCategoryAllRecentLocationRequests.addPreference(appPreference);
}
}
}
- @VisibleForTesting
- AppPreference createAppPreference(
- Context prefContext, RecentLocationApps.Request request) {
- final AppPreference pref = new AppPreference(prefContext);
- pref.setSummary(request.contentDescription);
- pref.setIcon(request.icon);
- pref.setTitle(request.label);
- pref.setOnPreferenceClickListener(
- new RecentLocationRequestPreferenceController.PackageEntryClickedListener(
- mFragment, request.packageName, request.userHandle));
- return pref;
+ /**
+ * Initialize {@link ProfileSelectFragment.ProfileType} of the controller
+ *
+ * @param type {@link ProfileSelectFragment.ProfileType} of the controller.
+ */
+ public void setProfileType(@ProfileSelectFragment.ProfileType int type) {
+ mType = type;
}
public void setShowSystem(boolean showSystem) {
package com.android.settings.dashboard.profileselector;
+import static android.content.Intent.EXTRA_USER_ID;
+
import static com.android.settings.dashboard.profileselector.ProfileSelectFragment.PERSONAL_TAB;
import static com.android.settings.dashboard.profileselector.ProfileSelectFragment.WORK_TAB;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.recyclerview.widget.RecyclerView;
-import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragmentTest;
-
-import com.google.android.material.tabs.TabLayout;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before;
import org.junit.Test;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.androidx.fragment.FragmentController;
+
+import java.util.HashSet;
+import java.util.Set;
@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class})
public class ProfileSelectFragmentTest {
private Context mContext;
private TestProfileSelectFragment mFragment;
private FragmentActivity mActivity;
+ private ShadowUserManager mUserManager;
@Before
public void setUp() {
mFragment = spy(new TestProfileSelectFragment());
when(mFragment.getContext()).thenReturn(mContext);
when(mFragment.getActivity()).thenReturn(mActivity);
+ mUserManager = ShadowUserManager.getShadow();
}
@Test
- @Config(shadows = ShadowPreferenceFragmentCompat.class)
- public void onCreateView_no_setCorrectTab() {
- FragmentController.of(mFragment, new Intent()).create(0 /* containerViewId*/,
- null /* bundle */).start().resume().visible().get();
- final TabLayout tabs = mFragment.getView().findViewById(R.id.tabs);
-
- assertThat(tabs.getSelectedTabPosition()).isEqualTo(PERSONAL_TAB);
+ public void getTabId_no_setCorrectTab() {
+ assertThat(mFragment.getTabId(mActivity, null)).isEqualTo(PERSONAL_TAB);
}
@Test
- @Config(shadows = ShadowPreferenceFragmentCompat.class)
- public void onCreateView_setArgument_setCorrectTab() {
+ public void getTabId_setArgument_setCorrectTab() {
final Bundle bundle = new Bundle();
bundle.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB, WORK_TAB);
- mFragment.setArguments(bundle);
- FragmentController.of(mFragment, new Intent()).create(0 /* containerViewId*/,
- bundle).start().resume().visible().get();
- final TabLayout tabs = mFragment.getView().findViewById(R.id.tabs);
+ assertThat(mFragment.getTabId(mActivity, bundle)).isEqualTo(WORK_TAB);
+ }
+
+ @Test
+ public void getTabId_setWorkId_getCorrectTab() {
+ final Bundle bundle = new Bundle();
+ bundle.putInt(EXTRA_USER_ID, 10);
+ final Set<Integer> profileIds = new HashSet<>();
+ profileIds.add(10);
+ mUserManager.setManagedProfiles(profileIds);
- assertThat(tabs.getSelectedTabPosition()).isEqualTo(WORK_TAB);
+ assertThat(mFragment.getTabId(mActivity, bundle)).isEqualTo(WORK_TAB);
+ }
+
+ @Test
+ public void getTabId_setPersonalId_getCorrectTab() {
+ final Bundle bundle = new Bundle();
+ bundle.putInt(EXTRA_USER_ID, 0);
+
+ assertThat(mFragment.getTabId(mActivity, bundle)).isEqualTo(PERSONAL_TAB);
+ }
+
+ @Test
+ public void getTabId_setPersonalIdByIntent_getCorrectTab() {
+ final Set<Integer> profileIds = new HashSet<>();
+ profileIds.add(10);
+ mUserManager.setManagedProfiles(profileIds);
+ final Intent intent = spy(new Intent());
+ when(intent.getContentUserHint()).thenReturn(10);
+ when(mActivity.getIntent()).thenReturn(intent);
+
+ assertThat(mFragment.getTabId(mActivity, null)).isEqualTo(WORK_TAB);
}
public static class TestProfileSelectFragment extends ProfileSelectFragment {
};
}
}
-
- @Implements(PreferenceFragmentCompat.class)
- public static class ShadowPreferenceFragmentCompat {
-
- private Context mContext;
-
- @Implementation
- protected View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
- @Nullable Bundle savedInstanceState) {
- mContext = inflater.getContext();
- return inflater.inflate(R.layout.preference_list_fragment, container);
- }
-
- @Implementation
- protected RecyclerView getListView() {
- final RecyclerView recyclerView = new RecyclerView(mContext);
- recyclerView.setAdapter(new RecyclerView.Adapter() {
- @NonNull
- @Override
- public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup,
- int i) {
- return null;
- }
-
- @Override
- public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
-
- }
-
- @Override
- public int getItemCount() {
- return 0;
- }
- });
- return recyclerView;
- }
- }
}
--- /dev/null
+/*
+ * Copyright (C) 2019 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.settings.dashboard.profileselector;
+
+import static com.android.settings.dashboard.profileselector.ProfileSelectFragment.EXTRA_PROFILE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class ProfileSelectLocationFragmentTest {
+
+ private ProfileSelectLocationFragment mProfileSelectLocationFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mProfileSelectLocationFragment = new ProfileSelectLocationFragment();
+ }
+
+ @Test
+ public void getFragments_containsCorrectBundle() {
+ assertThat(mProfileSelectLocationFragment.getFragments().length).isEqualTo(2);
+ assertThat(mProfileSelectLocationFragment.getFragments()[0].getArguments().getInt(
+ EXTRA_PROFILE, -1)).isEqualTo(ProfileSelectFragment.ProfileType.PERSONAL);
+ assertThat(mProfileSelectLocationFragment.getFragments()[1].getArguments().getInt(
+ EXTRA_PROFILE, -1)).isEqualTo(ProfileSelectFragment.ProfileType.WORK);
+ }
+}
--- /dev/null
+/*
+ * Copyright (C) 2019 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.settings.location;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settingslib.location.RecentLocationApps;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class})
+public class RecentLocationRequestPreferenceControllerTest {
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private PreferenceCategory mCategory;
+ private Context mContext;
+ private RecentLocationRequestPreferenceController mController;
+ private ShadowUserManager mUserManager;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = spy(
+ new RecentLocationRequestPreferenceController(mContext, "key"));
+ when(mCategory.getContext()).thenReturn(mContext);
+ when(mScreen.findPreference("key")).thenReturn(mCategory);
+ mUserManager = ShadowUserManager.getShadow();
+ mController.mRecentLocationApps = spy(new RecentLocationApps(mContext));
+ }
+
+ @Test
+ public void updateState_whenAppListMoreThanThree_shouldDisplayTopThreeApps() {
+ final List<RecentLocationApps.Request> requests = createMockRequest(6);
+ when(mController.mRecentLocationApps.getAppListSorted(false)).thenReturn(requests);
+
+ mController.displayPreference(mScreen);
+
+ verify(mCategory, times(3)).addPreference(any());
+ }
+
+ @Test
+ public void updateState_workProfile_shouldShowOnlyWorkProfileApps() {
+ final List<RecentLocationApps.Request> requests = createMockRequest(6);
+ when(mController.mRecentLocationApps.getAppListSorted(false)).thenReturn(requests);
+ mController.setProfileType(ProfileSelectFragment.ProfileType.WORK);
+ final Set<Integer> profileIds = new HashSet<>();
+ profileIds.add(4);
+ profileIds.add(5);
+ mUserManager.setManagedProfiles(profileIds);
+
+ mController.displayPreference(mScreen);
+
+ // contains userId 4 and userId 5
+ verify(mCategory, times(2)).addPreference(any());
+ }
+
+ @Test
+ public void updateState_Personal_shouldShowOnlyPersonalApps() {
+ final List<RecentLocationApps.Request> requests = createMockRequest(6);
+ when(mController.mRecentLocationApps.getAppListSorted(false)).thenReturn(requests);
+ mController.setProfileType(ProfileSelectFragment.ProfileType.PERSONAL);
+ final Set<Integer> profileIds = new HashSet<>();
+ for (int i = 0; i < 4; i++) {
+ profileIds.add(i);
+ }
+ mUserManager.setManagedProfiles(profileIds);
+
+ mController.displayPreference(mScreen);
+
+ // contains userId 4 and userId 5
+ verify(mCategory, times(2)).addPreference(any());
+ }
+
+ private List<RecentLocationApps.Request> createMockRequest(int count) {
+ final List<RecentLocationApps.Request> requests = new ArrayList<>();
+ for (int i = 0; i < count; i++) {
+ final Drawable icon = mock(Drawable.class);
+ // Add mock accesses
+ final RecentLocationApps.Request request = new RecentLocationApps.Request(
+ "packageName", UserHandle.of(i), icon,
+ "appTitle" + i, false, "appSummary" + i, 1000 - i);
+ requests.add(request);
+ }
+ return requests;
+ }
+}
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import org.robolectric.shadow.api.Shadow;
import org.robolectric.annotation.Resetter;
+import org.robolectric.shadow.api.Shadow;
import java.util.ArrayList;
import java.util.Collections;
return mUserSwitchEnabled;
}
+ @Implementation
+ protected boolean isManagedProfile(int userId) {
+ return mManagedProfiles.contains(userId);
+ }
+
+ public void setManagedProfiles(Set<Integer> profileIds) {
+ mManagedProfiles.clear();
+ mManagedProfiles.addAll(profileIds);
+ }
+
public void setUserSwitcherEnabled(boolean userSwitchEnabled) {
mUserSwitchEnabled = userSwitchEnabled;
}
OSDN Git Service
