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

Merge "Fix volume expand arrow to be displayed correctly"

Browse Source
This commit is contained in:
Julia Reynolds
2015-12-14 16:39:49 +00:00
committed by Gerrit Code Review
parent 85b010b826 5bb6dcef3f
commit caf1972dee
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
View File

@@ -128,6 +128,7 @@ public class VolumeDialog {
private boolean mPendingStateChanged; private boolean mPendingStateChanged;
private boolean mPendingRecheckAll; private boolean mPendingRecheckAll;
private long mCollapseTime; private long mCollapseTime;
private int mLastActiveStream;
public VolumeDialog(Context context, int windowType, VolumeDialogController controller, public VolumeDialog(Context context, int windowType, VolumeDialogController controller,
ZenModeController zenModeController, Callback callback) { ZenModeController zenModeController, Callback callback) {
@@ -273,10 +274,14 @@ public class VolumeDialog {
@Override @Override
public void onLayoutChange(View v, int left, int top, int right, int bottom, public void onLayoutChange(View v, int left, int top, int right, int bottom,
int oldLeft, int oldTop, int oldRight, int oldBottom) { int oldLeft, int oldTop, int oldRight, int oldBottom) {
final boolean moved = oldLeft != left || oldTop != top; final boolean moved = mLastActiveStream != mActiveStream ||
oldLeft != left || oldTop != top;
if (D.BUG) Log.d(TAG, "onLayoutChange moved=" + moved if (D.BUG) Log.d(TAG, "onLayoutChange moved=" + moved
+ " old=" + new Rect(oldLeft, oldTop, oldRight, oldBottom).toShortString() + " old=" + new Rect(oldLeft, oldTop, oldRight, oldBottom).toShortString()
+ " new=" + new Rect(left,top,right,bottom).toShortString()); + "," + mLastActiveStream
+ " new=" + new Rect(left,top,right,bottom).toShortString()
+ "," + mActiveStream);
mLastActiveStream = mActiveStream;
if (moved) { if (moved) {
for (int i = 0; i < mDialogContentView.getChildCount(); i++) { for (int i = 0; i < mDialogContentView.getChildCount(); i++) {
final View c = mDialogContentView.getChildAt(i); final View c = mDialogContentView.getChildAt(i);