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

Commit fea72152 authored by Jon Spivack's avatar Jon Spivack Committed by Android (Google) Code Review
Browse files

Merge "Disable NIU Actions on Work Profile apps" into sc-dev

parents 631767d9 cdbaea44

go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.Intent; 
import android.graphics.Matrix;

import android.graphics.Matrix;

import android.net.Uri;

import android.net.Uri;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -96,7 +97,10 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory { 
            }

            }





            getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);

            getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);

            boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot();

            // Disable Overview Actions for Work Profile apps

            boolean isManagedProfileTask =

                    UserManager.get(mApplicationContext).isManagedProfile(task.key.userId);

            boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot() && !isManagedProfileTask;

            getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));

            getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));

            mTaskPackageName = task.key.getPackageName();

            mTaskPackageName = task.key.getPackageName();
@@ -127,8 +131,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory { 
        /**

        /**

         * Creates and sends an Intent corresponding to the button that was clicked

         * Creates and sends an Intent corresponding to the button that was clicked

         */

         */

        @VisibleForTesting

        private void sendNIUIntent(String actionType) {

        public void sendNIUIntent(String actionType) {

            Intent intent = createNIUIntent(actionType);

            Intent intent = createNIUIntent(actionType);

            // Only add and send the image if the appropriate permissions are held

            // Only add and send the image if the appropriate permissions are held

            if (mAssistPermissionsEnabled) {

            if (mAssistPermissionsEnabled) {