From c1e9f8787f02df0d38a9d4e93f7996318fc46355 Mon Sep 17 00:00:00 2001
From: Matthew Fritze <mfritze@google.com>
Date: Tue, 23 May 2017 21:02:57 +0000
Subject: [PATCH] Revert "Revert "Replace dynamic summary text for
 SettingPref""

This reverts commit 8061aaef621b38e269eaa34c0cfef48a9b7eb288.
Test: make RunSettingsRoboTests
Fixes: 36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320
---
 res/xml/battery_saver_settings.xml            |  2 +-
 res/xml/sound_settings.xml                    |  4 +-
 .../fuelgauge/BatterySaverSettings.java       |  1 -
 .../settings/notification/SettingPref.java    | 13 ++++
 .../notification/SettingPrefTest.java         | 67 +++++++++++++++++++
 5 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 tests/robotests/src/com/android/settings/notification/SettingPrefTest.java

diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 1720c73749e..52f6793d971 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -22,6 +22,6 @@
     <DropDownPreference
             android:key="turn_on_automatically"
             android:title="@string/battery_saver_turn_on_automatically_title"
-            android:summary="%s" />
+            android:summary="@string/summary_placeholder" />
 
 </PreferenceScreen>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d288a9dec37..33c1b0a3919 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -124,7 +124,7 @@
         <DropDownPreference
           android:key="dock_audio_media"
           android:title="@string/dock_audio_media_title"
-          android:summary="%s" />
+          android:summary="@string/summary_placeholder" />
 
         <!-- Boot sounds -->
         <SwitchPreference
@@ -135,7 +135,7 @@
         <DropDownPreference
           android:key="emergency_tone"
           android:title="@string/emergency_tone_title"
-          android:summary="%s" />
+          android:summary="@string/summary_placeholder" />
 
         <com.android.settingslib.RestrictedPreference
           android:key="cell_broadcast_settings"
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 6b7ddf95696..45d0db20b17 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -99,7 +99,6 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
             }
         };
         mTriggerPref.init(this);
-
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
     }
 
diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java
index 18efc330234..cdbd5b39738 100644
--- a/src/com/android/settings/notification/SettingPref.java
+++ b/src/com/android/settings/notification/SettingPref.java
@@ -121,6 +121,19 @@ public class SettingPref {
         if (mTwoState != null) {
             mTwoState.setChecked(val != 0);
         } else if (mDropDown != null) {
+            if (mValues != null) {
+                int index = 0;
+                for (int len = mValues.length; index < len; index++) {
+                    if (mValues[index] == val) {
+                        break;
+                    }
+                }
+
+                if (index < mValues.length) {
+                    CharSequence entry = mDropDown.getEntries()[index];
+                    mDropDown.setSummary(entry);
+                }
+            }
             mDropDown.setValue(Integer.toString(val));
         }
     }
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java
new file mode 100644
index 00000000000..39f13778d5c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java
@@ -0,0 +1,67 @@
+package com.android.settings.notification;
+
+import android.content.res.Resources;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.DropDownPreference;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SettingPrefTest {
+
+    @Test
+    public void update_setsDropDownSummaryText() {
+        Context context = RuntimeEnvironment.application;
+        String testSetting = "test_setting";
+        int[] values = new int[] {1,2,3};
+        String[] entries = new String[] {"one", "two", "three"};
+        SettingPref settingPref =
+                spy(new SettingPref(SettingPref.TYPE_GLOBAL, "key", testSetting, 0, values) {
+                    @Override
+                    protected String getCaption(Resources res, int value) {
+                        return "temp";
+                    }
+                });
+        DropDownPreference dropdownPref = spy(new DropDownPreference(context));
+        dropdownPref.setEntries(entries);
+        settingPref.mDropDown = dropdownPref;
+        Settings.Global.putInt(context.getContentResolver(), testSetting, values[2]);
+
+        settingPref.update(context);
+
+        assertThat(settingPref.mDropDown.getSummary()).isEqualTo(entries[2]);
+    }
+
+    @Test
+    public void update_setsDropDownSummaryText_noMatch_noError() {
+        Context context = RuntimeEnvironment.application;
+        String testSetting = "test_setting";
+        int[] values = new int[] {1,2,3};
+        String[] entries = new String[] {"one", "two", "three"};
+        SettingPref settingPref =
+                spy(new SettingPref(SettingPref.TYPE_GLOBAL, "key", testSetting, 0, values) {
+                    @Override
+                    protected String getCaption(Resources res, int value) {
+                        return "temp";
+                    }
+                });
+        DropDownPreference dropdownPref = spy(new DropDownPreference(context));
+        dropdownPref.setEntries(entries);
+        settingPref.mDropDown = dropdownPref;
+        Settings.Global.putInt(context.getContentResolver(), testSetting, -1);
+
+        settingPref.update(context);
+
+        assertThat(settingPref.mDropDown.getSummary()).isNull();
+    }
+}