PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 10675748 from 745b7dca9f to udc-qpr1-release

Browse Source 
Change-Id: I3e709ebbb238e0b26ac00290808ff5638d11bb7b
This commit is contained in:
Android Build Coastguard Worker
2023-08-17 23:19:13 +00:00
parent 17d697d562 745b7dca9f
commit bec95fbb46
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiver.java
View File

@@ -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);

4
src/com/android/settings/notification/history/NotificationHistoryActivity.java
View File

@@ -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

28
tests/robotests/src/com/android/settings/connecteddevice/stylus/UsbStylusBroadcastReceiverTest.java
View File

@@ -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);
}
}