Snap for 4957529 from 5cd354c89cd3a48aa306e7f8fcaafb4417fa0a40 to pi-qpr1-release (be8bf8b1) · Commits · e / os / android_frameworks_base

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+15 −18

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.content.res.XmlResourceParser;
		import android.hardware.fingerprint.FingerprintManager;
		import android.os.Build;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.AttributeSet;
		@@ -189,12 +188,10 @@ public class AccessibilityServiceInfo implements Parcelable {
		* content and also the accessibility service will receive accessibility events from
		* them.
		* <p>
		* <strong>Note:</strong> For accessibility services targeting API version
		* {@link Build.VERSION_CODES#JELLY_BEAN} or higher this flag has to be explicitly
		* set for the system to regard views that are not important for accessibility. For
		* accessibility services targeting API version lower than
		* {@link Build.VERSION_CODES#JELLY_BEAN} this flag is ignored and all views are
		* regarded for accessibility purposes.
		* <strong>Note:</strong> For accessibility services targeting Android 4.1 (API level 16) or
		* higher, this flag has to be explicitly set for the system to regard views that are not
		* important for accessibility. For accessibility services targeting Android 4.0.4 (API level
		* 15) or lower, this flag is ignored and all views are regarded for accessibility purposes.
		* </p>
		* <p>
		* Usually views not important for accessibility are layout managers that do not
		@@ -219,19 +216,19 @@ public class AccessibilityServiceInfo implements Parcelable {
		* flag does not guarantee that the device will not be in touch exploration
		* mode since there may be another enabled service that requested it.
		* <p>
		* For accessibility services targeting API version higher than
		* {@link Build.VERSION_CODES#JELLY_BEAN_MR1} that want to set
		* this flag have to declare this capability in their meta-data by setting
		* the attribute {@link android.R.attr#canRequestTouchExplorationMode
		* canRequestTouchExplorationMode} to true, otherwise this flag will
		* For accessibility services targeting Android 4.3 (API level 18) or higher
		* that want to set this flag have to declare this capability in their
		* meta-data by setting the attribute
		* {@link android.R.attr#canRequestTouchExplorationMode
		* canRequestTouchExplorationMode} to true. Otherwise, this flag will
		* be ignored. For how to declare the meta-data of a service refer to
		* {@value AccessibilityService#SERVICE_META_DATA}.
		* </p>
		* <p>
		* Services targeting API version equal to or lower than
		* {@link Build.VERSION_CODES#JELLY_BEAN_MR1} will work normally, i.e.
		* the first time they are run, if this flag is specified, a dialog is
		* shown to the user to confirm enabling explore by touch.
		* Services targeting Android 4.2.2 (API level 17) or lower will work
		* normally. In other words, the first time they are run, if this flag is
		* specified, a dialog is shown to the user to confirm enabling explore by
		* touch.
		* </p>
		* @see android.R.styleable#AccessibilityService_canRequestTouchExplorationMode
		*/
		@@ -387,10 +384,10 @@ public class AccessibilityServiceInfo implements Parcelable {
		public int feedbackType;

		/**
		* The timeout after the most recent event of a given type before an
		* The timeout, in milliseconds, after the most recent event of a given type before an
		* {@link AccessibilityService} is notified.
		* <p>
		* <strong>Can be dynamically set at runtime.</strong>.
		* <strong>Can be dynamically set at runtime.</strong>
		* </p>
		* <p>
		* <strong>Note:</strong> The event notification timeout is useful to avoid propagating

core/java/android/text/Layout.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1583,7 +1583,8 @@ public abstract class Layout {
		}

		float get(final int offset) {
		if (mHorizontals == null) {
		if (mHorizontals == null \|\| offset < mLineStartOffset
		\|\| offset >= mLineStartOffset + mHorizontals.length) {
		return getHorizontal(offset, mPrimary);
		} else {
		return mHorizontals[offset - mLineStartOffset];

core/res/res/values-mcc214-mnc01/config.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -40,4 +40,7 @@
		<item>INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</item>
		</string-array>

		<!-- Whether safe headphone volume warning dialog is disabled on Vol+ (operator specific). -->
		<bool name="config_safe_media_disable_on_volume_up">false</bool>

		</resources>

core/res/res/values-mcc222-mnc10/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -28,4 +28,8 @@
		<string-array translatable="false" name="config_tether_apndata">
		<item>Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</item>
		</string-array>

		<!-- Whether safe headphone volume warning dialog is disabled on Vol+ (operator specific). -->
		<bool name="config_safe_media_disable_on_volume_up">false</bool>

		</resources>

core/res/res/values-mcc234-mnc15/config.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2018, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">

		<!-- Whether safe headphone volume warning dialog is disabled on Vol+ (operator specific). -->
		<bool name="config_safe_media_disable_on_volume_up">false</bool>

		</resources>