am 97993692: Fix brightness mirror positioning.

* commit '979936920ee2e654e23678172c49b301e886c374':
  Fix brightness mirror positioning.
This commit is contained in:
Jorim Jaggi
2015-05-14 23:33:57 +00:00
committed by Android Git Automerger
2 changed files with 13 additions and 7 deletions

View File

@@ -63,7 +63,7 @@
android:layout_gravity="@integer/notification_panel_layout_gravity"
android:paddingLeft="@dimen/notification_side_padding"
android:paddingRight="@dimen/notification_side_padding"
android:visibility="gone">
android:visibility="invisible">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -58,7 +58,7 @@ public class BrightnessMirrorController {
.withEndAction(new Runnable() {
@Override
public void run() {
mBrightnessMirror.setVisibility(View.GONE);
mBrightnessMirror.setVisibility(View.INVISIBLE);
}
});
}
@@ -77,12 +77,18 @@ public class BrightnessMirrorController {
public void setLocation(View original) {
original.getLocationInWindow(mInt2Cache);
int originalY = mInt2Cache[1];
mBrightnessMirror.getLocationInWindow(mInt2Cache);
int mirrorY = mInt2Cache[1];
mBrightnessMirror.setTranslationY(mBrightnessMirror.getTranslationY()
+ originalY - mirrorY);
// Original is slightly larger than the mirror, so make sure to use the center for the
// positioning.
int originalX = mInt2Cache[0] + original.getWidth()/2;
int originalY = mInt2Cache[1];
mBrightnessMirror.setTranslationX(0);
mBrightnessMirror.setTranslationY(0);
mBrightnessMirror.getLocationInWindow(mInt2Cache);
int mirrorX = mInt2Cache[0] + mBrightnessMirror.getWidth()/2;
int mirrorY = mInt2Cache[1];
mBrightnessMirror.setTranslationX(originalX - mirrorX);
mBrightnessMirror.setTranslationY(originalY - mirrorY);
}
public View getMirror() {