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

Commit c37b7922 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android Git Automerger
Browse files

am 66b8377e: am 2e030285: am ebbe7706: Merge "Fix comment bug in... 

am 66b8377e: am 2e030285: am ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev

* commit '66b8377e':
  Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
parents 87c3a63c 66b8377e

core/java/com/android/internal/widget/FloatingToolbar.java

+8 −1
Original line number Diff line number Diff line
@@ -450,7 +450,10 @@ public final class FloatingToolbar { 
            }

            refreshCoordinatesAndOverflowDirection(contentRectOnScreen);

            preparePopupContent();

            // We need to specify the offset relative to mParent.

            // PopupWindow#showAtLocation() receives the location relative to the attached window

            // hence the following code is correct when and only when mParent is aligned to the

            // top-left of the attached window.

            // TODO: Fix the following logic so that mParent can be placed at anywhere.

            // TODO: Consider to use PopupWindow.setLayoutInScreenEnabled(true) so that we can

            // specify the popup poision in screen coordinates.

            mParent.getLocationOnScreen(mParentPositionOnScreen);
@@ -519,6 +522,10 @@ public final class FloatingToolbar { 
            cancelOverflowAnimations();

            refreshCoordinatesAndOverflowDirection(contentRectOnScreen);

            preparePopupContent();

            // PopupWindow#update() receives the location relative to the attached window hence

            // the following code is correct when and only when mParent is aligned to the top-left

            // of the attached window.

            // TODO: Fix the following logic so that mParent can be placed at anywhere.

            // We need to specify the offset relative to mParent.

            // TODO: Consider to use PopupWindow.setLayoutInScreenEnabled(true) so that we can

            // specify the popup poision in screen coordinates.