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

Fix imports in LocationTimeZoneDetectionPreferenceController.

Browse Source 
Capabilities are extracted to separate class to reuse them
in time API.

Bug: 172891783
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest"
Change-Id: If7351c4f022c69262ddffd26efacd449dc7238c5
This commit is contained in:
Almaz Mingaleev
2021-03-11 15:26:31 +00:00
parent c2025d7180
commit a29a6ceab4
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
View File

@@ -15,10 +15,10 @@
*/ */
package com.android.settings.datetime; package com.android.settings.datetime;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_ALLOWED; import static android.app.time.Capabilities.CAPABILITY_NOT_ALLOWED;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE; import static android.app.time.Capabilities.CAPABILITY_NOT_APPLICABLE;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED; import static android.app.time.Capabilities.CAPABILITY_NOT_SUPPORTED;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED; import static android.app.time.Capabilities.CAPABILITY_POSSESSED;
import android.app.time.TimeManager; import android.app.time.TimeManager;
import android.app.time.TimeZoneCapabilities; import android.app.time.TimeZoneCapabilities;

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

@@ -16,9 +16,9 @@
package com.android.settings.datetime; package com.android.settings.datetime;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE; import static android.app.time.Capabilities.CAPABILITY_NOT_APPLICABLE;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED; import static android.app.time.Capabilities.CAPABILITY_NOT_SUPPORTED;
import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED; import static android.app.time.Capabilities.CAPABILITY_POSSESSED;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.time.Capabilities;
import android.app.time.TimeManager; import android.app.time.TimeManager;
import android.app.time.TimeZoneCapabilities; import android.app.time.TimeZoneCapabilities;
import android.app.time.TimeZoneCapabilitiesAndConfig; import android.app.time.TimeZoneCapabilitiesAndConfig;
@@ -142,7 +143,7 @@ public class LocationTimeZoneDetectionPreferenceControllerTest {
} }
private static TimeZoneCapabilities createTimeZoneCapabilities( private static TimeZoneCapabilities createTimeZoneCapabilities(
@TimeZoneCapabilities.CapabilityState int geoDetectionCapability) { @Capabilities.CapabilityState int geoDetectionCapability) {
UserHandle arbitraryUserHandle = UserHandle.of(123); UserHandle arbitraryUserHandle = UserHandle.of(123);
return new TimeZoneCapabilities.Builder(arbitraryUserHandle) return new TimeZoneCapabilities.Builder(arbitraryUserHandle)
.setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED) .setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED)