Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 52bb6c26: am 97993692: Fix brightness mirror positioning.

Browse Source 
* commit '52bb6c26c89bdbf44f1263532e216a758e80c0b3':
  Fix brightness mirror positioning.
This commit is contained in:
Jorim Jaggi
2015-05-14 23:48:56 +00:00
committed by Android Git Automerger
parent 28922386d8 52bb6c26c8
commit 00c8ff6d5e
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/super_status_bar.xml
View File

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

18
packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
View File

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