Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev (a6aef1bb) · Commits · e / os / android_frameworks_base

core/java/android/animation/TimeAnimator.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,12 @@ public class TimeAnimator extends ValueAnimator {
		private TimeListener mListener;
		private long mPreviousTime = -1;

		@Override
		public void start() {
		mPreviousTime = -1;
		super.start();
		}

		@Override
		boolean animationFrame(long currentTime) {
		if (mListener != null) {

packages/SystemUI/res/layout-sw600dp/super_status_bar.xml

+11 −5

Original line number	Diff line number	Diff line
		@@ -31,10 +31,16 @@
		android:layout_height="@*android:dimen/status_bar_height"
		/>


		<com.android.systemui.statusbar.phone.PanelHolder
		android:id="@+id/panel_holder"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		>
		<include layout="@layout/status_bar_expanded"
		android:layout_width="@dimen/notification_panel_width"
		android:layout_height="0dp"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|top"
		/>

		</com.android.systemui.statusbar.phone.PanelHolder>
		</com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/SystemUI/res/layout/status_bar_expanded.xml

+8 −9

Original line number	Diff line number	Diff line
		@@ -18,12 +18,12 @@
		*/
		-->

		<FrameLayout
		<com.android.systemui.statusbar.phone.NotificationPanelView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
		android:id="@+id/notification_panel"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:background="@drawable/notification_panel_bg"
		android:paddingTop="@dimen/notification_panel_padding_top"
		android:layout_marginLeft="@dimen/notification_panel_margin_left"
		@@ -42,7 +42,7 @@

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/close_handle_underlap"
		android:orientation="vertical"
		>
		@@ -65,7 +65,7 @@
		<ScrollView
		android:id="@+id/scroll"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:fadingEdge="none"
		android:overScrollMode="always"
		>
		@@ -78,7 +78,7 @@
		</ScrollView>
		</LinearLayout>

		<com.android.systemui.statusbar.phone.CloseDragHandle android:id="@+id/close"
		<LinearLayout android:id="@+id/handle"
		android:layout_width="match_parent"
		android:layout_height="@dimen/close_handle_height"
		android:layout_gravity="bottom"
		@@ -91,6 +91,5 @@
		android:scaleType="fitXY"
		android:src="@drawable/status_bar_close"
		/>

		</com.android.systemui.statusbar.phone.CloseDragHandle>
		</FrameLayout><!-- end of sliding panel -->
		</LinearLayout>
		</com.android.systemui.statusbar.phone.NotificationPanelView><!-- end of sliding panel -->

packages/SystemUI/res/layout/super_status_bar.xml

+9 −3

Original line number	Diff line number	Diff line
		@@ -32,9 +32,15 @@
		android:layout_height="@*android:dimen/status_bar_height"
		/>

		<com.android.systemui.statusbar.phone.PanelHolder
		android:id="@+id/panel_holder"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		>
		<include layout="@layout/status_bar_expanded"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_height="wrap_content"
		/>
		</com.android.systemui.statusbar.phone.PanelHolder>

		</com.android.systemui.statusbar.phone.StatusBarWindowView>

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

0 → 100644

+36 −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 android.content.Context;
		import android.util.AttributeSet;

		public class NotificationPanelView extends PanelView {
		public NotificationPanelView(Context context, AttributeSet attrs) {
		super(context, attrs);
		android.util.Slog.v("NotificationPanelView", "ctor");
		}


		@Override
		public void fling(float vel, boolean always) {
		((PhoneStatusBarView) mBar).mBar.getGestureRecorder().tag(
		"fling " + ((vel > 0) ? "open" : "closed"),
		"v=" + vel);
		super.fling(vel, always);
		}
		}