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

Commit c41d69f5 authored by Jeff Brown's avatar Jeff Brown Committed by The Android Automerger
Browse files

Fix regression in Bluetooth settings. 

Bug: 7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
parent a27ec92c

res/xml/device_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:key="bt_scan"

        android:title="@string/bluetooth_preference_scan_title" />



    <com.android.settings.ProgressCategory

    <com.android.settings.bluetooth.BluetoothProgressCategory

        android:key="bt_device_list"

        android:title="@string/bluetooth_preference_found_devices"

        android:orderingFromXml="false" />

res/xml/wifi_access_points.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/wifi_settings_category">



    <com.android.settings.ProgressCategory

    <com.android.settings.bluetooth.BluetoothProgressCategory

            android:key="access_points"

            android:title="@string/wifi_access_points"

            android:persistent="false" />

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 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.

 */



package com.android.settings.bluetooth;



import com.android.settings.ProgressCategory;

import com.android.settings.R;



import android.content.Context;

import android.util.AttributeSet;



public class BluetoothProgressCategory extends ProgressCategory {

    public BluetoothProgressCategory(Context context, AttributeSet attrs) {

        super(context, attrs, R.string.bluetooth_no_devices_found);

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -282,8 +282,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment { 


                // Available devices category

                if (mAvailableDevicesCategory == null) {

                    mAvailableDevicesCategory = new ProgressCategory(getActivity(), null,

                            R.string.bluetooth_no_devices_found);

                    mAvailableDevicesCategory = new BluetoothProgressCategory(getActivity(), null);

                } else {

                    mAvailableDevicesCategory.removeAll();

                }

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

+2 −2
Original line number Diff line number Diff line
@@ -193,8 +193,8 @@ public abstract class DeviceListPreferenceFragment extends 
    }



    private void updateProgressUi(boolean start) {

        if (mDeviceListGroup instanceof ProgressCategory) {

            ((ProgressCategory) mDeviceListGroup).setProgress(start);

        if (mDeviceListGroup instanceof BluetoothProgressCategory) {

            ((BluetoothProgressCategory) mDeviceListGroup).setProgress(start);

        }

    }