PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix time zone settings restriction logic" into main

Browse Source
This commit is contained in:
Edgar Wang
2024-01-11 13:06:35 +00:00
committed by Android (Google) Code Review
parent 52ebf58566 d0fcba932c
commit 13afe11227
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/datetime/TimeZonePreferenceController.java
View File

@@ -26,6 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.datetime.ZoneGetter;
import java.util.Calendar;
@@ -52,6 +53,12 @@ public class TimeZonePreferenceController extends BasePreferenceController {
@Override
public void updateState(Preference preference) {
super.updateState(preference);
if (preference instanceof RestrictedPreference
&& ((RestrictedPreference) preference).isDisabledByAdmin()) {
return;
}
preference.setEnabled(shouldEnableManualTimeZoneSelection());
}