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

Commit 8464cd67 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am b2c67b9d: am 9184bfba: DO NOT MERGE: Remove DayNight theme 

* commit 'b2c67b9d':
  DO NOT MERGE: Remove DayNight theme
parents 43246e0a b2c67b9d

android/app/AndroidManifest.xml

+7 −7
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 
        </receiver>

        <activity android:name=".opp.BluetoothOppLauncherActivity"

            android:process="@string/process"

            android:theme="@android:style/Theme.Material.DayNight.Dialog"

            android:theme="@android:style/Theme.Material.Light.Dialog"

            android:label="@string/bt_share_picker_label"

            android:enabled="@bool/profile_supported_opp">

            <intent-filter>
@@ -160,30 +160,30 @@ 
        <activity android:name=".opp.BluetoothOppBtEnableActivity"

                  android:process="@string/process"

                  android:excludeFromRecents="true"

                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"

                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert"

                  android:enabled="@bool/profile_supported_opp">

        </activity>

        <activity android:name=".opp.BluetoothOppBtErrorActivity"

                  android:process="@string/process"

                  android:excludeFromRecents="true"

                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert">

                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert">

        </activity>

        <activity android:name=".opp.BluetoothOppBtEnablingActivity"

                  android:process="@string/process"

                  android:excludeFromRecents="true"

                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"

                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert"

                  android:enabled="@bool/profile_supported_opp">

        </activity>

        <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity"

                  android:process="@string/process"

                  android:excludeFromRecents="true"

                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"

                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert"

                  android:enabled="@bool/profile_supported_opp">

        </activity>

        <activity android:name=".opp.BluetoothOppTransferActivity"

                  android:process="@string/process"

                  android:excludeFromRecents="true"

                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"

                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert"

                  android:enabled="@bool/profile_supported_opp">

        </activity>

        <activity android:name=".opp.BluetoothOppTransferHistory"
@@ -196,7 +196,7 @@ 
        <activity android:name=".pbap.BluetoothPbapActivity"

            android:process="@string/process"

            android:excludeFromRecents="true"

            android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"

            android:theme="@android:style/Theme.Material.Light.Dialog.Alert"

            android:enabled="@bool/profile_supported_pbap">

            <intent-filter>

                <category android:name="android.intent.category.DEFAULT" />

android/app/AndroidManifest_test.xml

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
        </receiver>

        <activity android:name=".opp.BluetoothOppLauncherActivity"

            android:process="@string/process"

            android:theme="@android:style/Theme.Material.DayNight.Dialog"

            android:theme="@android:style/Theme.Material.Light.Dialog"

            android:label="@string/bt_share_picker_label">

            <intent-filter>

                <action android:name="android.intent.action.SEND" />
@@ -76,7 +76,7 @@ 
        </activity>

        <activity android:name=".opp.BluetoothOppBtEnablingActivity"

            android:process="@string/process"

            android:theme="@android:style/Theme.Material.DayNight.Dialog">

            android:theme="@android:style/Theme.Material.Light.Dialog">

        </activity>

        <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity"

            android:process="@string/process">
@@ -87,7 +87,7 @@ 
        <activity android:name=".pbap.BluetoothPbapActivity"

            android:process="@string/process"

            android:label=" "

            android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert">

            android:theme="@android:style/Theme.Material.Light.Dialog.Alert">

            <intent-filter>

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>