X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2FAndroidManifest.xml;h=1239175968fb334ed0d44a400d727ef37c61fe17;hp=96fe5ac70164c29a52412e03619af6c2721374a4;hb=7e237920abb582d7ceb3e1925b11a848575ac68a;hpb=bd02349111ae0f39b320e6a10a330051ddc39fdf

diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml
index 96fe5ac7..12391759 100644
--- a/altosdroid/AndroidManifest.xml
+++ b/altosdroid/AndroidManifest.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
+<!--
+ * Copyright © 2012 Mike Beattie <mike@ethernal.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.altusmetrum.AltosDroid"
@@ -36,30 +38,8 @@
                   android:configChanges="orientation|keyboardHidden" />
 
 
-        <!-- Service Samples -->
-
         <service android:name=".TelemetryService" />
 
-        <activity android:name=".TelemetryServiceActivities$Controller"
-                android:label="@string/activity_telemetry_service_controller"
-                android:launchMode="singleTop">
-<!--
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
--->
-        </activity>
-
-        <activity android:name="TelemetryServiceActivities$Binding"
-                android:label="@string/activity_telemetry_service_binding">
-<!--
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
--->
-        </activity>
 
     </application>
 </manifest>