summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-08-19 18:44:43 (GMT)
committerAnthony Hugh <ahugh@google.com>2015-08-21 19:44:43 (GMT)
commitb7da1f5f9886ff8a4ad81b0d617d442c461ca1e5 (patch)
tree5ed7a00b0c862f255b2ff0ad7585d56898055abc /Android.mk
parent2b9cdf4e64d49c24658a5ca7e10633364ef2c1f2 (diff)
downloadandroid_packages_apps_PackageInstaller-b7da1f5f9886ff8a4ad81b0d617d442c461ca1e5.zip
android_packages_apps_PackageInstaller-b7da1f5f9886ff8a4ad81b0d617d442c461ca1e5.tar.gz
android_packages_apps_PackageInstaller-b7da1f5f9886ff8a4ad81b0d617d442c461ca1e5.tar.bz2
Implement base version of GrantPermissions dialog
With the Emerald release, we need to support the new permission APIs. This changelist adds a dialog for the Activity.requestPermissions() API so that users can request permissions. This check in is a functional version, but not polished. will need to be a follow up CL to add the correct animations and update the UI to the appropriate redlines. The implementation for the confirmation dialog is modeled after the one in the clockwork libs/Views folder. There are some tweaks to match the designed behavior of the permission dialog. When there's more time in the future, we should try to condense this to one implementation. BUG: 23118402 Change-Id: Ic90d37a2ce8a7adacb7c4e004b0a5260b624f5c8
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 5a53086..9a7fcc4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,12 +9,11 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-v4 \
- android-support-v7-recyclerview \
android-support-v7-preference \
android-support-v7-appcompat \
android-support-v14-preference \
android-support-v17-preference-leanback \
- android-support-v17-leanback
+ android-support-v17-leanback \
LOCAL_RESOURCE_DIR := \
frameworks/support/v17/leanback/res \
@@ -22,11 +21,10 @@ LOCAL_RESOURCE_DIR := \
frameworks/support/v14/preference/res \
frameworks/support/v17/preference-leanback/res \
frameworks/support/v7/appcompat/res \
- frameworks/support/v7/recyclerview/res \
$(LOCAL_PATH)/res
LOCAL_AAPT_FLAGS := --auto-add-overlay \
- --extra-packages android.support.v17.leanback:android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview
+ --extra-packages android.support.v17.leanback:android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat
LOCAL_PACKAGE_NAME := PackageInstaller
LOCAL_CERTIFICATE := platform
@@ -35,4 +33,6 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+include vendor/unbundled_google/libs/wearable/wearable-support.mk
+
include $(BUILD_PACKAGE)