Snap for 5590969 from a99d646fdb02679fc3e5415d812714ceef9f6c8f to sdk-release
Change-Id: I507add5b2cd6e43745a895b2e1807a2f4b190430
diff --git a/TvSampleLeanbackLauncher/Android.bp b/TvSampleLeanbackLauncher/Android.bp
new file mode 100644
index 0000000..54f8d59
--- /dev/null
+++ b/TvSampleLeanbackLauncher/Android.bp
@@ -0,0 +1,9 @@
+android_app_import {
+ name: "TvSampleLeanbackLauncher",
+ apk: "TvSampleLeanbackLauncher.apk",
+ presigned: true,
+ privileged: true,
+ dex_preopt: {
+ enabled: false,
+ },
+}
diff --git a/TvSampleLeanbackLauncher/Android.mk b/TvSampleLeanbackLauncher/Android.mk
deleted file mode 100644
index 99c70a4..0000000
--- a/TvSampleLeanbackLauncher/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := TvSampleLeanbackLauncher
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_DEX_PREOPT := false
-
-include $(BUILD_PREBUILT)
diff --git a/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml b/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml
index eec9afa..1773c3b 100644
--- a/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="accessibility_shortcut_toogle_warning" msgid="7758891516165017413">"When the shortcut is on, pressing both the back and down buttons for 3 seconds will start an accessibility feature.\n\n Current accessibility feature:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n You can change the feature in Settings > Accessibility."</string>
+ <string name="accessibility_shortcut_toogle_warning" msgid="7758891516165017413">"When the shortcut is on, pressing both the back and down buttons for 3 seconds will start an accessibility feature.\n\n Current accessibility feature:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n You can change the feature in Settings > Accessibility."</string>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-hy/strings.xml b/overlay/frameworks/base/core/res/res/values-hy/strings.xml
index 350e4d1..22e6fcd 100644
--- a/overlay/frameworks/base/core/res/res/values-hy/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-hy/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="accessibility_shortcut_toogle_warning" msgid="7758891516165017413">"Եթե դյուրանցումը միացված է, ապա հետ և ներքև կոճակները միասին 3 վայրկյան սեղմած պահելու դեպքում կգործարկվի մատչելիության գործառույթը:\n\n Մատչելիության ակտիվ գործառույթը՝\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Այն փոփոխելու համար անցեք Կարգավորումներ > Հատուկ գործառույթներ:"</string>
+ <string name="accessibility_shortcut_toogle_warning" msgid="7758891516165017413">"Եթե դյուրանցումը միացված է, ապա հետ և ներքև կոճակները միասին 3 վայրկյան սեղմած պահելու դեպքում կգործարկվի մատչելիության գործառույթը:\n\n Մատչելիության ակտիվ գործառույթը՝\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Այն փոփոխելու համար անցեք Կարգավորումներ > Մատչելիություն:"</string>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-vi/strings.xml b/overlay/frameworks/base/core/res/res/values-vi/strings.xml
index b01cfbc..b5e29d3 100644
--- a/overlay/frameworks/base/core/res/res/values-vi/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-vi/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="accessibility_shortcut_toogle_warning" msgid="7758891516165017413">"Khi đã bật phím tắt, nhấn vào cả hai nút quay lại và xuống trong 3 giây sẽ bắt đầu một tính năng hỗ trợ tiếp cận.\n\n Tính năng hỗ trợ tiếp cận hiện tại:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Bạn có thể thay đổi tính năng này trong Cài đặt > Hỗ trợ tiếp cận."</string>
+ <string name="accessibility_shortcut_toogle_warning" msgid="7758891516165017413">"Khi đã bật phím tắt, nhấn vào cả hai nút quay lại và xuống trong 3 giây sẽ bắt đầu một tính năng trợ năng.\n\n Tính năng trợ năng hiện tại:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Bạn có thể thay đổi tính năng trong Cài đặt > Trợ năng."</string>
</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-en-rXC/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values-en-rXC/config.xml
index f1dadfb..239608f 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-en-rXC/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-en-rXC/config.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="recents_tv_blacklist_array">
- <item msgid="9050240242608018713">"com.google.android.tv.remote.service"</item>
- <item msgid="8901636675968723687">"com.google.android.apps.mediashell"</item>
+ <item msgid="9050240242608018713">"com.google.android.tv.remote.service"</item>
+ <item msgid="8901636675968723687">"com.google.android.apps.mediashell"</item>
</string-array>
</resources>
diff --git a/products/sdk_atv_armv7.mk b/products/sdk_atv_armv7.mk
index 0803400..c112b17 100644
--- a/products/sdk_atv_armv7.mk
+++ b/products/sdk_atv_armv7.mk
@@ -16,6 +16,8 @@
PRODUCT_IS_ATV_SDK := true
+PRODUCT_USE_DYNAMIC_PARTITIONS := true
+
PRODUCT_PACKAGES := \
LeanbackSampleApp \
TelephonyProvider \
diff --git a/products/sdk_atv_x86.mk b/products/sdk_atv_x86.mk
index 6f2d544..b897416 100644
--- a/products/sdk_atv_x86.mk
+++ b/products/sdk_atv_x86.mk
@@ -22,7 +22,7 @@
PRODUCT_COPY_FILES += \
development/sys-img/advancedFeatures.ini:advancedFeatures.ini \
device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \
- prebuilts/qemu-kernel/x86_64/4.4/kernel-qemu2:kernel-ranchu-64
+ prebuilts/qemu-kernel/x86_64/4.14/kernel-qemu2:kernel-ranchu-64
# TODO: separate out a common base for arm/x86 atv SDK build.
$(call inherit-product, device/google/atv/products/sdk_atv_armv7.mk)
