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

Merge "Track move of timezone classes to libcore.timezone"

Browse Source
This commit is contained in:
Neil Fuller
2018-11-22 09:31:19 +00:00
committed by Android (Google) Code Review
parent c4cb4168cf 1e1961a5b3
commit 990a76d6ec
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.datetime.timezone.model; package com.android.settings.datetime.timezone.model;
import libcore.util.CountryTimeZones; import libcore.timezone.CountryTimeZones;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

6
src/com/android/settings/datetime/timezone/model/TimeZoneData.java
View File

@@ -18,9 +18,9 @@ package com.android.settings.datetime.timezone.model;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.collection.ArraySet; import androidx.collection.ArraySet;
import libcore.util.CountryTimeZones; import libcore.timezone.CountryTimeZones;
import libcore.util.CountryZonesFinder; import libcore.timezone.CountryZonesFinder;
import libcore.util.TimeZoneFinder; import libcore.timezone.TimeZoneFinder;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Collections; import java.util.Collections;

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

@@ -27,7 +27,7 @@ import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
import com.android.settings.datetime.timezone.model.TimeZoneData; import com.android.settings.datetime.timezone.model.TimeZoneData;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import libcore.util.CountryZonesFinder; import libcore.timezone.CountryZonesFinder;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

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

@@ -34,7 +34,7 @@ import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem;
import com.android.settings.datetime.timezone.model.TimeZoneData; import com.android.settings.datetime.timezone.model.TimeZoneData;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import libcore.util.CountryZonesFinder; import libcore.timezone.CountryZonesFinder;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

6
tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
View File

@@ -23,9 +23,9 @@ import static org.mockito.Mockito.when;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import libcore.util.CountryTimeZones; import libcore.timezone.CountryTimeZones;
import libcore.util.CountryTimeZones.TimeZoneMapping; import libcore.timezone.CountryTimeZones.TimeZoneMapping;
import libcore.util.CountryZonesFinder; import libcore.timezone.CountryZonesFinder;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;