Skip to content

Commit fff39f4

Browse files
bgcngmArianK16a
authored andcommittedDec 2, 2019
sagit: configpanel: Migrate to androidx
Change-Id: Ifaa67283a3437549a2304088a0ce377b399da19f
1 parent fe97f21 commit fff39f4

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed
 

‎configpanel/Android.mk

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
1010
LOCAL_USE_AAPT2 := true
1111

1212
LOCAL_STATIC_ANDROID_LIBRARIES := \
13-
android-support-v4 \
14-
android-support-v7-appcompat \
15-
android-support-v7-preference \
16-
android-support-v7-recyclerview \
17-
android-support-v13 \
18-
android-support-v14-preference \
13+
androidx.core_core \
14+
androidx.preference_preference
1915

2016
LOCAL_STATIC_JAVA_LIBRARIES := \
2117
org.lineageos.platform.internal

‎configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@
2020
import android.app.ActionBar;
2121
import android.content.SharedPreferences;
2222
import android.os.Bundle;
23-
import android.support.v14.preference.PreferenceFragment;
24-
import android.support.v14.preference.SwitchPreference;
25-
import android.support.v7.preference.ListPreference;
26-
import android.support.v7.preference.Preference;
27-
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
28-
import android.support.v7.preference.PreferenceCategory;
29-
import android.support.v7.preference.PreferenceManager;
3023
import android.text.TextUtils;
3124
import android.view.MenuItem;
3225

26+
import androidx.preference.ListPreference;
27+
import androidx.preference.Preference;
28+
import androidx.preference.PreferenceCategory;
29+
import androidx.preference.PreferenceFragment;
30+
import androidx.preference.PreferenceManager;
31+
import androidx.preference.SwitchPreference;
32+
3333
import org.lineageos.internal.util.FileUtils;
3434
import org.lineageos.internal.util.PackageManagerUtils;
3535

3636
public class ButtonSettingsFragment extends PreferenceFragment
37-
implements OnPreferenceChangeListener {
37+
implements Preference.OnPreferenceChangeListener {
3838

3939
@Override
4040
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

‎configpanel/src/org/lineageos/settings/device/Startup.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
import android.content.Intent;
2424
import android.content.pm.PackageManager;
2525
import android.content.SharedPreferences;
26-
import android.support.v7.preference.PreferenceManager;
2726
import android.util.Log;
2827

28+
import androidx.preference.PreferenceManager;
29+
2930
import org.lineageos.internal.util.FileUtils;
3031

3132
public class Startup extends BroadcastReceiver {

0 commit comments

Comments
 (0)
Please sign in to comment.