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

Change "When in VR mode" to full screen radio button picker

Browse Source 
Change-Id: I619af85f9c4a2c32daca786f49e898fde9b593f8
Fix: 36557316
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-03-23 13:13:36 -07:00
parent a278962dbc
commit a0c2c11bbf
7 changed files with 292 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
res/xml/display_settings.xml
View File

@@ -14,115 +14,116 @@
limitations under the License. limitations under the License.
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/display_settings" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
settings:keywords="@string/keywords_display"> android:title="@string/display_settings"
settings:keywords="@string/keywords_display">
<Preference <Preference
android:key="brightness" android:key="brightness"
android:title="@string/brightness" android:title="@string/brightness"
settings:keywords="@string/keywords_display_brightness_level"> settings:keywords="@string/keywords_display_brightness_level">
<intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" /> <intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
</Preference> </Preference>
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="wallpaper" android:key="wallpaper"
android:title="@string/wallpaper_settings_title" android:title="@string/wallpaper_settings_title"
settings:keywords="@string/keywords_display_wallpaper" settings:keywords="@string/keywords_display_wallpaper"
settings:useAdminDisabledSummary="true" > settings:useAdminDisabledSummary="true">
<intent <intent
android:targetPackage="@string/config_wallpaper_picker_package" android:targetPackage="@string/config_wallpaper_picker_package"
android:targetClass="@string/config_wallpaper_picker_class" /> android:targetClass="@string/config_wallpaper_picker_class" />
</com.android.settingslib.RestrictedPreference> </com.android.settingslib.RestrictedPreference>
<com.android.settings.display.NightDisplayPreference <com.android.settings.display.NightDisplayPreference
android:key="night_display" android:key="night_display"
android:title="@string/night_display_title" android:title="@string/night_display_title"
android:fragment="com.android.settings.display.NightDisplaySettings" android:fragment="com.android.settings.display.NightDisplaySettings"
settings:widgetLayout="@null" settings:widgetLayout="@null"
settings:keywords="@string/keywords_display_night_display" /> settings:keywords="@string/keywords_display_night_display" />
<com.android.settings.TimeoutListPreference <com.android.settings.TimeoutListPreference
android:key="screen_timeout" android:key="screen_timeout"
android:title="@string/screen_timeout" android:title="@string/screen_timeout"
android:summary="@string/screen_timeout_summary" android:summary="@string/screen_timeout_summary"
android:entries="@array/screen_timeout_entries" android:entries="@array/screen_timeout_entries"
android:entryValues="@array/screen_timeout_values" /> android:entryValues="@array/screen_timeout_values" />
<DropDownPreference <DropDownPreference
android:key="auto_rotate" android:key="auto_rotate"
android:summary="%s" android:summary="%s"
android:title="@string/display_auto_rotate_title" /> android:title="@string/display_auto_rotate_title" />
<SwitchPreference <SwitchPreference
android:key="auto_brightness" android:key="auto_brightness"
android:title="@string/auto_brightness_title" android:title="@string/auto_brightness_title"
settings:keywords="@string/keywords_display_auto_brightness" settings:keywords="@string/keywords_display_auto_brightness"
android:summary="@string/auto_brightness_summary" /> android:summary="@string/auto_brightness_summary" />
<Preference <Preference
android:key="font_size" android:key="font_size"
android:title="@string/title_font_size" android:title="@string/title_font_size"
android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment" android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
settings:keywords="@string/keywords_display_font_size" /> settings:keywords="@string/keywords_display_font_size" />
<com.android.settings.display.ScreenZoomPreference <com.android.settings.display.ScreenZoomPreference
android:key="screen_zoom" android:key="screen_zoom"
android:title="@string/screen_zoom_title" android:title="@string/screen_zoom_title"
settings:keywords="@string/screen_zoom_keywords" /> settings:keywords="@string/screen_zoom_keywords" />
<Preference <Preference
android:key="screensaver" android:key="screensaver"
android:title="@string/screensaver_settings_title" android:title="@string/screensaver_settings_title"
android:fragment="com.android.settings.DreamSettings" /> android:fragment="com.android.settings.DreamSettings" />
<!-- Hide night mode for now <!-- Hide night mode for now
<ListPreference <ListPreference
android:key="night_mode" android:key="night_mode"
android:title="@string/night_mode_title" android:title="@string/night_mode_title"
settings:keywords="@string/keywords_display_night_mode" settings:keywords="@string/keywords_display_night_mode"
android:summary="@string/night_mode_summary" android:summary="@string/night_mode_summary"
android:entries="@array/night_mode_entries" android:entries="@array/night_mode_entries"
android:entryValues="@array/night_mode_values" /> --> android:entryValues="@array/night_mode_values" /> -->
<SwitchPreference <SwitchPreference
android:key="camera_gesture" android:key="camera_gesture"
android:title="@string/camera_gesture_title" android:title="@string/camera_gesture_title"
android:summary="@string/camera_gesture_desc" /> android:summary="@string/camera_gesture_desc" />
<SwitchPreference <SwitchPreference
android:key="lift_to_wake" android:key="lift_to_wake"
android:title="@string/lift_to_wake_title" /> android:title="@string/lift_to_wake_title" />
<Preference <Preference
android:key="gesture_double_tap_screen" android:key="gesture_double_tap_screen"
android:title="@string/ambient_display_title" android:title="@string/ambient_display_title"
android:fragment="com.android.settings.gestures.DoubleTapScreenSettings"/> android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
<Preference <Preference
android:key="gesture_pick_up" android:key="gesture_pick_up"
android:title="@string/ambient_display_pickup_title" android:title="@string/ambient_display_pickup_title"
android:fragment="com.android.settings.gestures.PickupGestureSettings"/> android:fragment="com.android.settings.gestures.PickupGestureSettings" />
<SwitchPreference <SwitchPreference
android:key="doze" android:key="doze"
android:title="@string/doze_title" android:title="@string/doze_title"
android:summary="@string/doze_summary" /> android:summary="@string/doze_summary" />
<SwitchPreference <SwitchPreference
android:key="tap_to_wake" android:key="tap_to_wake"
android:title="@string/tap_to_wake" android:title="@string/tap_to_wake"
android:summary="@string/tap_to_wake_summary" /> android:summary="@string/tap_to_wake_summary" />
<ListPreference <ListPreference
android:key="theme" android:key="theme"
android:title="@string/device_theme" android:title="@string/device_theme"
android:summary="%s" /> android:summary="%s" />
<DropDownPreference <Preference
android:key="vr_display_pref" android:key="vr_display_pref"
android:summary="%s" android:title="@string/display_vr_pref_title"
android:title="@string/display_vr_pref_title" /> android:fragment="com.android.settings.display.VrDisplayPreferencePicker" />
</PreferenceScreen> </PreferenceScreen>

