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" am: 3ddcb6a90a

Browse Source 
am: de0bd5321f

Change-Id: I69516fa31c07a67621e8740ca14c19c40d5dd126
This commit is contained in:
Neil Fuller
2018-11-26 15:48:38 -08:00
committed by android-build-merger
parent e5e4e4cb76 de0bd5321f
commit 18a275efc3
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -26,9 +26,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import libcore.util.CountryTimeZones;
import libcore.util.CountryTimeZones.TimeZoneMapping;
import libcore.util.CountryZonesFinder;
import libcore.timezone.CountryTimeZones;
import libcore.timezone.CountryTimeZones.TimeZoneMapping;
import libcore.timezone.CountryZonesFinder;
import java.util.ArrayList;
import java.util.Arrays;