Daniel Sandler | 08d05e3 | 2012-08-08 16:39:54 -0400 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2012 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | package com.android.systemui.statusbar.phone; |
| 18 | |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 19 | import android.animation.Animator; |
| 20 | import android.animation.AnimatorListenerAdapter; |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 21 | import android.animation.ObjectAnimator; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 22 | import android.animation.ValueAnimator; |
Daniel Sandler | 08d05e3 | 2012-08-08 16:39:54 -0400 | [diff] [blame] | 23 | import android.content.Context; |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 24 | import android.graphics.Path; |
Daniel Sandler | 08d05e3 | 2012-08-08 16:39:54 -0400 | [diff] [blame] | 25 | import android.util.AttributeSet; |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 26 | import android.util.Log; |
Daniel Sandler | 040c2e4 | 2012-10-17 00:56:33 -0400 | [diff] [blame] | 27 | import android.view.MotionEvent; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 28 | import android.view.VelocityTracker; |
Daniel Sandler | 13522a2 | 2012-09-27 14:46:58 -0400 | [diff] [blame] | 29 | import android.view.View; |
Jorim Jaggi | 0d74eeb | 2014-05-09 22:05:24 +0200 | [diff] [blame] | 30 | import android.view.ViewGroup; |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 31 | import android.view.ViewTreeObserver; |
Casey Burkhardt | 23b0a4e | 2013-04-29 12:18:32 -0700 | [diff] [blame] | 32 | import android.view.accessibility.AccessibilityEvent; |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 33 | import android.view.animation.AnimationUtils; |
| 34 | import android.view.animation.Interpolator; |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 35 | import android.view.animation.PathInterpolator; |
Jorim Jaggi | 0d74eeb | 2014-05-09 22:05:24 +0200 | [diff] [blame] | 36 | import android.widget.LinearLayout; |
Daniel Sandler | 13522a2 | 2012-09-27 14:46:58 -0400 | [diff] [blame] | 37 | |
Chet Haase | 4d179dc | 2012-08-22 07:14:42 -0700 | [diff] [blame] | 38 | import com.android.systemui.R; |
Jorim Jaggi | be565df | 2014-04-28 17:51:23 +0200 | [diff] [blame] | 39 | import com.android.systemui.statusbar.ExpandableView; |
Jorim Jaggi | 87cd5e7 | 2014-05-12 23:29:10 +0200 | [diff] [blame] | 40 | import com.android.systemui.statusbar.FlingAnimationUtils; |
Daniel Sandler | 151f00d | 2012-10-02 22:33:08 -0400 | [diff] [blame] | 41 | import com.android.systemui.statusbar.GestureRecorder; |
Jorim Jaggi | ecbab36 | 2014-04-23 16:13:15 +0200 | [diff] [blame] | 42 | import com.android.systemui.statusbar.StatusBarState; |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 43 | import com.android.systemui.statusbar.stack.NotificationStackScrollLayout; |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 44 | import com.android.systemui.statusbar.stack.StackStateAnimator; |
Daniel Sandler | 08d05e3 | 2012-08-08 16:39:54 -0400 | [diff] [blame] | 45 | |
Jorim Jaggi | be565df | 2014-04-28 17:51:23 +0200 | [diff] [blame] | 46 | public class NotificationPanelView extends PanelView implements |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 47 | ExpandableView.OnHeightChangedListener, ObservableScrollView.Listener, |
| 48 | View.OnClickListener { |
Chet Haase | 4d179dc | 2012-08-22 07:14:42 -0700 | [diff] [blame] | 49 | |
Daniel Sandler | 040c2e4 | 2012-10-17 00:56:33 -0400 | [diff] [blame] | 50 | PhoneStatusBar mStatusBar; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 51 | private StatusBarHeaderView mHeader; |
John Spurlock | af8d6c4 | 2014-05-07 17:49:08 -0400 | [diff] [blame] | 52 | private View mQsContainer; |
John Spurlock | 73203eb | 2014-04-15 16:14:46 -0400 | [diff] [blame] | 53 | private View mKeyguardStatusView; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 54 | private ObservableScrollView mScrollView; |
| 55 | private View mStackScrollerContainer; |
John Spurlock | 73203eb | 2014-04-15 16:14:46 -0400 | [diff] [blame] | 56 | |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 57 | private NotificationStackScrollLayout mNotificationStackScroller; |
Jorim Jaggi | 8c1a44b | 2014-04-29 19:04:02 +0200 | [diff] [blame] | 58 | private int mNotificationTopPadding; |
Jorim Jaggi | 98fb09c | 2014-05-01 22:40:56 +0200 | [diff] [blame] | 59 | private boolean mAnimateNextTopPaddingChange; |
Chet Haase | 4d179dc | 2012-08-22 07:14:42 -0700 | [diff] [blame] | 60 | |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 61 | private int mTrackingPointer; |
| 62 | private VelocityTracker mVelocityTracker; |
| 63 | private boolean mTracking; |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 64 | |
| 65 | /** |
| 66 | * Whether we are currently handling a motion gesture in #onInterceptTouchEvent, but haven't |
| 67 | * intercepted yet. |
| 68 | */ |
| 69 | private boolean mIntercepting; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 70 | private boolean mQsExpanded; |
| 71 | private float mInitialHeightOnTouch; |
| 72 | private float mInitialTouchX; |
| 73 | private float mInitialTouchY; |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 74 | private float mLastTouchX; |
| 75 | private float mLastTouchY; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 76 | private float mQsExpansionHeight; |
| 77 | private int mQsMinExpansionHeight; |
| 78 | private int mQsMaxExpansionHeight; |
| 79 | private int mMinStackHeight; |
| 80 | private float mNotificationTranslation; |
| 81 | private int mStackScrollerIntrinsicPadding; |
| 82 | private boolean mQsExpansionEnabled = true; |
| 83 | private ValueAnimator mQsExpansionAnimator; |
Jorim Jaggi | 87cd5e7 | 2014-05-12 23:29:10 +0200 | [diff] [blame] | 84 | private FlingAnimationUtils mFlingAnimationUtils; |
Selim Cinek | 9dbbca8 | 2014-05-15 15:23:37 +0200 | [diff] [blame] | 85 | private int mStatusBarMinHeight; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 86 | |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 87 | private Interpolator mFastOutSlowInInterpolator; |
| 88 | private ObjectAnimator mClockAnimator; |
| 89 | private int mClockAnimationTarget = -1; |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 90 | private int mTopPaddingAdjustment; |
| 91 | private KeyguardClockPositionAlgorithm mClockPositionAlgorithm = |
| 92 | new KeyguardClockPositionAlgorithm(); |
| 93 | private KeyguardClockPositionAlgorithm.Result mClockPositionResult = |
| 94 | new KeyguardClockPositionAlgorithm.Result(); |
Jorim Jaggi | 069cd03 | 2014-05-15 03:09:01 +0200 | [diff] [blame] | 95 | |
Daniel Sandler | 08d05e3 | 2012-08-08 16:39:54 -0400 | [diff] [blame] | 96 | public NotificationPanelView(Context context, AttributeSet attrs) { |
| 97 | super(context, attrs); |
Daniel Sandler | 13522a2 | 2012-09-27 14:46:58 -0400 | [diff] [blame] | 98 | } |
Chet Haase | 4d179dc | 2012-08-22 07:14:42 -0700 | [diff] [blame] | 99 | |
Daniel Sandler | 040c2e4 | 2012-10-17 00:56:33 -0400 | [diff] [blame] | 100 | public void setStatusBar(PhoneStatusBar bar) { |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 101 | if (mStatusBar != null) { |
| 102 | mStatusBar.setOnFlipRunnable(null); |
| 103 | } |
Daniel Sandler | 040c2e4 | 2012-10-17 00:56:33 -0400 | [diff] [blame] | 104 | mStatusBar = bar; |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 105 | if (bar != null) { |
| 106 | mStatusBar.setOnFlipRunnable(new Runnable() { |
| 107 | @Override |
| 108 | public void run() { |
| 109 | requestPanelHeightUpdate(); |
| 110 | } |
| 111 | }); |
| 112 | } |
Daniel Sandler | 040c2e4 | 2012-10-17 00:56:33 -0400 | [diff] [blame] | 113 | } |
| 114 | |
Daniel Sandler | 13522a2 | 2012-09-27 14:46:58 -0400 | [diff] [blame] | 115 | @Override |
| 116 | protected void onFinishInflate() { |
| 117 | super.onFinishInflate(); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 118 | mHeader = (StatusBarHeaderView) findViewById(R.id.header); |
| 119 | mHeader.getBackgroundView().setOnClickListener(this); |
Jorim Jaggi | 3d878be | 2014-05-10 03:22:32 +0200 | [diff] [blame] | 120 | mHeader.setOverlayParent(this); |
John Spurlock | 73203eb | 2014-04-15 16:14:46 -0400 | [diff] [blame] | 121 | mKeyguardStatusView = findViewById(R.id.keyguard_status_view); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 122 | mStackScrollerContainer = findViewById(R.id.notification_container_parent); |
John Spurlock | af8d6c4 | 2014-05-07 17:49:08 -0400 | [diff] [blame] | 123 | mQsContainer = findViewById(R.id.quick_settings_container); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 124 | mScrollView = (ObservableScrollView) findViewById(R.id.scroll_view); |
| 125 | mScrollView.setListener(this); |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 126 | mNotificationStackScroller = (NotificationStackScrollLayout) |
| 127 | findViewById(R.id.notification_stack_scroller); |
Jorim Jaggi | be565df | 2014-04-28 17:51:23 +0200 | [diff] [blame] | 128 | mNotificationStackScroller.setOnHeightChangedListener(this); |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 129 | mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(getContext(), |
| 130 | android.R.interpolator.fast_out_slow_in); |
Jorim Jaggi | 069cd03 | 2014-05-15 03:09:01 +0200 | [diff] [blame] | 131 | } |
| 132 | |
| 133 | @Override |
| 134 | protected void loadDimens() { |
| 135 | super.loadDimens(); |
Jorim Jaggi | 8c1a44b | 2014-04-29 19:04:02 +0200 | [diff] [blame] | 136 | mNotificationTopPadding = getResources().getDimensionPixelSize( |
| 137 | R.dimen.notifications_top_padding); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 138 | mMinStackHeight = getResources().getDimensionPixelSize(R.dimen.collapsed_stack_height); |
Jorim Jaggi | 1d48069 | 2014-05-20 19:41:58 +0200 | [diff] [blame] | 139 | mFlingAnimationUtils = new FlingAnimationUtils(getContext(), 0.4f); |
Selim Cinek | 9dbbca8 | 2014-05-15 15:23:37 +0200 | [diff] [blame] | 140 | mStatusBarMinHeight = getResources().getDimensionPixelSize( |
| 141 | com.android.internal.R.dimen.status_bar_height); |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 142 | mClockPositionAlgorithm.loadDimens(getResources()); |
Jorim Jaggi | 8c1a44b | 2014-04-29 19:04:02 +0200 | [diff] [blame] | 143 | } |
| 144 | |
| 145 | @Override |
| 146 | protected void onLayout(boolean changed, int left, int top, int right, int bottom) { |
| 147 | super.onLayout(changed, left, top, right, bottom); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 148 | if (!mQsExpanded) { |
Jorim Jaggi | 069cd03 | 2014-05-15 03:09:01 +0200 | [diff] [blame] | 149 | positionClockAndNotifications(); |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 150 | mNotificationStackScroller.setStackHeight(getExpandedHeight()); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 151 | } |
| 152 | |
| 153 | // Calculate quick setting heights. |
| 154 | mQsMinExpansionHeight = mHeader.getCollapsedHeight(); |
| 155 | mQsMaxExpansionHeight = mHeader.getExpandedHeight() + mQsContainer.getHeight(); |
| 156 | if (mQsExpansionHeight == 0) { |
| 157 | mQsExpansionHeight = mQsMinExpansionHeight; |
| 158 | } |
Jorim Jaggi | 98fb09c | 2014-05-01 22:40:56 +0200 | [diff] [blame] | 159 | } |
| 160 | |
Jorim Jaggi | 069cd03 | 2014-05-15 03:09:01 +0200 | [diff] [blame] | 161 | /** |
| 162 | * Positions the clock and notifications dynamically depending on how many notifications are |
| 163 | * showing. |
| 164 | */ |
| 165 | private void positionClockAndNotifications() { |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 166 | boolean animateClock = mNotificationStackScroller.isAddOrRemoveAnimationPending(); |
Jorim Jaggi | 069cd03 | 2014-05-15 03:09:01 +0200 | [diff] [blame] | 167 | if (mStatusBar.getBarState() != StatusBarState.KEYGUARD) { |
| 168 | mStackScrollerIntrinsicPadding = mHeader.getBottom() + mNotificationTopPadding; |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 169 | mTopPaddingAdjustment = 0; |
Jorim Jaggi | 069cd03 | 2014-05-15 03:09:01 +0200 | [diff] [blame] | 170 | } else { |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 171 | mClockPositionAlgorithm.setup( |
| 172 | mStatusBar.getMaxKeyguardNotifications(), |
| 173 | getMaxPanelHeight(), |
| 174 | getExpandedHeight(), |
| 175 | mNotificationStackScroller.getNotGoneChildCount(), |
| 176 | getHeight(), |
| 177 | mKeyguardStatusView.getHeight()); |
| 178 | mClockPositionAlgorithm.run(mClockPositionResult); |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 179 | if (animateClock || mClockAnimator != null) { |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 180 | startClockAnimation(mClockPositionResult.clockY); |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 181 | } else { |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 182 | mKeyguardStatusView.setY(mClockPositionResult.clockY); |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 183 | } |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 184 | applyClockAlpha(mClockPositionResult.clockAlpha); |
| 185 | mStackScrollerIntrinsicPadding = mClockPositionResult.stackScrollerPadding; |
| 186 | mTopPaddingAdjustment = mClockPositionResult.stackScrollerPaddingAdjustment; |
Jorim Jaggi | 069cd03 | 2014-05-15 03:09:01 +0200 | [diff] [blame] | 187 | } |
| 188 | mNotificationStackScroller.setTopPadding(mStackScrollerIntrinsicPadding, |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 189 | mAnimateNextTopPaddingChange || animateClock); |
Jorim Jaggi | 069cd03 | 2014-05-15 03:09:01 +0200 | [diff] [blame] | 190 | mAnimateNextTopPaddingChange = false; |
| 191 | } |
| 192 | |
Jorim Jaggi | 75c9504 | 2014-05-16 19:09:59 +0200 | [diff] [blame] | 193 | private void startClockAnimation(int y) { |
| 194 | if (mClockAnimationTarget == y) { |
| 195 | return; |
| 196 | } |
| 197 | mClockAnimationTarget = y; |
| 198 | getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { |
| 199 | @Override |
| 200 | public boolean onPreDraw() { |
| 201 | getViewTreeObserver().removeOnPreDrawListener(this); |
| 202 | if (mClockAnimator != null) { |
| 203 | mClockAnimator.removeAllListeners(); |
| 204 | mClockAnimator.cancel(); |
| 205 | } |
| 206 | mClockAnimator = |
| 207 | ObjectAnimator.ofFloat(mKeyguardStatusView, View.Y, mClockAnimationTarget); |
| 208 | mClockAnimator.setInterpolator(mFastOutSlowInInterpolator); |
| 209 | mClockAnimator.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD); |
| 210 | mClockAnimator.addListener(new AnimatorListenerAdapter() { |
| 211 | @Override |
| 212 | public void onAnimationEnd(Animator animation) { |
| 213 | mClockAnimator = null; |
| 214 | mClockAnimationTarget = -1; |
| 215 | } |
| 216 | }); |
| 217 | StackStateAnimator.startInstantly(mClockAnimator); |
| 218 | return true; |
| 219 | } |
| 220 | }); |
| 221 | } |
| 222 | |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 223 | private void applyClockAlpha(float alpha) { |
| 224 | if (alpha != 1.0f) { |
| 225 | mKeyguardStatusView.setLayerType(LAYER_TYPE_HARDWARE, null); |
| 226 | } else { |
| 227 | mKeyguardStatusView.setLayerType(LAYER_TYPE_NONE, null); |
| 228 | } |
| 229 | mKeyguardStatusView.setAlpha(alpha); |
Jorim Jaggi | 069cd03 | 2014-05-15 03:09:01 +0200 | [diff] [blame] | 230 | } |
| 231 | |
Selim Cinek | c27437b | 2014-05-14 10:23:33 +0200 | [diff] [blame] | 232 | public void animateToFullShade() { |
Jorim Jaggi | 98fb09c | 2014-05-01 22:40:56 +0200 | [diff] [blame] | 233 | mAnimateNextTopPaddingChange = true; |
Selim Cinek | c27437b | 2014-05-14 10:23:33 +0200 | [diff] [blame] | 234 | mNotificationStackScroller.goToFullShade(); |
Jorim Jaggi | 98fb09c | 2014-05-01 22:40:56 +0200 | [diff] [blame] | 235 | requestLayout(); |
Daniel Sandler | 08d05e3 | 2012-08-08 16:39:54 -0400 | [diff] [blame] | 236 | } |
| 237 | |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 238 | /** |
| 239 | * @return Whether Quick Settings are currently expanded. |
| 240 | */ |
| 241 | public boolean isQsExpanded() { |
| 242 | return mQsExpanded; |
| 243 | } |
| 244 | |
| 245 | public void setQsExpansionEnabled(boolean qsExpansionEnabled) { |
| 246 | mQsExpansionEnabled = qsExpansionEnabled; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 247 | } |
| 248 | |
| 249 | public void closeQs() { |
| 250 | cancelAnimation(); |
| 251 | setQsExpansion(mQsMinExpansionHeight); |
| 252 | } |
| 253 | |
| 254 | public void openQs() { |
| 255 | cancelAnimation(); |
| 256 | if (mQsExpansionEnabled) { |
| 257 | setQsExpansion(mQsMaxExpansionHeight); |
| 258 | } |
| 259 | } |
| 260 | |
Daniel Sandler | 08d05e3 | 2012-08-08 16:39:54 -0400 | [diff] [blame] | 261 | @Override |
| 262 | public void fling(float vel, boolean always) { |
Daniel Sandler | 151f00d | 2012-10-02 22:33:08 -0400 | [diff] [blame] | 263 | GestureRecorder gr = ((PhoneStatusBarView) mBar).mBar.getGestureRecorder(); |
| 264 | if (gr != null) { |
| 265 | gr.tag( |
| 266 | "fling " + ((vel > 0) ? "open" : "closed"), |
| 267 | "notifications,v=" + vel); |
| 268 | } |
Daniel Sandler | 08d05e3 | 2012-08-08 16:39:54 -0400 | [diff] [blame] | 269 | super.fling(vel, always); |
| 270 | } |
Chet Haase | 4d179dc | 2012-08-22 07:14:42 -0700 | [diff] [blame] | 271 | |
Casey Burkhardt | 23b0a4e | 2013-04-29 12:18:32 -0700 | [diff] [blame] | 272 | @Override |
| 273 | public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { |
| 274 | if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) { |
| 275 | event.getText() |
| 276 | .add(getContext().getString(R.string.accessibility_desc_notification_shade)); |
| 277 | return true; |
| 278 | } |
| 279 | |
| 280 | return super.dispatchPopulateAccessibilityEvent(event); |
| 281 | } |
| 282 | |
Daniel Sandler | 040c2e4 | 2012-10-17 00:56:33 -0400 | [diff] [blame] | 283 | @Override |
John Spurlock | 73203eb | 2014-04-15 16:14:46 -0400 | [diff] [blame] | 284 | public boolean onInterceptTouchEvent(MotionEvent event) { |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 285 | int pointerIndex = event.findPointerIndex(mTrackingPointer); |
| 286 | if (pointerIndex < 0) { |
| 287 | pointerIndex = 0; |
| 288 | mTrackingPointer = event.getPointerId(pointerIndex); |
John Spurlock | 73203eb | 2014-04-15 16:14:46 -0400 | [diff] [blame] | 289 | } |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 290 | final float x = event.getX(pointerIndex); |
| 291 | final float y = event.getY(pointerIndex); |
| 292 | |
| 293 | switch (event.getActionMasked()) { |
| 294 | case MotionEvent.ACTION_DOWN: |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 295 | mIntercepting = true; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 296 | mInitialTouchY = y; |
| 297 | mInitialTouchX = x; |
| 298 | initVelocityTracker(); |
| 299 | trackMovement(event); |
| 300 | if (shouldIntercept(mInitialTouchX, mInitialTouchY, 0)) { |
| 301 | getParent().requestDisallowInterceptTouchEvent(true); |
| 302 | } |
| 303 | break; |
| 304 | case MotionEvent.ACTION_POINTER_UP: |
| 305 | final int upPointer = event.getPointerId(event.getActionIndex()); |
| 306 | if (mTrackingPointer == upPointer) { |
| 307 | // gesture is ongoing, find a new pointer to track |
| 308 | final int newIndex = event.getPointerId(0) != upPointer ? 0 : 1; |
| 309 | mTrackingPointer = event.getPointerId(newIndex); |
| 310 | mInitialTouchX = event.getX(newIndex); |
| 311 | mInitialTouchY = event.getY(newIndex); |
| 312 | } |
| 313 | break; |
| 314 | |
| 315 | case MotionEvent.ACTION_MOVE: |
| 316 | final float h = y - mInitialTouchY; |
| 317 | trackMovement(event); |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 318 | if (mTracking) { |
| 319 | |
| 320 | // Already tracking because onOverscrolled was called. We need to update here |
| 321 | // so we don't stop for a frame until the next touch event gets handled in |
| 322 | // onTouchEvent. |
| 323 | setQsExpansion(h + mInitialHeightOnTouch); |
| 324 | trackMovement(event); |
| 325 | mIntercepting = false; |
| 326 | return true; |
| 327 | } |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 328 | if (Math.abs(h) > mTouchSlop && Math.abs(h) > Math.abs(x - mInitialTouchX) |
| 329 | && shouldIntercept(mInitialTouchX, mInitialTouchY, h)) { |
| 330 | onQsExpansionStarted(); |
| 331 | mInitialHeightOnTouch = mQsExpansionHeight; |
| 332 | mInitialTouchY = y; |
| 333 | mInitialTouchX = x; |
| 334 | mTracking = true; |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 335 | mIntercepting = false; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 336 | return true; |
| 337 | } |
| 338 | break; |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 339 | |
| 340 | case MotionEvent.ACTION_CANCEL: |
| 341 | case MotionEvent.ACTION_UP: |
Jorim Jaggi | c9a52ab | 2014-05-12 23:46:19 +0200 | [diff] [blame] | 342 | trackMovement(event); |
| 343 | if (mTracking) { |
| 344 | flingWithCurrentVelocity(); |
| 345 | mTracking = false; |
| 346 | } |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 347 | mIntercepting = false; |
| 348 | break; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 349 | } |
| 350 | return !mQsExpanded && super.onInterceptTouchEvent(event); |
John Spurlock | 73203eb | 2014-04-15 16:14:46 -0400 | [diff] [blame] | 351 | } |
| 352 | |
| 353 | @Override |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 354 | public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) { |
| 355 | |
| 356 | // Block request so we can still intercept the scrolling when QS is expanded. |
| 357 | if (!mQsExpanded) { |
| 358 | super.requestDisallowInterceptTouchEvent(disallowIntercept); |
| 359 | } |
| 360 | } |
| 361 | |
Jorim Jaggi | c9a52ab | 2014-05-12 23:46:19 +0200 | [diff] [blame] | 362 | private void flingWithCurrentVelocity() { |
| 363 | float vel = getCurrentVelocity(); |
| 364 | |
| 365 | // TODO: Better logic whether we should expand or not. |
| 366 | flingSettings(vel, vel > 0); |
| 367 | } |
| 368 | |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 369 | @Override |
Daniel Sandler | 040c2e4 | 2012-10-17 00:56:33 -0400 | [diff] [blame] | 370 | public boolean onTouchEvent(MotionEvent event) { |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 371 | // TODO: Handle doublefinger swipe to notifications again. Look at history for a reference |
| 372 | // implementation. |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 373 | if (mTracking) { |
| 374 | int pointerIndex = event.findPointerIndex(mTrackingPointer); |
| 375 | if (pointerIndex < 0) { |
| 376 | pointerIndex = 0; |
| 377 | mTrackingPointer = event.getPointerId(pointerIndex); |
| 378 | } |
| 379 | final float y = event.getY(pointerIndex); |
| 380 | final float x = event.getX(pointerIndex); |
| 381 | |
| 382 | switch (event.getActionMasked()) { |
| 383 | case MotionEvent.ACTION_DOWN: |
| 384 | mTracking = true; |
| 385 | mInitialTouchY = y; |
| 386 | mInitialTouchX = x; |
| 387 | onQsExpansionStarted(); |
| 388 | mInitialHeightOnTouch = mQsExpansionHeight; |
| 389 | initVelocityTracker(); |
| 390 | trackMovement(event); |
| 391 | break; |
| 392 | |
| 393 | case MotionEvent.ACTION_POINTER_UP: |
| 394 | final int upPointer = event.getPointerId(event.getActionIndex()); |
| 395 | if (mTrackingPointer == upPointer) { |
| 396 | // gesture is ongoing, find a new pointer to track |
| 397 | final int newIndex = event.getPointerId(0) != upPointer ? 0 : 1; |
| 398 | final float newY = event.getY(newIndex); |
| 399 | final float newX = event.getX(newIndex); |
| 400 | mTrackingPointer = event.getPointerId(newIndex); |
| 401 | mInitialHeightOnTouch = mQsExpansionHeight; |
| 402 | mInitialTouchY = newY; |
| 403 | mInitialTouchX = newX; |
| 404 | } |
| 405 | break; |
| 406 | |
| 407 | case MotionEvent.ACTION_MOVE: |
| 408 | final float h = y - mInitialTouchY; |
| 409 | setQsExpansion(h + mInitialHeightOnTouch); |
| 410 | trackMovement(event); |
| 411 | break; |
| 412 | |
| 413 | case MotionEvent.ACTION_UP: |
| 414 | case MotionEvent.ACTION_CANCEL: |
| 415 | mTracking = false; |
| 416 | mTrackingPointer = -1; |
| 417 | trackMovement(event); |
Jorim Jaggi | c9a52ab | 2014-05-12 23:46:19 +0200 | [diff] [blame] | 418 | flingWithCurrentVelocity(); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 419 | if (mVelocityTracker != null) { |
| 420 | mVelocityTracker.recycle(); |
| 421 | mVelocityTracker = null; |
| 422 | } |
| 423 | break; |
John Spurlock | 73203eb | 2014-04-15 16:14:46 -0400 | [diff] [blame] | 424 | } |
| 425 | return true; |
| 426 | } |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 427 | |
| 428 | // Consume touch events when QS are expanded. |
| 429 | return mQsExpanded || super.onTouchEvent(event); |
| 430 | } |
| 431 | |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 432 | @Override |
| 433 | public void onOverscrolled(int amount) { |
| 434 | if (mIntercepting) { |
| 435 | onQsExpansionStarted(amount); |
| 436 | mInitialHeightOnTouch = mQsExpansionHeight; |
| 437 | mInitialTouchY = mLastTouchY; |
| 438 | mInitialTouchX = mLastTouchX; |
| 439 | mTracking = true; |
| 440 | } |
| 441 | } |
| 442 | |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 443 | private void onQsExpansionStarted() { |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 444 | onQsExpansionStarted(0); |
| 445 | } |
| 446 | |
| 447 | private void onQsExpansionStarted(int overscrollAmount) { |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 448 | cancelAnimation(); |
| 449 | |
| 450 | // Reset scroll position and apply that position to the expanded height. |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 451 | float height = mQsExpansionHeight - mScrollView.getScrollY() - overscrollAmount; |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 452 | mScrollView.scrollTo(0, 0); |
| 453 | setQsExpansion(height); |
| 454 | } |
| 455 | |
| 456 | private void expandQs() { |
| 457 | mHeader.setExpanded(true); |
| 458 | mNotificationStackScroller.setEnabled(false); |
| 459 | mScrollView.setVisibility(View.VISIBLE); |
| 460 | mQsExpanded = true; |
| 461 | } |
| 462 | |
| 463 | private void collapseQs() { |
| 464 | mHeader.setExpanded(false); |
| 465 | mNotificationStackScroller.setEnabled(true); |
| 466 | mScrollView.setVisibility(View.INVISIBLE); |
| 467 | mQsExpanded = false; |
| 468 | } |
| 469 | |
| 470 | private void setQsExpansion(float height) { |
| 471 | height = Math.min(Math.max(height, mQsMinExpansionHeight), mQsMaxExpansionHeight); |
| 472 | if (height > mQsMinExpansionHeight && !mQsExpanded) { |
| 473 | expandQs(); |
| 474 | } else if (height <= mQsMinExpansionHeight && mQsExpanded) { |
| 475 | collapseQs(); |
John Spurlock | 73203eb | 2014-04-15 16:14:46 -0400 | [diff] [blame] | 476 | } |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 477 | mQsExpansionHeight = height; |
| 478 | mHeader.setExpansion(height); |
| 479 | setQsTranslation(height); |
| 480 | setQsStackScrollerPadding(height); |
| 481 | } |
| 482 | |
| 483 | private void setQsTranslation(float height) { |
| 484 | mQsContainer.setY(height - mQsContainer.getHeight()); |
| 485 | } |
| 486 | |
| 487 | private void setQsStackScrollerPadding(float height) { |
| 488 | float start = height - mScrollView.getScrollY() + mNotificationTopPadding; |
| 489 | float stackHeight = mNotificationStackScroller.getHeight() - start; |
| 490 | if (stackHeight <= mMinStackHeight) { |
| 491 | float overflow = mMinStackHeight - stackHeight; |
| 492 | stackHeight = mMinStackHeight; |
| 493 | start = mNotificationStackScroller.getHeight() - stackHeight; |
| 494 | mNotificationStackScroller.setTranslationY(overflow); |
| 495 | mNotificationTranslation = overflow + mScrollView.getScrollY(); |
| 496 | } else { |
| 497 | mNotificationStackScroller.setTranslationY(0); |
| 498 | mNotificationTranslation = mScrollView.getScrollY(); |
| 499 | } |
| 500 | mNotificationStackScroller.setTopPadding(clampQsStackScrollerPadding((int) start), false); |
| 501 | } |
| 502 | |
| 503 | private int clampQsStackScrollerPadding(int desiredPadding) { |
| 504 | return Math.max(desiredPadding, mStackScrollerIntrinsicPadding); |
| 505 | } |
| 506 | |
| 507 | private void trackMovement(MotionEvent event) { |
| 508 | if (mVelocityTracker != null) mVelocityTracker.addMovement(event); |
Jorim Jaggi | fc1a824 | 2014-05-12 19:30:05 +0200 | [diff] [blame] | 509 | mLastTouchX = event.getX(); |
| 510 | mLastTouchY = event.getY(); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 511 | } |
| 512 | |
| 513 | private void initVelocityTracker() { |
| 514 | if (mVelocityTracker != null) { |
| 515 | mVelocityTracker.recycle(); |
| 516 | } |
| 517 | mVelocityTracker = VelocityTracker.obtain(); |
| 518 | } |
| 519 | |
| 520 | private float getCurrentVelocity() { |
| 521 | if (mVelocityTracker == null) { |
| 522 | return 0; |
| 523 | } |
| 524 | mVelocityTracker.computeCurrentVelocity(1000); |
| 525 | return mVelocityTracker.getYVelocity(); |
| 526 | } |
| 527 | |
| 528 | private void cancelAnimation() { |
| 529 | if (mQsExpansionAnimator != null) { |
| 530 | mQsExpansionAnimator.cancel(); |
| 531 | } |
| 532 | } |
| 533 | private void flingSettings(float vel, boolean expand) { |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 534 | float target = expand ? mQsMaxExpansionHeight : mQsMinExpansionHeight; |
Jorim Jaggi | 9cd731a | 2014-05-22 14:26:06 +0200 | [diff] [blame] | 535 | if (target == mQsExpansionHeight) { |
| 536 | return; |
| 537 | } |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 538 | ValueAnimator animator = ValueAnimator.ofFloat(mQsExpansionHeight, target); |
Jorim Jaggi | 87cd5e7 | 2014-05-12 23:29:10 +0200 | [diff] [blame] | 539 | mFlingAnimationUtils.apply(animator, mQsExpansionHeight, target, vel); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 540 | animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { |
| 541 | @Override |
| 542 | public void onAnimationUpdate(ValueAnimator animation) { |
| 543 | setQsExpansion((Float) animation.getAnimatedValue()); |
| 544 | } |
| 545 | }); |
| 546 | animator.addListener(new AnimatorListenerAdapter() { |
| 547 | @Override |
| 548 | public void onAnimationEnd(Animator animation) { |
| 549 | mQsExpansionAnimator = null; |
| 550 | } |
| 551 | }); |
| 552 | animator.start(); |
| 553 | mQsExpansionAnimator = animator; |
| 554 | } |
| 555 | |
| 556 | /** |
| 557 | * @return Whether we should intercept a gesture to open Quick Settings. |
| 558 | */ |
| 559 | private boolean shouldIntercept(float x, float y, float yDiff) { |
| 560 | if (!mQsExpansionEnabled) { |
| 561 | return false; |
| 562 | } |
Jorim Jaggi | bc5f496 | 2014-05-12 00:00:52 +0200 | [diff] [blame] | 563 | boolean onHeader = x >= mHeader.getLeft() && x <= mHeader.getRight() |
| 564 | && y >= mHeader.getTop() && y <= mHeader.getBottom(); |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 565 | if (mQsExpanded) { |
| 566 | return onHeader || (mScrollView.isScrolledToBottom() && yDiff < 0); |
| 567 | } else { |
| 568 | return onHeader; |
| 569 | } |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 570 | } |
| 571 | |
| 572 | @Override |
Jorim Jaggi | 0d74eeb | 2014-05-09 22:05:24 +0200 | [diff] [blame] | 573 | public void setVisibility(int visibility) { |
| 574 | int oldVisibility = getVisibility(); |
| 575 | super.setVisibility(visibility); |
| 576 | if (visibility != oldVisibility) { |
| 577 | reparentStatusIcons(visibility == VISIBLE); |
| 578 | } |
| 579 | } |
| 580 | |
| 581 | /** |
| 582 | * When the notification panel gets expanded, we need to move the status icons in the header |
| 583 | * card. |
| 584 | */ |
| 585 | private void reparentStatusIcons(boolean toHeader) { |
| 586 | if (mStatusBar == null) { |
| 587 | return; |
| 588 | } |
| 589 | LinearLayout systemIcons = mStatusBar.getSystemIcons(); |
| 590 | if (systemIcons.getParent() != null) { |
| 591 | ((ViewGroup) systemIcons.getParent()).removeView(systemIcons); |
| 592 | } |
| 593 | if (toHeader) { |
| 594 | mHeader.attachSystemIcons(systemIcons); |
| 595 | } else { |
Jorim Jaggi | 13c1b1f | 2014-05-11 21:55:00 +0200 | [diff] [blame] | 596 | mHeader.onSystemIconsDetached(); |
Jorim Jaggi | 0d74eeb | 2014-05-09 22:05:24 +0200 | [diff] [blame] | 597 | mStatusBar.reattachSystemIcons(); |
| 598 | } |
| 599 | } |
| 600 | |
| 601 | @Override |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 602 | protected boolean isScrolledToBottom() { |
| 603 | if (!isInSettings()) { |
| 604 | return mNotificationStackScroller.isScrolledToBottom(); |
Chris Wren | 64161cc | 2012-12-17 16:49:30 -0500 | [diff] [blame] | 605 | } |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 606 | return super.isScrolledToBottom(); |
| 607 | } |
| 608 | |
| 609 | @Override |
| 610 | protected int getMaxPanelHeight() { |
Jorim Jaggi | 1d48069 | 2014-05-20 19:41:58 +0200 | [diff] [blame] | 611 | // TODO: Figure out transition for collapsing when QS is open, adjust height here. |
| 612 | int maxPanelHeight = super.getMaxPanelHeight(); |
| 613 | int emptyBottomMargin = mStackScrollerContainer.getHeight() |
| 614 | - mNotificationStackScroller.getHeight() |
| 615 | + mNotificationStackScroller.getEmptyBottomMargin(); |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 616 | int maxHeight = maxPanelHeight - emptyBottomMargin - mTopPaddingAdjustment; |
Jorim Jaggi | 1d48069 | 2014-05-20 19:41:58 +0200 | [diff] [blame] | 617 | maxHeight = Math.max(maxHeight, mStatusBarMinHeight); |
| 618 | return maxHeight; |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 619 | } |
| 620 | |
| 621 | private boolean isInSettings() { |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 622 | return mQsExpanded; |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 623 | } |
| 624 | |
| 625 | @Override |
| 626 | protected void onHeightUpdated(float expandedHeight) { |
Jorim Jaggi | 7d16bb1 | 2014-05-22 04:24:50 +0200 | [diff] [blame^] | 627 | if (!mQsExpanded) { |
| 628 | positionClockAndNotifications(); |
| 629 | } |
Jorim Jaggi | 8c1a44b | 2014-04-29 19:04:02 +0200 | [diff] [blame] | 630 | mNotificationStackScroller.setStackHeight(expandedHeight); |
Selim Cinek | b6d85eb | 2014-03-28 20:21:01 +0100 | [diff] [blame] | 631 | } |
| 632 | |
| 633 | @Override |
Selim Cinek | 1685e63 | 2014-04-08 02:27:49 +0200 | [diff] [blame] | 634 | protected void onExpandingStarted() { |
| 635 | super.onExpandingStarted(); |
| 636 | mNotificationStackScroller.onExpansionStarted(); |
| 637 | } |
| 638 | |
| 639 | @Override |
| 640 | protected void onExpandingFinished() { |
| 641 | super.onExpandingFinished(); |
| 642 | mNotificationStackScroller.onExpansionStopped(); |
| 643 | } |
Jorim Jaggi | be565df | 2014-04-28 17:51:23 +0200 | [diff] [blame] | 644 | |
| 645 | @Override |
| 646 | public void onHeightChanged(ExpandableView view) { |
| 647 | requestPanelHeightUpdate(); |
| 648 | } |
Jorim Jaggi | d7daab7 | 2014-05-06 22:22:20 +0200 | [diff] [blame] | 649 | |
| 650 | @Override |
| 651 | public void onScrollChanged() { |
| 652 | if (mQsExpanded) { |
| 653 | mNotificationStackScroller.setTranslationY( |
| 654 | mNotificationTranslation - mScrollView.getScrollY()); |
| 655 | } |
| 656 | } |
| 657 | |
| 658 | @Override |
| 659 | public void onClick(View v) { |
| 660 | if (v == mHeader.getBackgroundView()) { |
| 661 | onQsExpansionStarted(); |
| 662 | if (mQsExpanded) { |
| 663 | flingSettings(0 /* vel */, false /* expand */); |
| 664 | } else if (mQsExpansionEnabled) { |
| 665 | flingSettings(0 /* vel */, true /* expand */); |
| 666 | } |
| 667 | } |
| 668 | } |
Daniel Sandler | 08d05e3 | 2012-08-08 16:39:54 -0400 | [diff] [blame] | 669 | } |