diff options
| author | Victor Chang <vichang@google.com> | 2018-02-28 19:43:03 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2018-03-07 13:37:00 +0000 |
| commit | 7cf7fe4f9e4b11194a6fa82f85a452815749a543 (patch) | |
| tree | 16a9b9a65c8373498ed7ad958f28149f61ddfd26 /src/com/android/settings/datetime | |
| parent | 368b5a6b2cad48b550a23fa322efd7673f4c425b (diff) | |
| download | packages_apps_Settings-7cf7fe4f9e4b11194a6fa82f85a452815749a543.tar.gz packages_apps_Settings-7cf7fe4f9e4b11194a6fa82f85a452815749a543.tar.bz2 packages_apps_Settings-7cf7fe4f9e4b11194a6fa82f85a452815749a543.zip | |
Enable new time zone picker
- Change the UI test due to UI changes
Bug: 73952488
Test: m RunSettingsRoboTest
Test: atest SettingsUITests:ZonePickerSettingsTest
Change-Id: I6d5716347e9debf429b757f1edd4118e86b70fab
(cherry picked from commit 335c0621d2521d3801c13dafdbfc2e632d171104)
Diffstat (limited to 'src/com/android/settings/datetime')
| -rw-r--r-- | src/com/android/settings/datetime/TimeZonePreferenceController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java index e29e24550b..aff204d76f 100644 --- a/src/com/android/settings/datetime/TimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java @@ -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()) { |