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

Merge "Revert Nav bar contrast under magnification" into pi-dev

Browse Source
This commit is contained in:
Phil Weaver
2018-05-08 20:59:27 +00:00
committed by Android (Google) Code Review
parent 0c2985384b b7f2c9cf29
commit 4179c5ca2c
4 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -803,9 +803,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
private int mCurrentUserId;
/* Whether accessibility is magnifying the screen */
private boolean mScreenMagnificationActive;
// Maps global key codes to the components that will handle them.
private GlobalKeyManager mGlobalKeyManager;
@@ -8412,11 +8409,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
*/
private int configureNavBarOpacity(int visibility, boolean dockedStackVisible,
boolean freeformStackVisible, boolean isDockedDividerResizing) {
if (mScreenMagnificationActive) {
// When the screen is magnified, the nav bar should be opaque since its background
// can vary as the user pans and zooms
visibility = setNavBarOpaqueFlag(visibility);
} else if (mNavBarOpacityMode == NAV_BAR_OPAQUE_WHEN_FREEFORM_OR_DOCKED) {
if (mNavBarOpacityMode == NAV_BAR_OPAQUE_WHEN_FREEFORM_OR_DOCKED) {
if (dockedStackVisible || freeformStackVisible || isDockedDividerResizing) {
visibility = setNavBarOpaqueFlag(visibility);
}
@@ -8570,14 +8563,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return false;
}
@Override
public void onScreenMagnificationStateChanged(boolean active) {
synchronized (mWindowManagerFuncs.getWindowManagerLock()) {
mScreenMagnificationActive = active;
updateSystemUiVisibilityLw();
}
}
@Override
public void writeToProto(ProtoOutputStream proto, long fieldId) {
final long token = proto.start(fieldId);

7
services/core/java/com/android/server/policy/WindowManagerPolicy.java
View File

@@ -1739,13 +1739,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants {
*/
boolean canDismissBootAnimation();
/**
* Called when the magnification state changes.
*
* @param active Whether magnification is active (that is, we are zoomed in).
*/
void onScreenMagnificationStateChanged(boolean active);
/**
* Convert the user rotation mode to a human readable format.
*/

7
services/core/java/com/android/server/wm/AccessibilityController.java
View File

@@ -87,8 +87,6 @@ final class AccessibilityController {
private WindowsForAccessibilityObserver mWindowsForAccessibilityObserver;
private boolean mScreenMagnificationActive;
public void setMagnificationCallbacksLocked(MagnificationCallbacks callbacks) {
if (callbacks != null) {
if (mDisplayMagnifier != null) {
@@ -138,11 +136,6 @@ final class AccessibilityController {
if (mWindowsForAccessibilityObserver != null) {
mWindowsForAccessibilityObserver.scheduleComputeChangedWindowsLocked();
}
boolean nowActive = !spec.isNop();
if (nowActive != mScreenMagnificationActive) {
mScreenMagnificationActive = nowActive;
mService.mPolicy.onScreenMagnificationStateChanged(nowActive);
}
}
public void getMagnificationRegionLocked(Region outMagnificationRegion) {

4
services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java
View File

@@ -590,10 +590,6 @@ class TestWindowManagerPolicy implements WindowManagerPolicy {
return true;
}
@Override
public void onScreenMagnificationStateChanged(boolean active) {
}
@Override
public void requestUserActivityNotification() {
}