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

Commit fba6e465 authored by Archisha Baranwal's avatar Archisha Baranwal Committed by Android (Google) Code Review
Browse files

Revert "Revert "Adding ViewCaptureAwareWindowManager to Floating..." 

Revert submission 29375289-revert-29345213-viewcapture floating button-ABNDYAQSJU

Reason for revert: Fixed the broken Launcher3Tests 

Reverted changes: /q/submissionid:29375289-revert-29345213-viewcapture+floating+button-ABNDYAQSJU

Change-Id: I26e04bc5da4358771a6251584b0b08aa0a088643
parent 0f6e11b6

packages/SystemUI/shared/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ android_library { 
        "jsr330",

        "//frameworks/libs/systemui:com_android_systemui_shared_flags_lib",

        "//frameworks/libs/systemui:msdl",

        "//frameworks/libs/systemui:view_capture",

    ],

    resource_dirs: [

        "res",

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java

+7 −3
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.systemui.shared.rotation;



import static com.android.app.viewcapture.ViewCaptureFactory.getViewCaptureAwareWindowManagerInstance;

import static com.android.systemui.Flags.enableViewCaptureTracing;



import android.annotation.DimenRes;

import android.annotation.IdRes;

import android.annotation.LayoutRes;
@@ -30,7 +33,6 @@ import android.graphics.drawable.Drawable; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams;

import android.view.animation.AccelerateDecelerateInterpolator;

import android.widget.FrameLayout;
@@ -38,6 +40,7 @@ import android.widget.FrameLayout; 
import androidx.annotation.BoolRes;

import androidx.core.view.OneShotPreDrawListener;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.systemui.shared.rotation.FloatingRotationButtonPositionCalculator.Position;



/**
@@ -47,7 +50,7 @@ public class FloatingRotationButton implements RotationButton { 


    private static final int MARGIN_ANIMATION_DURATION_MILLIS = 300;



    private final WindowManager mWindowManager;

    private final ViewCaptureAwareWindowManager mWindowManager;

    private final ViewGroup mKeyButtonContainer;

    private final FloatingRotationButtonView mKeyButtonView;
@@ -88,7 +91,8 @@ public class FloatingRotationButton implements RotationButton { 
            @DimenRes int taskbarBottomMargin, @DimenRes int buttonDiameter,

            @DimenRes int rippleMaxWidth, @BoolRes int floatingRotationBtnPositionLeftResource) {

        mContext = context;

        mWindowManager = mContext.getSystemService(WindowManager.class);

        mWindowManager = getViewCaptureAwareWindowManagerInstance(mContext,

                enableViewCaptureTracing());

        mKeyButtonContainer = (ViewGroup) LayoutInflater.from(mContext).inflate(layout, null);

        mKeyButtonView = mKeyButtonContainer.findViewById(keyButtonId);

        mKeyButtonView.setVisibility(View.VISIBLE);