Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(magnification thumbnail): remove feature flag, enable thumbnail by default

Browse Source 
Fix: b/290647325

Test: manual: 1. Activate magnification. Thumbnail should appear.
Change-Id: I1a2b4d91024890196cf471e735480bcca5f7219d
This commit is contained in:
Tyler Freeman
2023-07-10 11:55:39 -07:00
parent 28d0aabf7d
commit 564f344869
2 changed files with 5 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java
View File

@@ -110,7 +110,6 @@ public class FullScreenMagnificationController implements
private boolean mAlwaysOnMagnificationEnabled = false;
private final DisplayManagerInternal mDisplayManagerInternal;
private final MagnificationThumbnailFeatureFlag mMagnificationThumbnailFeatureFlag;
@NonNull private final Supplier<MagnificationThumbnail> mThumbnailSupplier;
/**
@@ -643,13 +642,6 @@ public class FullScreenMagnificationController implements
}
}
void onThumbnailFeatureFlagChanged() {
synchronized (mLock) {
destroyThumbnail();
createThumbnailIfSupported();
}
}
/**
* Updates the current magnification spec.
*
@@ -810,43 +802,19 @@ public class FullScreenMagnificationController implements
addInfoChangedCallback(magnificationInfoChangedCallback);
mScaleProvider = scaleProvider;
mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);
mMagnificationThumbnailFeatureFlag = new MagnificationThumbnailFeatureFlag();
mMagnificationThumbnailFeatureFlag.addOnChangedListener(
backgroundExecutor, this::onMagnificationThumbnailFeatureFlagChanged);
if (thumbnailSupplier != null) {
mThumbnailSupplier = thumbnailSupplier;
} else {
mThumbnailSupplier = () -> {
if (mMagnificationThumbnailFeatureFlag.isFeatureFlagEnabled()) {
return new MagnificationThumbnail(
ctx.getContext(),
ctx.getContext().getSystemService(WindowManager.class),
new Handler(ctx.getContext().getMainLooper())
);
}
return null;
return new MagnificationThumbnail(
ctx.getContext(),
ctx.getContext().getSystemService(WindowManager.class),
new Handler(ctx.getContext().getMainLooper())
);
};
}
}
private void onMagnificationThumbnailFeatureFlagChanged() {
synchronized (mLock) {
for (int i = 0; i < mDisplays.size(); i++) {
onMagnificationThumbnailFeatureFlagChanged(mDisplays.keyAt(i));
}
}
}
private void onMagnificationThumbnailFeatureFlagChanged(int displayId) {
synchronized (mLock) {
final DisplayMagnification display = mDisplays.get(displayId);
if (display == null) {
return;
}
display.onThumbnailFeatureFlagChanged();
}
}
/**
* Start tracking the magnification region for services that control magnification and the
* magnification gesture handler.

46
services/accessibility/java/com/android/server/accessibility/magnification/MagnificationThumbnailFeatureFlag.java
View File

@@ -1,46 +0,0 @@
/*
* Copyright (C) 2023 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.server.accessibility.magnification;
import android.provider.DeviceConfig;
/**
* Encapsulates the feature flags for magnification thumbnail. {@see DeviceConfig}
*
* @hide
*/
public class MagnificationThumbnailFeatureFlag extends MagnificationFeatureFlagBase {
private static final String NAMESPACE = DeviceConfig.NAMESPACE_ACCESSIBILITY;
private static final String FEATURE_NAME_ENABLE_MAGNIFIER_THUMBNAIL =
"enable_magnifier_thumbnail";
@Override
String getNamespace() {
return NAMESPACE;
}
@Override
String getFeatureName() {
return FEATURE_NAME_ENABLE_MAGNIFIER_THUMBNAIL;
}
@Override
boolean getDefaultValue() {
return false;
}
}