samsung: AdvancedDisplay: Migrate to androidx

Change-Id: I9f6f936120e6eac06c78525f3692207ff58c991f
tirimbino
Jan Altensen 5 years ago committed by Kevin F. Haggerty
parent 02138ed10c
commit 252388e559
No known key found for this signature in database
GPG Key ID: 6D95512933112729
  1. 12
      AdvancedDisplay/Android.mk
  2. 3
      AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
  3. 10
      AdvancedDisplay/src/org/lineageos/settings/device/mDNIeAccessibility.java
  4. 10
      AdvancedDisplay/src/org/lineageos/settings/device/mDNIeScenario.java

@ -12,12 +12,12 @@ LOCAL_CERTIFICATE := platform
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v4 \ androidx.appcompat_appcompat \
android-support-v7-appcompat \ androidx.preference_preference \
android-support-v7-preference \ androidx.recyclerview_recyclerview \
android-support-v7-recyclerview \ androidx.legacy_legacy-preference-v14 \
android-support-v13 \ androidx.legacy_legacy-support-v4 \
android-support-v14-preference androidx.legacy_legacy-support-v13
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
org.lineageos.platform.internal org.lineageos.platform.internal

@ -19,9 +19,10 @@ package org.lineageos.settings.device;
import android.app.ActionBar; import android.app.ActionBar;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.support.v14.preference.PreferenceFragment;
import android.view.MenuItem; import android.view.MenuItem;
import androidx.preference.PreferenceFragment;
import org.lineageos.settings.device.R; import org.lineageos.settings.device.R;
import org.lineageos.internal.util.FileUtils; import org.lineageos.internal.util.FileUtils;

@ -19,15 +19,15 @@ package org.lineageos.settings.device;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceManager;
import android.util.AttributeSet; import android.util.AttributeSet;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import org.lineageos.internal.util.FileUtils; import org.lineageos.internal.util.FileUtils;
public class mDNIeAccessibility extends ListPreference implements OnPreferenceChangeListener { public class mDNIeAccessibility extends ListPreference implements Preference.OnPreferenceChangeListener {
private static String FILE = null; private static String FILE = null;

@ -19,15 +19,15 @@ package org.lineageos.settings.device;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceManager;
import android.util.AttributeSet; import android.util.AttributeSet;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import org.lineageos.internal.util.FileUtils; import org.lineageos.internal.util.FileUtils;
public class mDNIeScenario extends ListPreference implements OnPreferenceChangeListener { public class mDNIeScenario extends ListPreference implements Preference.OnPreferenceChangeListener {
private static String FILE = null; private static String FILE = null;

Loading…
Cancel
Save