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

Commit bdec8a94 authored by Iavor-Valentin Iftime's avatar Iavor-Valentin Iftime Committed by Android (Google) Code Review
Browse files

Merge "Affordance view for notification bundles onboarding" into main

parents 15ae1670 d48db555
Loading
Loading
Loading
Loading
+9 −0
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="12"
    android:viewportHeight="12">
        <path
            android:pathData="M4.28501 7.14169C5.06182 8.43637 6.93818 8.43637 7.71499 7.14169L12 2.09815e-06L1.74846e-06 0L4.28501 7.14169Z"
            android:fillColor="#ffffff"/>
</vector>
+118 −0
Original line number Diff line number Diff line
<!--
  ~ 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
  -->

<!-- Extends FrameLayout -->
<com.android.systemui.statusbar.notification.stack.OnboardingAffordanceView
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content">

  <LinearLayout
      android:id="@+id/content"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:layout_gravity="center"
      android:clipChildren="false"
      android:forceHasOverlappingRendering="false"
      android:gravity="center_vertical"
      android:orientation="vertical">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:gravity="center_vertical"
        android:orientation="vertical"
        android:clipChildren="false"
        android:forceHasOverlappingRendering="false"
        android:padding="16dp"
        android:background="@drawable/rounded_bg_full"
        android:backgroundTint="@androidprv:color/materialColorTertiaryFixed">

      <LinearLayout
          android:id="@+id/row1"
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
          android:layout_gravity="bottom"
          android:clipChildren="false"
          android:forceHasOverlappingRendering="false"
          android:gravity="center"
          android:orientation="horizontal">
            <ImageView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:paddingRight="16dp"
                android:src="@drawable/ic_lightbulb"
                android:tint="@androidprv:color/materialColorOnTertiaryFixed" />

            <TextView
                android:id="@+id/message"
                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:focusable="true"
                android:forceHasOverlappingRendering="false"
                android:text="@string/notification_onboarding_bundles_message"
                android:textColor="@androidprv:color/materialColorOnTertiaryFixed" />
      </LinearLayout>

      <LinearLayout
          android:id="@+id/row2"
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
          android:layout_gravity="center"
          android:clipChildren="false"
          android:forceHasOverlappingRendering="false"
          android:gravity="end"
          android:orientation="horizontal">
            <TextView
                android:id="@+id/btn_turn_on"
                style="@*android:style/Widget.DeviceDefault.Notification.Text"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:focusable="true"
                android:forceHasOverlappingRendering="false"
                android:paddingHorizontal="16dp"
                android:paddingTop="10dp"
                android:paddingBottom="4dp"
                android:text="@string/learn_more"
                android:textColor="@androidprv:color/materialColorOnTertiaryFixedVariant" />
            <TextView
                android:id="@+id/btn_dismiss"
                style="@*android:style/Widget.DeviceDefault.Notification.Text"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:focusable="true"
                android:forceHasOverlappingRendering="false"
                android:paddingHorizontal="16dp"
                android:paddingTop="10dp"
                android:paddingBottom="4dp"
                android:text="@string/got_it"
                android:textColor="@androidprv:color/materialColorOnTertiaryFixedVariant" />
      </LinearLayout>

    </LinearLayout>

    <ImageView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:tint="@androidprv:color/materialColorTertiaryFixed"
        android:src="@drawable/ic_notif_beak" />
  </LinearLayout>

</com.android.systemui.statusbar.notification.stack.OnboardingAffordanceView>
+5 −2
Original line number Diff line number Diff line
@@ -2126,12 +2126,15 @@
    <!-- [CHAR LIMIT=100] Notification bundle inline settings summary -->
    <string name="notification_guts_recs_summary">Newsletters, recommended media, and more</string>

    <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
    <!-- Notification summaries onboarding affordance turn on button [CHAR LIMIT=40]-->
    <string name="notification_onboarding_summaries_turn_on">Turn on</string>

    <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=NONE]-->
    <!--  Notification summaries onboarding affordance message [CHAR LIMIT=NONE]-->
    <string name="notification_onboarding_summaries_message">Your longer conversations can now be summarized to give you quick recaps</string>

    <!--  Notification bundles onboarding affordance  [CHAR LIMIT=NONE]-->
    <string name="notification_onboarding_bundles_message">Notification organizer bundles and silences lower priority notifications</string>

    <!-- Notification Inline controls: button to dismiss the blocking helper [CHAR_LIMIT=20] -->
    <string name="inline_done_button">Done</string>