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

Merge "Don't run expand/collapse animations when dismissing." into nyc-mr1-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-08-11 14:28:47 +00:00
committed by Android (Google) Code Review
parent eed326b072 48242f0ac6
commit 2af6932ae8
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/volume_zen_footer.xml
View File

@@ -18,7 +18,8 @@
android:id="@+id/volume_zen_footer" android:id="@+id/volume_zen_footer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > <!-- extends LinearLayout --> android:orientation="vertical"
android:paddingBottom="8dp" > <!-- extends LinearLayout -->
<View <View
android:id="@+id/zen_embedded_divider" android:id="@+id/zen_embedded_divider"

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

@@ -495,7 +495,7 @@ public class VolumeDialog implements TunerService.Tunable {
mMotion.startDismiss(new Runnable() { mMotion.startDismiss(new Runnable() {
@Override @Override
public void run() { public void run() {
updateExpandedH(false); updateExpandedH(false /* expanding */, true /* dismissing */);
} }
}); });
if (mAccessibilityMgr.isEnabled()) { if (mAccessibilityMgr.isEnabled()) {
@@ -541,14 +541,16 @@ public class VolumeDialog implements TunerService.Tunable {
mHandler.sendEmptyMessageDelayed(H.UPDATE_BOTTOM_MARGIN, getConservativeCollapseDuration()); mHandler.sendEmptyMessageDelayed(H.UPDATE_BOTTOM_MARGIN, getConservativeCollapseDuration());
} }
private void updateExpandedH(final boolean expanded) { private void updateExpandedH(final boolean expanded, final boolean dismissing) {
if (mExpanded == expanded) return; if (mExpanded == expanded) return;
mExpanded = expanded; mExpanded = expanded;
mExpandButtonAnimationRunning = isAttached(); mExpandButtonAnimationRunning = isAttached();
if (D.BUG) Log.d(TAG, "updateExpandedH " + expanded); if (D.BUG) Log.d(TAG, "updateExpandedH " + expanded);
updateExpandButtonH(); updateExpandButtonH();
updateFooterH(); updateFooterH();
TransitionManager.endTransitions(mDialogView);
final VolumeRow activeRow = getActiveRow(); final VolumeRow activeRow = getActiveRow();
if (!dismissing) {
mWindow.setLayout(mWindow.getAttributes().width, ViewGroup.LayoutParams.MATCH_PARENT); mWindow.setLayout(mWindow.getAttributes().width, ViewGroup.LayoutParams.MATCH_PARENT);
AutoTransition transition = new AutoTransition(); AutoTransition transition = new AutoTransition();
transition.setDuration(mExpandButtonAnimationDuration); transition.setDuration(mExpandButtonAnimationDuration);
@@ -566,20 +568,20 @@ public class VolumeDialog implements TunerService.Tunable {
@Override @Override
public void onTransitionCancel(Transition transition) { public void onTransitionCancel(Transition transition) {
mWindow.setLayout(
mWindow.getAttributes().width, ViewGroup.LayoutParams.WRAP_CONTENT);
} }
@Override @Override
public void onTransitionPause(Transition transition) { public void onTransitionPause(Transition transition) {
mWindow.setLayout(
mWindow.getAttributes().width, ViewGroup.LayoutParams.WRAP_CONTENT);
} }
@Override @Override
public void onTransitionResume(Transition transition) { public void onTransitionResume(Transition transition) {
} }
}); });
TransitionManager.endTransitions(mDialogView);
TransitionManager.beginDelayedTransition(mDialogView, transition); TransitionManager.beginDelayedTransition(mDialogView, transition);
}
updateRowsH(activeRow); updateRowsH(activeRow);
rescheduleTimeoutH(); rescheduleTimeoutH();
} }
@@ -1029,7 +1031,7 @@ public class VolumeDialog implements TunerService.Tunable {
if (mExpandButtonAnimationRunning) return; if (mExpandButtonAnimationRunning) return;
final boolean newExpand = !mExpanded; final boolean newExpand = !mExpanded;
Events.writeEvent(mContext, Events.EVENT_EXPAND, newExpand); Events.writeEvent(mContext, Events.EVENT_EXPAND, newExpand);
updateExpandedH(newExpand); updateExpandedH(newExpand, false /* dismissing */);
} }
}; };