Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fd3c4a1 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

CameraBrowser: Add USB device filter meta-data for digital cameras 

This is used by the USB service to associate Gallery with PTP cameras.
Removed unnecessary broadcast receiver

Change-Id: Ifd78aa94f69cb7d6ec0b557313e90bb79812f15d
parent 27555315

media/tests/CameraBrowser/AndroidManifest.xml

+5 −11
Original line number Diff line number Diff line
@@ -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>

media/tests/CameraBrowser/res/xml/device_filter.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?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>

media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

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

            }

        }

    }

}