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

Commit b3afa6e8 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

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

am: ce7f36c7

Change-Id: I4bf3958e80286634dfc7d23f4133174d221be3b4
parents 95a98f06 ce7f36c7

res/xml/display_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 


    <DropDownPreference

        android:key="auto_rotate"

        android:summary="%s"

        android:summary="@string/summary_placeholder"

        android:title="@string/display_auto_rotate_title" />



    <Preference

src/com/android/settings/display/AutoRotatePreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ public class AutoRotatePreferenceController extends PreferenceController impleme 
    public void updateState(Preference preference) {

        final DropDownPreference rotatePreference = (DropDownPreference) preference;

        final int rotateLockedResourceId;

        preference.setSummary("%s");

        // The following block sets the string used when rotation is locked.

        // If the device locks specifically to portrait or landscape (rather than current

        // rotation), then we use a different string to include this information.