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

Change Display size option "normal" to "default"

Browse Source 
Bug: 27274227
Change-Id: I83b949cabaf333aa45cfef1beaa986d66067fa53
This commit is contained in:
Alan Viverette
2016-02-23 13:17:16 -05:00
parent 9c299734bb
commit 94ecc81376
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/display/ScreenZoomSettings.java
View File

@@ -38,7 +38,7 @@ import java.util.List;
*/
public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment implements Indexable {
private int mNormalDensity;
private int mDefaultDensity;
private int[] mValues;
@Override
@@ -56,19 +56,19 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme
final int initialIndex = density.getCurrentIndex();
if (initialIndex < 0) {
// Failed to obtain normal density, which means we failed to
// Failed to obtain default density, which means we failed to
// connect to the window manager service. Just use the current
// density and don't let the user change anything.
final int densityDpi = getResources().getDisplayMetrics().densityDpi;
mValues = new int[] { densityDpi };
mEntries = new String[] { getString(R.string.screen_zoom_summary_normal) };
mEntries = new String[] { getString(R.string.screen_zoom_summary_default) };
mInitialIndex = 0;
mNormalDensity = densityDpi;
mDefaultDensity = densityDpi;
} else {
mValues = density.getValues();
mEntries = density.getEntries();
mInitialIndex = initialIndex;
mNormalDensity = density.getNormalDensity();
mDefaultDensity = density.getDefaultDensity();
}
}
@@ -86,7 +86,7 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme
@Override
protected void commit() {
final int densityDpi = mValues[mCurrentIndex];
if (densityDpi == mNormalDensity) {
if (densityDpi == mDefaultDensity) {
DisplayDensityUtils.clearForcedDisplayDensity(Display.DEFAULT_DISPLAY);
} else {
DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);