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

Migrate Settings to androidx.

Browse Source 
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
(cherry picked from commit b1af85d155)
This commit is contained in:
Aurimas Liutikas
2018-04-17 11:22:43 -07:00
committed by Colin Cross
parent 6e2db2c34b
commit 03fcde338b
1190 changed files with 2367 additions and 2368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
View File

@@ -19,9 +19,9 @@ package com.android.settings.datetime;
import android.content.Context;
import android.provider.Settings;
import android.provider.Settings.System;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.TwoStatePreference;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import android.text.format.DateFormat;
import com.android.settings.core.PreferenceControllerMixin;

2
src/com/android/settings/datetime/AutoTimePreferenceController.java
View File

@@ -18,7 +18,7 @@ package com.android.settings.datetime;
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;

4
src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
View File

@@ -18,8 +18,8 @@ package com.android.settings.datetime;
import android.content.Context;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.Utils;

4
src/com/android/settings/datetime/DatePreferenceController.java
View File

@@ -20,8 +20,8 @@ import android.app.Activity;
import android.app.AlarmManager;
import android.app.DatePickerDialog;
import android.content.Context;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import android.text.TextUtils;
import android.text.format.DateFormat;
import android.widget.DatePicker;

6
src/com/android/settings/datetime/TimeFormatPreferenceController.java
View File

@@ -19,9 +19,9 @@ package com.android.settings.datetime;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.TwoStatePreference;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import android.text.format.DateFormat;

2
src/com/android/settings/datetime/TimePreferenceController.java
View File

@@ -20,7 +20,7 @@ import android.app.Activity;
import android.app.AlarmManager;
import android.app.TimePickerDialog;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.text.TextUtils;
import android.text.format.DateFormat;
import android.widget.TimePicker;

4
src/com/android/settings/datetime/TimeZonePreferenceController.java
View File

@@ -17,8 +17,8 @@
package com.android.settings.datetime;
import android.content.Context;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import android.util.FeatureFlagUtils;
import com.android.settings.core.FeatureFlags;

2
src/com/android/settings/datetime/ZonePicker.java
View File

@@ -22,7 +22,7 @@ import android.app.AlarmManager;
import android.app.ListFragment;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;

10
src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
View File

@@ -17,11 +17,11 @@
package com.android.settings.datetime.timezone;
import android.icu.text.BreakIterator;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.support.annotation.WorkerThread;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.annotation.WorkerThread;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

2
src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
View File

@@ -23,7 +23,7 @@ import android.content.res.Resources;
import android.icu.text.DateFormat;
import android.icu.text.SimpleDateFormat;
import android.icu.util.Calendar;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.android.settings.R;
import com.android.settings.datetime.timezone.model.TimeZoneData;

6
src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
View File

@@ -17,9 +17,9 @@
package com.android.settings.datetime.timezone;
import android.os.Bundle;
import android.support.annotation.VisibleForTesting;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;

2
src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java
View File

@@ -17,7 +17,7 @@
package com.android.settings.datetime.timezone;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;

2
src/com/android/settings/datetime/timezone/RegionPreferenceController.java
View File

@@ -17,7 +17,7 @@ package com.android.settings.datetime.timezone;
import android.content.Context;
import android.icu.text.LocaleDisplayNames;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import java.util.Locale;

2
src/com/android/settings/datetime/timezone/RegionSearchPicker.java
View File

@@ -21,7 +21,7 @@ import android.content.Intent;
import android.icu.text.Collator;
import android.icu.text.LocaleDisplayNames;
import android.os.Bundle;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;

4
src/com/android/settings/datetime/timezone/RegionZonePicker.java
View File

@@ -21,8 +21,8 @@ import android.icu.text.Collator;
import android.icu.text.LocaleDisplayNames;
import android.icu.util.TimeZone;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;

2
src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java
View File

@@ -17,7 +17,7 @@
package com.android.settings.datetime.timezone;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;

4
src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
View File

@@ -24,8 +24,8 @@ import android.icu.text.SimpleDateFormat;
import android.icu.util.Calendar;
import android.icu.util.TimeZone;
import android.icu.util.TimeZoneTransition;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settingslib.widget.FooterPreference;

4
src/com/android/settings/datetime/timezone/TimeZoneSettings.java
View File

@@ -23,8 +23,8 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.icu.util.TimeZone;
import android.os.Bundle;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.PreferenceCategory;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceCategory;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;

4
src/com/android/settings/datetime/timezone/model/TimeZoneData.java
View File

@@ -15,8 +15,8 @@
*/
package com.android.settings.datetime.timezone.model;
import android.support.annotation.VisibleForTesting;
import android.support.v4.util.ArraySet;
import androidx.annotation.VisibleForTesting;
import androidx.collection.ArraySet;
import libcore.util.CountryTimeZones;
import libcore.util.CountryZonesFinder;