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

Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: I8e81b3d707bce016006bf0af1f75785ecd15648e
This commit is contained in:
vichang
2020-07-02 10:50:06 +00:00
committed by Automerger Merge Worker
parent ba1e9c30c4 7485036f53
commit bc7f639e15
5 changed files with 10 additions and 12 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.timezone.CountryTimeZones; import com.android.i18n.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.timezone.CountryTimeZones; import com.android.i18n.timezone.CountryTimeZones;
import libcore.timezone.CountryZonesFinder; import com.android.i18n.timezone.CountryZonesFinder;
import libcore.timezone.TimeZoneFinder; import com.android.i18n.timezone.TimeZoneFinder;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Collections; import java.util.Collections;

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

@@ -23,11 +23,10 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import com.android.i18n.timezone.CountryZonesFinder;
import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; 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 libcore.timezone.CountryZonesFinder;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

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

@@ -28,13 +28,12 @@ import android.widget.LinearLayout;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity; 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.AdapterItem;
import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder;
import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem; 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 libcore.timezone.CountryZonesFinder;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;

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

@@ -21,18 +21,18 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import libcore.timezone.CountryTimeZones; import com.android.i18n.timezone.CountryTimeZones;
import libcore.timezone.CountryTimeZones.TimeZoneMapping; import com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping;
import libcore.timezone.CountryZonesFinder; import com.android.i18n.timezone.CountryZonesFinder;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class TimeZoneDataTest { public class TimeZoneDataTest {