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

Commit cf873ab5 authored by Mykola Podolian's avatar Mykola Podolian Committed by Android (Google) Code Review
Browse files

Merge "Remove dead code" into main

parents 59d2b48a 8a46912b

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerBubbleBarTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -552,8 +552,6 @@ class BubbleControllerBubbleBarTest { 


        override fun animateBubbleBarLocation(location: BubbleBarLocation?) {}



        override fun showBubbleBarPillowAt(location: BubbleBarLocation?) {}



        override fun showBubbleBarDropTargetAt(location: BubbleBarLocation?) {}

    }

}

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubblesStateListener.kt

+0 −2
Original line number Diff line number Diff line
@@ -29,7 +29,5 @@ class FakeBubblesStateListener : Bubbles.BubbleStateListener { 


    override fun animateBubbleBarLocation(location: BubbleBarLocation?) {}



    override fun showBubbleBarPillowAt(location: BubbleBarLocation?) {}



    override fun showBubbleBarDropTargetAt(location: BubbleBarLocation?) {}

}

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+1 −15
Original line number Diff line number Diff line
@@ -994,16 +994,6 @@ public class BubbleController implements ConfigurationChangeListener, 
        }

    }



    // TODO(b/411505605) remove all related code

    /**

     * Show bubble bar pin view given location.

     */

    public void showBubbleBarPinAtLocation(@Nullable BubbleBarLocation bubbleBarLocation) {

        if (isShowingAsBubbleBar() && mBubbleStateListener != null) {

            mBubbleStateListener.showBubbleBarPillowAt(bubbleBarLocation);

        }

    }



    /** Show bubble bar drop target at provided location or hide it if null. */

    public void showBubbleBarDropTargetAt(@Nullable BubbleBarLocation bubbleBarLocation) {

        if (isShowingAsBubbleBar() && mBubbleStateListener != null) {
@@ -1011,6 +1001,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        }

    }



    // TODO(b/416297506) remove this code too

    private void showBubbleBarExpandedViewDropTarget(BubbleBarLocation bubbleBarLocation) {

        ensureBubbleViewsAndWindowCreated();

        if (mLayerView != null) {
@@ -3143,11 +3134,6 @@ public class BubbleController implements ConfigurationChangeListener, 
                        mListener.call(l -> l.animateBubbleBarLocation(location));

                    }



                    @Override

                    public void showBubbleBarPillowAt(@Nullable BubbleBarLocation location) {

                        mListener.call(l -> l.showBubbleBarPillowAt(location));

                    }



                    @Override

                    public void showBubbleBarDropTargetAt(@Nullable BubbleBarLocation location) {

                        mListener.call(l -> l.showBubbleBarDropTargetAt(location));

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java

+0 −8
Original line number Diff line number Diff line
@@ -354,14 +354,6 @@ public interface Bubbles { 
         */

        void animateBubbleBarLocation(BubbleBarLocation location);



        /**

         * Show the bubble bar pillow view at the provided location.

         * If the location is null, the pillow view is should be hidden.

         *

         * @param location The location to show the pillow view, or null to hide it.

         */

        void showBubbleBarPillowAt(@Nullable BubbleBarLocation location);



        /** Show bubble bar drop target at provided location or hide if location is null. */

        void showBubbleBarDropTargetAt(@Nullable BubbleBarLocation location);

    }

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubblesListener.aidl

+0 −6
Original line number Diff line number Diff line
@@ -34,12 +34,6 @@ oneway interface IBubblesListener { 
     */

    void animateBubbleBarLocation(in BubbleBarLocation location);



    /**

    * Show the bubble bar pillow view at the provided location.

    * If the location is null, the pillow view is should be hidden.

    */

    void showBubbleBarPillowAt(in BubbleBarLocation location);



    /** Show bubble bar drop target at provided location or hide if location is null. */

    void showBubbleBarDropTargetAt(in BubbleBarLocation location);

}
 
 No newline at end of file