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
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
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
View File

@@ -16,8 +16,8 @@
package com.android.settings.widget;
import static android.arch.lifecycle.Lifecycle.Event.ON_START;
import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.times;
@@ -26,8 +26,8 @@ import static org.mockito.Mockito.when;
import android.app.ActionBar;
import android.app.Activity;
import android.arch.lifecycle.LifecycleOwner;
import android.support.v7.widget.RecyclerView;
import androidx.lifecycle.LifecycleOwner;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

2
tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
View File

@@ -24,7 +24,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.PreferenceViewHolder;
import android.view.View;
import android.widget.Button;

2
tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
View File

@@ -19,7 +19,7 @@ package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.PreferenceViewHolder;
import android.view.View;
import com.android.settings.R;

2
tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
View File

@@ -19,7 +19,7 @@ package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.PreferenceViewHolder;
import android.view.View;
import com.android.settings.R;

6
tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java
View File

@@ -35,9 +35,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import android.support.v7.preference.R;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.R;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import android.widget.LinearLayout;
@RunWith(SettingsRobolectricTestRunner.class)

2
tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
View File

@@ -35,7 +35,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.ColorDrawable;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageButton;

2
tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
View File

@@ -20,7 +20,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;

8
tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
View File

@@ -29,10 +29,10 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.widget.RecyclerView;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.android.settings.R;

4
tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
View File

@@ -21,8 +21,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.CheckBox;

4
tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
View File

@@ -21,8 +21,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;

2
tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
View File

@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.os.UserManager;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

2
tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java
View File

@@ -23,7 +23,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.app.Application;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.PreferenceViewHolder;
import android.view.View;
import com.android.settings.R;

2
tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
View File

@@ -19,7 +19,7 @@ package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import android.os.Parcelable;
import android.support.v4.view.PagerAdapter;
import androidx.viewpager.widget.PagerAdapter;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;

2
tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceControllerTest.java
View File

@@ -22,7 +22,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.PreferenceScreen;
import android.view.View;
import android.widget.Button;

2
tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
View File

@@ -25,7 +25,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.PreferenceViewHolder;
import android.text.InputType;
import android.text.TextWatcher;
import android.view.View;

2
tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
View File

@@ -22,7 +22,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.media.MediaPlayer;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import com.android.settings.R;