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

Commit 889de157 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I0416b6cf,If24852e3 am: 8b231b68 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1679448

Change-Id: I7cea818749c81a7a0cb0fc936a4932dbc0517436
parents 46ed346f 8b231b68

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/layout/bt_enabling_progress.xml

+13 −8
Original line number Diff line number Diff line
@@ -25,21 +25,26 @@ 
    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="match_parent"

        android:baselineAligned="false"

        android:paddingStart="?android:attr/dialogPreferredPadding"

        android:paddingTop="@*android:dimen/dialog_padding_top_material"

        android:paddingEnd="?android:attr/dialogPreferredPadding"

        android:paddingBottom="@*android:dimen/dialog_padding_top_material">



        <ProgressBar android:id="@+id/progress"

        <ProgressBar

            android:id="@+id/progress"

            style="?android:attr/progressBarStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />

            android:layout_height="wrap_content"

            android:max="10000"

            android:layout_marginEnd="?android:attr/dialogPreferredPadding" />



        <TextView

            android:id="@+id/progress_info"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginLeft="20dip"

            android:layout_marginRight="20dip"

            android:layout_gravity="center_vertical"

            android:textAppearance="?android:attr/textAppearanceMedium" />



            android:layout_gravity="center_vertical" />

     </LinearLayout>



 </ScrollView>

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>