Snap for 9048375 from 1eaf0fadf2046b644f62bbd502fd9ec2079a14e7 to tm-qpr1-release (5e2525ac) · Commits · e / os / android_frameworks_base

core/java/android/service/trust/TrustAgentService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,9 @@ public class TrustAgentService extends Service {
		*
		* Without this flag, the message passed to {@code grantTrust} is only used for debugging
		* purposes. With the flag, it may be displayed to the user as the reason why the device is
		* unlocked.
		* unlocked. If this flag isn't set OR the message is set to null, the device will display
		* its own default message for trust granted. If the TrustAgent intentionally doesn't want to
		* show any message, then it can set this flag AND set the message to an empty string.
		*/
		public static final int FLAG_GRANT_TRUST_DISPLAY_MESSAGE = 1 << 3;

core/java/android/view/View.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -12709,7 +12709,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if (mViewTranslationCallback != null) {
		mViewTranslationCallback.onClearTranslation(this);
		}
		clearViewTranslationCallback();
		clearViewTranslationResponse();
		if (hasTranslationTransientState()) {
		setHasTransientState(false);

core/java/com/android/internal/widget/ConversationLayout.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ public class ConversationLayout extends FrameLayout
		private Icon mLargeIcon;
		private View mExpandButtonContainer;
		private ViewGroup mExpandButtonAndContentContainer;
		private ViewGroup mExpandButtonContainerA11yContainer;
		private NotificationExpandButton mExpandButton;
		private MessagingLinearLayout mImageMessageContainer;
		private int mBadgeProtrusion;
		@@ -234,6 +235,8 @@ public class ConversationLayout extends FrameLayout
		});
		mConversationText = findViewById(R.id.conversation_text);
		mExpandButtonContainer = findViewById(R.id.expand_button_container);
		mExpandButtonContainerA11yContainer =
		findViewById(R.id.expand_button_a11y_container);
		mConversationHeader = findViewById(R.id.conversation_header);
		mContentContainer = findViewById(R.id.notification_action_list_margin_target);
		mExpandButtonAndContentContainer = findViewById(R.id.expand_button_and_content_container);
		@@ -1091,7 +1094,7 @@ public class ConversationLayout extends FrameLayout
		newContainer = mExpandButtonAndContentContainer;
		} else {
		buttonGravity = Gravity.CENTER_HORIZONTAL \| Gravity.TOP;
		newContainer = this;
		newContainer = mExpandButtonContainerA11yContainer;
		}
		mExpandButton.setExpanded(!mIsCollapsed);

core/res/res/layout/notification_template_material_conversation.xml

+48 −31

Original line number	Diff line number	Diff line
		@@ -89,8 +89,24 @@
		<include layout="@layout/notification_material_action_list" />
		</com.android.internal.widget.RemeasuringLinearLayout>

		<!--This is dynamically placed between here and at the end of the layout. It starts here since
		only FrameLayout layout params have gravity-->
		<!--expand_button_a11y_container ensures talkback focus order is correct when view is expanded.
		The -1px of marginTop and 1px of paddingTop make sure expand_button_a11y_container is prior to
		its sibling view in accessibility focus order.
		{see android.view.ViewGroup.addChildrenForAccessibility()}
		expand_button_container will be moved under expand_button_and_content_container when collapsed,
		this dynamic movement ensures message can flow under expand button when expanded-->
		<FrameLayout
		android:id="@+id/expand_button_a11y_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="end\|top"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:layout_marginTop="-1px"
		android:paddingTop="1px"
		>
		<!--expand_button_container is dynamically placed between here and at the end of the
		layout. It starts here since only FrameLayout layout params have gravity-->
		<FrameLayout
		android:id="@+id/expand_button_container"
		android:layout_width="wrap_content"
		@@ -98,9 +114,9 @@
		android:layout_gravity="end\|top"
		android:clipChildren="false"
		android:clipToPadding="false">
		<!--This layout makes sure that we can nicely center the expand content in the
		collapsed layout while the parent makes sure that we're never laid out bigger
		than the messaging content.-->
		<!--expand_button_touch_container makes sure that we can nicely center the expand
		content in the collapsed layout while the parent makes sure that we're never laid out
		bigger than the messaging content.-->
		<LinearLayout
		android:id="@+id/expand_button_touch_container"
		android:layout_width="wrap_content"
		@@ -130,4 +146,5 @@
		/>
		</LinearLayout>
		</FrameLayout>
		</FrameLayout>
		</com.android.internal.widget.ConversationLayout>

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -4279,6 +4279,7 @@
		<java-symbol type="id" name="conversation_icon_badge_ring" />
		<java-symbol type="id" name="conversation_icon_badge_bg" />
		<java-symbol type="id" name="expand_button_container" />
		<java-symbol type="id" name="expand_button_a11y_container" />
		<java-symbol type="id" name="expand_button_touch_container" />
		<java-symbol type="id" name="messaging_group_content_container" />
		<java-symbol type="id" name="expand_button_and_content_container" />