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

Commit d38421d0 authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "Remove temporary double icon workarounds" into udc-dev

parents 440cf522 ff6a080e

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUILayout.java

+0 −9
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.app.TaskInfo; 
import android.app.TaskInfo.CameraCompatControlState;

import android.content.Context;

import android.util.AttributeSet;

import android.view.MotionEvent;

import android.view.View;

import android.widget.ImageButton;

import android.widget.LinearLayout;
@@ -112,14 +111,6 @@ class CompatUILayout extends LinearLayout { 
        mWindowManager.relayout();

    }



    @Override

    public boolean onInterceptTouchEvent(MotionEvent ev) {

        if (ev.getAction() == MotionEvent.ACTION_DOWN) {

            mWindowManager.relayout();

        }

        return super.onInterceptTouchEvent(ev);

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java

+0 −7
Original line number Diff line number Diff line
@@ -204,14 +204,7 @@ class CompatUIWindowManager extends CompatUIWindowManagerAbstract { 
                : taskStableBounds.right - taskBounds.left - mLayout.getMeasuredWidth();

        final int positionY = taskStableBounds.bottom - taskBounds.top

                - mLayout.getMeasuredHeight();

        // To secure a proper visualisation, we hide the layout while updating the position of

        // the {@link SurfaceControl} it belongs.

        final int oldVisibility = mLayout.getVisibility();

        if (oldVisibility == View.VISIBLE) {

            mLayout.setVisibility(View.GONE);

        }

        updateSurfacePosition(positionX, positionY);

        mLayout.setVisibility(oldVisibility);

    }



    private void updateVisibilityOfViews() {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java

+2 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertFalse; 
import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;
@@ -363,14 +362,14 @@ public class CompatUIWindowManagerTest extends ShellTestCase { 
        mWindowManager.updateVisibility(/* canShow= */ false);



        verify(mWindowManager, never()).createLayout(anyBoolean());

        verify(mLayout, atLeastOnce()).setVisibility(View.GONE);

        verify(mLayout).setVisibility(View.GONE);



        // Show button.

        doReturn(View.GONE).when(mLayout).getVisibility();

        mWindowManager.updateVisibility(/* canShow= */ true);



        verify(mWindowManager, never()).createLayout(anyBoolean());

        verify(mLayout, atLeastOnce()).setVisibility(View.VISIBLE);

        verify(mLayout).setVisibility(View.VISIBLE);

    }



    @Test