From f3c4f68abf36bf46ed88bad95135508f9c6bf149 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 30 Sep 2022 18:38:09 +0100 Subject: [PATCH] Track method renames Track method renames: getSuggestManualTimeZoneCapability() -> getSetManualTimeZoneCapability() getSuggestManualTimeCapability() -> getSetManualTimeCapability() Assuming that TimeManager.setManualTime() and TimeManager.setManualTimeZone() become system APIs in the next release, they can be used in SettingsUI in place of TimeDetector.suggestManualTime() and TimeZoneDetector.suggestManualTimeZone() (in a later commit). Bug: 236612872 Test: build only Change-Id: Ifffc022c109fa68ae705e32400db9bfc8a1632ca --- src/com/android/settings/datetime/DatePreferenceController.java | 2 +- .../android/settings/datetime/TimeZonePreferenceController.java | 2 +- .../settings/datetime/AutoTimePreferenceControllerTest.java | 2 +- .../settings/datetime/AutoTimeZonePreferenceControllerTest.java | 2 +- .../android/settings/datetime/DatePreferenceControllerTest.java | 2 +- .../LocationTimeZoneDetectionPreferenceControllerTest.java | 2 +- .../settings/datetime/TimeZonePreferenceControllerTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java index 50feca16196..eef5526e93b 100644 --- a/src/com/android/settings/datetime/DatePreferenceController.java +++ b/src/com/android/settings/datetime/DatePreferenceController.java @@ -154,7 +154,7 @@ public class DatePreferenceController extends AbstractPreferenceController public boolean isEnabled() { TimeCapabilities timeZoneCapabilities = mTimeManager.getTimeCapabilitiesAndConfig().getCapabilities(); - int suggestManualTimeCapability = timeZoneCapabilities.getSuggestManualTimeCapability(); + int suggestManualTimeCapability = timeZoneCapabilities.getSetManualTimeCapability(); return suggestManualTimeCapability == CAPABILITY_POSSESSED; } } diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java index a26c7bf2b36..cb9c38a4557 100644 --- a/src/com/android/settings/datetime/TimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java @@ -77,7 +77,7 @@ public class TimeZonePreferenceController extends AbstractPreferenceController TimeZoneCapabilities timeZoneCapabilities = mTimeManager.getTimeZoneCapabilitiesAndConfig().getCapabilities(); int suggestManualTimeZoneCapability = - timeZoneCapabilities.getSuggestManualTimeZoneCapability(); + timeZoneCapabilities.getSetManualTimeZoneCapability(); return suggestManualTimeZoneCapability == CAPABILITY_POSSESSED; } } diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java index 20fb87173d0..022f5fe169e 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java @@ -158,7 +158,7 @@ public class AutoTimePreferenceControllerTest { : Capabilities.CAPABILITY_NOT_SUPPORTED; TimeCapabilities capabilities = new TimeCapabilities.Builder(UserHandle.SYSTEM) .setConfigureAutoDetectionEnabledCapability(configureAutoDetectionEnabledCapability) - .setSuggestManualTimeCapability(Capabilities.CAPABILITY_POSSESSED) + .setSetManualTimeCapability(Capabilities.CAPABILITY_POSSESSED) .build(); TimeConfiguration config = new TimeConfiguration.Builder() .setAutoDetectionEnabled(autoEnabled) diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index 45963a6c47b..e6a44a8ba73 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -221,7 +221,7 @@ public class AutoTimeZonePreferenceControllerTest { TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(UserHandle.SYSTEM) .setConfigureAutoDetectionEnabledCapability(configureAutoDetectionEnabledCapability) .setConfigureGeoDetectionEnabledCapability(Capabilities.CAPABILITY_NOT_SUPPORTED) - .setSuggestManualTimeZoneCapability(Capabilities.CAPABILITY_POSSESSED) + .setSetManualTimeZoneCapability(Capabilities.CAPABILITY_POSSESSED) .build(); TimeZoneConfiguration config = new TimeZoneConfiguration.Builder() .setAutoDetectionEnabled(autoEnabled) diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java index c7357ad5a59..76ab28938d5 100644 --- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java @@ -147,7 +147,7 @@ public class DatePreferenceControllerTest { : Capabilities.CAPABILITY_NOT_SUPPORTED; TimeCapabilities capabilities = new TimeCapabilities.Builder(UserHandle.SYSTEM) .setConfigureAutoDetectionEnabledCapability(Capabilities.CAPABILITY_POSSESSED) - .setSuggestManualTimeCapability(suggestManualCapability) + .setSetManualTimeCapability(suggestManualCapability) .build(); TimeConfiguration config = new TimeConfiguration.Builder() .setAutoDetectionEnabled(!suggestManualAllowed) diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java index fc62ac8895b..32d27a9f1d0 100644 --- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java @@ -176,7 +176,7 @@ public class LocationTimeZoneDetectionPreferenceControllerTest { return new TimeZoneCapabilities.Builder(arbitraryUserHandle) .setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED) .setConfigureGeoDetectionEnabledCapability(geoDetectionCapability) - .setSuggestManualTimeZoneCapability(CAPABILITY_NOT_APPLICABLE) + .setSetManualTimeZoneCapability(CAPABILITY_NOT_APPLICABLE) .build(); } diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java index 6767b4e2f72..d07d68b1b1a 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java @@ -102,7 +102,7 @@ public class TimeZonePreferenceControllerTest { TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(UserHandle.SYSTEM) .setConfigureAutoDetectionEnabledCapability(Capabilities.CAPABILITY_POSSESSED) .setConfigureGeoDetectionEnabledCapability(Capabilities.CAPABILITY_NOT_SUPPORTED) - .setSuggestManualTimeZoneCapability(suggestManualCapability) + .setSetManualTimeZoneCapability(suggestManualCapability) .build(); TimeZoneConfiguration config = new TimeZoneConfiguration.Builder() .setAutoDetectionEnabled(!suggestManualAllowed)