Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fbc82ef authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev 

* commit '38c904a6':
  Be a little more lenient with panel-open gestures.
  Missing copyright headers.
parents eee20931 38c904a6

packages/SystemUI/src/com/android/systemui/BeanBagDream.java

+16 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui;



import android.service.dreams.DreamService;

packages/SystemUI/src/com/android/systemui/statusbar/RotationToggle.java

+16 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar;



import android.content.Context;

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

+16 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.phone;



import java.util.ArrayList;

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java

+17 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.phone;



import android.content.Context;

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

+18 −4
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.phone;



import android.animation.ObjectAnimator;
@@ -320,7 +336,7 @@ public class PanelView extends FrameLayout { 
                            final float deltaY = Math.abs(mFinalTouchY - mInitialTouchY);

                            if (deltaY < mFlingGestureMinDistPx

                                    || vel < mFlingExpandMinVelocityPx

                                    || mJustPeeked) {

                                    ) {

                                vel = 0;

                            }
@@ -328,10 +344,8 @@ public class PanelView extends FrameLayout { 
                                vel = -vel;

                            }



                            if (DEBUG) LOG("gesture: dy=%f vraw=(%f,%f) vnorm=(%f,%f) vlinear=%f",

                            if (DEBUG) LOG("gesture: dy=%f vel=(%f,%f) vlinear=%f",

                                    deltaY,

                                    mVelocityTracker.getXVelocity(),

                                    mVelocityTracker.getYVelocity(),

                                    xVel, yVel,

                                    vel);