From 966be254ab2137760593f3305f93d7a9c3c8d817 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 8 May 2017 13:15:58 -0700
Subject: [PATCH] Remove placeholder summary text in auto-rotate preference

- Remove the %s from xml and set it in code instead.
- This is hack to make search stop display %s. It's fixed properly in
  master but we don't want to cherry-pick the master change because of its
  size and risk.

Bug: 36101902
Test: rerun robotests
Change-Id: I0e03957532b265c15d5cc0754396aea26e5cd8a1
Merged-In: If42cceb74296814311eb0eff8e26b4a48a1c4d29
---
 res/xml/display_settings.xml                                    | 2 +-
 .../settings/display/AutoRotatePreferenceController.java        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index b9ff7808bc6..53881c57079 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -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
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index 11c933371aa..fd79e51cafc 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -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.