33
src/com/android/settings/display/VrDisplayPreferenceController.java
View File

@@ -17,17 +17,13 @@ import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.provider.Settings; import android.provider.Settings;
import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.util.Log;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.PreferenceController; import com.android.settings.core.PreferenceController;
public class VrDisplayPreferenceController extends PreferenceController implements public class VrDisplayPreferenceController extends PreferenceController {
Preference.OnPreferenceChangeListener {
private static final String TAG = "VrDisplayPrefContr";
private static final String KEY_VR_DISPLAY_PREF = "vr_display_pref"; private static final String KEY_VR_DISPLAY_PREF = "vr_display_pref";
public VrDisplayPreferenceController(Context context) { public VrDisplayPreferenceController(Context context) {
@@ -47,31 +43,14 @@ public class VrDisplayPreferenceController extends PreferenceController implemen
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
final DropDownPreference pref = (DropDownPreference) preference;
pref.setEntries(new CharSequence[]{
mContext.getString(R.string.display_vr_pref_low_persistence),
mContext.getString(R.string.display_vr_pref_off),
});
pref.setEntryValues(new CharSequence[]{"0", "1"});
int currentUser = ActivityManager.getCurrentUser(); int currentUser = ActivityManager.getCurrentUser();
int current = Settings.Secure.getIntForUser(mContext.getContentResolver(), int current = Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.VR_DISPLAY_MODE, Settings.Secure.VR_DISPLAY_MODE, Settings.Secure.VR_DISPLAY_MODE_LOW_PERSISTENCE,
/*default*/Settings.Secure.VR_DISPLAY_MODE_LOW_PERSISTENCE,
currentUser); currentUser);
pref.setValueIndex(current); if (current == 0) {
} preference.setSummary(R.string.display_vr_pref_low_persistence);
} else {
@Override preference.setSummary(R.string.display_vr_pref_off);
public boolean onPreferenceChange(Preference preference, Object newValue) {
int i = Integer.parseInt((String) newValue);
int u = ActivityManager.getCurrentUser();
if (!Settings.Secure.putIntForUser(mContext.getContentResolver(),
Settings.Secure.VR_DISPLAY_MODE,
i, u)) {
Log.e(TAG, "Could not change setting for " +
Settings.Secure.VR_DISPLAY_MODE);
} }
return true;
} }
} }

99
src/com/android/settings/display/VrDisplayPreferencePicker.java Normal file
View File

