summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-07-08 03:14:30 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-07-08 03:14:30 +0000
commit1ca1b8e764b57a449a2e0b9d17e1cd173ab8b3b2 (patch)
tree251104148eec9f6dff7831027b0d3302dbb68a03
parenta03111324d0c9eabea17db2935578cf2075b39ca (diff)
parente844dc4c27f11d0f229cd682db7eb978a5f0f647 (diff)
downloadatv-android-9.0.0_r12.tar.gz
Snap for 4880674 from e844dc4c27f11d0f229cd682db7eb978a5f0f647 to pi-dr1-releaseandroid-9.0.0_r12android-9.0.0_r11pie-dr1-release
Change-Id: I5338c87260e2a59824d4de79876c7476d36e0421
-rw-r--r--overlay/frameworks/base/core/res/res/values-as/strings.xml20
-rw-r--r--overlay/frameworks/base/packages/SystemUI/res/values-as/config.xml23
-rw-r--r--sdk/images_armeabi-v7a_source.prop_template2
-rw-r--r--sdk/images_x86_source.prop_template2
4 files changed, 45 insertions, 2 deletions
diff --git a/overlay/frameworks/base/core/res/res/values-as/strings.xml b/overlay/frameworks/base/core/res/res/values-as/strings.xml
new file mode 100644
index 0000000..cdb6d20
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-as/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<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">"শ্বৰ্টকাট অন হৈ থকাৰ সময়ত দুয়োটা ভলিউম বুটামত ৩ ছেকেণ্ডৰ বাবে টিপি থাকিলে সাধ্য সুবিধা এটা আৰম্ভ হ\'ব।\n\n এতিয়া ব্য়ৱহাৰ কৰি থকা সাধ্য সুবিধাবোৰ হৈছে:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n আপুনি এই সুবিধাটো ছেটিংসমূহত &gt;; সাধ্য সুবিধাসমূহত সলনি কৰিব পাৰে।"</string>
+</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-as/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values-as/config.xml
new file mode 100644
index 0000000..9c7cfc9
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-as/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<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>
+ </string-array>
+</resources>
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