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

Commit 4e0ea752 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge branch 'cupcake'

parents aab45d54 01f17236

res/drawable/ic_menu_archive.png

deleted100644 → 0
−1.32 KiB
Loading image diff...

res/drawable/ic_menu_goto.png

deleted100644 → 0
−1.6 KiB
Loading image diff...

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class BluetoothSettings extends PreferenceActivity 
    @Override

    public boolean onCreateOptionsMenu(Menu menu) {

        menu.add(0, MENU_SCAN, 0, R.string.bluetooth_scan_for_devices)

                .setIcon(android.R.drawable.ic_menu_refresh)

                .setIcon(com.android.internal.R.drawable.ic_menu_refresh)

                .setAlphabeticShortcut('r');

        return true;

    }

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

+4 −4
Original line number Diff line number Diff line
@@ -181,8 +181,9 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity 
            }

        }

        

        LocalBluetoothProfileManager.setPreferredProfile(this, mDevice.getAddress(), profile,

                checked);

        LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager

                .getProfileManager(mManager, profile);

        profileManager.setPreferred(mDevice.getAddress(), checked);

    }

    

    public void onDeviceAttributesChanged(LocalBluetoothDevice device) {
@@ -252,8 +253,7 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity 
        profilePref.setSummary(getProfileSummary(profileManager, profile, address,

                connectionStatus, mOnlineMode));

        

        profilePref.setChecked(

                LocalBluetoothProfileManager.isPreferredProfile(this, address, profile));

        profilePref.setChecked(profileManager.isPreferred(address));

    }



    private Profile getProfileOf(Preference pref) {

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

+6 −2
Original line number Diff line number Diff line
@@ -147,7 +147,9 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> { 
        Context context = mLocalManager.getContext();

        boolean hasAtLeastOnePreferredProfile = false;

        for (Profile profile : mProfiles) {

            if (LocalBluetoothProfileManager.isPreferredProfile(context, mAddress, profile)) {

            LocalBluetoothProfileManager profileManager =

                    LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);

            if (profileManager.isPreferred(mAddress)) {

                hasAtLeastOnePreferredProfile = true;

                connect(profile);

            }
@@ -163,7 +165,9 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> { 
        

        Context context = mLocalManager.getContext();

        for (Profile profile : mProfiles) {

            LocalBluetoothProfileManager.setPreferredProfile(context, mAddress, profile, true);

            LocalBluetoothProfileManager profileManager =

                    LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);

            profileManager.setPreferred(mAddress, true);

            connect(profile);

        }

    }