Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7d7a2fb authored by Alison Cichowlas's avatar Alison Cichowlas
Browse files

Layout for full inline demote button. 

- Allow NotificationMenuRow to accept a generic view, not just icon id,
for a MenuRowItem
- Add text, background
- Update text formatting for button & undo
- Pin icon filled not outlined

Bug: 379186372
Test: atest SystemUiTests
Flag: com.android.systemui.permission_helper_inline_ui_rich_ongoing
Change-Id: Ib194984f0831ee90fd12adb4347b4ca9d6dd7ef9
parent 86c44cf9

packages/SystemUI/res/drawable/notification_menu_button_background.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2025 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

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <solid android:color="#202124"/>

    <corners android:radius="@dimen/notification_corner_radius"/>

</shape>

packages/SystemUI/res/drawable/unpin_icon.xml

+6 −6
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:tint="?attr/colorControlNormal"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal">

    android:viewportWidth="960">

    <path

        android:fillColor="@android:color/white"

      android:pathData="M680,120L680,200L640,200L640,527L560,447L560,200L400,200L400,287L313,200L280,167L280,167L280,120L680,120ZM480,920L440,880L440,640L240,640L240,560L320,480L320,434L56,168L112,112L848,848L790,904L526,640L520,640L520,880L480,920ZM354,560L446,560L402,516L400,514L354,560ZM480,367L480,367L480,367L480,367ZM402,516L402,516L402,516L402,516Z"/>

        android:pathData="M680,120L680,200L640,200L640,527L313,200L280,167L280,167L280,120L680,120ZM480,920L440,880L440,640L240,640L240,560L320,480L320,434L56,168L112,112L848,848L790,904L526,640L520,640L520,880L480,920Z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/layout/promoted_menu_item.xml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2025 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.

  -->

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:layout_width="wrap_content"

    android:layout_height="match_parent">

    <androidx.constraintlayout.widget.ConstraintLayout

        android:layout_height="match_parent"

        android:layout_width="@dimen/notification_menu_item_width"

        android:background="@drawable/notification_menu_button_background"

        android:backgroundTint="@androidprv:color/materialColorPrimaryContainer"

        android:padding="@dimen/notification_menu_button_padding">

        <ImageView

            android:id="@+id/promoted_menuitem_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:tint="@androidprv:color/materialColorPrimary"

            android:src="@drawable/unpin_icon" />

        <TextView

            android:id="@+id/promoted_menuitem_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/notification_inline_disable_promotion_button"

            style="@style/TextAppearance.NotificationMenuButtonText"/>

        <androidx.constraintlayout.helper.widget.Flow

            android:id="@+id/flow3"

            android:orientation="vertical"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            app:flow_verticalStyle="packed"

            app:flow_horizontalAlign="center"

            app:flow_verticalAlign="center"

            app:constraint_referenced_ids="promoted_menuitem_icon,promoted_menuitem_text"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"/>

    </androidx.constraintlayout.widget.ConstraintLayout>

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/promoted_permission_guts.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
            android:textColor="@androidprv:color/materialColorOnSurface"

            android:minWidth="@dimen/min_clickable_item_size"

            android:minHeight="@dimen/min_clickable_item_size"

            style="@style/TextAppearance.NotificationInfo.Button" />

            style="@style/TextAppearance.NotificationMenuButtonText" />



        <TextView

            android:id="@+id/undo"

packages/SystemUI/res/values/dimens.xml

+6 −1
Original line number Diff line number Diff line
@@ -300,6 +300,9 @@ 
    <!-- Side padding on the side of notifications -->

    <dimen name="notification_side_paddings">16dp</dimen>



    <!-- Width of inline notification menu item buttons -->

    <dimen name="notification_menu_item_width">112dp</dimen>



    <!-- Starting translateY offset of the HUN appear and disappear animations. Indicates

    the amount by the view is positioned above the screen before the animation starts. -->

    <dimen name="heads_up_appear_y_above_screen">32dp</dimen>
@@ -370,10 +373,12 @@ 
    <dimen name="min_notification_layout_height">48dp</dimen>



    <!-- Size of the space to place a notification menu item -->

    <dimen name="notification_menu_icon_size">64dp</dimen>

    <dimen name="notification_menu_icon_size">120dp</dimen>



    <!-- The space around a notification menu item  -->

    <dimen name="notification_menu_icon_padding">20dp</dimen>

    <!-- The space around a notification menu button  -->

    <dimen name="notification_menu_button_padding">8dp</dimen>



    <!-- scroll view the size of 3 channel rows -->

    <dimen name="notification_blocker_channel_list_height">192dp</dimen>