Merge "Fix sub status of LocationSettings" into tm-dev (edf39d0e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/location/RecentLocationAccessPreferenceController.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import androidx.preference.PreferenceCategory;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
		import com.android.settingslib.applications.RecentAppOpsAccess;
		@@ -41,8 +40,7 @@ import java.util.List;
		/**
		* Preference controller that handles the display of apps that access locations.
		*/
		public class RecentLocationAccessPreferenceController extends LocationBasePreferenceController
		implements BasePreferenceController.UiBlocker {
		public class RecentLocationAccessPreferenceController extends LocationBasePreferenceController {
		public static final int MAX_APPS = 3;
		@VisibleForTesting
		RecentAppOpsAccess mRecentLocationApps;
		@@ -131,16 +129,12 @@ public class RecentLocationAccessPreferenceController extends LocationBasePrefer
		banner.setSelectable(false);
		mCategoryRecentLocationRequests.addPreference(banner);
		}

		if (mUiBlockListener != null) {
		mUiBlockListener.onBlockerWorkFinished(this);
		}
		}

		@Override
		public void onLocationModeChanged(int mode, boolean restricted) {
		boolean enabled = mLocationEnabler.isEnabled(mode);
		updatePreferenceVisibilityDelegate(mCategoryRecentLocationRequests, enabled);
		mCategoryRecentLocationRequests.setVisible(enabled);
		}

		/**

+2 −4

Original line number	Diff line number	Diff line
		@@ -20,13 +20,11 @@ import android.content.Context;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.core.BasePreferenceController;

		/**
		* Preference controller that handles the "See All" button for recent location access.
		*/
		public class RecentLocationAccessSeeAllButtonPreferenceController extends
		LocationBasePreferenceController implements BasePreferenceController.UiBlocker {
		LocationBasePreferenceController {

		private Preference mPreference;

		@@ -46,6 +44,6 @@ public class RecentLocationAccessSeeAllButtonPreferenceController extends
		@Override
		public void onLocationModeChanged(int mode, boolean restricted) {
		boolean enabled = mLocationEnabler.isEnabled(mode);
		updatePreferenceVisibilityDelegate(mPreference, enabled);
		mPreference.setVisible(enabled);
		}
		}