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

Commit 01f5f5d5 authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev 

am: b38c1e53

Change-Id: Ia8323363dabd6937a33c6b53ea6755c904e776d4
parents aebf049b b38c1e53

res/xml/configure_notification_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
    <com.android.settings.notification.RestrictedDropDownPreference

        android:key="lock_screen_notifications"

        android:title="@string/lock_screen_notifications_title"

        android:summary="%s"/>

        android:summary="@string/summary_placeholder"/>



    <SwitchPreference

        android:key="gesture_swipe_down_fingerprint"
@@ -50,7 +50,7 @@ 
        <com.android.settings.notification.RestrictedDropDownPreference

            android:key="lock_screen_notifications_profile"

            android:title="@string/lock_screen_notifications_title"

            android:summary="%s"/>

            android:summary="@string/summary_placeholder"/>



    </PreferenceCategory>

res/xml/security_lockscreen_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        <com.android.settings.notification.RestrictedDropDownPreference

            android:key="lock_screen_notifications"

            android:title="@string/lock_screen_notifications_title"

            android:summary="%s"/>

            android:summary="@string/summary_placeholder"/>



        <com.android.settingslib.RestrictedSwitchPreference

            android:key="add_users_when_locked"

src/com/android/settings/notification/LockScreenNotificationPreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ public class LockScreenNotificationPreferenceController extends PreferenceContro 
            return;

        }

        mLockscreenSelectedValue = getSummaryResource();

        mLockscreen.setSummary("%s");

        mLockscreen.setValue(Integer.toString(mLockscreenSelectedValue));

    }