diff options
3 files changed, 24 insertions, 59 deletions
diff --git a/media/tests/CameraBrowser/AndroidManifest.xml b/media/tests/CameraBrowser/AndroidManifest.xml index f167f4b..fccb3ca 100644 --- a/media/tests/CameraBrowser/AndroidManifest.xml +++ b/media/tests/CameraBrowser/AndroidManifest.xml @@ -2,7 +2,6 @@ package="com.android.camerabrowser"> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.ACCESS_USB" /> <application android:label="@string/app_label" android:name="com.android.camerabrowser.CameraBrowserApplication"> @@ -12,20 +11,15 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> + <intent-filter> + <action android:name="android.hardware.action.USB_DEVICE_ATTACHED" /> + </intent-filter> + <meta-data android:name="android.hardware.action.USB_DEVICE_ATTACHED" + android:resource="@xml/device_filter" /> </activity> <activity android:name="StorageBrowser" /> <activity android:name="ObjectBrowser" /> <activity android:name="ObjectViewer" /> - -<!-- - <receiver android:name="UsbReceiver"> - <intent-filter> - <action android:name="android.hardware.action.USB_DEVICE_ATTACHED" /> - </intent-filter> - </receiver> ---> </application> - - </manifest> diff --git a/media/tests/CameraBrowser/res/xml/device_filter.xml b/media/tests/CameraBrowser/res/xml/device_filter.xml new file mode 100644 index 0000000..36cd13d --- /dev/null +++ b/media/tests/CameraBrowser/res/xml/device_filter.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <!-- filter for PTP devices --> + <usb-device class="6" subclass="1" protocol="1" /> +</resources> diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java deleted file mode 100644 index 22d9443..0000000 --- a/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.camerabrowser; - -import android.content.Context; -import android.content.Intent; -import android.content.BroadcastReceiver; -import android.hardware.UsbDevice; -import android.hardware.UsbManager; -import android.mtp.MtpClient; -import android.os.Bundle; -import android.os.Parcelable; -import android.util.Log; - -public class UsbReceiver extends BroadcastReceiver -{ - private static final String TAG = "UsbReceiver"; - - @Override - public void onReceive(Context context, Intent intent) { - Log.d(TAG, "onReceive " + intent); - if (UsbManager.ACTION_USB_DEVICE_ATTACHED.equals(intent.getAction())) { - UsbDevice device = (UsbDevice)intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); - if (MtpClient.isCamera(device)) { - String deviceName = device.getDeviceName(); - Log.d(TAG, "Got camera: " + deviceName); - intent = new Intent(context, StorageBrowser.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.putExtra("device", deviceName); - context.startActivity(intent); - } - } - } -} |