Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flickers on the Location page" into tm-dev am: a8eabc6ada

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17447104

Change-Id: Ia63428939b5f9329d3f59965391ce33d5888ec6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-03-30 09:34:22 +00:00
committed by Automerger Merge Worker
parent 187b39edc2 a8eabc6ada
commit c9ea940a37
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/location/RecentLocationAccessPreferenceController.java
View File

@@ -131,12 +131,16 @@ public class RecentLocationAccessPreferenceController extends LocationBasePrefer
banner.setSelectable(false); banner.setSelectable(false);
mCategoryRecentLocationRequests.addPreference(banner); mCategoryRecentLocationRequests.addPreference(banner);
} }
if (mUiBlockListener != null) {
mUiBlockListener.onBlockerWorkFinished(this);
}
} }
@Override @Override
public void onLocationModeChanged(int mode, boolean restricted) { public void onLocationModeChanged(int mode, boolean restricted) {
boolean enabled = mLocationEnabler.isEnabled(mode); boolean enabled = mLocationEnabler.isEnabled(mode);
mCategoryRecentLocationRequests.setVisible(enabled); updatePreferenceVisibilityDelegate(mCategoryRecentLocationRequests, enabled);
} }
/** /**

6
src/com/android/settings/location/RecentLocationAccessSeeAllButtonPreferenceController.java
View File

@@ -20,11 +20,13 @@ import android.content.Context;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
/** /**
* Preference controller that handles the "See All" button for recent location access. * Preference controller that handles the "See All" button for recent location access.
*/ */
public class RecentLocationAccessSeeAllButtonPreferenceController extends public class RecentLocationAccessSeeAllButtonPreferenceController extends
LocationBasePreferenceController { LocationBasePreferenceController implements BasePreferenceController.UiBlocker {
private Preference mPreference; private Preference mPreference;
@@ -44,6 +46,6 @@ public class RecentLocationAccessSeeAllButtonPreferenceController extends
@Override @Override
public void onLocationModeChanged(int mode, boolean restricted) { public void onLocationModeChanged(int mode, boolean restricted) {
boolean enabled = mLocationEnabler.isEnabled(mode); boolean enabled = mLocationEnabler.isEnabled(mode);
mPreference.setVisible(enabled); updatePreferenceVisibilityDelegate(mPreference, enabled);
} }
} }