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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-12 02:04:37 +00:00
committed by Android (Google) Code Review
parent 1425b91bac e2cb72fa7f
commit b38c1e5353
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
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>

2
res/xml/security_lockscreen_settings.xml
View File

@@ -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"

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

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