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

Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-09 01:25:16 +00:00
committed by Android (Google) Code Review
parent 6c0f337d52 966be254ab
commit ce7f36c799
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/display_settings.xml
View File

@@ -59,7 +59,7 @@
<DropDownPreference <DropDownPreference
android:key="auto_rotate" android:key="auto_rotate"
android:summary="%s" android:summary="@string/summary_placeholder"
android:title="@string/display_auto_rotate_title" /> android:title="@string/display_auto_rotate_title" />
<Preference <Preference

1
src/com/android/settings/display/AutoRotatePreferenceController.java
View File

@@ -45,6 +45,7 @@ public class AutoRotatePreferenceController extends PreferenceController impleme
public void updateState(Preference preference) { public void updateState(Preference preference) {
final DropDownPreference rotatePreference = (DropDownPreference) preference; final DropDownPreference rotatePreference = (DropDownPreference) preference;
final int rotateLockedResourceId; final int rotateLockedResourceId;
preference.setSummary("%s");
// The following block sets the string used when rotation is locked. // The following block sets the string used when rotation is locked.
// If the device locks specifically to portrait or landscape (rather than current // If the device locks specifically to portrait or landscape (rather than current
// rotation), then we use a different string to include this information. // rotation), then we use a different string to include this information.