Merge "Move FooterView to its own directory." into main (a7a3e04f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/status_bar_notification_footer.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@
	-->		-->

	<!-- Extends Framelayout -->		<!-- Extends Framelayout -->
	<com.android.systemui.statusbar.notification.row.FooterView		<com.android.systemui.statusbar.notification.footer.ui.view.FooterView
	xmlns:android="http://schemas.android.com/apk/res/android"		xmlns:android="http://schemas.android.com/apk/res/android"
	xmlns:app="http://schemas.android.com/apk/res-auto"		xmlns:app="http://schemas.android.com/apk/res-auto"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	@@ -76,4 +76,4 @@
	/>		/>
	</androidx.constraintlayout.widget.ConstraintLayout>		</androidx.constraintlayout.widget.ConstraintLayout>
	</com.android.systemui.statusbar.AlphaOptimizedFrameLayout>		</com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
	</com.android.systemui.statusbar.notification.row.FooterView>		</com.android.systemui.statusbar.notification.footer.ui.view.FooterView>

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java→packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java

+15 −2

Original line number	Original line	Diff line number	Diff line
	@@ -11,10 +11,10 @@
	* distributed under the License is distributed on an "AS IS" BASIS,		* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and		* See the License for the specific language governing permissions and
	* limitations under the License		* limitations under the License.
	*/		*/

	package com.android.systemui.statusbar.notification.row;		package com.android.systemui.statusbar.notification.footer.ui.view;

	import static android.graphics.PorterDuff.Mode.SRC_ATOP;		import static android.graphics.PorterDuff.Mode.SRC_ATOP;

	@@ -35,6 +35,8 @@ import androidx.annotation.NonNull;

	import com.android.settingslib.Utils;		import com.android.settingslib.Utils;
	import com.android.systemui.res.R;		import com.android.systemui.res.R;
			import com.android.systemui.statusbar.notification.row.FooterViewButton;
			import com.android.systemui.statusbar.notification.row.StackScrollerDecorView;
	import com.android.systemui.statusbar.notification.stack.ExpandableViewState;		import com.android.systemui.statusbar.notification.stack.ExpandableViewState;
	import com.android.systemui.statusbar.notification.stack.ViewState;		import com.android.systemui.statusbar.notification.stack.ViewState;
	import com.android.systemui.util.DumpUtilsKt;		import com.android.systemui.util.DumpUtilsKt;
	@@ -93,6 +95,7 @@ public class FooterView extends StackScrollerDecorView {
	updateColors();		updateColors();
	}		}

			/** Show a message instead of the footer buttons. */
	public void setFooterLabelVisible(boolean isVisible) {		public void setFooterLabelVisible(boolean isVisible) {
	if (isVisible) {		if (isVisible) {
	mManageButton.setVisibility(View.GONE);		mManageButton.setVisibility(View.GONE);
	@@ -105,14 +108,22 @@ public class FooterView extends StackScrollerDecorView {
	}		}
	}		}

			/** Set onClickListener for the manage/history button. */
	public void setManageButtonClickListener(OnClickListener listener) {		public void setManageButtonClickListener(OnClickListener listener) {
	mManageButton.setOnClickListener(listener);		mManageButton.setOnClickListener(listener);
	}		}

			/** Set onClickListener for the clear all (end) button. */
	public void setClearAllButtonClickListener(OnClickListener listener) {		public void setClearAllButtonClickListener(OnClickListener listener) {
	mClearAllButton.setOnClickListener(listener);		mClearAllButton.setOnClickListener(listener);
	}		}

			/**
			* Whether the touch is outside the Clear all button.
			*
			* TODO(b/293167744): This is an artifact from the time when we could press underneath the
			* shade to dismiss it. Check if it's safe to remove.
			*/
	public boolean isOnEmptySpace(float touchX, float touchY) {		public boolean isOnEmptySpace(float touchX, float touchY) {
	return touchX < mContent.getX()		return touchX < mContent.getX()
	\|\| touchX > mContent.getX() + mContent.getWidth()		\|\| touchX > mContent.getX() + mContent.getWidth()
	@@ -120,6 +131,7 @@ public class FooterView extends StackScrollerDecorView {
	\|\| touchY > mContent.getY() + mContent.getHeight();		\|\| touchY > mContent.getY() + mContent.getHeight();
	}		}

			/** Show "History" instead of "Manage" on the start button. */
	public void showHistory(boolean showHistory) {		public void showHistory(boolean showHistory) {
	if (mShowHistory == showHistory) {		if (mShowHistory == showHistory) {
	return;		return;
	@@ -141,6 +153,7 @@ public class FooterView extends StackScrollerDecorView {
	.setCompoundDrawablesRelative(mSeenNotifsFilteredIcon, null, null, null);		.setCompoundDrawablesRelative(mSeenNotifsFilteredIcon, null, null, null);
	}		}

			/** Whether the start button shows "History" (true) or "Manage" (false). */
	public boolean isHistoryShown() {		public boolean isHistoryShown() {
	return mShowHistory;		return mShowHistory;
	}		}

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -167,7 +167,7 @@ public abstract class StackScrollerDecorView extends ExpandableView {
	}		}

	@VisibleForTesting		@VisibleForTesting
	boolean isSecondaryVisible() {		public boolean isSecondaryVisible() {
	return mIsSecondaryVisible;		return mIsSecondaryVisible;
	}		}

	@@ -179,7 +179,8 @@ public abstract class StackScrollerDecorView extends ExpandableView {
	return mIsVisible;		return mIsVisible;
	}		}

	void setDuration(int duration) {		@VisibleForTesting
			public void setDuration(int duration) {
	mDuration = duration;		mDuration = duration;
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+2 −2

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java

+2 −2