Skip to content

Commit e5b3977

Browse files
committed
Migrate to Androidx
Fixes: 134040941 Test: Confirmed build succeeds. Manually tested provisioning flow. Change-Id: I0e8c9615e2603bfef43e932e2d6fdfac53b0e832
1 parent 86a588f commit e5b3977

File tree

47 files changed

+103
-109
lines changed

Some content is hidden

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

47 files changed

+103
-109
lines changed

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ private void stripTestOnlyForBuild(flavor, buildType) {
126126

127127
dependencies {
128128
implementation 'androidx.enterprise:enterprise-feedback:1.0.0-alpha01'
129-
implementation 'com.android.support:multidex:1.0.1'
130-
implementation 'com.android.support:preference-v14:28.0.0-SNAPSHOT'
131-
implementation 'com.android.support:recyclerview-v7:28.0.0-SNAPSHOT'
132-
implementation 'com.android.support:support-v13:28.0.0-SNAPSHOT'
133-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
129+
implementation 'androidx.multidex:multidex:2.0.0'
130+
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
131+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
132+
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
133+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
134134
implementation(name: 'setup-wizard-lib-platform-release', ext: 'aar')
135135
implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
136136
implementation 'org.bouncycastle:bcprov-jdk15on:1.56'

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163

164164
<provider
165165
android:authorities="com.afwsamples.testdpc.fileprovider"
166-
android:name="android.support.v4.content.FileProvider"
166+
android:name="androidx.core.content.FileProvider"
167167
android:grantUriPermissions="true"
168168
android:exported="false">
169169
<meta-data

app/src/main/java/com/afwsamples/testdpc/DeviceAdminReceiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import android.os.Process;
3333
import android.os.UserHandle;
3434
import android.os.UserManager;
35-
import android.support.v4.app.NotificationCompat;
35+
import androidx.core.app.NotificationCompat;
3636
import android.util.Log;
3737
import android.widget.Toast;
3838
import com.afwsamples.testdpc.common.NotificationUtil;

app/src/main/java/com/afwsamples/testdpc/DeviceAdminService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.Intent;
55
import android.content.IntentFilter;
66
import android.os.Build.VERSION_CODES;
7-
import android.support.annotation.RequiresApi;
7+
import androidx.annotation.RequiresApi;
88

99
/**
1010
* To allow DPC process to be persistent and foreground.

app/src/main/java/com/afwsamples/testdpc/PackageMonitorReceiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.content.BroadcastReceiver;
66
import android.content.Context;
77
import android.content.Intent;
8-
import android.support.v4.app.NotificationCompat;
8+
import androidx.core.app.NotificationCompat;
99
import android.text.TextUtils;
1010
import com.afwsamples.testdpc.common.NotificationUtil;
1111

app/src/main/java/com/afwsamples/testdpc/common/BaseSearchablePolicyPreferenceFragment.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import android.content.Context;
44
import android.os.Bundle;
5-
import android.support.v14.preference.PreferenceFragment;
6-
import android.support.v7.preference.Preference;
7-
import android.support.v7.preference.PreferenceGroup;
8-
import android.support.v7.preference.PreferenceGroupAdapter;
9-
import android.support.v7.preference.PreferenceScreen;
10-
import android.support.v7.preference.PreferenceViewHolder;
11-
import android.support.v7.widget.LinearLayoutManager;
12-
import android.support.v7.widget.RecyclerView;
5+
import androidx.preference.PreferenceFragment;
6+
import androidx.preference.Preference;
7+
import androidx.preference.PreferenceGroup;
8+
import androidx.preference.PreferenceGroupAdapter;
9+
import androidx.preference.PreferenceScreen;
10+
import androidx.preference.PreferenceViewHolder;
11+
import androidx.recyclerview.widget.LinearLayoutManager;
12+
import androidx.recyclerview.widget.RecyclerView;
1313
import android.text.TextUtils;
1414
import android.view.Menu;
1515
import android.view.MenuInflater;

app/src/main/java/com/afwsamples/testdpc/common/NotificationUtil.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import android.app.NotificationChannel;
55
import android.app.NotificationManager;
66
import android.content.Context;
7-
import android.os.Build;
87
import android.os.Build.VERSION_CODES;
9-
import android.support.annotation.RequiresApi;
10-
import android.support.annotation.StringRes;
11-
import android.support.v4.app.NotificationCompat;
8+
import androidx.annotation.RequiresApi;
9+
import androidx.annotation.StringRes;
10+
import androidx.core.app.NotificationCompat;
1211
import com.afwsamples.testdpc.R;
1312

1413
public class NotificationUtil {

app/src/main/java/com/afwsamples/testdpc/common/ProfileOrParentFragment.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
import android.app.admin.DevicePolicyManager;
2222
import android.content.ComponentName;
2323
import android.content.Context;
24-
import android.os.Build;
2524
import android.os.Build.VERSION_CODES;
2625
import android.os.Bundle;
27-
import android.support.v13.app.FragmentTabHost;
28-
import android.support.v7.preference.PreferenceManager;
26+
import androidx.legacy.app.FragmentTabHost;
27+
import androidx.preference.PreferenceManager;
2928
import android.view.LayoutInflater;
3029
import android.view.View;
3130
import android.view.ViewGroup;

app/src/main/java/com/afwsamples/testdpc/common/StringArrayTypeInputAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.afwsamples.testdpc.common;
1818

19-
import android.support.v7.widget.RecyclerView;
19+
import androidx.recyclerview.widget.RecyclerView;
2020
import android.text.Editable;
2121
import android.text.TextWatcher;
2222
import android.view.LayoutInflater;

app/src/main/java/com/afwsamples/testdpc/common/Util.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@
2626
import android.content.IntentFilter;
2727
import android.graphics.BitmapFactory;
2828
import android.net.Uri;
29-
import android.os.Build;
3029
import android.os.Build.VERSION;
3130
import android.os.Build.VERSION_CODES;
3231
import android.os.Bundle;
3332
import android.os.UserHandle;
3433
import android.os.UserManager;
35-
import android.support.v14.preference.PreferenceFragment;
34+
import androidx.preference.PreferenceFragment;
3635
import android.text.format.DateUtils;
3736
import android.util.Log;
3837
import android.widget.ImageView;

0 commit comments

Comments
 (0)