Merge "Fix flickers on the Location page" into tm-dev (a8eabc6a) · Commits · e / os / android_packages_apps_Settings

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -131,12 +131,16 @@ 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);
		mCategoryRecentLocationRequests.setVisible(enabled);
		updatePreferenceVisibilityDelegate(mCategoryRecentLocationRequests, enabled);
		}

		/**

+4 −2

Original line number	Diff line number	Diff line
		@@ -20,11 +20,13 @@ 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 {
		LocationBasePreferenceController implements BasePreferenceController.UiBlocker {

		private Preference mPreference;

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