LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Migrated various apps under development/samples/ShortcutSample to androidx"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-18 00:37:46 +00:00
committed by Android (Google) Code Review
parent f54b9a0237 a55e5516d0
commit b323870e25
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/ShortcutSample/Android.mk
View File

@@ -24,6 +24,8 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample
LOCAL_AAPT_FLAGS += --version-code 10
@@ -34,7 +36,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4
LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4
LOCAL_SDK_VERSION := current
@@ -46,6 +48,8 @@ include $(BUILD_PACKAGE)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample11
LOCAL_AAPT_FLAGS += --version-code 11
@@ -56,7 +60,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4
LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4
LOCAL_SDK_VERSION := current
@@ -68,6 +72,8 @@ include $(BUILD_PACKAGE)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample12
LOCAL_AAPT_FLAGS += --version-code 12
@@ -78,7 +84,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4
LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4
LOCAL_SDK_VERSION := current
@@ -90,6 +96,8 @@ include $(BUILD_PACKAGE)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample11nb
LOCAL_AAPT_FLAGS += --version-code 11
@@ -101,7 +109,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4
LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4
LOCAL_SDK_VERSION := current
@@ -113,6 +121,8 @@ include $(BUILD_PACKAGE)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample12nb
LOCAL_AAPT_FLAGS += --version-code 12
@@ -124,7 +134,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4
LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4
LOCAL_SDK_VERSION := current

2
samples/ShortcutSample/src/com/example/android/shortcutsample/Main.java
View File

@@ -24,7 +24,7 @@ import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.content.pm.ShortcutManagerCompat;
import androidx.core.content.pm.ShortcutManagerCompat;
import android.util.ArraySet;
import android.util.Log;
import android.view.LayoutInflater;

4
samples/ShortcutSample/src/com/example/android/shortcutsample/ShortcutHelper.java
View File

@@ -25,8 +25,8 @@ import android.graphics.drawable.Icon;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.PersistableBundle;
import android.support.v4.content.pm.ShortcutInfoCompat;
import android.support.v4.content.pm.ShortcutManagerCompat;
import androidx.core.content.pm.ShortcutInfoCompat;
import androidx.core.content.pm.ShortcutManagerCompat;
import android.util.Log;
import java.io.BufferedInputStream;