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

am f610c295: am 26f544ae: Merge "For Matias." into jb-mr1-dev

Browse Source 
* commit 'f610c295049e03d524577f602e9cf17cf07793c9':
  For Matias.
This commit is contained in:
Daniel Sandler
2012-10-17 12:01:54 -07:00
committed by Android Git Automerger
parent 66add489df f610c29504
commit 385bc61263
4 changed files with 170 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
View File

@@ -21,6 +21,8 @@ import android.content.res.Resources;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Slog;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import com.android.systemui.R; import com.android.systemui.R;
@@ -31,11 +33,18 @@ public class NotificationPanelView extends PanelView {
Drawable mHandleBar; Drawable mHandleBar;
float mHandleBarHeight; float mHandleBarHeight;
View mHandleView; View mHandleView;
int mFingers;
PhoneStatusBar mStatusBar;
private boolean mFlipped;
public NotificationPanelView(Context context, AttributeSet attrs) { public NotificationPanelView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
} }
public void setStatusBar(PhoneStatusBar bar) {
mStatusBar = bar;
}
@Override @Override
protected void onFinishInflate() { protected void onFinishInflate() {
super.onFinishInflate(); super.onFinishInflate();
@@ -79,4 +88,35 @@ public class NotificationPanelView extends PanelView {
mHandleBar.draw(canvas); mHandleBar.draw(canvas);
canvas.translate(0, -off); canvas.translate(0, -off);
} }
@Override
public boolean onTouchEvent(MotionEvent event) {
if (PhoneStatusBar.SETTINGS_DRAG_SHORTCUT && mStatusBar.mHasFlipSettings) {
switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN:
mFlipped = false;
break;
case MotionEvent.ACTION_POINTER_DOWN:
if (!mFlipped) {
float miny = event.getY(0);
float maxy = miny;
for (int i=1; i<event.getPointerCount(); i++) {
final float y = event.getY(i);
if (y < miny) miny = y;
if (y > maxy) maxy = y;
}
if (maxy - miny < mHandleBarHeight) {
if (getMeasuredHeight() < mHandleBarHeight) {
mStatusBar.switchToSettings();
} else {
mStatusBar.flipToSettings();
}
mFlipped = true;
}
}
break;
}
}
return mHandleView.dispatchTouchEvent(event);
}
} }

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

@@ -102,7 +102,7 @@ public class PanelBar extends FrameLayout {
startOpeningPanel(panel); startOpeningPanel(panel);
} }
final boolean result = mTouchingPanel != null final boolean result = mTouchingPanel != null
? mTouchingPanel.getHandle().dispatchTouchEvent(event) ? mTouchingPanel.onTouchEvent(event)
: true; : true;
return result; return result;
} }

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

