Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93cf2a57 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 62c2c123: Run Bluetooth Opp activities in the phone process. 

Merge commit '62c2c123' into kraken

* commit '62c2c123':
  Run Bluetooth Opp activities in the phone process.
parents 4a19c973 62c2c123

android/app/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -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">

android/app/AndroidManifest_test.xml

+12 −5
Original line number Diff line number Diff line
@@ -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" />