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

Commit 0f6e11b6 authored by Pechetty Sravani (xWF)'s avatar Pechetty Sravani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Adding ViewCaptureAwareWindowManager to FloatingRotation..." 

Revert submission 29345213-viewcapture floating button

Reason for revert: DroidMonitor created revert due to b/366061796.

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

Change-Id: I8c3695bbadd651bc9fdea00dc803d59915313b83
parent 0531579a

packages/SystemUI/shared/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 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

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


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;
@@ -33,6 +30,7 @@ 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;
@@ -40,7 +38,6 @@ 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;



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


    private static final int MARGIN_ANIMATION_DURATION_MILLIS = 300;



    private final ViewCaptureAwareWindowManager mWindowManager;

    private final WindowManager mWindowManager;

    private final ViewGroup mKeyButtonContainer;

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

            @DimenRes int rippleMaxWidth, @BoolRes int floatingRotationBtnPositionLeftResource) {

        mContext = context;

        mWindowManager = getViewCaptureAwareWindowManagerInstance(mContext,

                enableViewCaptureTracing());

        mWindowManager = mContext.getSystemService(WindowManager.class);

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

        mKeyButtonView = mKeyButtonContainer.findViewById(keyButtonId);

        mKeyButtonView.setVisibility(View.VISIBLE);