@@ -250,6 +250,7 @@ public class PanelView extends FrameLayout {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
mTracking = true; mTracking = true;
mHandleView.setPressed(true); mHandleView.setPressed(true);
postInvalidate(); // catch the press state change
mInitialTouchY = y; mInitialTouchY = y;
mVelocityTracker = VelocityTracker.obtain(); mVelocityTracker = VelocityTracker.obtain();
trackMovement(event); trackMovement(event);
@@ -283,6 +284,7 @@ public class PanelView extends FrameLayout {
mFinalTouchY = y; mFinalTouchY = y;
mTracking = false; mTracking = false;
mHandleView.setPressed(false); mHandleView.setPressed(false);
postInvalidate(); // catch the press state change
mBar.onTrackingStopped(PanelView.this); mBar.onTrackingStopped(PanelView.this);
trackMovement(event); trackMovement(event);

221
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -110,6 +110,8 @@ public class PhoneStatusBar extends BaseStatusBar {
public static final boolean ENABLE_NOTIFICATION_PANEL_CLING = false; public static final boolean ENABLE_NOTIFICATION_PANEL_CLING = false;
public static final boolean SETTINGS_DRAG_SHORTCUT = true;
// additional instrumentation for testing purposes; intended to be left on during development // additional instrumentation for testing purposes; intended to be left on during development
public static final boolean CHATTY = DEBUG; public static final boolean CHATTY = DEBUG;
@@ -180,7 +182,7 @@ public class PhoneStatusBar extends BaseStatusBar {
View mMoreIcon; View mMoreIcon;
// expanded notifications // expanded notifications
PanelView mNotificationPanel; // the sliding/resizing panel within the notification window NotificationPanelView mNotificationPanel; // the sliding/resizing panel within the notification window
ScrollView mScrollView; ScrollView mScrollView;
View mExpandedContents; View mExpandedContents;
int mNotificationPanelGravity; int mNotificationPanelGravity;
@@ -363,7 +365,8 @@ public class PhoneStatusBar extends BaseStatusBar {
PanelHolder holder = (PanelHolder) mStatusBarWindow.findViewById(R.id.panel_holder); PanelHolder holder = (PanelHolder) mStatusBarWindow.findViewById(R.id.panel_holder);
mStatusBarView.setPanelHolder(holder); mStatusBarView.setPanelHolder(holder);
mNotificationPanel = (PanelView) mStatusBarWindow.findViewById(R.id.notification_panel); mNotificationPanel = (NotificationPanelView) mStatusBarWindow.findViewById(R.id.notification_panel);
mNotificationPanel.setStatusBar(this);
mNotificationPanelIsFullScreenWidth = mNotificationPanelIsFullScreenWidth =
(mNotificationPanel.getLayoutParams().width == ViewGroup.LayoutParams.MATCH_PARENT); (mNotificationPanel.getLayoutParams().width == ViewGroup.LayoutParams.MATCH_PARENT);
@@ -1285,6 +1288,10 @@ public class PhoneStatusBar extends BaseStatusBar {
} }
} }
public Handler getHandler() {
return mHandler;
}
View.OnFocusChangeListener mFocusChangeListener = new View.OnFocusChangeListener() { View.OnFocusChangeListener mFocusChangeListener = new View.OnFocusChangeListener() {
public void onFocusChange(View v, boolean hasFocus) { public void onFocusChange(View v, boolean hasFocus) {
// Because 'v' is a ViewGroup, all its children will be (un)selected // Because 'v' is a ViewGroup, all its children will be (un)selected
@@ -1299,18 +1306,6 @@ public class PhoneStatusBar extends BaseStatusBar {
return; return;
} }
if (mHasFlipSettings && !mExpandedVisible) {
// reset things to their proper state
mScrollView.setScaleX(1f);
mScrollView.setVisibility(View.VISIBLE);
mSettingsButton.setAlpha(1f);
mSettingsButton.setVisibility(View.VISIBLE);
mNotificationPanel.setVisibility(View.GONE);
mFlipSettingsView.setVisibility(View.GONE);
mNotificationButton.setVisibility(View.GONE);
setAreThereNotifications(); // show the clear button
}
mExpandedVisible = true; mExpandedVisible = true;
mPile.setLayoutTransitionsEnabled(true); mPile.setLayoutTransitionsEnabled(true);
if (mNavigationBarView != null) if (mNavigationBarView != null)
@@ -1420,51 +1415,53 @@ public class PhoneStatusBar extends BaseStatusBar {
} }
mNotificationPanel.expand(); mNotificationPanel.expand();
if (mHasFlipSettings) { if (mHasFlipSettings && mScrollView.getVisibility() != View.VISIBLE) {
if (mScrollView.getVisibility() != View.VISIBLE) { flipToNotifications();
if (mFlipSettingsViewAnim != null) mFlipSettingsViewAnim.cancel();
if (mScrollViewAnim != null) mScrollViewAnim.cancel();
if (mSettingsButtonAnim != null) mSettingsButtonAnim.cancel();
if (mNotificationButtonAnim != null) mNotificationButtonAnim.cancel();
if (mClearButtonAnim != null) mClearButtonAnim.cancel();
mScrollView.setVisibility(View.VISIBLE);
mScrollViewAnim = start(
startDelay(FLIP_DURATION_OUT,
interpolator(mDecelerateInterpolator,
ObjectAnimator.ofFloat(mScrollView, View.SCALE_X, 0f, 1f)
.setDuration(FLIP_DURATION_IN)
)));
mFlipSettingsViewAnim = start(
setVisibilityWhenDone(
interpolator(mAccelerateInterpolator,
ObjectAnimator.ofFloat(mFlipSettingsView, View.SCALE_X, 1f, 0f)
)
.setDuration(FLIP_DURATION_OUT),
mFlipSettingsView, View.INVISIBLE));
mNotificationButtonAnim = start(
setVisibilityWhenDone(
ObjectAnimator.ofFloat(mNotificationButton, View.ALPHA, 0f)
.setDuration(FLIP_DURATION),
mNotificationButton, View.INVISIBLE));
mSettingsButton.setVisibility(View.VISIBLE);
mSettingsButtonAnim = start(
ObjectAnimator.ofFloat(mSettingsButton, View.ALPHA, 1f)
.setDuration(FLIP_DURATION));
mClearButton.setVisibility(View.VISIBLE);
mClearButton.setAlpha(0f);
setAreThereNotifications(); // this will show/hide the button as necessary
mNotificationPanel.postDelayed(new Runnable() {
public void run() {
updateCarrierLabelVisibility(false);
}
}, FLIP_DURATION - 150);
}
} }
if (false) postStartTracing(); if (false) postStartTracing();
} }
public void flipToNotifications() {
if (mFlipSettingsViewAnim != null) mFlipSettingsViewAnim.cancel();
if (mScrollViewAnim != null) mScrollViewAnim.cancel();
if (mSettingsButtonAnim != null) mSettingsButtonAnim.cancel();
if (mNotificationButtonAnim != null) mNotificationButtonAnim.cancel();
if (mClearButtonAnim != null) mClearButtonAnim.cancel();
mScrollView.setVisibility(View.VISIBLE);
mScrollViewAnim = start(
startDelay(FLIP_DURATION_OUT,
interpolator(mDecelerateInterpolator,
ObjectAnimator.ofFloat(mScrollView, View.SCALE_X, 0f, 1f)
.setDuration(FLIP_DURATION_IN)
)));
mFlipSettingsViewAnim = start(
setVisibilityWhenDone(
interpolator(mAccelerateInterpolator,
ObjectAnimator.ofFloat(mFlipSettingsView, View.SCALE_X, 1f, 0f)
)
.setDuration(FLIP_DURATION_OUT),
mFlipSettingsView, View.INVISIBLE));
mNotificationButtonAnim = start(
setVisibilityWhenDone(
ObjectAnimator.ofFloat(mNotificationButton, View.ALPHA, 0f)
.setDuration(FLIP_DURATION),
mNotificationButton, View.INVISIBLE));
mSettingsButton.setVisibility(View.VISIBLE);
mSettingsButtonAnim = start(
ObjectAnimator.ofFloat(mSettingsButton, View.ALPHA, 1f)
.setDuration(FLIP_DURATION));
mClearButton.setVisibility(View.VISIBLE);
mClearButton.setAlpha(0f);
setAreThereNotifications(); // this will show/hide the button as necessary
mNotificationPanel.postDelayed(new Runnable() {
public void run() {
updateCarrierLabelVisibility(false);
}
}, FLIP_DURATION - 150);
}
@Override @Override
public void animateExpandSettingsPanel() { public void animateExpandSettingsPanel() {
if (SPEW) Slog.d(TAG, "animateExpand: mExpandedVisible=" + mExpandedVisible); if (SPEW) Slog.d(TAG, "animateExpand: mExpandedVisible=" + mExpandedVisible);
@@ -1475,46 +1472,7 @@ public class PhoneStatusBar extends BaseStatusBar {
if (mHasFlipSettings) { if (mHasFlipSettings) {
mNotificationPanel.expand(); mNotificationPanel.expand();
if (mFlipSettingsView.getVisibility() != View.VISIBLE) { if (mFlipSettingsView.getVisibility() != View.VISIBLE) {
if (mFlipSettingsViewAnim != null) mFlipSettingsViewAnim.cancel(); flipToSettings();
if (mScrollViewAnim != null) mScrollViewAnim.cancel();
if (mSettingsButtonAnim != null) mSettingsButtonAnim.cancel();
if (mNotificationButtonAnim != null) mNotificationButtonAnim.cancel();
if (mClearButtonAnim != null) mClearButtonAnim.cancel();
mFlipSettingsView.setVisibility(View.VISIBLE);
mFlipSettingsView.setScaleX(0f);
mFlipSettingsViewAnim = start(
startDelay(FLIP_DURATION_OUT,
interpolator(mDecelerateInterpolator,
ObjectAnimator.ofFloat(mFlipSettingsView, View.SCALE_X, 0f, 1f)
.setDuration(FLIP_DURATION_IN)
)));
mScrollViewAnim = start(
setVisibilityWhenDone(
interpolator(mAccelerateInterpolator,
ObjectAnimator.ofFloat(mScrollView, View.SCALE_X, 1f, 0f)
)
.setDuration(FLIP_DURATION_OUT),
mScrollView, View.INVISIBLE));
mSettingsButtonAnim = start(
setVisibilityWhenDone(
ObjectAnimator.ofFloat(mSettingsButton, View.ALPHA, 0f)
.setDuration(FLIP_DURATION),
mScrollView, View.INVISIBLE));
mNotificationButton.setVisibility(View.VISIBLE);
mNotificationButtonAnim = start(
ObjectAnimator.ofFloat(mNotificationButton, View.ALPHA, 1f)
.setDuration(FLIP_DURATION));
mClearButtonAnim = start(
setVisibilityWhenDone(
ObjectAnimator.ofFloat(mClearButton, View.ALPHA, 0f)
.setDuration(FLIP_DURATION),
mClearButton, View.INVISIBLE));
mNotificationPanel.postDelayed(new Runnable() {
public void run() {
updateCarrierLabelVisibility(false);
}
}, FLIP_DURATION - 150);
} }
} else if (mSettingsPanel != null) { } else if (mSettingsPanel != null) {
mSettingsPanel.expand(); mSettingsPanel.expand();
@@ -1523,6 +1481,69 @@ public class PhoneStatusBar extends BaseStatusBar {
if (false) postStartTracing(); if (false) postStartTracing();
} }
public void switchToSettings() {
mFlipSettingsView.setScaleX(1f);
mFlipSettingsView.setVisibility(View.VISIBLE);
mSettingsButton.setVisibility(View.GONE);
mScrollView.setVisibility(View.GONE);
mNotificationButton.setVisibility(View.VISIBLE);
mNotificationButton.setAlpha(1f);
mClearButton.setVisibility(View.GONE);
}
public void flipToSettings() {
if (mFlipSettingsViewAnim != null) mFlipSettingsViewAnim.cancel();
if (mScrollViewAnim != null) mScrollViewAnim.cancel();
if (mSettingsButtonAnim != null) mSettingsButtonAnim.cancel();
if (mNotificationButtonAnim != null) mNotificationButtonAnim.cancel();
if (mClearButtonAnim != null) mClearButtonAnim.cancel();
mFlipSettingsView.setVisibility(View.VISIBLE);
mFlipSettingsView.setScaleX(0f);
mFlipSettingsViewAnim = start(
startDelay(FLIP_DURATION_OUT,
interpolator(mDecelerateInterpolator,
ObjectAnimator.ofFloat(mFlipSettingsView, View.SCALE_X, 0f, 1f)
.setDuration(FLIP_DURATION_IN)
)));
mScrollViewAnim = start(
setVisibilityWhenDone(
interpolator(mAccelerateInterpolator,
ObjectAnimator.ofFloat(mScrollView, View.SCALE_X, 1f, 0f)
)
.setDuration(FLIP_DURATION_OUT),
mScrollView, View.INVISIBLE));
mSettingsButtonAnim = start(
setVisibilityWhenDone(
ObjectAnimator.ofFloat(mSettingsButton, View.ALPHA, 0f)
.setDuration(FLIP_DURATION),
mScrollView, View.INVISIBLE));
mNotificationButton.setVisibility(View.VISIBLE);
mNotificationButtonAnim = start(
ObjectAnimator.ofFloat(mNotificationButton, View.ALPHA, 1f)
.setDuration(FLIP_DURATION));
mClearButtonAnim = start(
setVisibilityWhenDone(
ObjectAnimator.ofFloat(mClearButton, View.ALPHA, 0f)
.setDuration(FLIP_DURATION),
mClearButton, View.INVISIBLE));
mNotificationPanel.postDelayed(new Runnable() {
public void run() {
updateCarrierLabelVisibility(false);
}
}, FLIP_DURATION - 150);
}
public void flipPanels() {
if (mHasFlipSettings) {
if (mFlipSettingsView.getVisibility() != View.VISIBLE) {
flipToSettings();
} else {
flipToNotifications();
}
}
}
public void animateCollapseQuickSettings() { public void animateCollapseQuickSettings() {
mStatusBarView.collapseAllPanels(true); mStatusBarView.collapseAllPanels(true);
} }
@@ -1542,6 +1563,18 @@ public class PhoneStatusBar extends BaseStatusBar {
// Ensure the panel is fully collapsed (just in case; bug 6765842, 7260868) // Ensure the panel is fully collapsed (just in case; bug 6765842, 7260868)
mStatusBarView.collapseAllPanels(/*animate=*/ false); mStatusBarView.collapseAllPanels(/*animate=*/ false);
if (mHasFlipSettings) {
// reset things to their proper state
mScrollView.setScaleX(1f);
mScrollView.setVisibility(View.VISIBLE);
mSettingsButton.setAlpha(1f);
mSettingsButton.setVisibility(View.VISIBLE);
mNotificationPanel.setVisibility(View.GONE);
mFlipSettingsView.setVisibility(View.GONE);
mNotificationButton.setVisibility(View.GONE);
setAreThereNotifications(); // show the clear button
}
mExpandedVisible = false; mExpandedVisible = false;
mPile.setLayoutTransitionsEnabled(false); mPile.setLayoutTransitionsEnabled(false);
if (mNavigationBarView != null) if (mNavigationBarView != null)