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

Commit 75ea67c9 authored by jackqdyulei's avatar jackqdyulei
Browse files

Update ConnectedDeviceGroupController 

Get the PreferenceGroup there and add/remove preference
through the callback

Also add ConnectedBluetoothDeviceUpdater which only filter
the connected device.

Bug: 69333961
Test: RunSettingsRoboTests

Change-Id: Ia2ab6b6708329227929d6fe442df3a8d45bf86f5
parent 88579e25

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -394,6 +394,11 @@ 
    <!-- Title for pairing bluetooth device page [CHAR LIMIT=none] -->

    <string name="bluetooth_pairing_page_title">Pair new device</string>









    <!-- Title for connected device group [CHAR LIMIT=none]-->









    <string name="connected_device_connected_title">Currently connected</string>









    <!-- Title for connected device group [CHAR LIMIT=none]-->









    <string name="connected_device_saved_title">Saved devices</string>

















    <!-- Date & time settings screen title -->









    <string name="date_and_time">Date &amp; time</string>









    <!-- The title of the activity to pick a time zone. -->
































res/xml/connected_devices.xml



+3
−0






























Original line number
Diff line number
Diff line







@@ -19,4 +19,7 @@







    android:key="connected_devices_screen"









    android:title="@string/connected_devices_dashboard_title">



















    <PreferenceCategory









        android:key="connected_device_list"









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









</PreferenceScreen>
























src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
0 → 100644



+66
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2017 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 android.bluetooth.BluetoothAdapter;









import android.bluetooth.BluetoothDevice;









import android.support.annotation.VisibleForTesting;



















import com.android.settings.connecteddevice.DevicePreferenceCallback;









import com.android.settings.dashboard.DashboardFragment;









import com.android.settingslib.bluetooth.CachedBluetoothDevice;









import com.android.settingslib.bluetooth.LocalBluetoothManager;



















/**









 * Controller to maintain connected bluetooth devices









 */









public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {



















    public ConnectedBluetoothDeviceUpdater(DashboardFragment fragment,









            DevicePreferenceCallback devicePreferenceCallback) {









        super(fragment, devicePreferenceCallback);









    }



















    @VisibleForTesting









    ConnectedBluetoothDeviceUpdater(DashboardFragment fragment,









            DevicePreferenceCallback devicePreferenceCallback,









            LocalBluetoothManager localBluetoothManager) {









        super(fragment, devicePreferenceCallback, localBluetoothManager);









    }



















    @Override









    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {









        if (state == BluetoothAdapter.STATE_CONNECTED) {









            addPreference(cachedDevice);









        } else if (state == BluetoothAdapter.STATE_DISCONNECTED) {









            removePreference(cachedDevice);









        }









    }



















    @Override









    public void update(CachedBluetoothDevice cachedDevice) {









        final BluetoothDevice device = cachedDevice.getDevice();









        final boolean filterMatch =









                device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();



















        if (filterMatch) {









            // Add the preference if it is new one









            addPreference(cachedDevice);









        } else {









            removePreference(cachedDevice);









        }









    }









}
























src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java



+17
−10






























Original line number
Diff line number
Diff line







@@ -17,27 +17,20 @@ package com.android.settings.connecteddevice;

















import android.app.Activity;









import android.content.Context;









import android.content.pm.PackageManager;









import android.provider.SearchIndexableResource;









import android.support.annotation.VisibleForTesting;



















import com.android.internal.logging.nano.MetricsProto;









import com.android.settings.R;









import com.android.settings.SettingsActivity;









import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;









import com.android.settings.bluetooth.Utils;









import com.android.settings.dashboard.DashboardFragment;









import com.android.settings.dashboard.SummaryLoader;









import com.android.settings.deviceinfo.UsbBackend;









import com.android.settings.nfc.NfcPreferenceController;









import com.android.settings.overlay.FeatureFactory;









import com.android.settings.search.BaseSearchIndexProvider;









import com.android.settings.search.Indexable;









import com.android.settingslib.core.AbstractPreferenceController;









import com.android.settingslib.core.lifecycle.Lifecycle;



















import java.util.ArrayList;









import java.util.Arrays;









import java.util.List;



















