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

Merge "Collapse QS panel after details if we expanded it before" into nyc-dev

Browse Source 
am: 6dde42f

* commit '6dde42f0ee2efe09a0021a6172f61d84800ad1c7':
  Collapse QS panel after details if we expanded it before

Change-Id: Id21c4d906b99e8602997ca9c9623c3ab2c3a22e8
This commit is contained in:
Jason Monk
2016-04-20 14:30:30 +00:00
committed by android-build-merger
parent 3a254a294e 6dde42f0ee
commit 410a288b12
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
View File

@@ -70,6 +70,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
private QSCustomizer mCustomizePanel; private QSCustomizer mCustomizePanel;
private Record mDetailRecord; private Record mDetailRecord;
private boolean mTriggeredExpand;
public QSPanel(Context context) { public QSPanel(Context context) {
this(context, null); this(context, null);
@@ -384,8 +385,16 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
} }
protected void handleShowDetail(Record r, boolean show) { protected void handleShowDetail(Record r, boolean show) {
if (show && !mExpanded) { if (show) {
mHost.animateExpandQS(); if (!mExpanded) {
mTriggeredExpand = true;
mHost.animateToggleQSExpansion();
} else {
mTriggeredExpand = false;
}
} else if (mTriggeredExpand) {
mHost.animateToggleQSExpansion();
mTriggeredExpand = false;
} }
if (r instanceof TileRecord) { if (r instanceof TileRecord) {
handleShowDetailTile((TileRecord) r, show); handleShowDetailTile((TileRecord) r, show);

2
packages/SystemUI/src/com/android/systemui/qs/QSTile.java
View File

@@ -389,7 +389,7 @@ public abstract class QSTile<TState extends State> implements Listenable {
void startRunnableDismissingKeyguard(Runnable runnable); void startRunnableDismissingKeyguard(Runnable runnable);
void warn(String message, Throwable t); void warn(String message, Throwable t);
void collapsePanels(); void collapsePanels();
void animateExpandQS(); void animateToggleQSExpansion();
void openPanels(); void openPanels();
Looper getLooper(); Looper getLooper();
Context getContext(); Context getContext();

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
View File

@@ -209,7 +209,7 @@ public class QSTileHost implements QSTile.Host, Tunable {
// already logged // already logged
} }
public void animateExpandQS() { public void animateToggleQSExpansion() {
// TODO: Better path to animated panel expansion. // TODO: Better path to animated panel expansion.
mHeader.performClick(); mHeader.performClick();
} }