diff options
Diffstat (limited to 'security')
4 files changed, 11 insertions, 10 deletions
diff --git a/security/FingerprintDialog/Application/src/main/Android.mk b/security/FingerprintDialog/Application/src/main/Android.mk index 30420c04..54ec850e 100644 --- a/security/FingerprintDialog/Application/src/main/Android.mk +++ b/security/FingerprintDialog/Application/src/main/Android.mk @@ -14,16 +14,17 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-v7-appcompat \ - android-support-v4 \ - android-support-annotations +LOCAL_USE_AAPT2 := true +LOCAL_STATIC_ANDROID_LIBRARIES := \ + androidx.appcompat_appcompat \ + androidx.legacy_legacy-support-v4 \ + androidx.annotation_annotation LOCAL_MODULE_TAGS := samples LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FingerprintDialog LOCAL_SDK_VERSION := current LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ - frameworks/support/v7/appcompat/res + prebuilts/sdk/current/support/v7/appcompat/res LOCAL_AAPT_FLAGS := --auto-add-overlay \ --extra-packages android.support.v7.appcompat diff --git a/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/MainActivity.java b/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/MainActivity.java index e30b4c22..867f6f94 100644 --- a/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/MainActivity.java +++ b/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/MainActivity.java @@ -26,9 +26,9 @@ import android.preference.PreferenceManager; import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.KeyPermanentlyInvalidatedException; import android.security.keystore.KeyProperties; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Base64; import android.util.Log; import android.view.Menu; diff --git a/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/SettingsActivity.java b/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/SettingsActivity.java index 4ac88462..5ae75185 100644 --- a/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/SettingsActivity.java +++ b/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/SettingsActivity.java @@ -18,7 +18,7 @@ package com.example.android.fingerprintdialog; import android.os.Bundle; import android.preference.PreferenceFragment; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; public class SettingsActivity extends AppCompatActivity { diff --git a/security/FingerprintDialog/Application/src/main/res/layout/activity_main.xml b/security/FingerprintDialog/Application/src/main/res/layout/activity_main.xml index 130bc8c7..956f5761 100644 --- a/security/FingerprintDialog/Application/src/main/res/layout/activity_main.xml +++ b/security/FingerprintDialog/Application/src/main/res/layout/activity_main.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" |