Snap for 5746125 from 2738aa3f79041f8be9183dcc35c9e0220f6829d8 to qt-qpr1-release (03d3fe1f) · Commits · e / os / android_frameworks_base

core/java/android/widget/RelativeLayout.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1202,13 +1202,13 @@ public class RelativeLayout extends ViewGroup {
		* determine where to position the view on the screen. If the view is not contained
		* within a relative layout, these attributes are ignored.
		*
		* See the <a href="/guide/topics/ui/layout/relative.html">
		* Relative Layout</a> guide for example code demonstrating how to use relative layout’s
		* See the <a href="{@docRoot}guide/topics/ui/layout/relative.html">Relative
		* Layout</a> guide for example code demonstrating how to use relative layout's
		* layout parameters in a layout XML.
		*
		* To learn more about layout parameters and how they differ from typical view attributes,
		* see the <a href="/guide/topics/ui/declaring-layout.html#attributes">
		* Layouts guide</a>.
		* see the <a href="{@docRoot}guide/topics/ui/declaring-layout.html#attributes">Layouts
		* guide</a>.
		*
		*
		* @attr ref android.R.styleable#RelativeLayout_Layout_layout_alignWithParentIfMissing

core/res/res/values-zh-rCN/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -297,7 +297,7 @@
		<string name="permgrouplab_microphone" msgid="171539900250043464">"麦克风"</string>
		<string name="permgroupdesc_microphone" msgid="4988812113943554584">"录制音频"</string>
		<string name="permgrouprequest_microphone" msgid="9167492350681916038">"允许<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>录音吗？"</string>
		<string name="permgrouplab_activityRecognition" msgid="1565108047054378642">"健身运动"</string>
		<string name="permgrouplab_activityRecognition" msgid="1565108047054378642">"身体活动"</string>
		<string name="permgroupdesc_activityRecognition" msgid="6949472038320473478">"访问您的健身运动"</string>
		<string name="permgrouprequest_activityRecognition" msgid="7626438016904799383">"允许<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>访问您的健身运动吗？"</string>
		<string name="permgrouplab_camera" msgid="4820372495894586615">"相机"</string>

libs/hwui/renderthread/CanvasContext.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,8 @@ void CanvasContext::setSurface(sp<Surface>&& surface) {

		if (surface) {
		mNativeSurface = new ReliableSurface{std::move(surface)};
		mNativeSurface->setDequeueTimeout(500_ms);
		// TODO: Fix error handling & re-shorten timeout
		mNativeSurface->setDequeueTimeout(4000_ms);
		} else {
		mNativeSurface = nullptr;
		}

packages/SystemUI/res/values-da/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -255,8 +255,8 @@
		<string name="accessibility_quick_settings_flashlight_on" msgid="2003479320007841077">"Lommelygten er tændt."</string>
		<string name="accessibility_quick_settings_flashlight_changed_off" msgid="3303701786768224304">"Lommelygten er slukket."</string>
		<string name="accessibility_quick_settings_flashlight_changed_on" msgid="6531793301533894686">"Lommelygten er tændt."</string>
		<string name="accessibility_quick_settings_color_inversion_changed_off" msgid="4406577213290173911">"Invertering af farver er slået fra."</string>
		<string name="accessibility_quick_settings_color_inversion_changed_on" msgid="6897462320184911126">"Invertering af farver er slået til."</string>
		<string name="accessibility_quick_settings_color_inversion_changed_off" msgid="4406577213290173911">"Ombytning af farver er slået fra."</string>
		<string name="accessibility_quick_settings_color_inversion_changed_on" msgid="6897462320184911126">"Ombytning af farver er slået til."</string>
		<string name="accessibility_quick_settings_hotspot_changed_off" msgid="5004708003447561394">"Mobilhotspot er slået fra."</string>
		<string name="accessibility_quick_settings_hotspot_changed_on" msgid="2890951609226476206">"Mobilhotspot er slået til."</string>
		<string name="accessibility_casting_turned_off" msgid="1430668982271976172">"Casting af din skærm er stoppet."</string>

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java

+3 −18

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ import android.content.Context;
		import android.content.res.Resources;
		import android.graphics.Color;
		import android.graphics.Rect;
		import android.provider.Settings;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -32,7 +31,6 @@ import com.android.systemui.statusbar.notification.NotificationUtils;
		import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
		import com.android.systemui.tuner.TunerService;

		import java.util.ArrayList;
		import java.util.Objects;
		@@ -58,7 +56,6 @@ public class NotificationIconAreaController implements DarkReceiver,
		private final KeyguardBypassController mBypassController;
		private final DozeParameters mDozeParameters;

		private boolean mShowSilentOnLockscreen = true;
		private int mIconSize;
		private int mIconHPadding;
		private int mIconTint = Color.WHITE;
		@@ -101,11 +98,6 @@ public class NotificationIconAreaController implements DarkReceiver,

		initializeNotificationAreaViews(context);
		reloadAodColor();

		TunerService tunerService = Dependency.get(TunerService.class);
		tunerService.addTunable((key, newValue) -> {
		mShowSilentOnLockscreen = "1".equals(newValue);
		}, Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS);
		}

		protected View inflateIconArea(LayoutInflater inflater) {
		@@ -238,7 +230,7 @@ public class NotificationIconAreaController implements DarkReceiver,
		}

		protected boolean shouldShowNotificationIcon(NotificationEntry entry,
		boolean showAmbient, boolean showLowPriority, boolean hideDismissed,
		boolean showAmbient, boolean hideDismissed,
		boolean hideRepliedMessages, boolean hideCurrentMedia, boolean hideCenteredIcon,
		boolean hidePulsing, boolean onlyShowCenteredIcon) {

		@@ -257,9 +249,6 @@ public class NotificationIconAreaController implements DarkReceiver,
		if (hideCurrentMedia && entry.key.equals(mMediaManager.getMediaNotificationKey())) {
		return false;
		}
		if (!showLowPriority && !entry.isHighPriority()) {
		return false;
		}
		if (!entry.isTopLevelChild()) {
		return false;
		}
		@@ -297,7 +286,6 @@ public class NotificationIconAreaController implements DarkReceiver,
		private void updateShelfIcons() {
		updateIconsForLayout(entry -> entry.expandedIcon, mShelfIcons,
		true /* showAmbient */,
		true /* showLowPriority */,
		false /* hideDismissed */,
		false /* hideRepliedMessages */,
		false /* hideCurrentMedia */,
		@@ -309,7 +297,6 @@ public class NotificationIconAreaController implements DarkReceiver,
		public void updateStatusBarIcons() {
		updateIconsForLayout(entry -> entry.icon, mNotificationIcons,
		false /* showAmbient */,
		true /* showLowPriority */,
		true /* hideDismissed */,
		true /* hideRepliedMessages */,
		false /* hideCurrentMedia */,
		@@ -321,7 +308,6 @@ public class NotificationIconAreaController implements DarkReceiver,
		private void updateCenterIcon() {
		updateIconsForLayout(entry -> entry.centeredIcon, mCenteredIcon,
		false /* showAmbient */,
		true /* showLowPriority */,
		false /* hideDismissed */,
		false /* hideRepliedMessages */,
		false /* hideCurrentMedia */,
		@@ -333,7 +319,6 @@ public class NotificationIconAreaController implements DarkReceiver,
		public void updateAodNotificationIcons() {
		updateIconsForLayout(entry -> entry.aodIcon, mAodIcons,
		false /* showAmbient */,
		mShowSilentOnLockscreen /* showLowPriority */,
		true /* hideDismissed */,
		true /* hideRepliedMessages */,
		true /* hideCurrentMedia */,
		@@ -353,7 +338,7 @@ public class NotificationIconAreaController implements DarkReceiver,
		* @param hidePulsing should pulsing notifications be hidden
		*/
		private void updateIconsForLayout(Function<NotificationEntry, StatusBarIconView> function,
		NotificationIconContainer hostLayout, boolean showAmbient, boolean showLowPriority,
		NotificationIconContainer hostLayout, boolean showAmbient,
		boolean hideDismissed, boolean hideRepliedMessages, boolean hideCurrentMedia,
		boolean hideCenteredIcon, boolean hidePulsing, boolean onlyShowCenteredIcon) {
		ArrayList<StatusBarIconView> toShow = new ArrayList<>(
		@@ -364,7 +349,7 @@ public class NotificationIconAreaController implements DarkReceiver,
		View view = mNotificationScrollLayout.getChildAt(i);
		if (view instanceof ExpandableNotificationRow) {
		NotificationEntry ent = ((ExpandableNotificationRow) view).getEntry();
		if (shouldShowNotificationIcon(ent, showAmbient, showLowPriority, hideDismissed,
		if (shouldShowNotificationIcon(ent, showAmbient, hideDismissed,
		hideRepliedMessages, hideCurrentMedia, hideCenteredIcon, hidePulsing,
		onlyShowCenteredIcon)) {
		StatusBarIconView iconView = function.apply(ent);