diff options
author | Jaikumar Ganesh <jaikumar@google.com> | 2010-05-14 15:00:28 -0700 |
---|---|---|
committer | Jaikumar Ganesh <jaikumar@google.com> | 2010-05-14 15:04:48 -0700 |
commit | 6a148f10d0e26eef9f94e08ac3f1897ce8983bfa (patch) | |
tree | 4c2bb4f77211b45a220dc817cb9874f3406eeb0b | |
parent | b7533e86bb84a2f95c2cff62c1565a8e1696d1ea (diff) | |
download | android_packages_apps_Bluetooth-6a148f10d0e26eef9f94e08ac3f1897ce8983bfa.tar.gz android_packages_apps_Bluetooth-6a148f10d0e26eef9f94e08ac3f1897ce8983bfa.tar.bz2 android_packages_apps_Bluetooth-6a148f10d0e26eef9f94e08ac3f1897ce8983bfa.zip |
Run Bluetooth Opp activities in the phone process.
There were just too much shared code between the classes - we
cannot have them in 2 different process - it can work sometimes and
will fail sometimes depending on the ordering of processes.
Rework involves a lot of code change at this point of time.
Bug: 2684281
Change-Id: I76784650c5f635c1e961392b682c1d33fc2f343f
-rw-r--r-- | AndroidManifest.xml | 8 | ||||
-rw-r--r-- | AndroidManifest_test.xml | 17 |
2 files changed, 20 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fabdf02bd..58e0ebc16 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -44,6 +44,7 @@ </intent-filter> </receiver> <activity android:name=".opp.BluetoothOppLauncherActivity" + android:process="@string/process" android:theme="@android:style/Theme.Dialog" android:label="@string/bt_share_picker_label"> <intent-filter> <action android:name="android.intent.action.SEND" /> @@ -75,26 +76,32 @@ </intent-filter> </activity> <activity android:name=".opp.BluetoothOppBtEnableActivity" + android:process="@string/process" android:excludeFromRecents="true" android:theme="@*android:style/Theme.Dialog.Alert"> </activity> <activity android:name=".opp.BluetoothOppBtErrorActivity" + android:process="@string/process" android:excludeFromRecents="true" android:theme="@*android:style/Theme.Dialog.Alert"> </activity> <activity android:name=".opp.BluetoothOppBtEnablingActivity" + android:process="@string/process" android:excludeFromRecents="true" android:theme="@*android:style/Theme.Dialog.Alert"> </activity> <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity" + android:process="@string/process" android:excludeFromRecents="true" android:theme="@*android:style/Theme.Dialog.Alert"> </activity> <activity android:name=".opp.BluetoothOppTransferActivity" + android:process="@string/process" android:excludeFromRecents="true" android:theme="@*android:style/Theme.Dialog.Alert"> </activity> <activity android:name=".opp.BluetoothOppLiveFolder" + android:process="@string/process" android:icon="@drawable/ic_launcher_folder_bluetooth" android:label="@string/btopp_live_folder"> <intent-filter> @@ -103,6 +110,7 @@ </intent-filter> </activity> <activity android:name=".opp.BluetoothOppTransferHistory" + android:process="@string/process" android:label="" android:excludeFromRecents="true" android:configChanges="orientation|keyboardHidden"> diff --git a/AndroidManifest_test.xml b/AndroidManifest_test.xml index de55b5f46..0115724a7 100644 --- a/AndroidManifest_test.xml +++ b/AndroidManifest_test.xml @@ -45,6 +45,7 @@ </intent-filter> </receiver> <activity android:name=".opp.BluetoothOppLauncherActivity" + android:process="@string/process" android:theme="@android:style/Theme.Dialog" android:label="@string/bt_share_picker_label"> <intent-filter> <action android:name="android.intent.action.SEND" /> @@ -66,17 +67,23 @@ <data android:mimeType="vnd.android.cursor.item/vnd.android.btopp" /> </intent-filter> </activity> - <activity android:name=".opp.BluetoothOppBtEnableActivity"> + <activity android:name=".opp.BluetoothOppBtEnableActivity" + android:process="@string/process"> </activity> - <activity android:name=".opp.BluetoothOppBtErrorActivity"> + <activity android:name=".opp.BluetoothOppBtErrorActivity" + android:process="@string/process"> </activity> - <activity android:name=".opp.BluetoothOppBtEnablingActivity"> + <activity android:name=".opp.BluetoothOppBtEnablingActivity" + android:process="@string/process"> android:theme="@android:style/Theme.Dialog"> </activity> - <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity"> + <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity" + android:process="@string/process"> </activity> - <activity android:name=".opp.BluetoothOppTransferActivity"> + <activity android:name=".opp.BluetoothOppTransferActivity" + android:process="@string/process"> </activity> <activity android:name=".opp.BluetoothOppLiveFolder" + android:process="@string/process" android:label="@string/btopp_live_folder"> <intent-filter> <action android:name="android.intent.action.CREATE_LIVE_FOLDER" /> |