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

Commit 9d200f1f authored by Yining Liu's avatar Yining Liu Committed by Android (Google) Code Review
Browse files

Merge changes I1dffab01,I6e34ef9b,Ia8d472ea,Icf4e7003 into main 

* changes:
  Notification on lockscreen settings: adapt text view for large font
  Inverse toggles on the notifications on locks screen settings page
  Update appearance of notifications on locks screen settings page
  Remove description from notifications on locks screen settings page
parents 2a828c6b fb200f0d

res/layout/notification_ls_minimalism_selector.xml

+5 −19
Original line number Diff line number Diff line
@@ -19,22 +19,10 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:orientation="vertical"

    android:paddingTop="@dimen/settingslib_illustration_padding"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <TextView

        android:id="@+id/notif_ls_style_desc"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingVertical="@dimen/settingslib_illustration_padding"

        android:paddingEnd="48dp"

        android:paddingStart="48dp"

        android:layout_gravity="center_horizontal"

        android:gravity="center"

        android:focusable="true"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -66,12 +54,11 @@ 
            </FrameLayout>



            <TextView

                android:layout_width="match_parent"

                android:layout_width="@dimen/contrast_button_total_size"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/contrast_button_text_spacing"

                android:gravity="center_horizontal|top"

                android:ellipsize="end"

                android:singleLine="true"

                android:singleLine="false"

                android:textSize="@dimen/contrast_button_text_size"

                android:text="@string/lock_screen_notifs_show_compact"

                android:textColor="@androidprv:color/materialColorOnSurface"/>
@@ -101,12 +88,11 @@ 
            </FrameLayout>



            <TextView

                android:layout_width="match_parent"

                android:layout_width="@dimen/contrast_button_total_size"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/contrast_button_text_spacing"

                android:gravity="center_horizontal|top"

                android:ellipsize="end"

                android:singleLine="true"

                android:singleLine="false"

                android:textSize="@dimen/contrast_button_text_size"

                android:text="@string/lock_screen_notifs_show_full_list"

                android:textColor="@androidprv:color/materialColorOnSurface"/>

res/values/strings.xml

+12 −15
Original line number Diff line number Diff line
@@ -8892,14 +8892,8 @@ 
    <!-- Configure notifications: Value for lockscreen notifications: show all notifications [CHAR LIMIT=60] -->

    <string name="lock_screen_notifs_show_full_list">Full list</string>









    <!-- Configure notifications: Summary for lockscreen notifications: show all notifications [CHAR LIMIT=NONE] -->









    <string name="lock_screen_notifs_full_list_desc">The current default placement is a full shelf and notification stack.</string>

















    <!-- Configure notifications: Value for lockscreen notifications: show compact notifications (minimalism on) [CHAR LIMIT=60] -->









    <string name="lock_screen_notifs_show_compact">Compact</string>

















    <!-- Configure notifications: Summary for lockscreen notifications: show compact notifications (minimalism on) [CHAR LIMIT=NONE] -->









    <string name="lock_screen_notifs_compact_desc">New notifications are collapsed into a shelf on your lockscreen.</string>









    <!-- Configure notifications: Value for lockscreen notifications: show compact notifications (minimalism on) [CHAR LIMIT=30] -->









    <string name="lock_screen_notifs_show_compact">Compact View</string>

















    <!-- Configure notifications: Title for determining which notifications appear on the lock screen [CHAR LIMIT=60] -->









    <string name="lock_screen_notifs_title">Notifications on lock screen</string>








