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

Revert "[RRS] show resolution option on Settings page."

Browse Source 
This reverts commit 0d9e5d600c.

Reason for revert: bad CL causing breakage in com.android.settings.display.ScreenResolutionFragmentTest https://screenshot.googleplex.com/AG6d44f3LTksHGx

Change-Id: I522c6b5220c138b56af777627619ca986e2cd43c
This commit is contained in:
Paul Hobbs
2023-01-18 20:05:37 +00:00
committed by Android (Google) Code Review
parent 0d9e5d600c
commit 73187f3599
4 changed files with 58 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/com/android/settings/display/ScreenResolutionController.java
View File

@@ -17,9 +17,7 @@
package com.android.settings.display;
import android.content.Context;
import android.graphics.Point;
import android.hardware.display.DisplayManager;
import android.util.Log;
import android.view.Display;
import androidx.annotation.VisibleForTesting;
@@ -27,63 +25,32 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/** Controller that switch the screen resolution. */
public class ScreenResolutionController extends BasePreferenceController {
private static final String TAG = "ScreenResolutionController";
static final int HIGHRESOLUTION_IDX = 0;
static final int FULLRESOLUTION_IDX = 1;
static final int FHD_WIDTH = 1080;
static final int QHD_WIDTH = 1440;
private Display mDisplay;
private Set<Point> mSupportedResolutions = null;
private int mHighWidth = 0;
private int mFullWidth = 0;
private int mHighHeight = 0;
private int mFullHeight = 0;
public ScreenResolutionController(Context context, String key) {
super(context, key);
mDisplay =
mContext.getSystemService(DisplayManager.class).getDisplay(Display.DEFAULT_DISPLAY);
initSupportedResolutionData();
}
/**
* Initialize the resolution data. So far, we support two resolution switching. Save the width
* and the height for high resolution and full resolution.
*/
private void initSupportedResolutionData() {
// Collect and filter the resolutions
Set<Point> resolutions = new HashSet<>();
/** Check if the width is supported by the display. */
private boolean isSupportedMode(int width) {
for (Display.Mode mode : getSupportedModes()) {
resolutions.add(new Point(mode.getPhysicalWidth(), mode.getPhysicalHeight()));
if (mode.getPhysicalWidth() == width) return true;
}
mSupportedResolutions = resolutions;
// Get the width and height for high resolution and full resolution
List<Point> resolutionList = new ArrayList<>(resolutions);
if (resolutionList == null || resolutionList.size() != 2) {
Log.e(TAG, "No support");
return;
}
Collections.sort(resolutionList, (p1, p2) -> p1.x * p1.y - p2.x * p2.y);
mHighWidth = resolutionList.get(HIGHRESOLUTION_IDX).x;
mHighHeight = resolutionList.get(HIGHRESOLUTION_IDX).y;
mFullWidth = resolutionList.get(FULLRESOLUTION_IDX).x;
mFullHeight = resolutionList.get(FULLRESOLUTION_IDX).y;
return false;
}
/** Return true if the device contains two (or more) resolutions. */
protected boolean checkSupportedResolutions() {
return getHighWidth() != 0 && getFullWidth() != 0;
return isSupportedMode(FHD_WIDTH) && isSupportedMode(QHD_WIDTH);
}
@Override
@@ -94,43 +61,20 @@ public class ScreenResolutionController extends BasePreferenceController {
@Override
public CharSequence getSummary() {
String summary = null;
int width = getDisplayWidth();
if (width == mHighWidth) {
summary = mContext.getString(R.string.screen_resolution_option_high);
} else if (width == mFullWidth) {
summary = mContext.getString(R.string.screen_resolution_option_full);
} else {
summary = mContext.getString(R.string.screen_resolution_title);
switch (getDisplayWidth()) {
case FHD_WIDTH:
summary = mContext.getString(R.string.screen_resolution_summary_high);
break;
case QHD_WIDTH:
summary = mContext.getString(R.string.screen_resolution_summary_highest);
break;
default:
summary = mContext.getString(R.string.screen_resolution_title);
}
return summary;
}
/** Return all supported resolutions of the device. */
public Set<Point> getAllSupportedResolutions() {
return this.mSupportedResolutions;
}
/** Return the high resolution width of the device. */
public int getHighWidth() {
return this.mHighWidth;
}
/** Return the full resolution width of the device. */
public int getFullWidth() {
return this.mFullWidth;
}
/** Return the high resolution height of the device. */
public int getHighHeight() {
return this.mHighHeight;
}
/** Return the full resolution height of the device. */
public int getFullHeight() {
return this.mFullHeight;
}
@VisibleForTesting
public int getDisplayWidth() {
return mDisplay.getMode().getPhysicalWidth();