diff options
author | Xin Li <delphij@google.com> | 2018-08-13 13:01:01 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2018-08-13 13:01:01 -0700 |
commit | 7ac9abfb424de505fc2543da8a6111a8983529f7 (patch) | |
tree | fe39fb67126cee63b25116fe41e703da29407bf9 | |
parent | a3de2fe435297ad2d2e1121a731caf6ca24095a1 (diff) | |
parent | 67a01dd8c07da7e8c0f280653cdc230ee7bfcc63 (diff) | |
download | device_google_atv-7ac9abfb424de505fc2543da8a6111a8983529f7.tar.gz device_google_atv-7ac9abfb424de505fc2543da8a6111a8983529f7.tar.bz2 device_google_atv-7ac9abfb424de505fc2543da8a6111a8983529f7.zip |
Merge stage-dr1-aosp-master into stage-aosp-master
Bug: 112535855
Change-Id: I95cf94703e9f7cdba8a00069ad5a5dd7702e7db5
-rw-r--r-- | overlay/frameworks/base/core/res/res/values-hy/strings.xml | 2 | ||||
-rw-r--r-- | overlay/frameworks/base/core/res/res/values-vi/strings.xml | 2 | ||||
-rw-r--r-- | permissions/tv_core_hardware.xml | 4 | ||||
-rw-r--r-- | sdk/images_armeabi-v7a_source.prop_template | 2 | ||||
-rw-r--r-- | sdk/images_x86_source.prop_template | 2 |
5 files changed, 6 insertions, 6 deletions
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/permissions/tv_core_hardware.xml b/permissions/tv_core_hardware.xml index 74403e2..d9d4eb1 100644 --- a/permissions/tv_core_hardware.xml +++ b/permissions/tv_core_hardware.xml @@ -30,8 +30,8 @@ <feature name="android.software.leanback" /> <feature name="android.software.leanback_only" /> <feature name="android.software.live_tv" /> - <feature name="android.software.picture_in_picture" /> - <feature name="android.software.activities_on_secondary_displays" /> + <feature name="android.software.picture_in_picture" notLowRam="true" /> + <feature name="android.software.activities_on_secondary_displays" notLowRam="true" /> <feature name="android.software.voice_recognizers" /> <feature name="android.software.input_methods" /> <feature name="android.software.autofill" /> diff --git a/sdk/images_armeabi-v7a_source.prop_template b/sdk/images_armeabi-v7a_source.prop_template index c0fc670..f65eaed 100644 --- a/sdk/images_armeabi-v7a_source.prop_template +++ b/sdk/images_armeabi-v7a_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false -Pkg.Revision=4 +Pkg.Revision=5 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} SystemImage.Abi=armeabi-v7a diff --git a/sdk/images_x86_source.prop_template b/sdk/images_x86_source.prop_template index 5477fcd..636280d 100644 --- a/sdk/images_x86_source.prop_template +++ b/sdk/images_x86_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false -Pkg.Revision=4 +Pkg.Revision=5 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} SystemImage.Abi=x86 |