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

Merge "Don't crash on invalid numbers." into nyc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-05-13 18:14:58 +00:00
committed by Android (Google) Code Review
parent f4f2211b13 b9cad485af
commit 5c401966a3
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/display/DensityPreference.java
View File

@@ -19,6 +19,7 @@ import android.content.res.Resources;
import android.text.InputType; import android.text.InputType;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Slog;
import android.view.Display; import android.view.Display;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
@@ -27,6 +28,7 @@ import com.android.settings.R;
import com.android.settingslib.display.DisplayDensityUtils; import com.android.settingslib.display.DisplayDensityUtils;
public class DensityPreference extends CustomEditTextPreference { public class DensityPreference extends CustomEditTextPreference {
private static final String TAG = "DensityPreference";
public DensityPreference(Context context, AttributeSet attrs) { public DensityPreference(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
@@ -62,13 +64,18 @@ public class DensityPreference extends CustomEditTextPreference {
@Override @Override
protected void onDialogClosed(boolean positiveResult) { protected void onDialogClosed(boolean positiveResult) {
if (positiveResult) { if (positiveResult) {
final Resources res = getContext().getResources(); try {
final DisplayMetrics metrics = res.getDisplayMetrics(); final Resources res = getContext().getResources();
final int newSwDp = Math.max(Integer.parseInt(getText()), 320); final DisplayMetrics metrics = res.getDisplayMetrics();
final int minDimensionPx = Math.min(metrics.widthPixels, metrics.heightPixels); final int newSwDp = Math.max(Integer.parseInt(getText()), 320);
final int newDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / newSwDp; final int minDimensionPx = Math.min(metrics.widthPixels, metrics.heightPixels);
final int densityDpi = Math.max(newDensity, 120); final int newDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / newSwDp;
DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi); final int densityDpi = Math.max(newDensity, 120);
DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
} catch (Exception e) {
// TODO: display a message instead of silently failing.
Slog.e(TAG, "Couldn't save density", e);
}
} }
} }
} }