Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a29a6cea authored by Almaz Mingaleev's avatar Almaz Mingaleev
Browse files

Fix imports in LocationTimeZoneDetectionPreferenceController. 

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
parent c2025d71

src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java

+4 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
 */

package com.android.settings.datetime;



import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_ALLOWED;

import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;

import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED;

import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;

import static android.app.time.Capabilities.CAPABILITY_NOT_ALLOWED;

import static android.app.time.Capabilities.CAPABILITY_NOT_APPLICABLE;

import static android.app.time.Capabilities.CAPABILITY_NOT_SUPPORTED;

import static android.app.time.Capabilities.CAPABILITY_POSSESSED;



import android.app.time.TimeManager;

import android.app.time.TimeZoneCapabilities;

tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java

+5 −4
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package com.android.settings.datetime;



import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;

import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED;

import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;

import static android.app.time.Capabilities.CAPABILITY_NOT_APPLICABLE;

import static android.app.time.Capabilities.CAPABILITY_NOT_SUPPORTED;

import static android.app.time.Capabilities.CAPABILITY_POSSESSED;



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.when;



import android.app.time.Capabilities;

import android.app.time.TimeManager;

import android.app.time.TimeZoneCapabilities;

import android.app.time.TimeZoneCapabilitiesAndConfig;
@@ -142,7 +143,7 @@ public class LocationTimeZoneDetectionPreferenceControllerTest { 
    }



    private static TimeZoneCapabilities createTimeZoneCapabilities(

            @TimeZoneCapabilities.CapabilityState int geoDetectionCapability) {

            @Capabilities.CapabilityState int geoDetectionCapability) {

        UserHandle arbitraryUserHandle = UserHandle.of(123);

        return new TimeZoneCapabilities.Builder(arbitraryUserHandle)

                .setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED)