PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 01f5f5d5c9

Change-Id: I2eebd4c6d7b7452d419d02df2dc378bc6847901b
This commit is contained in:
Matthew Fritze
2017-05-12 08:59:41 +00:00
committed by android-build-merger
parent fed86ddf91 01f5f5d5c9
commit 031bb4e3a5
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/configure_notification_settings.xml
View File

@@ -36,7 +36,7 @@
<com.android.settings.notification.RestrictedDropDownPreference <com.android.settings.notification.RestrictedDropDownPreference
android:key="lock_screen_notifications" android:key="lock_screen_notifications"
android:title="@string/lock_screen_notifications_title" android:title="@string/lock_screen_notifications_title"
android:summary="%s"/> android:summary="@string/summary_placeholder"/>
<SwitchPreference <SwitchPreference
android:key="gesture_swipe_down_fingerprint" android:key="gesture_swipe_down_fingerprint"
@@ -50,7 +50,7 @@
<com.android.settings.notification.RestrictedDropDownPreference <com.android.settings.notification.RestrictedDropDownPreference
android:key="lock_screen_notifications_profile" android:key="lock_screen_notifications_profile"
android:title="@string/lock_screen_notifications_title" android:title="@string/lock_screen_notifications_title"
android:summary="%s"/> android:summary="@string/summary_placeholder"/>
</PreferenceCategory> </PreferenceCategory>

2
res/xml/security_lockscreen_settings.xml
View File

@@ -21,7 +21,7 @@
<com.android.settings.notification.RestrictedDropDownPreference <com.android.settings.notification.RestrictedDropDownPreference
android:key="lock_screen_notifications" android:key="lock_screen_notifications"
android:title="@string/lock_screen_notifications_title" android:title="@string/lock_screen_notifications_title"
android:summary="%s"/> android:summary="@string/summary_placeholder"/>
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="add_users_when_locked" android:key="add_users_when_locked"

1
src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
View File

@@ -281,6 +281,7 @@ public class LockScreenNotificationPreferenceController extends PreferenceContro
return; return;
} }
mLockscreenSelectedValue = getSummaryResource(); mLockscreenSelectedValue = getSummaryResource();
mLockscreen.setSummary("%s");
mLockscreen.setValue(Integer.toString(mLockscreenSelectedValue)); mLockscreen.setValue(Integer.toString(mLockscreenSelectedValue));
} }