Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE
Change-Id: I461bdf6afe2f9149a80105f0db73a608952972d3
diff --git a/LeanbackSampleApp/Android.mk b/LeanbackSampleApp/Android.mk
new file mode 100644
index 0000000..a9c0737
--- /dev/null
+++ b/LeanbackSampleApp/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := LeanbackSampleApp
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_CERTIFICATE := platform
+
+include $(BUILD_PREBUILT)
diff --git a/LeanbackSampleApp/LeanbackSampleApp.apk b/LeanbackSampleApp/LeanbackSampleApp.apk
new file mode 100644
index 0000000..d15afe8
--- /dev/null
+++ b/LeanbackSampleApp/LeanbackSampleApp.apk
Binary files differ
diff --git a/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg b/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
new file mode 100644
index 0000000..5b33b29
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
Binary files differ
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index c1b8f5d..69c0447 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -48,4 +48,5 @@
<!-- Override configuration check for dpad so that we always appear to have one -->
<bool name="config_hasPermanentDpad">true</bool>
+ <bool name="config_defaultInTouchMode">false</bool>
</resources>
diff --git a/products/atv_base.mk b/products/atv_base.mk
index 6ecad46..e908a13 100644
--- a/products/atv_base.mk
+++ b/products/atv_base.mk
@@ -67,6 +67,7 @@
FusedLocation \
InputDevices \
KeyChain \
+ Launcher2 \
PicoTts \
PacProcessor \
PrintSpooler \
@@ -82,6 +83,8 @@
librs_jni \
audio.primary.default \
audio_policy.default \
+ clatd \
+ clatd.conf \
local_time.default \
screenrecord
@@ -98,6 +101,8 @@
$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)
+$(call inherit-product-if-exists, external/google-fonts/cutive-mono/fonts.mk)
+$(call inherit-product-if-exists, external/lohit-fonts/fonts.mk)
$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)
$(call inherit-product-if-exists, external/naver-fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
diff --git a/products/sdk_atv_armv7.mk b/products/sdk_atv_armv7.mk
index ba91ccf..e0f5aba 100644
--- a/products/sdk_atv_armv7.mk
+++ b/products/sdk_atv_armv7.mk
@@ -18,6 +18,7 @@
PRODUCT_PACKAGES := \
EmulatorSmokeTests \
+ LeanbackSampleApp \
TelephonyProvider \
audio.primary.goldfish \
rild
