Migrate Settings to androidx.

Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
This commit is contained in:
Aurimas Liutikas
2018-04-17 11:22:43 -07:00
parent 538a4594ff
commit e0069d332d
1161 changed files with 2316 additions and 2316 deletions

View File

@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import androidx.preference.SwitchPreference;
import android.text.format.DateFormat;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

View File

@@ -23,7 +23,7 @@ import static org.robolectric.shadow.api.Shadow.extract;
import android.content.Context;
import android.net.ConnectivityManager;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;

View File

@@ -22,8 +22,8 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

View File

@@ -16,7 +16,7 @@
package com.android.settings.datetime.timezone;
import android.support.v7.widget.RecyclerView.AdapterDataObserver;
import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

View File

@@ -18,7 +18,7 @@ package com.android.settings.datetime.timezone;
import android.app.Activity;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

View File

@@ -18,7 +18,7 @@ package com.android.settings.datetime.timezone;
import android.app.Activity;
import android.icu.util.TimeZone;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

View File

@@ -17,7 +17,7 @@
package com.android.settings.datetime.timezone;
import android.app.Activity;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

View File

@@ -18,7 +18,7 @@ package com.android.settings.datetime.timezone;
import android.app.Activity;
import android.icu.util.TimeZone;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

View File

@@ -19,7 +19,7 @@ package com.android.settings.datetime.timezone;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.spy;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
import com.android.settings.testutils.SettingsRobolectricTestRunner;