Merge "Removing clickable function from clock on screen saver" into main (e9955341) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -37,4 +37,6 @@
		app:ambientShadowOffsetY="@dimen/dream_overlay_clock_ambient_text_shadow_dy"
		app:ambientShadowAlpha="0.3"
		app:removeTextDescent="true"
		app:textDescentExtraPadding="@dimen/dream_overlay_clock_text_descent_extra_padding" />
		app:textDescentExtraPadding="@dimen/dream_overlay_clock_text_descent_extra_padding"
		android:clickable="false"
		/>

+1 −7

Original line number	Diff line number	Diff line
		@@ -130,15 +130,9 @@ public class DreamClockTimeComplication implements Complication {
		}

		@Override
		protected void onViewAttached() {
		mView.setOnClickListener(this::onClick);
		}
		protected void onViewAttached() {}

		@Override
		protected void onViewDetached() {}

		private void onClick(View v) {
		mUiEventLogger.log(DreamOverlayUiEvent.DREAM_CLOCK_TAPPED);
		}
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import com.android.internal.logging.UiEventLogger.UiEventEnum
		enum class DreamOverlayUiEvent(private val mId: Int) : UiEventEnum {
		@UiEvent(doc = "The home controls on the screensaver has been tapped.")
		DREAM_HOME_CONTROLS_TAPPED(1212),
		@UiEvent(doc = "The clock on the screensaver has been tapped") DREAM_CLOCK_TAPPED(1440),
		@UiEvent(doc = "The weather on the screensaver has been tapped") DREAM_WEATHER_TAPPED(1441);

		override fun getId(): Int {

+0 −15

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import com.android.systemui.shared.condition.Monitor;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentCaptor;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;

		@@ -140,18 +139,4 @@ public class DreamClockTimeComplicationTest extends SysuiTestCase {
		assertThat(viewHolder.getView()).isEqualTo(mView);
		assertThat(viewHolder.getLayoutParams()).isEqualTo(mLayoutParams);
		}

		@Test
		public void testClick_logUiEvent() {
		final DreamClockTimeComplication.DreamClockTimeViewController controller =
		new DreamClockTimeComplication.DreamClockTimeViewController(mView, mUiEventLogger);
		controller.onViewAttached();

		final ArgumentCaptor<View.OnClickListener> clickListenerCaptor =
		ArgumentCaptor.forClass(View.OnClickListener.class);
		verify(mView).setOnClickListener(clickListenerCaptor.capture());

		clickListenerCaptor.getValue().onClick(mView);
		verify(mUiEventLogger).log(DreamOverlayUiEvent.DREAM_CLOCK_TAPPED);
		}
		}