@@ -8963,17 +8957,20 @@







    <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their profile notifications to appear when the device is locked [CHAR LIMIT=NONE] -->









    <string name="lock_screen_notifications_interstitial_message_profile">When your device is locked, how do you want profile notifications to show?</string>

















    <!-- Notification Settings > Notifications on lock screen > Title for hiding seen notifications toggle. [CHAR LIMIT=60] -->









    <string name="lock_screen_notification_hide_seen_title">Hide seen notifications</string>









    <!-- Notification Settings > Notifications on lock screen > Title for showing notifications on the lock screen. [CHAR LIMIT=100] -->









    <string name="lockscreen_notification_what_to_show_title">What to show on lock screen</string>

















    <!-- Notification Settings > Notifications on lock screen > Summary for hiding seen notifications toggle. [CHAR LIMIT=100] -->









    <string name="lock_screen_notification_hide_seen_summary">Seen notifications are removed from the lock screen.</string>









    <!-- Notification Settings > Notifications on lock screen > Title for showing seen notifications toggle. [CHAR LIMIT=60] -->









    <string name="lock_screen_notification_show_seen_title">Show seen notifications</string>

















    <!-- Notification Settings > Notifications on lock screen > Title for hiding silent notifications toggle. [CHAR LIMIT=60] -->









    <string name="lock_screen_notification_hide_silent_title">Hide silent notifications</string>









    <string name="lock_screen_notification_show_silent_title">Show silent notifications</string>

















    <!-- Notification Settings > Notifications on lock screen > Title for hiding sensitive notification content on lock screen. [CHAR LIMIT=60] -->









    <string name="lock_screen_notification_show_sensitive_content_title">Show sensitive content</string>

















    <!-- Notification Settings > Notifications on lock screen > Summary for hiding silent notifications toggle. [CHAR LIMIT=100] -->









    <string name="lock_screen_notification_hide_silent_summary">Silent notifications and conversations are removed from the lock screen.</string>









    <!-- Notification Settings > Notifications on lock screen > Title for hiding sensitive work profile notification content on lock screen. [CHAR LIMIT=100] -->









    <string name="lock_screen_notification_show_sensitive_work_content_title">Show sensitive work profile content</string>

















    <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their profile notifications to appear when the device is locked [CHAR LIMIT=30] -->









    <string name="lock_screen_notifications_interstitial_title_profile">Profile notifications</string>

























res/xml/lock_screen_notifications_settings.xml



+22
−18






























Original line number
Diff line number
Diff line







@@ -44,26 +44,30 @@







        android:layout="@layout/notification_ls_minimalism_selector"









        settings:controller="com.android.settings.notification.lockscreen.MinimalismPreferenceController" />



















    <PreferenceCategory









        android:key="lockscreen_notification_what_to_show"









        android:title="@string/lockscreen_notification_what_to_show_title">



















        <SwitchPreferenceCompat









            android:key="lock_screen_notification_show_seen_toggle"









            android:title="@string/lock_screen_notification_show_seen_title"









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



















        <SwitchPreferenceCompat









            android:key="lock_screen_notification_show_silent_toggle"









            android:title="@string/lock_screen_notification_show_silent_title"









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



















        <com.android.settingslib.RestrictedSwitchPreference









            android:key="lock_screen_notification_show_sensitive_toggle"









        android:title="@string/lock_screen_notifications_summary_hide"









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









            android:title="@string/lock_screen_notification_show_sensitive_content_title"









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



















        <com.android.settingslib.RestrictedSwitchPreference









            android:key="work_profile_show_sensitive_notif_toggle"









        android:title="@string/lock_screen_notifications_summary_hide_profile"









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



















    <SwitchPreferenceCompat









        android:key="lock_screen_notification_hide_seen_toggle"









        android:title="@string/lock_screen_notification_hide_seen_title"









        android:summary="@string/lock_screen_notification_hide_seen_summary"









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









            android:title="@string/lock_screen_notification_show_sensitive_work_content_title"









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



















    <SwitchPreferenceCompat









        android:key="lock_screen_notification_hide_silent_toggle"









        android:title="@string/lock_screen_notification_hide_silent_title"









        android:summary="@string/lock_screen_notification_hide_silent_summary"









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









    </PreferenceCategory>



















</PreferenceScreen>
























src/com/android/settings/notification/LockScreenNotificationHideSeenToggleController.java→src/com/android/settings/notification/LockScreenNotificationShowSeenController.java



+7
−7






























Original line number
Diff line number
Diff line







@@ -39,7 +39,7 @@ import com.android.settings.core.TogglePreferenceController;







 * Controls the toggle that determines whether to hide seen notifications from the lock screen.









 * Toggle for setting: Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS









 */









public class LockScreenNotificationHideSeenToggleController extends TogglePreferenceController









