Merge "Fix EnRouteView expand button not expanding issue." into main (6a7b8d72) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/notification_template_en_route_contracted.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		<com.android.systemui.statusbar.notification.row.ui.view.EnRouteView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/status_bar_latest_event_content"
		android:id="@*android:id/status_bar_latest_event_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"

packages/SystemUI/res/layout/notification_template_en_route_expanded.xml

0 → 100644

+86 −0

Original line number	Diff line number	Diff line
		<?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
		-->
		<com.android.systemui.statusbar.notification.row.ui.view.EnRouteView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@*android:id/status_bar_latest_event_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:clipChildren="false"
		android:tag="big"
		>

		<LinearLayout
		android:id="@*android:id/notification_action_list_margin_target"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@*android:dimen/notification_content_margin"
		android:orientation="vertical"
		>

		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:layout_gravity="top"
		>

		<include layout="@*android:layout/notification_template_header" />

		<LinearLayout
		android:id="@*android:id/notification_main_column"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="@*android:dimen/notification_content_margin_start"
		android:layout_marginEnd="@*android:dimen/notification_content_margin_end"
		android:layout_marginTop="@*android:dimen/notification_content_margin_top"
		android:orientation="vertical"
		>

		<include layout="@*android:layout/notification_template_part_line1" />

		<include layout="@*android:layout/notification_template_text_multiline" />

		<include
		android:layout_width="match_parent"
		android:layout_height="@*android:dimen/notification_progress_bar_height"
		android:layout_marginTop="@*android:dimen/notification_progress_margin_top"
		layout="@*android:layout/notification_template_progress"
		/>
		</LinearLayout>

		<include layout="@*android:layout/notification_template_right_icon" />
		</FrameLayout>

		<ViewStub
		android:layout="@*android:layout/notification_material_reply_text"
		android:id="@*android:id/notification_material_reply_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		/>

		<include
		layout="@*android:layout/notification_template_smart_reply_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="@*android:dimen/notification_content_margin_start"
		android:layout_marginEnd="@*android:dimen/notification_content_margin_end"
		android:layout_marginTop="@*android:dimen/notification_content_margin"
		/>

		<include layout="@*android:layout/notification_material_action_list" />
		</LinearLayout>
		</com.android.systemui.statusbar.notification.row.ui.view.EnRouteView>

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RichOngoingNotificationViewInflater.kt

+12 −2

Original line number	Diff line number	Diff line
		@@ -198,12 +198,22 @@ constructor(
		parentView,
		/* attachToRoot= */ false
		) as EnRouteView

		InflatedContentViewHolder(newView) {
		EnRouteViewBinder.bindWhileAttached(newView, createViewModel())
		}
		}
		RichOngoingNotificationViewType.Expanded,
		RichOngoingNotificationViewType.Expanded -> {
		val newView =
		LayoutInflater.from(systemUiContext)
		.inflate(
		R.layout.notification_template_en_route_expanded,
		parentView,
		/* attachToRoot= */ false
		) as EnRouteView
		InflatedContentViewHolder(newView) {
		EnRouteViewBinder.bindWhileAttached(newView, createViewModel())
		}
		}
		RichOngoingNotificationViewType.HeadsUp -> NullContentView
		}
		}