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

Commit 0cf0ca7f authored by Timi's avatar Timi Committed by Myles Watson
Browse files

Bluetooth: follow system theme in dialogs 



Bug: 188222741
Test: share a file via bluetooth with BT disabled, verify
´Turn on Bluetooth now´ and ´Turning on Bluetooth´ -dialogs
are dark
Change-Id: If24852e3731193089bdee4a2429fcd0cfbf385cf
Signed-off-by: default avatarTimi Rautamäki <timi.rautamaki@gmail.com>
parent 11cea5d9

android/app/AndroidManifest.xml

+6 −6
Original line number Diff line number Diff line
@@ -184,30 +184,30 @@ 
        <activity android:name=".opp.BluetoothOppBtEnableActivity"

             android:process="@string/process"

             android:excludeFromRecents="true"

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

             android:theme="@style/dialog"

             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.Light.Dialog.Alert">

             android:theme="@style/dialog">

        </activity>

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

             android:process="@string/process"

             android:excludeFromRecents="true"

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

             android:theme="@style/dialog"

             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.Light.Dialog.Alert"

             android:theme="@style/dialog"

             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.Light.Dialog.Alert"

             android:theme="@style/dialog"

             android:enabled="@bool/profile_supported_opp">

        </activity>

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

             android:process="@string/process"

             android:excludeFromRecents="true"

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

             android:theme="@style/dialog"

             android:enabled="@bool/profile_supported_pbap">

        </activity>

        <service android:process="@string/process"

android/app/res/values-night/styles.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>



    <style name="dialog" parent="android:style/Theme.Material.Dialog.Alert" />



</resources>

android/app/res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -45,4 +45,6 @@ 
        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>

    </style>



    <style name="dialog" parent="android:style/Theme.Material.Light.Dialog.Alert" />



</resources>