Skip to content
This repository has been archived by the owner on Mar 24, 2022. It is now read-only.

Commit

Permalink
Got rid of old asm and great expectations jars since they were interf…
Browse files Browse the repository at this point in the history
…ering with using Robolectric 2. Also got rid of C2DM

We'll replace GreatExpectations with Fest soon.
  • Loading branch information
David Varvel and Phil Goodwin committed Feb 26, 2013
1 parent cf41668 commit 1631af5
Show file tree
Hide file tree
Showing 14 changed files with 652 additions and 1,201 deletions.
66 changes: 22 additions & 44 deletions AndroidManifest.xml
Expand Up @@ -4,49 +4,27 @@
android:versionCode="1"
android:versionName="1.0">

<!-- These permissions are required for C2DM -->
<!-- Only this application can receive the messages and registration result -->
<permission android:name="com.example.android.sampleapp.permission.C2D_MESSAGE"
android:protectionLevel="signature"/>
<uses-permission android:name="com.example.android.sampleapp.permission.C2D_MESSAGE"/>
<!-- This app has permission to register and receive message -->
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<!-- Send the registration id to the server. Many apps will want this permission even when C2DM is not needed. -->
<uses-permission android:name="android.permission.INTERNET"/>
<!-- End of C2DM permissions -->

<application
android:label="@string/app_name"
android:icon="@drawable/icon"
android:name=".MySampleApplication">
<activity android:name=".StarterActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- These permissions are required for C2DM -->
<!-- Only this application can receive the messages and registration result -->
<permission android:name="com.example.android.sampleapp.permission.C2D_MESSAGE"
android:protectionLevel="signature"/>
<uses-permission android:name="com.example.android.sampleapp.permission.C2D_MESSAGE"/>
<!-- This app has permission to register and receive message -->
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<!-- Send the registration id to the server. Many apps will want this permission even when C2DM is not needed. -->
<uses-permission android:name="android.permission.INTERNET"/>
<!-- End of C2DM permissions -->

<!-- C2DM START C2DM START C2DM START C2DM START C2DM START C2DM START C2DM START -->
<!-- C2DM Note: C2DM is only supported in API v2.2 and above but is safely ignored in lower versions -->
<!--NOTE FOR C2DM: Read http://code.google.com/android/c2dm/#manifest but note that the XML is wrong! -->
<!--Use this pattern instead.-->
<service android:name=".C2DMReceiver"/>
<!-- Only C2DM servers can send messages for the app. If permission is not set - any other app can generate it -->
<receiver android:name="com.google.android.c2dm.C2DMBroadcastReceiver"
android:permission="com.google.android.c2dm.permission.SEND">
<!-- Receive the actual message -->
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE"/>
<category android:name="com.example.android.sampleapp"/>
</intent-filter>
<!-- Receive the registration id -->
<intent-filter>
<action android:name="com.google.android.c2dm.intent.REGISTRATION"/>
<category android:name="com.example.android.sampleapp"/>
</intent-filter>
</receiver>
<!--C2DM END C2DM END C2DM END C2DM END C2DM END C2DM END C2DM END C2DM END C2DM END-->

</application>
<application
android:label="@string/app_name"
android:icon="@drawable/icon"
android:name=".MySampleApplication">
<activity android:name=".StarterActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
Binary file removed libs/test/asm-3.3.1.jar
Binary file not shown.
Binary file removed libs/test/asm-commons-3.3.1.jar
Binary file not shown.
Binary file removed libs/test/great-expectations.jar
Binary file not shown.
Binary file removed libs/test/robolectric-gem.jar
Binary file not shown.
90 changes: 0 additions & 90 deletions src/com/example/android/sampleapp/C2DMReceiver.java

This file was deleted.

197 changes: 0 additions & 197 deletions src/com/google/android/c2dm/C2DMBaseReceiver.java

This file was deleted.

25 changes: 0 additions & 25 deletions src/com/google/android/c2dm/C2DMBroadcastReceiver.java

This file was deleted.

0 comments on commit 1631af5

Please sign in to comment.