public class LockScreenNotificationShowSeenController extends TogglePreferenceController









        implements LifecycleEventObserver {



















    private static final int UNSET = 0;








@@ -57,7 +57,7 @@ public class LockScreenNotificationHideSeenToggleController extends TogglePrefer







        }









    };



















    public LockScreenNotificationHideSeenToggleController(@NonNull Context context,









    public LockScreenNotificationShowSeenController(@NonNull Context context,









            @NonNull String preferenceKey) {









        super(context, preferenceKey);









        mContentResolver = context.getContentResolver();








@@ -90,7 +90,7 @@ public class LockScreenNotificationHideSeenToggleController extends TogglePrefer







    @Override









    public void updateState(@NonNull Preference preference) {









        super.updateState(preference);









        setChecked(lockScreenShowOnlyUnseenNotifications());









        setChecked(lockScreenShowSeenNotifications());









        preference.setVisible(isAvailable());









    }


















@@ -115,18 +115,18 @@ public class LockScreenNotificationHideSeenToggleController extends TogglePrefer

















    @Override









    public boolean isChecked() {









        return lockScreenShowOnlyUnseenNotifications();









        return lockScreenShowSeenNotifications();









    }



















    private boolean lockScreenShowOnlyUnseenNotifications() {









    private boolean lockScreenShowSeenNotifications() {









        return Settings.Secure.getInt(mContext.getContentResolver(),









                Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET) == ON;









                Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET) == OFF;









    }



















    @Override









    public boolean setChecked(boolean isChecked) {









        return Settings.Secure.putInt(mContext.getContentResolver(),









                Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, (isChecked ? ON : OFF));









                Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, (isChecked ? OFF : ON));









    }



















    @Override
































src/com/android/settings/notification/LockScreenNotificationShowSensitiveToggleController.java→src/com/android/settings/notification/LockScreenNotificationShowSensitiveController.java



+9
−9






























Original line number
Diff line number
Diff line







@@ -53,7 +53,7 @@ import java.util.List;







 * when locked.









 * Toggle for: Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS









 */









public class LockScreenNotificationShowSensitiveToggleController









public class LockScreenNotificationShowSensitiveController









        extends TogglePreferenceController implements LifecycleEventObserver {



















    private static final int ON = 1;








@@ -78,7 +78,7 @@ public class LockScreenNotificationShowSensitiveToggleController







        }









    };



















    public LockScreenNotificationShowSensitiveToggleController(@NonNull Context context,









    public LockScreenNotificationShowSensitiveController(@NonNull Context context,









            @NonNull String preferenceKey) {









        super(context, preferenceKey);









        mContentResolver = context.getContentResolver();








@@ -145,7 +145,7 @@ public class LockScreenNotificationShowSensitiveToggleController







    @Override









    public void updateState(@Nullable Preference preference) {









        if (preference == null) return;









        setChecked(showSensitiveContentOnlyWhenUnlocked());









        setChecked(showSensitiveContentWhenLocked());









        preference.setVisible(isAvailable());









    }


















@@ -187,15 +187,15 @@ public class LockScreenNotificationShowSensitiveToggleController

















    @Override









    public boolean isChecked() {









        return showSensitiveContentOnlyWhenUnlocked();









        return showSensitiveContentWhenLocked();









    }



















    private boolean showSensitiveContentOnlyWhenUnlocked() {









    private boolean showSensitiveContentWhenLocked() {









        int userId = getUserId();









        if (!isLockScreenSecure()) return false;









        if (getEnforcedAdmin(userId) != null) return true;









        if (!isLockScreenSecure()) return true;









        if (getEnforcedAdmin(userId) != null) return false;









        return Settings.Secure.getIntForUser(mContext.getContentResolver(),









                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, ON, userId) == OFF;









                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, ON, userId) == ON;









    }



















    @Override








@@ -203,7 +203,7 @@ public class LockScreenNotificationShowSensitiveToggleController







        return Settings.Secure.putIntForUser(









                mContext.getContentResolver(),









                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,









                (isChecked ? OFF : ON), getUserId()









                (isChecked ? ON : OFF), getUserId()









        );









    }