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 am: bc7f639e15 am: 56a24f9ac1 am: f233240117

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

Change-Id: I47f49f1928a26300ddaed83e0e67f95a0dc09d1f
This commit is contained in:
vichang
2020-07-02 11:45:30 +00:00
committed by Automerger Merge Worker
parent 2e7fc5a0d7 f233240117
commit 25c5553ef8
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;
import libcore.timezone.CountryTimeZones;
import com.android.i18n.timezone.CountryTimeZones;
import java.util.Collections;
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.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;