Snap for 6723788 from 5a187f3d19f7e9d1a6b6a1a834cb1eb30f4bafff to rvc-qpr1-release (f0cdaf55) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PermissionInfo.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -525,6 +525,9 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
		if ((level & PermissionInfo.PROTECTION_FLAG_APP_PREDICTOR) != 0) {
		protLevel += "\|appPredictor";
		}
		if ((level & PermissionInfo.PROTECTION_FLAG_COMPANION) != 0) {
		protLevel += "\|companion";
		}
		if ((level & PermissionInfo.PROTECTION_FLAG_RETAIL_DEMO) != 0) {
		protLevel += "\|retailDemo";
		}

+0 −11

Original line number	Diff line number	Diff line
		@@ -10769,17 +10769,6 @@ public final class Settings {
		*/
		public static final String MODE_RINGER = "mode_ringer";

		/**
		* Specifies whether Enhanced Connectivity is enabled or not. This setting allows the
		* Connectivity Thermal Power Manager to actively help the device to save power in 5G
		* scenarios
		* Type: int 1 is enabled, 0 is disabled
		*
		* @hide
		*/
		public static final String ENHANCED_CONNECTIVITY_ENABLED =
		"enhanced_connectivity_enable";

		/**
		* Overlay display devices setting.
		* The associated value is a specially formatted string that describes the

+11 −8

Original line number	Diff line number	Diff line
		@@ -311,6 +311,9 @@ public class FocusFinder {
		}

		final int count = focusables.size();
		if (count < 2) {
		return null;
		}
		switch (direction) {
		case View.FOCUS_FORWARD:
		return getNextFocusable(focused, focusables, count);
		@@ -373,30 +376,30 @@ public class FocusFinder {
		}

		private static View getNextFocusable(View focused, ArrayList<View> focusables, int count) {
		if (count < 2) {
		return null;
		}
		if (focused != null) {
		int position = focusables.lastIndexOf(focused);
		if (position >= 0 && position + 1 < count) {
		return focusables.get(position + 1);
		}
		}
		if (!focusables.isEmpty()) {
		return focusables.get(0);
		}
		return null;
		}

		private static View getPreviousFocusable(View focused, ArrayList<View> focusables, int count) {
		if (count < 2) {
		return null;
		}
		if (focused != null) {
		int position = focusables.indexOf(focused);
		if (position > 0) {
		return focusables.get(position - 1);
		}
		}
		if (!focusables.isEmpty()) {
		return focusables.get(count - 1);
		}
		return null;
		}

		private static View getNextKeyboardNavigationCluster(
		View root,

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2020 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.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_focused="true">
		<ripple android:color="#2371cd">
		<item android:id="@android:id/mask">
		<color android:color="@*android:color/car_white_1000"/>
		</item>
		</ripple>
		</item>
		<item>
		<ripple android:color="?android:attr/colorControlHighlight">
		<item android:id="@android:id/mask">
		<color android:color="@*android:color/car_white_1000"/>
		</item>
		</ripple>
		</item>
		</selector>

+11 −4

Original line number	Diff line number	Diff line
		@@ -16,11 +16,18 @@
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_focused="true">
		<ripple android:color="#4b9eff">
		<item android:id="@android:id/mask">
		<color android:color="@*android:color/car_white_1000"/>
		<layer-list>
		<item>
		<shape android:shape="rectangle">
		<solid android:color="#3D94CBFF"/>
		</shape>
		</item>
		</ripple>
		<item>
		<shape android:shape="rectangle">
		<stroke android:width="8dp" android:color="#94CBFF"/>
		</shape>
		</item>
		</layer-list>
		</item>
		<item>
		<ripple android:color="?android:attr/colorControlHighlight">