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

Merge "Track method renames"

Browse Source
This commit is contained in:
Neil Fuller
2022-10-05 15:45:42 +00:00
committed by Android (Google) Code Review
parent 8e74ee57d1 f3c4f68abf
commit 15910795f2
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/datetime/DatePreferenceController.java
View File

@@ -154,7 +154,7 @@ public class DatePreferenceController extends AbstractPreferenceController
public boolean isEnabled() { public boolean isEnabled() {
TimeCapabilities timeZoneCapabilities = TimeCapabilities timeZoneCapabilities =
mTimeManager.getTimeCapabilitiesAndConfig().getCapabilities(); mTimeManager.getTimeCapabilitiesAndConfig().getCapabilities();
int suggestManualTimeCapability = timeZoneCapabilities.getSuggestManualTimeCapability(); int suggestManualTimeCapability = timeZoneCapabilities.getSetManualTimeCapability();
return suggestManualTimeCapability == CAPABILITY_POSSESSED; return suggestManualTimeCapability == CAPABILITY_POSSESSED;
} }
} }

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

@@ -77,7 +77,7 @@ public class TimeZonePreferenceController extends AbstractPreferenceController
TimeZoneCapabilities timeZoneCapabilities = TimeZoneCapabilities timeZoneCapabilities =
mTimeManager.getTimeZoneCapabilitiesAndConfig().getCapabilities(); mTimeManager.getTimeZoneCapabilitiesAndConfig().getCapabilities();
int suggestManualTimeZoneCapability = int suggestManualTimeZoneCapability =
timeZoneCapabilities.getSuggestManualTimeZoneCapability(); timeZoneCapabilities.getSetManualTimeZoneCapability();
return suggestManualTimeZoneCapability == CAPABILITY_POSSESSED; return suggestManualTimeZoneCapability == CAPABILITY_POSSESSED;
} }
} }

2
tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
View File

@@ -158,7 +158,7 @@ public class AutoTimePreferenceControllerTest {
: Capabilities.CAPABILITY_NOT_SUPPORTED; : Capabilities.CAPABILITY_NOT_SUPPORTED;
TimeCapabilities capabilities = new TimeCapabilities.Builder(UserHandle.SYSTEM) TimeCapabilities capabilities = new TimeCapabilities.Builder(UserHandle.SYSTEM)
.setConfigureAutoDetectionEnabledCapability(configureAutoDetectionEnabledCapability) .setConfigureAutoDetectionEnabledCapability(configureAutoDetectionEnabledCapability)
.setSuggestManualTimeCapability(Capabilities.CAPABILITY_POSSESSED) .setSetManualTimeCapability(Capabilities.CAPABILITY_POSSESSED)
.build(); .build();
TimeConfiguration config = new TimeConfiguration.Builder() TimeConfiguration config = new TimeConfiguration.Builder()
.setAutoDetectionEnabled(autoEnabled) .setAutoDetectionEnabled(autoEnabled)

2
tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
View File

@@ -221,7 +221,7 @@ public class AutoTimeZonePreferenceControllerTest {
TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(UserHandle.SYSTEM) TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(UserHandle.SYSTEM)
.setConfigureAutoDetectionEnabledCapability(configureAutoDetectionEnabledCapability) .setConfigureAutoDetectionEnabledCapability(configureAutoDetectionEnabledCapability)
.setConfigureGeoDetectionEnabledCapability(Capabilities.CAPABILITY_NOT_SUPPORTED) .setConfigureGeoDetectionEnabledCapability(Capabilities.CAPABILITY_NOT_SUPPORTED)
.setSuggestManualTimeZoneCapability(Capabilities.CAPABILITY_POSSESSED) .setSetManualTimeZoneCapability(Capabilities.CAPABILITY_POSSESSED)
.build(); .build();
TimeZoneConfiguration config = new TimeZoneConfiguration.Builder() TimeZoneConfiguration config = new TimeZoneConfiguration.Builder()
.setAutoDetectionEnabled(autoEnabled) .setAutoDetectionEnabled(autoEnabled)

2
tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
View File

@@ -147,7 +147,7 @@ public class DatePreferenceControllerTest {
: Capabilities.CAPABILITY_NOT_SUPPORTED; : Capabilities.CAPABILITY_NOT_SUPPORTED;
TimeCapabilities capabilities = new TimeCapabilities.Builder(UserHandle.SYSTEM) TimeCapabilities capabilities = new TimeCapabilities.Builder(UserHandle.SYSTEM)
.setConfigureAutoDetectionEnabledCapability(Capabilities.CAPABILITY_POSSESSED) .setConfigureAutoDetectionEnabledCapability(Capabilities.CAPABILITY_POSSESSED)
.setSuggestManualTimeCapability(suggestManualCapability) .setSetManualTimeCapability(suggestManualCapability)
.build(); .build();
TimeConfiguration config = new TimeConfiguration.Builder() TimeConfiguration config = new TimeConfiguration.Builder()
.setAutoDetectionEnabled(!suggestManualAllowed) .setAutoDetectionEnabled(!suggestManualAllowed)

2
tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
View File

@@ -176,7 +176,7 @@ public class LocationTimeZoneDetectionPreferenceControllerTest {
return new TimeZoneCapabilities.Builder(arbitraryUserHandle) return new TimeZoneCapabilities.Builder(arbitraryUserHandle)
.setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED) .setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED)
.setConfigureGeoDetectionEnabledCapability(geoDetectionCapability) .setConfigureGeoDetectionEnabledCapability(geoDetectionCapability)
.setSuggestManualTimeZoneCapability(CAPABILITY_NOT_APPLICABLE) .setSetManualTimeZoneCapability(CAPABILITY_NOT_APPLICABLE)
.build(); .build();
} }

2
tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
View File

@@ -102,7 +102,7 @@ public class TimeZonePreferenceControllerTest {
TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(UserHandle.SYSTEM) TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(UserHandle.SYSTEM)
.setConfigureAutoDetectionEnabledCapability(Capabilities.CAPABILITY_POSSESSED) .setConfigureAutoDetectionEnabledCapability(Capabilities.CAPABILITY_POSSESSED)
.setConfigureGeoDetectionEnabledCapability(Capabilities.CAPABILITY_NOT_SUPPORTED) .setConfigureGeoDetectionEnabledCapability(Capabilities.CAPABILITY_NOT_SUPPORTED)
.setSuggestManualTimeZoneCapability(suggestManualCapability) .setSetManualTimeZoneCapability(suggestManualCapability)
.build(); .build();
TimeZoneConfiguration config = new TimeZoneConfiguration.Builder() TimeZoneConfiguration config = new TimeZoneConfiguration.Builder()
.setAutoDetectionEnabled(!suggestManualAllowed) .setAutoDetectionEnabled(!suggestManualAllowed)