Fix the logic used that determines whether the automatic time
zone detection toggle is available in the Settings UI Date & Time
screen. Also, ensure that the TimeZonePreferenceController uses correct
logic for whether the user can manually enter a time zone.
This change migrates the controllers to use a existing high-level
TimeManager API rather than (incorrectly) duplicating in Settings UI the
logic for whether time zone detection is supported / enabled.
Without this change, WiFi-only devices _with_ location-based time zone
detection enabled would incorrectly hide the "auto time zone" toggle,
which would have the knock-on of making it look like the user is allowed
to enter a time zone manually when they aren't (because it is
enabled/disabled based on the presence of the toggle).
That toggle still needs to be present while there is a possible time
zone detection mechanism. All the (quite complex) logic around this is
already considered by the TimeManager API.
Possible side effects:
This change decouples the "does the toggle show true or false?"
(isEnabled()) from the "should the toggle be shown at all?"
(isAvailable()) logic by removing a call to isAvailable() inside of
isEnabled(). This is to avoid making multiple (probably more expensive
than what it was doing before) calls to the time_zone_detector service,
and avoid the extra complexity of caching / cache invalidation that
would be needed to mitigate it. Previously, as a result of the call to
isAvailable(), isEnabled() would always return false when mIsFromSUW is
true, but now it will return the underlying value of the device's
auto_time_zone setting. This means that if the UI is changed in future
to render a visible-but-can't-be-changed-by-the-user toggle for auto
time zone, it will display the current setting value, which is perfectly
reasonable. It is assumed it will have no other side effects.
The AutoTimeZonePreferenceControllerTest.isFromSUW_notEnable test has
been changed to reflect the change in behavior. Various name changes
made to tests to reflect the new behavior.
Bug: 228247623
Bug: 186625820
Bug: 172891783
Test: treehugger
Test: Manual test on a device with telephony
Test: m ROBOTEST_FILTER=AutoTimeZonePreferenceControllerTest RunSettingsRoboTests -j40
Test: m ROBOTEST_FILTER=TimeZonePreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: I4c7608e8645eee5994c8ecf85a14a27d3278ac04
(cherry picked from commit 7a8ac683d4)
141 lines
5.1 KiB
Java
141 lines
5.1 KiB
Java
/*
|
|
* Copyright (C) 2019 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License
|
|
*/
|
|
|
|
package com.android.settings.datetime;
|
|
|
|
import android.app.Activity;
|
|
import android.app.Dialog;
|
|
import android.app.settings.SettingsEnums;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.dashboard.DashboardFragment;
|
|
import com.android.settings.search.BaseSearchIndexProvider;
|
|
import com.android.settingslib.core.AbstractPreferenceController;
|
|
import com.android.settingslib.search.SearchIndexable;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
@SearchIndexable
|
|
public class DateTimeSettings extends DashboardFragment implements
|
|
TimePreferenceController.TimePreferenceHost, DatePreferenceController.DatePreferenceHost {
|
|
|
|
private static final String TAG = "DateTimeSettings";
|
|
|
|
// have we been launched from the setup wizard?
|
|
protected static final String EXTRA_IS_FROM_SUW = "firstRun";
|
|
|
|
@Override
|
|
public int getMetricsCategory() {
|
|
return SettingsEnums.DATE_TIME;
|
|
}
|
|
|
|
@Override
|
|
protected String getLogTag() {
|
|
return TAG;
|
|
}
|
|
|
|
@Override
|
|
protected int getPreferenceScreenResId() {
|
|
return R.xml.date_time_prefs;
|
|
}
|
|
|
|
@Override
|
|
public void onAttach(Context context) {
|
|
super.onAttach(context);
|
|
getSettingsLifecycle().addObserver(new TimeChangeListenerMixin(context, this));
|
|
use(LocationTimeZoneDetectionPreferenceController.class).setFragment(this);
|
|
}
|
|
|
|
@Override
|
|
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
|
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
|
final Activity activity = getActivity();
|
|
final Intent intent = activity.getIntent();
|
|
final boolean isFromSUW = intent.getBooleanExtra(EXTRA_IS_FROM_SUW, false);
|
|
|
|
final AutoTimeZonePreferenceController autoTimeZonePreferenceController =
|
|
new AutoTimeZonePreferenceController(
|
|
activity, this /* UpdateTimeAndDateCallback */, isFromSUW);
|
|
final AutoTimePreferenceController autoTimePreferenceController =
|
|
new AutoTimePreferenceController(
|
|
activity, this /* UpdateTimeAndDateCallback */);
|
|
final AutoTimeFormatPreferenceController autoTimeFormatPreferenceController =
|
|
new AutoTimeFormatPreferenceController(
|
|
activity, this /* UpdateTimeAndDateCallback */);
|
|
|
|
controllers.add(autoTimeZonePreferenceController);
|
|
controllers.add(autoTimePreferenceController);
|
|
controllers.add(autoTimeFormatPreferenceController);
|
|
|
|
controllers.add(new TimeFormatPreferenceController(
|
|
activity, this /* UpdateTimeAndDateCallback */, isFromSUW));
|
|
controllers.add(new TimeZonePreferenceController(activity));
|
|
controllers.add(new TimePreferenceController(
|
|
activity, this /* UpdateTimeAndDateCallback */, autoTimePreferenceController));
|
|
controllers.add(new DatePreferenceController(
|
|
activity, this /* UpdateTimeAndDateCallback */, autoTimePreferenceController));
|
|
return controllers;
|
|
}
|
|
|
|
@Override
|
|
public void updateTimeAndDateDisplay(Context context) {
|
|
updatePreferenceStates();
|
|
}
|
|
|
|
@Override
|
|
public Dialog onCreateDialog(int id) {
|
|
switch (id) {
|
|
case DatePreferenceController.DIALOG_DATEPICKER:
|
|
return use(DatePreferenceController.class)
|
|
.buildDatePicker(getActivity());
|
|
case TimePreferenceController.DIALOG_TIMEPICKER:
|
|
return use(TimePreferenceController.class)
|
|
.buildTimePicker(getActivity());
|
|
default:
|
|
throw new IllegalArgumentException();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public int getDialogMetricsCategory(int dialogId) {
|
|
switch (dialogId) {
|
|
case DatePreferenceController.DIALOG_DATEPICKER:
|
|
return SettingsEnums.DIALOG_DATE_PICKER;
|
|
case TimePreferenceController.DIALOG_TIMEPICKER:
|
|
return SettingsEnums.DIALOG_TIME_PICKER;
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void showTimePicker() {
|
|
removeDialog(TimePreferenceController.DIALOG_TIMEPICKER);
|
|
showDialog(TimePreferenceController.DIALOG_TIMEPICKER);
|
|
}
|
|
|
|
@Override
|
|
public void showDatePicker() {
|
|
showDialog(DatePreferenceController.DIALOG_DATEPICKER);
|
|
}
|
|
|
|
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
|
new BaseSearchIndexProvider(R.xml.date_time_prefs);
|
|
}
|