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

Commit 268371c4 authored by vichang's avatar vichang Committed by Gerrit Code Review
Browse files

Merge "Move libcore.timezone to the i18n module - Final part"

parents b1cea4f1 b07e53c1

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.timezone.CountryTimeZones;

import com.android.i18n.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.timezone.CountryTimeZones;

import libcore.timezone.CountryZonesFinder;

import libcore.timezone.TimeZoneFinder;

import com.android.i18n.timezone.CountryTimeZones;

import com.android.i18n.timezone.CountryZonesFinder;

import com.android.i18n.timezone.TimeZoneFinder;



import java.lang.ref.WeakReference;

import java.util.Collections;

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

+1 −2
Original line number Diff line number Diff line
@@ -23,11 +23,10 @@ import static org.mockito.Mockito.when; 


import android.content.Context;



import com.android.i18n.timezone.CountryZonesFinder;

import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;

import com.android.settings.datetime.timezone.model.TimeZoneData;



import libcore.timezone.CountryZonesFinder;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

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

+1 −2
Original line number Diff line number Diff line
@@ -28,13 +28,12 @@ import android.widget.LinearLayout; 
import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentActivity;



import com.android.i18n.timezone.CountryZonesFinder;

import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;

import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder;

import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem;

import com.android.settings.datetime.timezone.model.TimeZoneData;



import libcore.timezone.CountryZonesFinder;



import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.Robolectric;

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

+4 −4
Original line number Diff line number Diff line
@@ -21,18 +21,18 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import libcore.timezone.CountryTimeZones;

import libcore.timezone.CountryTimeZones.TimeZoneMapping;

import libcore.timezone.CountryZonesFinder;

import com.android.i18n.timezone.CountryTimeZones;

import com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping;

import com.android.i18n.timezone.CountryZonesFinder;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import org.robolectric.RobolectricTestRunner;



@RunWith(RobolectricTestRunner.class)

public class TimeZoneDataTest {