diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-10 00:09:04 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-10 00:09:04 +0000 |
| commit | ef37a6322934498491507dac7fc4f8b165456bc2 (patch) | |
| tree | 120ff23204dae7d38a938892316337dc8eeaea9d | |
| parent | 0a5432637e7a123ebbb632ed4e72574059f5f062 (diff) | |
| parent | b3419444f206f72bf79304720156e6023f80a562 (diff) | |
| download | Car-ef37a6322934498491507dac7fc4f8b165456bc2.tar.gz | |
Snap for 8282142 from b3419444f206f72bf79304720156e6023f80a562 to sc-qpr3-release
Change-Id: Ia566319ae9169cdd45d9460cfaa96abfce57f211
3 files changed, 39 insertions, 9 deletions
diff --git a/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/layout/car_notification_body_view.xml b/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/layout/car_notification_body_view.xml index 2a3fba18e6..5203840502 100644 --- a/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/layout/car_notification_body_view.xml +++ b/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/layout/car_notification_body_view.xml @@ -68,13 +68,4 @@ android:layout_below="@id/notification_body_content" android:layout_marginTop="@dimen/message_count_top_margin" style="@style/NotificationBodyContentText"/> - - <DateTimeView - android:id="@+id/time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/notification_body_content" - android:layout_alignParentEnd="true" - android:layout_marginEnd="@dimen/time_margin" - style="@style/NotificationHeaderText"/> </merge> diff --git a/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/layout/car_notification_header_view.xml b/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/layout/car_notification_header_view.xml new file mode 100644 index 0000000000..5cc05e939a --- /dev/null +++ b/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/layout/car_notification_header_view.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 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. +--> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <ImageView + android:id="@+id/app_icon" + android:layout_width="@dimen/notification_secondary_icon_size" + android:layout_height="@dimen/notification_secondary_icon_size" + android:layout_gravity="center_vertical" + android:scaleType="fitCenter"/> + + <TextView + android:id="@+id/header_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingStart="@dimen/header_small_icon_padding" + style="@style/NotificationHeaderText"/> + + <DateTimeView + android:id="@+id/time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/NotificationHeaderText"/> +</merge> + diff --git a/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/xml/overlays.xml b/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/xml/overlays.xml index adf311bb1a..c5ed6c53a5 100644 --- a/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/xml/overlays.xml +++ b/car_product/car_ui_portrait/rro/CarUiPortraitNotificationRRO/res/xml/overlays.xml @@ -116,6 +116,7 @@ <item target="layout/car_warning_notification_template" value="@layout/car_warning_notification_template"/> <item target="layout/headsup_container_bottom" value="@layout/headsup_container_bottom"/> <item target="layout/message_headsup_notification_template" value="@layout/message_headsup_notification_template" /> + <item target="layout/car_notification_header_view" value="@layout/car_notification_header_view"/> <item target="layout/notification_center_activity" value="@layout/notification_center_activity"/> <item target="drawable/ic_reply" value="@drawable/ic_reply"/> |