public class ConnectedDeviceDashboardFragment extends DashboardFragment {








@@ -66,7 +59,14 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {

















    @Override









    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {









        return null;









        final List<AbstractPreferenceController> controllers = new ArrayList<>();









        final Lifecycle lifecycle = getLifecycle();



















        final ConnectedDeviceGroupController connectedDeviceGroupController =









                new ConnectedDeviceGroupController(this, lifecycle);









        controllers.add(connectedDeviceGroupController);









        return controllers;



















    }



















    @VisibleForTesting








@@ -109,6 +109,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {







    /**









     * For Search.









     */









    //TODO(b/69333961): update the index for this new fragment









    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =









            new BaseSearchIndexProvider() {









                @Override








@@ -120,8 +121,14 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {







                @Override









                public List<String> getNonIndexableKeys(Context context) {





























                    return new ArrayList<>();









                }



















                @Override









                public List<AbstractPreferenceController> getPreferenceControllers(









                        Context context) {









                    //TODO(b/69333961): update the index for controllers









                    return super.getPreferenceControllers(context);









                }









            };









}
























src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java



+44
−13






























Original line number
Diff line number
Diff line







@@ -15,64 +15,95 @@







 */









package com.android.settings.connecteddevice;



















import android.content.Context;









import android.support.annotation.VisibleForTesting;









import android.support.v7.preference.Preference;









import android.support.v7.preference.PreferenceGroup;









import android.support.v7.preference.PreferenceScreen;



















import com.android.settings.core.PreferenceControllerMixin;









import com.android.settings.bluetooth.BluetoothDeviceUpdater;









import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;









import com.android.settingslib.core.AbstractPreferenceController;









import com.android.settingslib.core.lifecycle.Lifecycle;









import com.android.settingslib.core.lifecycle.LifecycleObserver;









import com.android.settings.dashboard.DashboardFragment;









import com.android.settingslib.core.lifecycle.events.OnStart;









import com.android.settingslib.core.lifecycle.events.OnStop;



















/**









 * Controller to maintain the {@link android.support.v7.preference.PreferenceGroup} for all









 * connected devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference}









 *









 * TODO(b/69333961): add real impl









 */









public class ConnectedDeviceGroupController extends AbstractPreferenceController









        implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop,









        DevicePreferenceCallback {









    private BluetoothDeviceUpdater mBluetoothController;



















    public ConnectedDeviceGroupController(Context context) {









        super(context);









    private static final String KEY = "connected_device_list";



















    @VisibleForTesting









    PreferenceGroup mPreferenceGroup;









    private BluetoothDeviceUpdater mBluetoothDeviceUpdater;



















    public ConnectedDeviceGroupController(DashboardFragment fragment, Lifecycle lifecycle) {









        super(fragment.getContext());









        init(lifecycle, new ConnectedBluetoothDeviceUpdater(fragment, this));









    }



















    @VisibleForTesting









    ConnectedDeviceGroupController(DashboardFragment fragment, Lifecycle lifecycle,









            BluetoothDeviceUpdater bluetoothDeviceUpdater) {









        super(fragment.getContext());









        init(lifecycle, bluetoothDeviceUpdater);









    }



















    @Override









    public void onStart() {









        mBluetoothController.registerCallback();









        mBluetoothDeviceUpdater.registerCallback();









    }



















    @Override









    public void onStop() {









        mBluetoothController.unregisterCallback();









        mBluetoothDeviceUpdater.unregisterCallback();









    }



















    @Override









    public void displayPreference(PreferenceScreen screen) {



















        super.displayPreference(screen);









        mPreferenceGroup = (PreferenceGroup) screen.findPreference(KEY);









        mPreferenceGroup.setVisible(false);









        mBluetoothDeviceUpdater.setPrefContext(screen.getContext());









        mBluetoothDeviceUpdater.forceUpdate();









    }



















    @Override









    public boolean isAvailable() {









        return false;









        return true;









    }



















    @Override









    public String getPreferenceKey() {









        return null;









        return KEY;









    }



















    @Override









    public void onDeviceAdded(Preference preference) {



















        if (mPreferenceGroup.getPreferenceCount() == 0) {









            mPreferenceGroup.setVisible(true);









        }









        mPreferenceGroup.addPreference(preference);









    }



















    @Override









    public void onDeviceRemoved(Preference preference) {









        mPreferenceGroup.removePreference(preference);









        if (mPreferenceGroup.getPreferenceCount() == 0) {









            mPreferenceGroup.setVisible(false);









        }









    }



















    private void init(Lifecycle lifecycle, BluetoothDeviceUpdater bluetoothDeviceUpdater) {









        if (lifecycle != null) {









            lifecycle.addObserver(this);









        }









        mBluetoothDeviceUpdater = bluetoothDeviceUpdater;









    }









}