Added External Display settings page
Settings page to show rotation, resolution, enable/disable display settings for external and overlay displays. In case persist.demo.userrotation.package_name sysprop is set, then the virtual display with this will also be shown. In case there is only one allowed display available, then this display will be shown right away. When there are more than 1 displays available, then the list of displays will be shown. Change-Id: I186667aaba94ed6befec3a98f4a87f2b2d1f1859 Test: atest ExternalDisplayUpdaterTest Test: atest ExternalDisplayPreferenceFragmentTest Test: atest ResolutionPreferenceFragmentTest Test: atest ConnectedDeviceGroupControllerTest Bug: 340218151 Bug: 294015706 Bug: 253296253 Flag: com.android.settings.flags.rotation_connected_display_setting Flag: com.android.settings.flags.resolution_and_enable_connected_display_setting
This commit is contained in:
Oleg Blinnikov
@@ -0,0 +1,341 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.connecteddevice.display;
|
||||
|
||||
import static android.content.Context.DISPLAY_SERVICE;
|
||||
import static android.hardware.display.DisplayManager.DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED;
|
||||
import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_ADDED;
|
||||
import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_CHANGED;
|
||||
import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_CONNECTION_CHANGED;
|
||||
import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_REMOVED;
|
||||
import static android.view.Display.INVALID_DISPLAY;
|
||||
|
||||
import android.content.Context;
|
||||
import android.hardware.display.DisplayManager;
|
||||
import android.hardware.display.DisplayManagerGlobal;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.os.RemoteException;
|
||||
import android.os.SystemProperties;
|
||||
import android.view.Display;
|
||||
import android.view.Display.Mode;
|
||||
import android.view.IWindowManager;
|
||||
import android.view.WindowManagerGlobal;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.flags.FeatureFlags;
|
||||
import com.android.settings.flags.FeatureFlagsImpl;
|
||||
|
||||
public class ExternalDisplaySettingsConfiguration {
|
||||
static final String VIRTUAL_DISPLAY_PACKAGE_NAME_SYSTEM_PROPERTY =
|
||||
"persist.demo.userrotation.package_name";
|
||||
static final String DISPLAY_ID_ARG = "display_id";
|
||||
static final int EXTERNAL_DISPLAY_NOT_FOUND_RESOURCE = R.string.external_display_not_found;
|
||||
static final int EXTERNAL_DISPLAY_HELP_URL = R.string.help_url_external_display;
|
||||
|
||||
public static class SystemServicesProvider {
|
||||
@Nullable
|
||||
private IWindowManager mWindowManager;
|
||||
@Nullable
|
||||
private DisplayManager mDisplayManager;
|
||||
@Nullable
|
||||
protected Context mContext;
|
||||
/**
|
||||
* @param name of a system property.
|
||||
* @return the value of the system property.
|
||||
*/
|
||||
@NonNull
|
||||
public String getSystemProperty(@NonNull String name) {
|
||||
return SystemProperties.get(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return return public Display manager.
|
||||
*/
|
||||
@Nullable
|
||||
public DisplayManager getDisplayManager() {
|
||||
if (mDisplayManager == null && getContext() != null) {
|
||||
mDisplayManager = (DisplayManager) getContext().getSystemService(DISPLAY_SERVICE);
|
||||
}
|
||||
return mDisplayManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return internal IWindowManager
|
||||
*/
|
||||
@Nullable
|
||||
public IWindowManager getWindowManager() {
|
||||
if (mWindowManager == null) {
|
||||
mWindowManager = WindowManagerGlobal.getWindowManagerService();
|
||||
}
|
||||
return mWindowManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return context.
|
||||
*/
|
||||
@Nullable
|
||||
public Context getContext() {
|
||||
return mContext;
|
||||
}
|
||||
}
|
||||
|
||||
public static class Injector extends SystemServicesProvider {
|
||||
@NonNull
|
||||
private final FeatureFlags mFlags;
|
||||
@NonNull
|
||||
private final Handler mHandler;
|
||||
|
||||
Injector(@Nullable Context context) {
|
||||
this(context, new FeatureFlagsImpl(), new Handler(Looper.getMainLooper()));
|
||||
}
|
||||
|
||||
Injector(@Nullable Context context, @NonNull FeatureFlags flags, @NonNull Handler handler) {
|
||||
mContext = context;
|
||||
mFlags = flags;
|
||||
mHandler = handler;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return all displays including disabled.
|
||||
*/
|
||||
@NonNull
|
||||
public Display[] getAllDisplays() {
|
||||
var dm = getDisplayManager();
|
||||
if (dm == null) {
|
||||
return new Display[0];
|
||||
}
|
||||
return dm.getDisplays(DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return enabled displays only.
|
||||
*/
|
||||
@NonNull
|
||||
public Display[] getEnabledDisplays() {
|
||||
var dm = getDisplayManager();
|
||||
if (dm == null) {
|
||||
return new Display[0];
|
||||
}
|
||||
return dm.getDisplays();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if the display is enabled
|
||||
*/
|
||||
public boolean isDisplayEnabled(@NonNull Display display) {
|
||||
for (var enabledDisplay : getEnabledDisplays()) {
|
||||
if (enabledDisplay.getDisplayId() == display.getDisplayId()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Register display listener.
|
||||
*/
|
||||
public void registerDisplayListener(@NonNull DisplayManager.DisplayListener listener) {
|
||||
var dm = getDisplayManager();
|
||||
if (dm == null) {
|
||||
return;
|
||||
}
|
||||
dm.registerDisplayListener(listener, mHandler, EVENT_FLAG_DISPLAY_ADDED
|
||||
| EVENT_FLAG_DISPLAY_CHANGED | EVENT_FLAG_DISPLAY_REMOVED
|
||||
| EVENT_FLAG_DISPLAY_CONNECTION_CHANGED);
|
||||
}
|
||||
|
||||
/**
|
||||
* Unregister display listener.
|
||||
*/
|
||||
public void unregisterDisplayListener(@NonNull DisplayManager.DisplayListener listener) {
|
||||
var dm = getDisplayManager();
|
||||
if (dm == null) {
|
||||
return;
|
||||
}
|
||||
dm.unregisterDisplayListener(listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return feature flags.
|
||||
*/
|
||||
@NonNull
|
||||
public FeatureFlags getFlags() {
|
||||
return mFlags;
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable connected display.
|
||||
*/
|
||||
public boolean enableConnectedDisplay(int displayId) {
|
||||
var dm = getDisplayManager();
|
||||
if (dm == null) {
|
||||
return false;
|
||||
}
|
||||
dm.enableConnectedDisplay(displayId);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Disable connected display.
|
||||
*/
|
||||
public boolean disableConnectedDisplay(int displayId) {
|
||||
var dm = getDisplayManager();
|
||||
if (dm == null) {
|
||||
return false;
|
||||
}
|
||||
dm.disableConnectedDisplay(displayId);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param displayId which must be returned
|
||||
* @return display object for the displayId
|
||||
*/
|
||||
@Nullable
|
||||
public Display getDisplay(int displayId) {
|
||||
if (displayId == INVALID_DISPLAY) {
|
||||
return null;
|
||||
}
|
||||
var dm = getDisplayManager();
|
||||
if (dm == null) {
|
||||
return null;
|
||||
}
|
||||
return dm.getDisplay(displayId);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return handler
|
||||
*/
|
||||
@NonNull
|
||||
public Handler getHandler() {
|
||||
return mHandler;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get display rotation
|
||||
* @param displayId display identifier
|
||||
* @return rotation
|
||||
*/
|
||||
public int getDisplayUserRotation(int displayId) {
|
||||
var wm = getWindowManager();
|
||||
if (wm == null) {
|
||||
return 0;
|
||||
}
|
||||
try {
|
||||
return wm.getDisplayUserRotation(displayId);
|
||||
} catch (RemoteException e) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Freeze rotation of the display in the specified rotation.
|
||||
* @param displayId display identifier
|
||||
* @param rotation [0, 1, 2, 3]
|
||||
* @return true if successful
|
||||
*/
|
||||
public boolean freezeDisplayRotation(int displayId, int rotation) {
|
||||
var wm = getWindowManager();
|
||||
if (wm == null) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
wm.freezeDisplayRotation(displayId, rotation,
|
||||
"ExternalDisplayPreferenceFragment");
|
||||
return true;
|
||||
} catch (RemoteException e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Enforce display mode on the given display.
|
||||
*/
|
||||
public void setUserPreferredDisplayMode(int displayId, @NonNull Mode mode) {
|
||||
DisplayManagerGlobal.getInstance().setUserPreferredDisplayMode(displayId, mode);
|
||||
}
|
||||
}
|
||||
|
||||
public abstract static class DisplayListener implements DisplayManager.DisplayListener {
|
||||
@Override
|
||||
public void onDisplayAdded(int displayId) {
|
||||
update(displayId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisplayRemoved(int displayId) {
|
||||
update(displayId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisplayChanged(int displayId) {
|
||||
update(displayId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisplayConnected(int displayId) {
|
||||
update(displayId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisplayDisconnected(int displayId) {
|
||||
update(displayId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Called from other listener methods to trigger update of the settings page.
|
||||
*/
|
||||
public abstract void update(int displayId);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return whether the settings page is enabled or not.
|
||||
*/
|
||||
public static boolean isExternalDisplaySettingsPageEnabled(@NonNull FeatureFlags flags) {
|
||||
return flags.rotationConnectedDisplaySetting()
|
||||
|| flags.resolutionAndEnableConnectedDisplaySetting();
|
||||
}
|
||||
|
||||
static boolean isDisplayAllowed(@NonNull Display display,
|
||||
@NonNull SystemServicesProvider props) {
|
||||
return display.getType() == Display.TYPE_EXTERNAL
|
||||
|| display.getType() == Display.TYPE_OVERLAY
|
||||
|| isVirtualDisplayAllowed(display, props);
|
||||
}
|
||||
|
||||
static boolean isVirtualDisplayAllowed(@NonNull Display display,
|
||||
@NonNull SystemServicesProvider properties) {
|
||||
var sysProp = properties.getSystemProperty(VIRTUAL_DISPLAY_PACKAGE_NAME_SYSTEM_PROPERTY);
|
||||
return !sysProp.isEmpty() && display.getType() == Display.TYPE_VIRTUAL
|
||||
&& sysProp.equals(display.getOwnerPackageName());
|
||||
}
|
||||
|
||||
static boolean isUseDisplaySettingEnabled(@Nullable Injector injector) {
|
||||
return injector != null && injector.getFlags().resolutionAndEnableConnectedDisplaySetting();
|
||||
}
|
||||
|
||||
static boolean isResolutionSettingEnabled(@Nullable Injector injector) {
|
||||
return injector != null && injector.getFlags().resolutionAndEnableConnectedDisplaySetting();
|
||||
}
|
||||
|
||||
static boolean isRotationSettingEnabled(@Nullable Injector injector) {
|
||||
return injector != null && injector.getFlags().rotationConnectedDisplaySetting();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user