am 9477dee8: am 123538f3: am bafd4638: Merge change Ic7edd6ea into eclair

[android-x86/packages-apps-DeskClock.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9ec9d5a..25ac74d 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -13,9 +13,17 @@
 
         <provider android:name="AlarmProvider" android:authorities="com.android.deskclock" />
 
-        <activity android:name="AlarmClock" android:label="@string/app_label"
+        <activity android:name="DeskClock"
+                android:label="@string/app_label"
+                android:theme="@android:style/Theme.Wallpaper.NoTitleBar"
                 android:icon="@drawable/ic_widget_analog_clock"
+                android:launchMode="singleInstance"
                 android:configChanges="orientation|keyboardHidden|keyboard|navigation">
+                >
+
+            <!-- while docked, this is our home application -->
+            <meta-data android:name="android.dock_home" android:value="true" />
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -24,6 +32,13 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="AlarmClock" android:label="@string/alarm_list_title"
+                android:configChanges="orientation|keyboardHidden|keyboard|navigation">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="SettingsActivity" android:label="@string/settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />