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

Commit 1031eb71 authored by Casey Burkhardt's avatar Casey Burkhardt Committed by android-build-merger
Browse files

am 5e2986ef: am 2997285f: Merge "Disable circular display mask with color... 

am 5e2986ef: am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev
automerge: fb80a3b2

* commit 'fb80a3b2':
  Disable circular display mask with color inversion
parents f2459e2e fb80a3b2

services/core/java/com/android/server/wm/WindowManagerService.java

+47 −23
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import android.graphics.RectF; 
import android.graphics.Region;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManagerInternal;

import android.net.Uri;

import android.os.Binder;

import android.os.Bundle;

import android.os.Debug;
@@ -558,16 +559,26 @@ public class WindowManagerService extends IWindowManager.Stub 
    SettingsObserver mSettingsObserver;



    private final class SettingsObserver extends ContentObserver {

        private final Uri mShowImeWithHardKeyboardUri =

                Settings.Secure.getUriFor(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD);



        private final Uri mDisplayInversionEnabledUri =

                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED);



        public SettingsObserver() {

            super(new Handler());

            ContentResolver resolver = mContext.getContentResolver();

            resolver.registerContentObserver(Settings.Secure.getUriFor(

                    Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD), false, this);

            resolver.registerContentObserver(mShowImeWithHardKeyboardUri, false, this);

            resolver.registerContentObserver(mDisplayInversionEnabledUri, false, this);

        }



        @Override

        public void onChange(boolean selfChange) {

        public void onChange(boolean selfChange, Uri uri) {

            if (mShowImeWithHardKeyboardUri.equals(uri)) {

                updateShowImeWithHardKeyboard();

            } else if (mDisplayInversionEnabledUri.equals(uri)) {

                updateCircularDisplayMaskIfNeeded();

            }

        }

    }
@@ -903,7 +914,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            SurfaceControl.closeTransaction();

        }



        showCircularDisplayMaskIfNeeded();

        updateCircularDisplayMaskIfNeeded();

        showEmulatorDisplayOverlayIfNeeded();

    }
@@ -5842,13 +5853,21 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

    }



    public void showCircularDisplayMaskIfNeeded() {

    public void updateCircularDisplayMaskIfNeeded() {

        // we're fullscreen and not hosted in an ActivityView

        if (mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_windowIsRound)

                && mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_windowShowCircularMask)) {

            mH.sendMessage(mH.obtainMessage(H.SHOW_CIRCULAR_DISPLAY_MASK));

            // Device configuration calls for a circular display mask, but we only enable the mask

            // if the accessibility color inversion feature is disabled, as the inverted mask

            // causes artifacts.

            int inversionState = Settings.Secure.getIntForUser(mContext.getContentResolver(),

                    Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, 0, mCurrentUserId);

            int showMask = (inversionState == 1) ? 0 : 1;

            Message m = mH.obtainMessage(H.SHOW_CIRCULAR_DISPLAY_MASK);

            m.arg1 = showMask;

            mH.sendMessage(m);

        }

    }
@@ -5861,13 +5880,14 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

    }



    public void showCircularMask() {

    public void showCircularMask(boolean visible) {

        synchronized(mWindowMap) {



            if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG,

                    ">>> OPEN TRANSACTION showCircularMask");

                    ">>> OPEN TRANSACTION showCircularMask(visible=" + visible + ")");

            SurfaceControl.openTransaction();

            try {

                if (visible) {

                    // TODO(multi-display): support multiple displays

                    if (mCircularDisplayMask == null) {

                        int screenOffset = mContext.getResources().getDimensionPixelSize(
@@ -5881,10 +5901,14 @@ public class WindowManagerService extends IWindowManager.Stub 
                                        * TYPE_LAYER_MULTIPLIER + 10, screenOffset);

                    }

                    mCircularDisplayMask.setVisibility(true);

                } else if (mCircularDisplayMask != null) {

                    mCircularDisplayMask.setVisibility(false);

                    mCircularDisplayMask = null;

                }

            } finally {

                SurfaceControl.closeTransaction();

                if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG,

                        "<<< CLOSE TRANSACTION showCircularMask");

                        "<<< CLOSE TRANSACTION showCircularMask(visible=" + visible + ")");

            }

        }

    }
@@ -7955,7 +7979,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                }



                case SHOW_CIRCULAR_DISPLAY_MASK: {

                    showCircularMask();

                    showCircularMask(msg.arg1 == 1);

                    break;

                }