Merge "Merge "Making the media carousel dismissable" into rvc-dev am:... (459a5eee) · Commits · e / os / android_frameworks_base

packages/SystemUI/plugin/src/com/android/systemui/plugins/FalsingManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import java.io.PrintWriter;
		*/
		@ProvidesInterface(version = FalsingManager.VERSION)
		public interface FalsingManager {
		int VERSION = 3;
		int VERSION = 4;

		void onSuccessfulUnlock();

		@@ -88,11 +88,11 @@ public interface FalsingManager {

		void onScreenOff();

		void onNotificatonStopDismissing();
		void onNotificationStopDismissing();

		void onNotificationDismissed();

		void onNotificatonStartDismissing();
		void onNotificationStartDismissing();

		void onNotificationDoubleTap(boolean accepted, float dx, float dy);

+2 −4

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		android:clipChildren="false"
		android:clipToPadding="false"
		>
		<com.android.systemui.media.UnboundHorizontalScrollView
		<com.android.systemui.media.MediaScrollView
		android:id="@+id/media_carousel_scroller"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -41,14 +41,12 @@
		>
		<!-- QSMediaPlayers will be added here dynamically -->
		</LinearLayout>
		</com.android.systemui.media.UnboundHorizontalScrollView>
		</com.android.systemui.media.MediaScrollView>
		<com.android.systemui.qs.PageIndicator
		android:id="@+id/media_page_indicator"
		android:layout_width="wrap_content"
		android:layout_height="48dp"
		android:layout_marginBottom="4dp"
		android:layout_gravity="center_horizontal\|bottom"
		android:gravity="center"
		android:tint="@color/media_primary_text"
		/>
		</FrameLayout>

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2020 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.
		-->
		<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/settings_cog"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:contentDescription="@string/controls_media_settings_button"
		android:paddingStart="30dp"
		android:paddingEnd="30dp"
		android:paddingBottom="20dp"
		android:paddingTop="20dp"
		android:src="@drawable/ic_settings"
		android:tint="@color/notification_gear_color"
		android:visibility="invisible"
		android:forceHasOverlappingRendering="false"/>

+2 −2

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ public class FalsingManagerFake implements FalsingManager {
		}

		@Override
		public void onNotificatonStopDismissing() {
		public void onNotificationStopDismissing() {

		}

		@@ -211,7 +211,7 @@ public class FalsingManagerFake implements FalsingManager {
		}

		@Override
		public void onNotificatonStartDismissing() {
		public void onNotificationStartDismissing() {

		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -481,15 +481,15 @@ public class FalsingManagerImpl implements FalsingManager {
		mDataCollector.onNotificationDismissed();
		}

		public void onNotificatonStartDismissing() {
		public void onNotificationStartDismissing() {
		if (FalsingLog.ENABLED) {
		FalsingLog.i("onNotificatonStartDismissing", "");
		FalsingLog.i("onNotificationStartDismissing", "");
		}
		mHumanInteractionClassifier.setType(Classifier.NOTIFICATION_DISMISS);
		mDataCollector.onNotificatonStartDismissing();
		}

		public void onNotificatonStopDismissing() {
		public void onNotificationStopDismissing() {
		mDataCollector.onNotificatonStopDismissing();
		}