Skip to content

Commit d927ae9

Browse files
author
guyc
committed
修改依赖库为androidx
1 parent d1c80dd commit d927ae9

File tree

90 files changed

+161
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+161
-158
lines changed

‎build.gradle

+11-10
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
versionCode 1
3333
versionName "1.0"
3434

35-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
35+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3636
vectorDrawables.useSupportLibrary = true
3737
}
3838
buildTypes {
@@ -119,20 +119,21 @@ repositories {
119119
}
120120

121121
dependencies {
122-
implementation "com.android.support:appcompat-v7:${SUPPORT_LIBS_VERSION}"
123-
implementation "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"
124-
implementation "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}"
125-
implementation "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}"
122+
implementation 'androidx.appcompat:appcompat:1.1.0'
123+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
124+
implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
125+
implementation 'androidx.recyclerview:recyclerview:1.1.0'
126+
implementation 'androidx.preference:preference:1.1.0'
126127
implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2'
127128
quickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')
128129
testImplementation 'junit:junit:4.12'
129-
androidTestImplementation 'org.mockito:mockito-core:3.1.0'
130+
androidTestImplementation 'org.mockito:mockito-core:3.2.4'
130131
androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
131132
androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
132-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
133-
androidTestImplementation 'com.android.support.test:rules:1.0.2'
134-
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
135-
androidTestImplementation "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}"
133+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
134+
androidTestImplementation 'androidx.test:rules:1.2.0'
135+
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
136+
androidTestImplementation 'androidx.annotation:annotation:1.1.0'
136137
implementation project(':mxlibrary')
137138
implementation project(':mxtheme')
138139
}

‎gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.enableJetifier=true
2+
android.useAndroidX=true

‎mxlibrary/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
versionCode 1
1010
versionName "1.0"
1111

12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313

1414
}
1515

