From 0761f46d092554cf5e909804cdce5a444c41ece3 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Fri, 11 Aug 2023 12:07:52 -0400 Subject: [PATCH 1/2] Change Notification expander to use 10% opaque foreground color Bug: 277285099 Test: post and cancel notifications; check history Change-Id: I55f533eed8ad39a7ab3886d064f0ee0bd7c3b666 --- .../notification/history/NotificationHistoryActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java index b71d295f7f5..4808773f52e 100644 --- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java +++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java @@ -50,6 +50,7 @@ import android.view.ViewOutlineProvider; import android.widget.ImageView; import android.widget.TextView; +import androidx.core.graphics.ColorUtils; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -176,7 +177,8 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity { com.android.internal.R.id.expand_button); int textColor = obtainThemeColor(android.R.attr.textColorPrimary); int backgroundColor = obtainThemeColor(android.R.attr.colorBackgroundFloating); - expand.setDefaultPillColor(backgroundColor); + int pillColor = ColorUtils.blendARGB(textColor, backgroundColor, 0.9f); + expand.setDefaultPillColor(pillColor); expand.setDefaultTextColor(textColor); expand.setExpanded(false); header.setStateDescription(container.getVisibility() == View.VISIBLE From d8ee6665f74b6ead5cd504555ecb5a2b61f795b8 Mon Sep 17 00:00:00 2001 From: Vania Januar Date: Wed, 16 Aug 2023 15:54:00 +0100 Subject: [PATCH 2/2] Listen to USB_STATE events in the StylusUsbFirmwareController. Test: UsbStylusBroadcastReceiverTest Bug: 288850921 Change-Id: I415e5ca04d371a235eff31327b086d568bcc00f0 --- .../stylus/UsbStylusBroadcastReceiver.java | 1 + .../UsbStylusBroadcastReceiverTest.java | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiver.java b/src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiver.java index 01662500443..41d88d2691d 100644 --- a/src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiver.java +++ b/src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiver.java @@ -41,6 +41,7 @@ public class UsbStylusBroadcastReceiver extends BroadcastReceiver { final IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED); intentFilter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED); + intentFilter.addAction(UsbManager.ACTION_USB_STATE); final Intent intent = mContext.registerReceiver(this, intentFilter); if (intent != null) { onReceive(mContext, intent); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiverTest.java index ccaefb25523..03279ee48e3 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiverTest.java @@ -95,4 +95,32 @@ public class UsbStylusBroadcastReceiverTest { verifyNoMoreInteractions(mListener); } + + @Test + public void onReceive_usbDeviceStateStylus_invokeCallback() { + when(mFeatureFactory.mStylusFeatureProvider.isUsbFirmwareUpdateEnabled(any())) + .thenReturn(true); + final UsbDevice usbDevice = mock(UsbDevice.class); + final Intent intent = new Intent(); + intent.setAction(UsbManager.ACTION_USB_STATE); + intent.putExtra(UsbManager.EXTRA_DEVICE, usbDevice); + + mReceiver.onReceive(mContext, intent); + + verify(mListener).onUsbStylusConnectionChanged(usbDevice, false); + } + + @Test + public void onReceive_usbDeviceStateNotStylus_doesNotInvokeCallback() { + when(mFeatureFactory.mStylusFeatureProvider.isUsbFirmwareUpdateEnabled(any())) + .thenReturn(false); + final UsbDevice usbDevice = mock(UsbDevice.class); + final Intent intent = new Intent(); + intent.setAction(UsbManager.ACTION_USB_STATE); + intent.putExtra(UsbManager.EXTRA_DEVICE, usbDevice); + + mReceiver.onReceive(mContext, intent); + + verifyNoMoreInteractions(mListener); + } }