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

Commit 3ddcb6a9 authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

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

parents a995cb33 17f04b66

src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.datetime.timezone.model;



import libcore.util.CountryTimeZones;

import libcore.timezone.CountryTimeZones;



import java.util.Collections;

import java.util.List;

src/com/android/settings/datetime/timezone/model/TimeZoneData.java

+3 −3
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.settings.datetime.timezone.model; 
import androidx.annotation.VisibleForTesting;

import androidx.collection.ArraySet;



import libcore.util.CountryTimeZones;

import libcore.util.CountryZonesFinder;

import libcore.util.TimeZoneFinder;

import libcore.timezone.CountryTimeZones;

import libcore.timezone.CountryZonesFinder;

import libcore.timezone.TimeZoneFinder;



import java.lang.ref.WeakReference;

import java.util.Collections;

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+3 −3
Original line number Diff line number Diff line
@@ -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;