Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 305a8e0e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update external display settings to use DesktopExperienceFlags" into main

parents c5136b82 761920b4
Loading
Loading
Loading
Loading
+41 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2025 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 android.window.DesktopExperienceFlags.DesktopExperienceFlag
import com.android.settings.flags.FeatureFlags

/** Class handling Settings flags, but using the Desktop Experience developer option overrides. */
class DesktopExperienceFlags(private val featureFlagsImpl: FeatureFlags) : FeatureFlags by featureFlagsImpl {

    private val displayTopologyPaneInDisplayListFlag =
        DesktopExperienceFlag(
            featureFlagsImpl::displayTopologyPaneInDisplayList,
            /* shouldOverrideByDevOption= */ true,
        )

    override fun displayTopologyPaneInDisplayList(): Boolean =
        displayTopologyPaneInDisplayListFlag.isTrue

    private val displaySizeConnectedDisplaySettingFlag =
        DesktopExperienceFlag(
            featureFlagsImpl::displaySizeConnectedDisplaySetting,
            /* shouldOverrideByDevOption= */ true,
        )

    override fun displaySizeConnectedDisplaySetting(): Boolean =
        displaySizeConnectedDisplaySettingFlag.isTrue
}
 No newline at end of file
+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ public class ExternalDisplaySettingsConfiguration {
        private final Handler mHandler;

        Injector(@Nullable Context context) {
            this(context, new FeatureFlagsImpl(), new Handler(Looper.getMainLooper()));
            this(context, new DesktopExperienceFlags(new FeatureFlagsImpl()),
                    new Handler(Looper.getMainLooper()));
        }

        Injector(@Nullable Context context, @NonNull FeatureFlags flags, @NonNull Handler handler) {