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

Commit dba078fe authored by PauloftheWest's avatar PauloftheWest
Browse files

Fixed a crash when loading Bluetooth Settings. 

Bug: 17320674
Change-Id: Ibff0b5929b88b1a48c1fdd810fd8461bdb5f1274
parent 48d3f0fd

res/layout/bluetooth_device_settings.xml

0 → 100644
+53 −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.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:gravity="center">



    <LinearLayout android:id="@+id/dialog_layout"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:paddingBottom="@dimen/bluetooth_dialog_padding"

            style="@style/bt_item" >



            <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/bluetooth_preference_paired_dialog_name_label"

                    android:textDirection="locale"

                    android:textColor="?android:attr/colorAccent"

                    style="@style/bt_item_label" />



            <EditText android:id="@+id/name"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:inputType="textNoSuggestions"

                    android:maxLength="@integer/bluetooth_name_length"

                    android:singleLine="true"

                    style="@style/bt_item_edit_content" />



            <fragment android:id="@+id/bluetooth_fragment_settings"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    class="com.android.settings.bluetooth.DeviceProfilesSettings" />



    </LinearLayout>



</LinearLayout>

res/values/styles.xml

+23 −0
Original line number Diff line number Diff line
@@ -196,6 +196,29 @@ 
        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="bt_item">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_marginTop">8dip</item>

        <item name="android:layout_marginStart">16dip</item>

        <item name="android:layout_marginEnd">16dip</item>

        <item name="android:orientation">vertical</item>

        <item name="android:gravity">start</item>

    </style>



    <style name="bt_item_label">

        <item name="android:layout_width">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textAlignment">viewStart</item>

    </style>



    <style name="bt_item_edit_content">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:textSize">18sp</item>

    </style>



    <style name="wifi_item">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

src/com/android/settings/bluetooth/BluetoothSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem 
            }

            if (profileFrag == null) {

                LayoutInflater inflater = getActivity().getLayoutInflater();

                mSettingsDialogView = inflater.inflate(R.layout.bluetooth_device_picker, null);

                mSettingsDialogView = inflater.inflate(R.layout.bluetooth_device_settings, null);

                profileFrag = (DeviceProfilesSettings)activity.getFragmentManager()

                    .findFragmentById(R.id.bluetooth_fragment_settings);

            }