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

Suppress ExpandHelper on quick settings.

Browse Source 
Bug: 7004997
Change-Id: I423de03022982d9f87451eb3fb5ffdca818cac8a
This commit is contained in:
Daniel Sandler
2012-09-12 23:07:44 -07:00
parent 8a0e1fefee
commit b4e56edde6
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
View File

@@ -356,6 +356,14 @@ public class PanelView extends FrameLayout {
return mExpandedFraction;
}
public boolean isFullyExpanded() {
return mExpandedHeight == getFullHeight();
}
public boolean isFullyCollapsed() {
return mExpandedHeight == 0;
}
public void setBar(PanelBar panelBar) {
mBar = panelBar;
}
@@ -367,13 +375,13 @@ public class PanelView extends FrameLayout {
public void collapse() {
// TODO: abort animation or ongoing touch
if (mExpandedHeight > 0) {
if (!isFullyCollapsed()) {
fling(-mSelfCollapseVelocityPx, /*always=*/ true);
}
}
public void expand() {
if (mExpandedHeight < getFullHeight()) {
if (!isFullyExpanded()) {
fling (mSelfExpandVelocityPx, /*always=*/ true);
}
}

21
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
View File

@@ -21,6 +21,7 @@ import android.util.AttributeSet;
import android.util.Log;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ScrollView;
import android.widget.TextSwitcher;
@@ -36,6 +37,7 @@ public class StatusBarWindowView extends FrameLayout
private ExpandHelper mExpandHelper;
private NotificationRowLayout latestItems;
private NotificationPanelView mNotificationPanel;
PhoneStatusBar mService;
@@ -49,6 +51,7 @@ public class StatusBarWindowView extends FrameLayout
super.onAttachedToWindow();
latestItems = (NotificationRowLayout) findViewById(R.id.latestItems);
ScrollView scroller = (ScrollView) findViewById(R.id.scroll);
mNotificationPanel = (NotificationPanelView) findViewById(R.id.notification_panel);
int minHeight = getResources().getDimensionPixelSize(R.dimen.notification_row_min_height);
int maxHeight = getResources().getDimensionPixelSize(R.dimen.notification_row_max_height);
mExpandHelper = new ExpandHelper(mContext, latestItems, minHeight, maxHeight);
@@ -71,8 +74,13 @@ public class StatusBarWindowView extends FrameLayout
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
boolean intercept = mExpandHelper.onInterceptTouchEvent(ev) ||
super.onInterceptTouchEvent(ev);
boolean intercept = false;
if (mNotificationPanel.isFullyExpanded()) {
intercept = mExpandHelper.onInterceptTouchEvent(ev);
}
if (!intercept) {
super.onInterceptTouchEvent(ev);
}
if (intercept) {
MotionEvent cancellation = MotionEvent.obtain(ev);
cancellation.setAction(MotionEvent.ACTION_CANCEL);
@@ -84,8 +92,13 @@ public class StatusBarWindowView extends FrameLayout
@Override
public boolean onTouchEvent(MotionEvent ev) {
boolean handled = mExpandHelper.onTouchEvent(ev) ||
super.onTouchEvent(ev);
boolean handled = false;
if (mNotificationPanel.isFullyExpanded()) {
handled = mExpandHelper.onTouchEvent(ev);
}
if (!handled) {
handled = super.onTouchEvent(ev);
}
return handled;
}
}