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

Commit b2c90374 authored by Candice Lo's avatar Candice Lo Committed by Automerger Merge Worker
Browse files

Merge "Change the flag of magnification settings to TYPE_NAVIGATION_BAR_PANE"... 

Merge "Change the flag of magnification settings to TYPE_NAVIGATION_BAR_PANE" into udc-dev am: bfd652d0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22649701



Change-Id: Ib2c4880353d617fb4895d46f7d0afc7fcda27cbc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40d0b255 bfd652d0

packages/SystemUI/src/com/android/systemui/accessibility/MagnificationSettingsController.java

+8 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.ComponentCallbacks; 
import android.content.Context;

import android.content.res.Configuration;

import android.util.Range;

import android.view.WindowManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.graphics.SfVsyncFrameCallbackProvider;
@@ -68,14 +69,18 @@ public class MagnificationSettingsController implements ComponentCallbacks { 
            @NonNull Callback settingsControllerCallback,

            SecureSettings secureSettings,

            WindowMagnificationSettings windowMagnificationSettings) {

        mContext = context;

        mContext = context.createWindowContext(

                context.getDisplay(),

                WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,

                null);

        mContext.setTheme(com.android.systemui.R.style.Theme_SystemUI);

        mDisplayId = mContext.getDisplayId();

        mConfiguration = new Configuration(context.getResources().getConfiguration());

        mConfiguration = new Configuration(mContext.getResources().getConfiguration());

        mSettingsControllerCallback = settingsControllerCallback;

        if (windowMagnificationSettings != null) {

            mWindowMagnificationSettings = windowMagnificationSettings;

        } else {

            mWindowMagnificationSettings = new WindowMagnificationSettings(context,

            mWindowMagnificationSettings = new WindowMagnificationSettings(mContext,

                    mWindowMagnificationSettingsCallback,

                    sfVsyncFrameProvider, secureSettings);

        }

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
        final LayoutParams params = new LayoutParams(

                LayoutParams.WRAP_CONTENT,

                LayoutParams.WRAP_CONTENT,

                LayoutParams.TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY,

                LayoutParams.TYPE_NAVIGATION_BAR_PANEL,

                LayoutParams.FLAG_NOT_FOCUSABLE,

                PixelFormat.TRANSPARENT);

        params.gravity = Gravity.TOP | Gravity.START;