@@ -0,0 +1,99 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.display;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.provider.Settings;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.widget.RadioButtonPickerFragment;
import java.util.ArrayList;
import java.util.List;
public class VrDisplayPreferencePicker extends RadioButtonPickerFragment {
static final String PREF_KEY_PREFIX = "vr_display_pref_";
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.VR_DISPLAY_PREFERENCE;
}
@Override
protected List<VrCandidateInfo> getCandidates() {
List<VrCandidateInfo> candidates = new ArrayList<>();
final Context context = getContext();
candidates.add(new VrCandidateInfo(context, 0, R.string.display_vr_pref_low_persistence));
candidates.add(new VrCandidateInfo(context, 1, R.string.display_vr_pref_off));
return candidates;
}
@Override
protected String getDefaultKey() {
int current = Settings.Secure.getIntForUser(getContext().getContentResolver(),
Settings.Secure.VR_DISPLAY_MODE, Settings.Secure.VR_DISPLAY_MODE_LOW_PERSISTENCE,
mUserId);
return PREF_KEY_PREFIX + current;
}
@Override
protected boolean setDefaultKey(String key) {
if (TextUtils.isEmpty(key)) {
return false;
}
switch (key) {
case PREF_KEY_PREFIX + 0:
return Settings.Secure.putIntForUser(getContext().getContentResolver(),
Settings.Secure.VR_DISPLAY_MODE, 0, mUserId);
case PREF_KEY_PREFIX + 1:
return Settings.Secure.putIntForUser(getContext().getContentResolver(),
Settings.Secure.VR_DISPLAY_MODE, 1, mUserId);
}
return false;
}
static class VrCandidateInfo extends CandidateInfo {
public final String label;
public final int value;
public VrCandidateInfo(Context context, int value, int resId) {
super(true);
this.value = value;
label = context.getString(resId);
}
@Override
public CharSequence loadLabel() {
return label;
}
@Override
public Drawable loadIcon() {
return null;
}
@Override
public String getKey() {
return PREF_KEY_PREFIX + value;
}
}
}

3
src/com/android/settings/widget/RadioButtonPickerFragment.java
View File

@@ -141,8 +141,7 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr
} }
for (Map.Entry<String, CandidateInfo> app : mCandidates.entrySet()) { for (Map.Entry<String, CandidateInfo> app : mCandidates.entrySet()) {
RadioButtonPreference pref = new RadioButtonPreference(getPrefContext()); RadioButtonPreference pref = new RadioButtonPreference(getPrefContext());
bindPreference( bindPreference(pref, app.getKey(), app.getValue(), defaultKey);
pref, app.getKey(), app.getValue(), defaultKey);
bindPreferenceExtra(pref, app.getKey(), app.getValue(), defaultKey, systemDefaultKey); bindPreferenceExtra(pref, app.getKey(), app.getValue(), defaultKey, systemDefaultKey);
screen.addPreference(pref); screen.addPreference(pref);
} }

1
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.applications.defaultapps; package com.android.settings.applications.defaultapps;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;

82
tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java Normal file
View File

@@ -0,0 +1,82 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.ContentResolver;
import android.os.UserHandle;
import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VrDisplayPreferencePickerTest {
private VrDisplayPreferencePicker mPicker;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mPicker = spy(new VrDisplayPreferencePicker());
doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
}
@Test
public void verifyMetricsConstant() {
assertThat(mPicker.getMetricsCategory())
.isEqualTo(MetricsProto.MetricsEvent.VR_DISPLAY_PREFERENCE);
}
@Test
public void getCandidates_shouldReturnTwoCandidates() {
List<VrDisplayPreferencePicker.VrCandidateInfo> candidates = mPicker.getCandidates();
assertThat(candidates.size()).isEqualTo(2);
assertThat(candidates.get(0).getKey())
.isEqualTo(VrDisplayPreferencePicker.PREF_KEY_PREFIX + 0);
assertThat(candidates.get(1).getKey())
.isEqualTo(VrDisplayPreferencePicker.PREF_KEY_PREFIX + 1);
}
@Test
@Config(shadows = ShadowSecureSettings.class)
public void getKey_shouldGetFromSettingsProvider() {
final ContentResolver cr = RuntimeEnvironment.application.getContentResolver();
Settings.Secure.putIntForUser(cr, Settings.Secure.VR_DISPLAY_MODE, 1,
UserHandle.myUserId());
assertThat(mPicker.getDefaultKey())
.isEqualTo(VrDisplayPreferencePicker.PREF_KEY_PREFIX + 1);
}
}

11
tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
View File

@@ -52,6 +52,17 @@ public class ShadowSecureSettings {
return getString(resolver, name); return getString(resolver, name);
} }
@Implementation
public static boolean putIntForUser(ContentResolver cr, String name, int value,
int userHandle) {
return putInt(cr, name, value);
}
@Implementation
public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) {
return getInt(cr, name, def);
}
@Implementation @Implementation
public static int getInt(ContentResolver resolver, String name, int defaultValue) { public static int getInt(ContentResolver resolver, String name, int defaultValue) {
Integer value = (Integer) mValueMap.get(name); Integer value = (Integer) mValueMap.get(name);