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

Commit c7fafa25 authored by PauloftheWest's avatar PauloftheWest Committed by Android (Google) Code Review
Browse files

Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev

parents 3c6f7a33 8677d045

res/layout/bluetooth_device_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -31,8 +31,9 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/bluetooth_preference_paired_dialog_name_label"

                    android:textAppearance="@android:style/TextAppearance.Material.Body1"

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

                    android:textDirection="locale"

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

                    style="@style/bt_item_label" />



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

res/layout/bluetooth_preference_category.xml

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

-->



<!-- Layout used for Bluetooth PreferenceCategory in a DeviceProfilesSettings. -->

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

    android:id="@+android:id/title"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:textAppearance="@android:style/TextAppearance.Material.Body1"

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

    android:paddingTop="16dip"

    android:paddingBottom="16dip" />

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

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ public final class DeviceProfilesSettings extends SettingsPreferenceFragment 
        addPreferencesFromResource(R.xml.bluetooth_device_advanced);

        getPreferenceScreen().setOrderingAsAdded(false);

        mProfileContainer = (PreferenceGroup) findPreference(KEY_PROFILE_CONTAINER);

        mProfileContainer.setLayoutResource(R.layout.bluetooth_preference_category);



        mManager = LocalBluetoothManager.getInstance(getActivity());

        CachedBluetoothDeviceManager deviceManager =