diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-12 14:14:33 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-08-12 14:14:33 -0400 |
| commit | 94e460fd45da93d8e8c7e23fea5bdf8c443816b7 (patch) | |
| tree | b9633945dd2f078869b2366861d7cda6066ef1cb | |
| parent | 42ae7fba5b6570cfa36d2132ce30bb23bd91d2e9 (diff) | |
| download | packages_apps_Settings-94e460fd45da93d8e8c7e23fea5bdf8c443816b7.zip packages_apps_Settings-94e460fd45da93d8e8c7e23fea5bdf8c443816b7.tar.gz packages_apps_Settings-94e460fd45da93d8e8c7e23fea5bdf8c443816b7.tar.bz2 | |
Fix Usb-C dialog issues
- Fix theme
- Fix PTP bug introduced in initial USB-C support
Bug: 21615151
Change-Id: I577f06929b028fe3f50ef5b9adcfa9507fd1df0e
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/deviceinfo/UsbBackend.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b536b20..f199673 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1828,7 +1828,7 @@ android:excludeFromRecents="true" android:exported="true" android:permission="android.permission.MANAGE_USB" - android:theme="@style/Transparent"> + android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"> </activity> <activity android:name=".bluetooth.RequestPermissionHelperActivity" diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java index c44f2eb..846d6e3 100644 --- a/src/com/android/settings/deviceinfo/UsbBackend.java +++ b/src/com/android/settings/deviceinfo/UsbBackend.java @@ -83,7 +83,7 @@ public class UsbBackend { } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) { return MODE_DATA_MTP; } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) { - return MODE_DATA_MTP; + return MODE_DATA_PTP; } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MIDI)) { return MODE_DATA_MIDI; } |