@@ -35,8 +35,8 @@ repositories {
3535

3636
dependencies {
3737
implementation fileTree(include: ['*.jar'], dir: 'libs')
38-
implementation 'com.android.support:appcompat-v7:28.0.0'
38+
implementation 'androidx.appcompat:appcompat:1.1.0'
3939
testImplementation 'junit:junit:4.13-beta-3'
40-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
41-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
40+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
41+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4242
}

‎mxlibrary/src/main/java/com/android/mxlibrary/util/PermissionUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.app.Activity;
55
import android.content.pm.PackageManager;
66
import android.os.Build;
7-
import android.support.v4.app.ActivityCompat;
8-
import android.support.v4.content.ContextCompat;
7+
import androidx.core.app.ActivityCompat;
8+
import androidx.core.content.ContextCompat;
99

1010
public final class PermissionUtil {
1111

‎mxlibrary/src/main/java/com/android/mxlibrary/view/CircleImageView.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import android.graphics.drawable.Drawable;
2020
import android.net.Uri;
2121
import android.os.Build;
22-
import android.support.annotation.ColorInt;
23-
import android.support.annotation.ColorRes;
24-
import android.support.annotation.DrawableRes;
25-
import android.support.annotation.RequiresApi;
26-
import android.support.v7.widget.AppCompatImageView;
22+
import androidx.annotation.ColorInt;
23+
import androidx.annotation.ColorRes;
24+
import androidx.annotation.DrawableRes;
25+
import androidx.annotation.RequiresApi;
26+
import androidx.appcompat.widget.AppCompatImageView;
2727
import android.util.AttributeSet;
2828
import android.view.MotionEvent;
2929
import android.view.View;

‎mxlibrary/src/main/java/com/android/mxlibrary/view/RingEffectView.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.graphics.Canvas;
55
import android.graphics.Paint;
66
import android.graphics.Path;
7-
import android.support.annotation.FloatRange;
8-
import android.support.annotation.Nullable;
7+
import androidx.annotation.FloatRange;
8+
import androidx.annotation.Nullable;
99
import android.util.AttributeSet;
1010
import android.view.View;
1111

‎mxtheme/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
versionCode 1
1010
versionName "1.0"
1111

12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313

1414
}
1515

@@ -35,9 +35,9 @@ repositories {
3535

3636
dependencies {
3737
implementation fileTree(include: ['*.jar'], dir: 'libs')
38-
implementation 'com.android.support:appcompat-v7:28.0.0'
38+
implementation 'androidx.appcompat:appcompat:1.1.0'
3939
testImplementation 'junit:junit:4.13-beta-3'
40-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
41-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
40+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
41+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4242
implementation project(':mxlibrary')
4343
}

‎mxtheme/src/androidTest/java/com/android/mxtheme/ExampleInstrumentedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.android.mxtheme;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

‎mxtheme/src/main/java/com/android/mxtheme/ThemeActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v7.app.AppCompatActivity;
6+
import androidx.annotation.Nullable;
7+
import androidx.appcompat.app.AppCompatActivity;
88
import android.view.View;
99
import android.widget.Button;
1010
import android.widget.TextView;

‎quickstep/src/com/android/launcher3/LauncherAnimationRunner.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import android.annotation.TargetApi;
2222
import android.os.Build;
2323
import android.os.Handler;
24-
import android.support.annotation.BinderThread;
25-
import android.support.annotation.UiThread;
24+
import androidx.annotation.BinderThread;
25+
import androidx.annotation.UiThread;
2626

2727
import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
2828
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

‎quickstep/src/com/android/quickstep/ActivityControlHelper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import android.os.Build;
2727
import android.os.Handler;
2828
import android.os.Looper;
29-
import android.support.annotation.Nullable;
30-
import android.support.annotation.UiThread;
29+
import androidx.annotation.Nullable;
30+
import androidx.annotation.UiThread;
3131
import android.view.View;
3232

3333
import com.android.launcher3.BaseDraggingActivity;

‎quickstep/src/com/android/quickstep/OverviewInteractionState.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import android.os.Message;
2525
import android.os.RemoteException;
2626
import android.provider.Settings;
27-
import android.support.annotation.WorkerThread;
27+
import androidx.annotation.WorkerThread;
2828
import android.util.Log;
2929

3030
import com.android.launcher3.MainThreadExecutor;

‎quickstep/src/com/android/quickstep/RecentsModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import android.os.Looper;
2929
import android.os.RemoteException;
3030
import android.os.UserHandle;
31-
import android.support.annotation.WorkerThread;
31+
import androidx.annotation.WorkerThread;
3232
import android.util.Log;
3333
import android.util.LruCache;
3434
import android.util.SparseArray;

‎quickstep/src/com/android/quickstep/TouchConsumer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import android.annotation.TargetApi;
1919
import android.os.Build;
20-
import android.support.annotation.IntDef;
20+
import androidx.annotation.IntDef;
2121
import android.view.Choreographer;
2222
import android.view.MotionEvent;
2323

‎quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import android.os.Looper;
3131
import android.os.SystemClock;
3232
import android.os.UserHandle;
33-
import android.support.annotation.AnyThread;
34-
import android.support.annotation.UiThread;
35-
import android.support.annotation.WorkerThread;
33+
import androidx.annotation.AnyThread;
34+
import androidx.annotation.UiThread;
35+
import androidx.annotation.WorkerThread;
3636
import android.util.Log;
3737
import android.view.View;
3838
import android.view.ViewTreeObserver.OnDrawListener;

‎quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import android.graphics.RectF;
2525
import android.os.Build;
2626
import android.os.RemoteException;
27-
import android.support.annotation.Nullable;
27+
import androidx.annotation.Nullable;
2828
import android.view.animation.Interpolator;
2929

3030
import com.android.launcher3.BaseDraggingActivity;

‎quickstep/src/com/android/quickstep/util/LayoutUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import android.content.Context;
1919
import android.content.res.Resources;
2020
import android.graphics.Rect;
21-
import android.support.annotation.AnyThread;
22-
import android.support.annotation.IntDef;
21+
import androidx.annotation.AnyThread;
22+
import androidx.annotation.IntDef;
2323

2424
import com.android.launcher3.DeviceProfile;
2525
import com.android.launcher3.R;

‎quickstep/src/com/android/quickstep/views/ClearAllButton.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import android.content.Context;
2020
import android.graphics.Rect;
21-
import android.support.annotation.Nullable;
21+
import androidx.annotation.Nullable;
2222
import android.util.AttributeSet;
2323
import android.view.accessibility.AccessibilityNodeInfo;
2424
import android.widget.Button;

‎quickstep/src/com/android/quickstep/views/RecentsView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import android.os.Bundle;
3535
import android.os.Handler;
3636
import android.os.UserHandle;
37-
import android.support.annotation.Nullable;
37+
import androidx.annotation.Nullable;
3838
import android.text.Layout;
3939
import android.text.StaticLayout;
4040
import android.text.TextPaint;

‎quickstep/src/com/android/quickstep/views/ShelfScrimView.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import com.android.launcher3.uioverrides.OverviewState;
3030
import com.android.launcher3.util.Themes;
3131

32-
import static android.support.v4.graphics.ColorUtils.compositeColors;
33-
import static android.support.v4.graphics.ColorUtils.setAlphaComponent;
32+
import static androidx.core.graphics.ColorUtils.compositeColors;
33+
import static androidx.core.graphics.ColorUtils.setAlphaComponent;
3434
import static com.android.launcher3.LauncherState.OVERVIEW;
3535
import static com.android.launcher3.anim.Interpolators.ACCEL_2;
3636

‎src/com/android/launcher3/AbstractFloatingView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import android.annotation.SuppressLint;
2020
import android.content.Context;
21-
import android.support.annotation.IntDef;
21+
import androidx.annotation.IntDef;
2222
import android.util.AttributeSet;
2323
import android.util.Pair;
2424
import android.view.MotionEvent;

‎src/com/android/launcher3/AllAppsList.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import android.content.Context;
2121
import android.content.pm.LauncherActivityInfo;
2222
import android.os.UserHandle;
23-
import android.support.annotation.NonNull;
24-
import android.support.annotation.Nullable;
23+
import androidx.annotation.NonNull;
24+
import androidx.annotation.Nullable;
2525
import android.util.Log;
2626

2727
import com.android.launcher3.compat.LauncherAppsCompat;

‎src/com/android/launcher3/AppWidgetsRestoredReceiver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import android.content.Intent;
1010
import android.database.Cursor;
1111
import android.os.Handler;
12-
import android.support.annotation.WorkerThread;
12+
import androidx.annotation.WorkerThread;
1313
import android.util.Log;
1414

1515
import com.android.launcher3.LauncherSettings.Favorites;

‎src/com/android/launcher3/BaseActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import android.content.ContextWrapper;
2222
import android.content.Intent;
2323
import android.content.res.Configuration;
24-
import android.support.annotation.IntDef;
24+
import androidx.annotation.IntDef;
2525
import android.view.View.AccessibilityDelegate;
2626

2727
import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;

‎src/com/android/launcher3/BaseDraggingActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import android.os.Process;
2929
import android.os.StrictMode;
3030
import android.os.UserHandle;
31-
import android.support.v4.content.LocalBroadcastManager;
31+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
3232
import android.util.Log;
3333
import android.view.ActionMode;
3434
import android.view.View;

‎src/com/android/launcher3/BaseRecyclerView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.android.launcher3;
1818

1919
import android.content.Context;
20-
import android.support.v7.widget.RecyclerView;
20+
import androidx.recyclerview.widget.RecyclerView;
2121
import android.util.AttributeSet;
2222
import android.view.MotionEvent;
2323
import android.view.View;

‎src/com/android/launcher3/BubbleTextView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import android.graphics.Rect;
2929
import android.graphics.drawable.ColorDrawable;
3030
import android.graphics.drawable.Drawable;
31-
import android.support.v4.graphics.ColorUtils;
31+
import androidx.core.graphics.ColorUtils;
3232
import android.text.TextUtils;
3333
import android.text.TextUtils.TruncateAt;
3434
import android.util.AttributeSet;

‎src/com/android/launcher3/CellLayout.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import android.graphics.drawable.ColorDrawable;
3535
import android.graphics.drawable.Drawable;
3636
import android.os.Parcelable;
37-
import android.support.annotation.IntDef;
38-
import android.support.v4.view.ViewCompat;
37+
import androidx.annotation.IntDef;
38+
import androidx.core.view.ViewCompat;
3939
import android.util.ArrayMap;
4040
import android.util.AttributeSet;
4141
import android.util.Log;

‎src/com/android/launcher3/IconCache.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
import android.os.Process;
3939
import android.os.SystemClock;
4040
import android.os.UserHandle;
41-
import android.support.annotation.NonNull;
42-
import android.support.v4.graphics.ColorUtils;
41+
import androidx.annotation.NonNull;
42+
import androidx.core.graphics.ColorUtils;
4343
import android.text.TextUtils;
4444
import android.util.Log;
4545

‎src/com/android/launcher3/InvariantDeviceProfile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import android.content.res.TypedArray;
2323
import android.content.res.XmlResourceParser;
2424
import android.graphics.Point;
25-
import android.support.annotation.VisibleForTesting;
25+
import androidx.annotation.VisibleForTesting;
2626
import android.util.DisplayMetrics;
2727
import android.util.Xml;
2828
import android.view.Display;

‎src/com/android/launcher3/Launcher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import android.os.Process;
4747
import android.os.StrictMode;
4848
import android.os.UserHandle;
49-
import android.support.annotation.Nullable;
49+
import androidx.annotation.Nullable;
5050
import android.text.TextUtils;
5151
import android.text.method.TextKeyListener;
5252
import android.util.Log;

‎src/com/android/launcher3/LauncherModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import android.os.Looper;
2929
import android.os.Process;
3030
import android.os.UserHandle;
31-
import android.support.annotation.Nullable;
31+
import androidx.annotation.Nullable;
3232
import android.text.TextUtils;
3333
import android.util.Log;
3434
import android.util.Pair;

‎src/com/android/launcher3/LauncherStateManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import android.animation.AnimatorSet;
2222
import android.os.Handler;
2323
import android.os.Looper;
24-
import android.support.annotation.IntDef;
24+
import androidx.annotation.IntDef;
2525

2626
import com.android.launcher3.anim.AnimationSuccessListener;
2727
import com.android.launcher3.anim.AnimatorPlaybackController;

‎src/com/android/launcher3/PromiseAppInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import android.content.Context;
2020
import android.content.Intent;
21-
import android.support.annotation.NonNull;
21+
import androidx.annotation.NonNull;
2222

2323
import com.android.launcher3.compat.PackageInstallerCompat;
2424
import com.android.launcher3.util.PackageManagerHelper;

‎src/com/android/launcher3/WidgetPreviewLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import android.os.CancellationSignal;
2626
import android.os.Handler;
2727
import android.os.UserHandle;
28-
import android.support.annotation.Nullable;
28+
import androidx.annotation.Nullable;
2929
import android.util.Log;
3030
import android.util.LongSparseArray;
3131

0 commit comments

Comments
 (0)