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

Merge "Enable new time zone picker" into pi-dev

Browse Source
This commit is contained in:
Victor Chang
2018-03-07 17:09:59 +00:00
committed by Android (Google) Code Review
parent 999e4f4405 7cf7fe4f9e
commit 3c5aeac39f
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,11 +19,11 @@ package com.android.settings.datetime;
import android.content.Context;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.util.FeatureFlagUtils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.datetime.timezone.ZonePicker;
import com.android.settings.datetime.timezone.TimeZoneSettings;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.datetime.ZoneGetter;
@@ -51,7 +51,7 @@ public class TimeZonePreferenceController extends AbstractPreferenceController
return;
}
if (mZonePickerV2) {
preference.setFragment(ZonePicker.class.getName());
preference.setFragment(TimeZoneSettings.class.getName());
}
preference.setSummary(getTimeZoneOffsetAndName());
if( !((RestrictedPreference) preference).isDisabledByAdmin()) {