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

* commit '5301bd7274a48528f8a1cf4ed3fa402a65e64a56':
  Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.

1 files changed, 8 insertions, 1 deletions

diff --git a/core/java/com/android/internal/widget/FloatingToolbar.java b/core/java/com/android/internal/widget/FloatingToolbar.java
index b3f688bbbd04..3482d3ce2ba3 100644
--- a/core/java/com/android/internal/widget/FloatingToolbar.java
+++ b/core/java/com/android/internal/widget/FloatingToolbar.java
@@ -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.