sdm660-common: Doze: Migrate to androidx

Change-Id: Ifaa67283a3437549a2304088a0ce377b399da19f
This commit is contained in:
Bruno Martins 2019-07-09 22:31:00 +01:00 committed by Max Weffers
parent bfcc56f8f8
commit 9576d1a262
No known key found for this signature in database
GPG key ID: 795F73D22FB93FAE
5 changed files with 9 additions and 20 deletions

View file

@ -14,12 +14,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v4 \ androidx.preference_preference
android-support-v13 \
android-support-v7-recyclerview \
android-support-v7-preference \
android-support-v7-appcompat \
android-support-v14-preference
LOCAL_RESOURCE_DIR := \ LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/res $(LOCAL_PATH)/res

View file

@ -1,8 +1,3 @@
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet);
}
-keep class ** extends android.support.v14.preference.PreferenceFragment
-keep class org.lineageos.settings.doze.* { -keep class org.lineageos.settings.doze.* {
*; *;
} }

View file

@ -22,15 +22,14 @@ import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.support.v14.preference.PreferenceFragment; import androidx.preference.PreferenceFragment;
import android.support.v14.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import android.support.v7.preference.Preference; import androidx.preference.Preference;
import android.support.v7.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
import android.support.v7.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceChangeListener;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;

View file

@ -21,7 +21,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.support.v7.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log; import android.util.Log;

View file

@ -216,8 +216,8 @@ PRODUCT_PACKAGES += \
vendor.display.config@1.1_vendor vendor.display.config@1.1_vendor
# Doze # Doze
#PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
# XiaomiDoze XiaomiDoze
# DRM # DRM
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \