Merge "Empty notification shade state." into lmp-dev (81a0d408) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/status_bar_no_notifications.xml

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2014 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
		-->

		<!-- Extends Framelayout -->
		<com.android.systemui.statusbar.EmptyShadeView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone"
		>
		<TextView
		android:id="@+id/no_notifications"
		android:layout_width="match_parent"
		android:layout_height="64dp"
		android:paddingTop="12dp"
		android:gravity="top\|center_horizontal"
		android:textColor="#ffffff"
		android:textSize="20sp"
		android:text="@string/empty_shade_text"/>
		</com.android.systemui.statusbar.EmptyShadeView>

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -200,6 +200,7 @@ public abstract class BaseStatusBar extends SystemUI implements

		protected NotificationOverflowContainer mKeyguardIconOverflowContainer;
		protected DismissView mDismissView;
		protected EmptyShadeView mEmptyShadeView;

		@Override // NotificationData.Environment
		public boolean isDeviceProvisioned() {
		@@ -1405,12 +1406,11 @@ public abstract class BaseStatusBar extends SystemUI implements
		} else {
		mKeyguardIconOverflowContainer.setVisibility(View.GONE);
		}
		// Move overflow container to second last position.
		mStackScroller.changeViewPosition(mKeyguardIconOverflowContainer,
		mStackScroller.getChildCount() - 2);

		// Now move dismissView to the last position.
		mStackScroller.changeViewPosition(mDismissView, mStackScroller.getChildCount() - 1);
		mStackScroller.changeViewPosition(mKeyguardIconOverflowContainer,
		mStackScroller.getChildCount() - 3);
		mStackScroller.changeViewPosition(mDismissView, mStackScroller.getChildCount() - 2);
		mStackScroller.changeViewPosition(mEmptyShadeView, mStackScroller.getChildCount() - 1);
		}

		private boolean shouldShowOnKeyguard(StatusBarNotification sbn) {

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

+5 −117

Original line number	Diff line number	Diff line
		@@ -19,133 +19,21 @@ package com.android.systemui.statusbar;
		import android.content.Context;
		import android.util.AttributeSet;
		import android.view.View;
		import android.view.animation.Interpolator;

		import com.android.systemui.R;
		import com.android.systemui.statusbar.phone.PhoneStatusBar;

		public class DismissView extends ExpandableView {

		private View mClearAllIcon;
		private boolean mIsVisible;
		private boolean mAnimating;
		private boolean mWillBeGone;
		public class DismissView extends StackScrollerDecorView {

		public DismissView(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();
		mClearAllIcon = findViewById(R.id.dismiss_text);
		setInvisible();
		}

		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
		super.onLayout(changed, left, top, right, bottom);
		setOutlineProvider(null);
		}

		@Override
		public boolean isTransparent() {
		return true;
		}

		public void performVisibilityAnimation(boolean nowVisible) {
		animateText(nowVisible, null /* onFinishedRunnable */);
		}

		public void performVisibilityAnimation(boolean nowVisible, Runnable onFinishedRunnable) {
		animateText(nowVisible, onFinishedRunnable);
		}

		public boolean isVisible() {
		return mIsVisible \|\| mAnimating;
		}

		/**
		* Animate the text to a new visibility.
		*
		* @param nowVisible should it now be visible
		* @param onFinishedRunnable A runnable which should be run when the animation is
		* finished.
		*/
		private void animateText(boolean nowVisible, final Runnable onFinishedRunnable) {
		if (nowVisible != mIsVisible) {
		// Animate text
		float endValue = nowVisible ? 1.0f : 0.0f;
		Interpolator interpolator;
		if (nowVisible) {
		interpolator = PhoneStatusBar.ALPHA_IN;
		} else {
		interpolator = PhoneStatusBar.ALPHA_OUT;
		}
		mAnimating = true;
		mClearAllIcon.animate()
		.alpha(endValue)
		.setInterpolator(interpolator)
		.setDuration(260)
		.withLayer()
		.withEndAction(new Runnable() {
		@Override
		public void run() {
		mAnimating = false;
		if (onFinishedRunnable != null) {
		onFinishedRunnable.run();
		}
		}
		});
		mIsVisible = nowVisible;
		} else {
		if (onFinishedRunnable != null) {
		onFinishedRunnable.run();
		}
		}
		}

		public void setInvisible() {
		mClearAllIcon.setAlpha(0.0f);
		mIsVisible = false;
		}

		@Override
		public void performRemoveAnimation(long duration, float translationDirection,
		Runnable onFinishedRunnable) {
		// TODO: Use duration
		performVisibilityAnimation(false);
		}

		@Override
		public void performAddAnimation(long delay, long duration) {
		// TODO: use delay and duration
		performVisibilityAnimation(true);
		}

		@Override
		public void setScrimAmount(float scrimAmount) {
		// We don't need to scrim the dismissView
		}

		public void setOnButtonClickListener(OnClickListener onClickListener) {
		mClearAllIcon.setOnClickListener(onClickListener);
		}

		@Override
		public boolean hasOverlappingRendering() {
		return false;
		}

		public void cancelAnimation() {
		mClearAllIcon.animate().cancel();
		}

		public boolean willBeGone() {
		return mWillBeGone;
		protected View findContentView() {
		return findViewById(R.id.dismiss_text);
		}

		public void setWillBeGone(boolean willBeGone) {
		mWillBeGone = willBeGone;
		public void setOnButtonClickListener(OnClickListener listener) {
		mContent.setOnClickListener(listener);
		}
		}

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

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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;
		import android.util.AttributeSet;
		import android.view.View;
		import android.view.animation.Interpolator;

		import com.android.systemui.R;
		import com.android.systemui.statusbar.phone.PhoneStatusBar;

		public class EmptyShadeView extends StackScrollerDecorView {

		public EmptyShadeView(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		@Override
		protected View findContentView() {
		return findViewById(R.id.no_notifications);
		}
		}

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

0 → 100644

+152 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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;
		import android.util.AttributeSet;
		import android.view.View;
		import android.view.animation.Interpolator;

		import com.android.systemui.statusbar.phone.PhoneStatusBar;

		/**
		* A common base class for all views in the notification stack scroller which don't have a
		* background.
		*/
		public abstract class StackScrollerDecorView extends ExpandableView {

		protected View mContent;
		private boolean mIsVisible;
		private boolean mAnimating;
		private boolean mWillBeGone;

		public StackScrollerDecorView(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();
		mContent = findContentView();
		setInvisible();
		}

		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
		super.onLayout(changed, left, top, right, bottom);
		setOutlineProvider(null);
		}

		@Override
		public boolean isTransparent() {
		return true;
		}

		public void performVisibilityAnimation(boolean nowVisible) {
		animateText(nowVisible, null /* onFinishedRunnable */);
		}

		public void performVisibilityAnimation(boolean nowVisible, Runnable onFinishedRunnable) {
		animateText(nowVisible, onFinishedRunnable);
		}

		public boolean isVisible() {
		return mIsVisible \|\| mAnimating;
		}

		/**
		* Animate the text to a new visibility.
		*
		* @param nowVisible should it now be visible
		* @param onFinishedRunnable A runnable which should be run when the animation is
		* finished.
		*/
		private void animateText(boolean nowVisible, final Runnable onFinishedRunnable) {
		if (nowVisible != mIsVisible) {
		// Animate text
		float endValue = nowVisible ? 1.0f : 0.0f;
		Interpolator interpolator;
		if (nowVisible) {
		interpolator = PhoneStatusBar.ALPHA_IN;
		} else {
		interpolator = PhoneStatusBar.ALPHA_OUT;
		}
		mAnimating = true;
		mContent.animate()
		.alpha(endValue)
		.setInterpolator(interpolator)
		.setDuration(260)
		.withLayer()
		.withEndAction(new Runnable() {
		@Override
		public void run() {
		mAnimating = false;
		if (onFinishedRunnable != null) {
		onFinishedRunnable.run();
		}
		}
		});
		mIsVisible = nowVisible;
		} else {
		if (onFinishedRunnable != null) {
		onFinishedRunnable.run();
		}
		}
		}

		public void setInvisible() {
		mContent.setAlpha(0.0f);
		mIsVisible = false;
		}

		@Override
		public void performRemoveAnimation(long duration, float translationDirection,
		Runnable onFinishedRunnable) {
		// TODO: Use duration
		performVisibilityAnimation(false);
		}

		@Override
		public void performAddAnimation(long delay, long duration) {
		// TODO: use delay and duration
		performVisibilityAnimation(true);
		}

		@Override
		public void setScrimAmount(float scrimAmount) {
		// We don't need to scrim the dismissView
		}

		@Override
		public boolean hasOverlappingRendering() {
		return false;
		}

		public void cancelAnimation() {
		mContent.animate().cancel();
		}

		public boolean willBeGone() {
		return mWillBeGone;
		}

		public void setWillBeGone(boolean willBeGone) {
		mWillBeGone = willBeGone;
		}

		protected abstract View findContentView();
		}