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

Commit 8a0a3196 authored by Ivan Chiang's avatar Ivan Chiang Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously... 

Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""" into pi-dev
am: 44505ef8

Change-Id: I39adc9974b57830940b983bc7d378359de0505fd
parents bc77a750 44505ef8

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

+13 −3
Original line number Diff line number Diff line
@@ -21,26 +21,29 @@ import android.support.annotation.VisibleForTesting; 
import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;



import android.util.Log;

import com.android.settings.bluetooth.BluetoothDeviceUpdater;

import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;

import com.android.settings.connecteddevice.dock.DockUpdater;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.dashboard.DashboardFragment;



import com.android.settings.overlay.FeatureFactory;

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

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

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

import com.android.settingslib.utils.ThreadUtils;



public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController

        implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback {



    private Preference mPreference;

    private BluetoothDeviceUpdater mBluetoothDeviceUpdater;

    private DockUpdater mSavedDockUpdater;

    private int mPreferenceSize;



    public PreviouslyConnectedDevicePreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);



        mSavedDockUpdater = FeatureFactory.getFactory(

                context).getDockUpdaterFeatureProvider().getSavedDockUpdater(context, this);

    }



    @Override
@@ -62,12 +65,14 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc 
    @Override

    public void onStart() {

        mBluetoothDeviceUpdater.registerCallback();

        mSavedDockUpdater.registerCallback();

        updatePreferenceOnSizeChanged();

    }



    @Override

    public void onStop() {

        mBluetoothDeviceUpdater.unregisterCallback();

        mSavedDockUpdater.unregisterCallback();

    }



    public void init(DashboardFragment fragment) {
@@ -92,6 +97,11 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc 
        mBluetoothDeviceUpdater = bluetoothDeviceUpdater;

    }



    @VisibleForTesting

    void setSavedDockUpdater(DockUpdater savedDockUpdater) {

        mSavedDockUpdater = savedDockUpdater;

    }



    @VisibleForTesting

    void setPreferenceSize(int size) {

        mPreferenceSize = size;

tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.pm.PackageManager; 
import android.support.v7.preference.Preference;



import com.android.settings.bluetooth.BluetoothDeviceUpdater;

import com.android.settings.connecteddevice.dock.DockUpdater;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -46,6 +47,8 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { 
    @Mock

    private BluetoothDeviceUpdater mBluetoothDeviceUpdater;

    @Mock

    private DockUpdater mDockUpdater;

    @Mock

    private PackageManager mPackageManager;



    private Context mContext;
@@ -61,6 +64,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { 
        mPreConnectedDeviceController =

                new PreviouslyConnectedDevicePreferenceController(mContext, KEY);

        mPreConnectedDeviceController.setBluetoothDeviceUpdater(mBluetoothDeviceUpdater);

        mPreConnectedDeviceController.setSavedDockUpdater(mDockUpdater);



        mPreference = new Preference(mContext);

        mPreConnectedDeviceController.setPreference(mPreference);
@@ -71,10 +75,12 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { 
        // register the callback in onStart()

        mPreConnectedDeviceController.onStart();

        verify(mBluetoothDeviceUpdater).registerCallback();

        verify(mDockUpdater).registerCallback();



        // unregister the callback in onStop()

        mPreConnectedDeviceController.onStop();

        verify(mBluetoothDeviceUpdater).unregisterCallback();

        verify(mDockUpdater).unregisterCallback();

    }



    @Test