Revert "Use location access for recent location apps."
This reverts commit f383cb44b4b23c13cc0a25ea823dac786238ebc0.
Reason for revert: crashes on work profiles (http://b/180516388)
Change-Id: Iff499e6a1439b6ecb524a61a9a88fe253799a131
(cherry picked from commit 5da4f381a60d60d528b2c5c3a8baf43a71caf26e)
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 162dc38..fb03f4c 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -22,10 +22,16 @@
settings:keywords="@string/keywords_location">
<PreferenceCategory
- android:key="recent_location_access"
- android:title="@string/location_category_recent_location_access"
- settings:controller=
- "com.android.settings.location.RecentLocationAccessPreferenceController"/>
+ android:key="recent_location_requests"
+ android:title="@string/location_category_recent_location_requests"
+ settings:controller="com.android.settings.location.RecentLocationRequestPreferenceController"/>
+
+ <Preference
+ android:key="recent_location_requests_see_all_button"
+ android:title="@string/location_recent_location_requests_see_all"
+ android:icon="@drawable/ic_chevron_right_24dp"
+ android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
+ settings:searchable="false"/>
<PreferenceCategory
android:key="location_advanced_settings"
diff --git a/res/xml/location_settings_personal.xml b/res/xml/location_settings_personal.xml
index e2a2f15..de8ed81 100644
--- a/res/xml/location_settings_personal.xml
+++ b/res/xml/location_settings_personal.xml
@@ -25,8 +25,14 @@
<PreferenceCategory
android:key="recent_location_requests"
android:title="@string/location_category_recent_location_requests"
- settings:controller=
- "com.android.settings.location.RecentLocationAccessPreferenceController"/>
+ settings:controller="com.android.settings.location.RecentLocationRequestPreferenceController"/>
+
+ <Preference
+ android:key="recent_location_requests_see_all_button"
+ android:title="@string/location_recent_location_requests_see_all"
+ android:icon="@drawable/ic_chevron_right_24dp"
+ android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
+ settings:searchable="false"/>
<!-- This preference category gets removed if new_recent_location_ui is disabled -->
<Preference
diff --git a/res/xml/location_settings_workprofile.xml b/res/xml/location_settings_workprofile.xml
index f6f2d96..f15c8d8 100644
--- a/res/xml/location_settings_workprofile.xml
+++ b/res/xml/location_settings_workprofile.xml
@@ -25,8 +25,16 @@
<PreferenceCategory
android:key="recent_location_requests"
android:title="@string/location_category_recent_location_requests"
- settings:controller=
- "com.android.settings.location.RecentLocationAccessPreferenceController"/>
+ settings:controller="com.android.settings.location.RecentLocationRequestPreferenceController"/>
+
+ <Preference
+ android:key="recent_location_requests_see_all_button"
+ 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
android:key="managed_profile_location_switch"
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 0bc7fc7..b4f0f1f 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -82,7 +82,7 @@
super.onAttach(context);
use(AppLocationPermissionPreferenceController.class).init(this);
- use(RecentLocationAccessPreferenceController.class).init(this);
+ use(RecentLocationRequestPreferenceController.class).init(this);
use(LocationServicePreferenceController.class).init(this);
use(LocationFooterPreferenceController.class).init(this);
use(LocationForWorkPreferenceController.class).init(this);
diff --git a/src/com/android/settings/location/LocationWorkProfileSettings.java b/src/com/android/settings/location/LocationWorkProfileSettings.java
index c312714..2bf5f98 100644
--- a/src/com/android/settings/location/LocationWorkProfileSettings.java
+++ b/src/com/android/settings/location/LocationWorkProfileSettings.java
@@ -21,6 +21,7 @@
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
/**
* Location Setting page for managed profile.
@@ -53,9 +54,11 @@
use(LocationFooterPreferenceController.class).init(this);
use(LocationForWorkPreferenceController.class).init(this);
- final RecentLocationAccessPreferenceController controller =
- use(RecentLocationAccessPreferenceController.class);
+ final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
+ final RecentLocationRequestPreferenceController controller = use(
+ RecentLocationRequestPreferenceController.class);
controller.init(this);
+ controller.setProfileType(profileType);
}
@Override
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index 245118d..c835a51 100644
--- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -13,141 +13,114 @@
*/
package com.android.settings.location;
-import static android.Manifest.permission_group.LOCATION;
+import static java.util.concurrent.TimeUnit.DAYS;
+import android.Manifest;
import android.content.Context;
import android.content.Intent;
-import android.os.UserHandle;
-import android.os.UserManager;
+import android.icu.text.RelativeDateTimeFormatter;
+import android.provider.DeviceConfig;
+import android.view.View;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
+import com.android.settings.Utils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.location.RecentLocationAccesses;
-import com.android.settingslib.widget.AppPreference;
+import com.android.settingslib.utils.StringUtil;
+import com.android.settingslib.widget.AppEntitiesHeaderController;
+import com.android.settingslib.widget.AppEntityInfo;
+import com.android.settingslib.widget.LayoutPreference;
-import java.util.ArrayList;
import java.util.List;
-/**
- * Preference controller that handles the display of apps that access locations.
- */
-public class RecentLocationAccessPreferenceController extends LocationBasePreferenceController {
- @VisibleForTesting
- RecentLocationAccesses mRecentLocationApps;
- private PreferenceCategory mCategoryRecentLocationRequests;
- private int mType = ProfileSelectFragment.ProfileType.ALL;
+public class RecentLocationAccessPreferenceController extends AbstractPreferenceController
+ implements PreferenceControllerMixin {
+ /** Key for the recent location apps dashboard */
+ private static final String KEY_APPS_DASHBOARD = "apps_dashboard";
+ private final RecentLocationAccesses mRecentLocationAccesses;
+ private AppEntitiesHeaderController mController;
+ private static final int MAXIMUM_APP_COUNT = 3;
- private static class PackageEntryClickedListener implements
- Preference.OnPreferenceClickListener {
- private final Context mContext;
- private final String mPackage;
- private final UserHandle mUserHandle;
-
- PackageEntryClickedListener(Context context, String packageName,
- UserHandle userHandle) {
- mContext = context;
- mPackage = packageName;
- mUserHandle = userHandle;
- }
-
- @Override
- public boolean onPreferenceClick(Preference preference) {
- final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSION);
- intent.putExtra(Intent.EXTRA_PERMISSION_GROUP_NAME, LOCATION);
- intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mPackage);
- intent.putExtra(Intent.EXTRA_USER, mUserHandle);
- mContext.startActivity(intent);
- return true;
- }
- }
-
- public RecentLocationAccessPreferenceController(Context context, String key) {
- this(context, key, new RecentLocationAccesses(context));
+ public RecentLocationAccessPreferenceController(Context context) {
+ this(context, new RecentLocationAccesses(context));
}
@VisibleForTesting
- public RecentLocationAccessPreferenceController(Context context, String key,
- RecentLocationAccesses recentLocationApps) {
- super(context, key);
- mRecentLocationApps = recentLocationApps;
+ RecentLocationAccessPreferenceController(Context context,
+ RecentLocationAccesses recentAccesses) {
+ super(context);
+ mRecentLocationAccesses = recentAccesses;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_APPS_DASHBOARD;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return Boolean.parseBoolean(
+ DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED));
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- mCategoryRecentLocationRequests = screen.findPreference(getPreferenceKey());
- final Context prefContext = mCategoryRecentLocationRequests.getContext();
- final List<RecentLocationAccesses.Access> recentLocationAccesses = new ArrayList<>();
- final UserManager userManager = UserManager.get(mContext);
- for (RecentLocationAccesses.Access access : mRecentLocationApps.getAppListSorted()) {
- if (isRequestMatchesProfileType(userManager, access, mType)) {
- recentLocationAccesses.add(access);
- }
- }
-
- if (recentLocationAccesses.size() > 0) {
- // Add preferences to container in original order (already sorted by recency).
- for (RecentLocationAccesses.Access access : recentLocationAccesses) {
- mCategoryRecentLocationRequests.addPreference(
- createAppPreference(prefContext, access, mFragment));
- }
- } else {
- // If there's no item to display, add a "No recent apps" item.
- final Preference banner = new AppPreference(prefContext);
- banner.setTitle(R.string.location_no_recent_accesses);
- banner.setSelectable(false);
- mCategoryRecentLocationRequests.addPreference(banner);
- }
+ final LayoutPreference preference = screen.findPreference(KEY_APPS_DASHBOARD);
+ final View view = preference.findViewById(R.id.app_entities_header);
+ mController = AppEntitiesHeaderController.newInstance(mContext, view)
+ .setHeaderTitleRes(R.string.location_category_recent_location_access)
+ .setHeaderDetailsRes(R.string.location_recent_location_access_view_details)
+ .setHeaderEmptyRes(R.string.location_no_recent_accesses)
+ .setHeaderDetailsClickListener((View v) -> {
+ final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE);
+ intent.putExtra(Intent.EXTRA_PERMISSION_NAME,
+ Manifest.permission.ACCESS_FINE_LOCATION);
+ intent.putExtra(Intent.EXTRA_DURATION_MILLIS, DAYS.toMillis(1));
+ mContext.startActivity(intent);
+ });
}
@Override
- public void onLocationModeChanged(int mode, boolean restricted) {
- mCategoryRecentLocationRequests.setEnabled(mLocationEnabler.isEnabled(mode));
+ public void updateState(Preference preference) {
+ updateRecentApps();
}
- /**
- * Initialize {@link ProfileSelectFragment.ProfileType} of the controller
- *
- * @param type {@link ProfileSelectFragment.ProfileType} of the controller.
- */
- public void setProfileType(@ProfileSelectFragment.ProfileType int type) {
- mType = type;
- }
-
- /**
- * Create a {@link AppPreference}
- */
- public static AppPreference createAppPreference(Context prefContext,
- RecentLocationAccesses.Access access, DashboardFragment fragment) {
- final AppPreference pref = new AppPreference(prefContext);
- pref.setIcon(access.icon);
- pref.setTitle(access.label);
- pref.setOnPreferenceClickListener(new PackageEntryClickedListener(
- fragment.getContext(), access.packageName, access.userHandle));
- return pref;
- }
-
- /**
- * Return if the {@link RecentLocationAccesses.Access} matches current UI
- * {@ProfileSelectFragment.ProfileType}
- */
- public static boolean isRequestMatchesProfileType(UserManager userManager,
- RecentLocationAccesses.Access access, @ProfileSelectFragment.ProfileType int type) {
-
- final boolean isWorkProfile = userManager.isManagedProfile(
- access.userHandle.getIdentifier());
- if (isWorkProfile && (type & ProfileSelectFragment.ProfileType.WORK) != 0) {
- return true;
+ private void updateRecentApps() {
+ final List<RecentLocationAccesses.Access> recentLocationAccesses =
+ mRecentLocationAccesses.getAppListSorted();
+ if (recentLocationAccesses.size() > 0) {
+ // Display the top 3 preferences to container in original order.
+ int i = 0;
+ for (; i < Math.min(recentLocationAccesses.size(), MAXIMUM_APP_COUNT); i++) {
+ final RecentLocationAccesses.Access access = recentLocationAccesses.get(i);
+ final AppEntityInfo appEntityInfo = new AppEntityInfo.Builder()
+ .setIcon(access.icon)
+ .setTitle(access.label)
+ .setSummary(StringUtil.formatRelativeTime(mContext,
+ System.currentTimeMillis() - access.accessFinishTime, false,
+ RelativeDateTimeFormatter.Style.SHORT))
+ .setOnClickListener((v) -> {
+ final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSION);
+ intent.putExtra(Intent.EXTRA_PERMISSION_NAME,
+ Manifest.permission.ACCESS_FINE_LOCATION);
+ intent.putExtra(Intent.EXTRA_PACKAGE_NAME, access.packageName);
+ intent.putExtra(Intent.EXTRA_USER, access.userHandle);
+ mContext.startActivity(intent);
+ })
+ .build();
+ mController.setAppEntity(i, appEntityInfo);
+ }
+ for (; i < MAXIMUM_APP_COUNT; i++) {
+ mController.removeAppEntity(i);
+ }
}
- if (!isWorkProfile && (type & ProfileSelectFragment.ProfileType.PERSONAL) != 0) {
- return true;
- }
- return false;
+ mController.apply();
}
}
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
index 5feee60..71a80de 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
@@ -24,17 +24,19 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
+import android.provider.DeviceConfig;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.ImageView;
import android.widget.TextView;
-import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.Utils;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
import com.android.settingslib.location.RecentLocationAccesses;
+import com.android.settingslib.widget.LayoutPreference;
import org.junit.After;
import org.junit.Before;
@@ -53,14 +55,11 @@
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowDeviceConfig.class})
public class RecentLocationAccessPreferenceControllerTest {
- private static final String PREFERENCE_KEY = "test_preference_key";
@Mock
- private PreferenceCategory mLayoutPreference;
+ private LayoutPreference mLayoutPreference;
@Mock
private PreferenceScreen mScreen;
@Mock
- private DashboardFragment mDashboardFragment;
- @Mock
private RecentLocationAccesses mRecentLocationApps;
private Context mContext;
@@ -72,16 +71,15 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mController = spy(
- new RecentLocationAccessPreferenceController(mContext, PREFERENCE_KEY,
- mRecentLocationApps));
- mController.init(mDashboardFragment);
+ new RecentLocationAccessPreferenceController(mContext, mRecentLocationApps));
final String key = mController.getPreferenceKey();
mAppEntitiesHeaderView = LayoutInflater.from(mContext).inflate(
R.layout.app_entities_header, null /* root */);
when(mScreen.findPreference(key)).thenReturn(mLayoutPreference);
when(mLayoutPreference.getKey()).thenReturn(key);
when(mLayoutPreference.getContext()).thenReturn(mContext);
- when(mDashboardFragment.getContext()).thenReturn(mContext);
+ when(mLayoutPreference.findViewById(R.id.app_entities_header)).thenReturn(
+ mAppEntitiesHeaderView);
}
@After
@@ -90,7 +88,16 @@
}
@Test
- public void isAvailable_shouldReturnTrue() {
+ public void isAvailable_permissionHubNotSet_shouldReturnFalse() {
+ // We have not yet set the property to show the Permissions Hub.
+ assertThat(mController.isAvailable()).isEqualTo(false);
+ }
+
+ @Test
+ public void isAvailable_permissionHubEnabled_shouldReturnTrue() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true);
+
assertThat(mController.isAvailable()).isEqualTo(true);
}
@@ -111,6 +118,39 @@
assertThat(details.hasOnClickListeners()).isTrue();
}
+ @Test
+ public void updateState_whenAppListMoreThanThree_shouldDisplayTopThreeApps() {
+ final List<RecentLocationAccesses.Access> accesses = createMockAccesses(6);
+ doReturn(accesses).when(mRecentLocationApps).getAppListSorted();
+ mController.displayPreference(mScreen);
+ mController.updateState(mLayoutPreference);
+
+ // The widget can display the top 3 apps from the list when there're more than 3.
+ final View app1View = mAppEntitiesHeaderView.findViewById(R.id.app1_view);
+ final ImageView appIconView1 = app1View.findViewById(R.id.app_icon);
+ final TextView appTitle1 = app1View.findViewById(R.id.app_title);
+
+ assertThat(app1View.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(appIconView1.getDrawable()).isNotNull();
+ assertThat(appTitle1.getText()).isEqualTo("appTitle0");
+
+ final View app2View = mAppEntitiesHeaderView.findViewById(R.id.app2_view);
+ final ImageView appIconView2 = app2View.findViewById(R.id.app_icon);
+ final TextView appTitle2 = app2View.findViewById(R.id.app_title);
+
+ assertThat(app2View.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(appIconView2.getDrawable()).isNotNull();
+ assertThat(appTitle2.getText()).isEqualTo("appTitle1");
+
+ final View app3View = mAppEntitiesHeaderView.findViewById(R.id.app3_view);
+ final ImageView appIconView3 = app3View.findViewById(R.id.app_icon);
+ final TextView appTitle3 = app3View.findViewById(R.id.app_title);
+
+ assertThat(app3View.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(appIconView3.getDrawable()).isNotNull();
+ assertThat(appTitle3.getText()).isEqualTo("appTitle2");
+ }
+
private List<RecentLocationAccesses.Access> createMockAccesses(int count) {
final List<RecentLocationAccesses.Access> accesses = new ArrayList<>();
for (int i = 0; i < count; i++) {
