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

Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev

Browse Source 
am: ae0886c9f7

Change-Id: I29ca4bdf7ad579699283fe4adde2ad22439d7ce9
This commit is contained in:
Matthew Fritze
2017-05-24 17:16:01 +00:00
committed by android-build-merger
parent f7c007b2c1 ae0886c9f7
commit 934a04509f
5 changed files with 83 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/battery_saver_settings.xml
View File

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

4
res/xml/sound_settings.xml
View File

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

1
src/com/android/settings/fuelgauge/BatterySaverSettings.java
View File

@@ -99,7 +99,6 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
}
};
mTriggerPref.init(this);
mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
}

13
src/com/android/settings/notification/SettingPref.java
View File

@@ -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));
}
}

67
tests/robotests/src/com/android/settings/notification/SettingPrefTest.java Normal file
View File

@@ -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();
}
}