commit dc3bacd6eb626a93f2c3c4c62b3ef6aa9e575d92
author Lixin Yue <L.X.YUE@motorola.com> Mon Sep 21 20:36:16 2009 +0800
committer Jaikumar Ganesh <jaikumar@google.com> Wed Sep 23 08:55:16 2009 -0700
tree 930a2338d2a3865c20a95e8a2f31a1a369dc7cd5
parent 1f556d99c4bb7cae5ed55c171ce7f65b5010fa57

Update opp/pbap look and feel

Update OPP BtEnabling Dialog-add timeout handling, handle Bluetooth ON intent, handle back key

Change-Id: I3d3ade3a9a4de645ddb7195e8b81ca42afb3d31e

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5e983da..6538420 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -55,17 +55,25 @@
                 <data android:mimeType="vnd.android.cursor.item/vnd.android.btopp" />
             </intent-filter>
         </activity>
-        <activity android:name=".opp.BluetoothOppBtEnableActivity">
+        <activity android:name=".opp.BluetoothOppBtEnableActivity"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Dialog.Alert">
         </activity>
-        <activity android:name=".opp.BluetoothOppBtErrorActivity">
+        <activity android:name=".opp.BluetoothOppBtErrorActivity"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Dialog.Alert">
         </activity>
-        <activity android:name=".opp.BluetoothOppBtEnablingActivity">
-            android:theme="@android:style/Theme.Dialog"> </activity>
+        <activity android:name=".opp.BluetoothOppBtEnablingActivity"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Dialog.Alert">
+        </activity>
         <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Dialog.Alert">
         </activity>
-        <activity android:name=".opp.BluetoothOppTransferActivity">
+        <activity android:name=".opp.BluetoothOppTransferActivity"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Dialog.Alert">
         </activity>
         <activity android:name=".opp.BluetoothOppLiveFolder"
             android:label="@string/btopp_live_folder">
@@ -75,7 +83,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".pbap.BluetoothPbapActivity"
-            android:label=" "
+            android:excludeFromRecents="true"
             android:theme="@*android:style/Theme.Dialog.Alert">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />