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

Commit 384d9cc1 authored by Yining Liu's avatar Yining Liu
Browse files

Add notif on ls icons to the settings page 

Add the UX chosen icons to the notification on lockscreen settings
page for selecting compact view/full list view. Also implemented the
dynamic colors for theme changes.

Bug: 367455695
Bug: 383778222
Flag: com.android.server.notification.notification_lock_screen_settings
Test: manual
Change-Id: Ib8b7fb6544ba5b806ca4167d4a68e9ba14b8bee7
parent 2897cf5d

res/drawable/notification_on_ls_compact_view.xml

0 → 100644
+30 −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.

-->



<!-- go/gm2-icons, from gs_short_text_vd_theme_24.xml -->



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

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal"

    android:autoMirrored="true">

    <path

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

        android:pathData="M160,600L160,520L560,520L560,600L160,600ZM160,440L160,360L800,360L800,440L160,440Z"/>

</vector>
 
 No newline at end of file

res/drawable/notification_on_ls_full_list_view.xml

0 → 100644
+28 −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.

-->



<!-- go/gm2-icons, from gs_format_align_justify_vd_theme_24.xml -->

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

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal">

    <path

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

        android:pathData="M120,840L120,760L840,760L840,840L120,840ZM120,680L120,600L840,600L840,680L120,680ZM120,520L120,440L840,440L840,520L120,520ZM120,360L120,280L840,280L840,360L120,360ZM120,200L120,120L840,120L840,200L120,200Z"/>

</vector>
 
 No newline at end of file

res/layout/notification_ls_minimalism_selector.xml

+4 −2
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ 
                    android:layout_height="wrap_content"

                    android:layout_width="wrap_content"

                    android:contentDescription="@null"

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

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



            </FrameLayout>



            <TextView
@@ -84,7 +85,8 @@ 
                    android:layout_height="wrap_content"

                    android:layout_width="wrap_content"

                    android:contentDescription="@null"

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

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



            </FrameLayout>



            <TextView

res/xml/lock_screen_notifications_settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
        android:title="@string/switch_on_text"

        settings:controller="com.android.settings.notification.LockScreenNotificationsGlobalPreferenceController"/>



<!--    TODO: replace res with actual illustrations when we have -->

    <com.android.settingslib.widget.IllustrationPreference

        android:key="compact_illustration"

        settings:searchable="false"