diff options
4 files changed, 4 insertions, 24 deletions
diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml b/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml index 6de10b405aba..6538725e2374 100644 --- a/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml +++ b/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml @@ -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" +/> diff --git a/packages/SystemUI/src/com/android/systemui/complication/DreamClockTimeComplication.java b/packages/SystemUI/src/com/android/systemui/complication/DreamClockTimeComplication.java index dc32a59d86a9..c709e3436cd6 100644 --- a/packages/SystemUI/src/com/android/systemui/complication/DreamClockTimeComplication.java +++ b/packages/SystemUI/src/com/android/systemui/complication/DreamClockTimeComplication.java @@ -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); - } } } diff --git a/packages/SystemUI/src/com/android/systemui/complication/DreamOverlayUiEvent.kt b/packages/SystemUI/src/com/android/systemui/complication/DreamOverlayUiEvent.kt index 17cc8299c309..4d41262a8073 100644 --- a/packages/SystemUI/src/com/android/systemui/complication/DreamOverlayUiEvent.kt +++ b/packages/SystemUI/src/com/android/systemui/complication/DreamOverlayUiEvent.kt @@ -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 { diff --git a/packages/SystemUI/tests/src/com/android/systemui/complication/DreamClockTimeComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/DreamClockTimeComplicationTest.java index cbbbe5203b24..b9aa4c65be92 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/complication/DreamClockTimeComplicationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/DreamClockTimeComplicationTest.java @@ -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); - } } |