Merge changes I3dd31855,Id5a75217 into pi-dev am: 720a224e00

am: e598b1ae03

Change-Id: I715f7dba77f7ba10314ed4114b9eda1019171253

diff --cc src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
index 984b791,47e3438..2e5598b
--- 1/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
--- 2/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
@@@ -17,24 -17,27 +17,27 @@@ package com.android.settings.connectedd
  
  import android.content.pm.PackageManager;
  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 androidx.annotation.VisibleForTesting;
 +import androidx.preference.Preference;
 +import androidx.preference.PreferenceGroup;
 +import androidx.preference.PreferenceScreen;
  
+ import com.android.settings.bluetooth.BluetoothDeviceUpdater;
+ import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
+ import com.android.settings.connecteddevice.dock.DockUpdater;
  import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
  import com.android.settings.core.BasePreferenceController;
  import com.android.settings.core.PreferenceControllerMixin;
- import com.android.settings.bluetooth.BluetoothDeviceUpdater;
- import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
- import com.android.settingslib.core.lifecycle.Lifecycle;
- import com.android.settingslib.core.lifecycle.LifecycleObserver;
  import com.android.settings.dashboard.DashboardFragment;
+ import com.android.settings.overlay.DockUpdaterFeatureProvider;
+ import com.android.settings.overlay.FeatureFactory;
  import com.android.settingslib.core.lifecycle.events.OnStart;
  import com.android.settingslib.core.lifecycle.events.OnStop;
+ import com.android.settingslib.core.lifecycle.Lifecycle;
+ import com.android.settingslib.core.lifecycle.LifecycleObserver;
  
  /**
 - * Controller to maintain the {@link android.support.v7.preference.PreferenceGroup} for all
 + * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all
   * connected devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference}
   */
  public class ConnectedDeviceGroupController extends BasePreferenceController

diff --cc src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index 9eaf78f,3039895..3cdd959
--- 1/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
--- 2/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@@ -25,15 -26,16 +26,16 @@@ import static org.mockito.Mockito.spy
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
  
 -import android.arch.lifecycle.LifecycleOwner;
 +import androidx.lifecycle.LifecycleOwner;
  import android.content.Context;
  import android.content.pm.PackageManager;
 -import android.support.v7.preference.Preference;
 -import android.support.v7.preference.PreferenceGroup;
 -import android.support.v7.preference.PreferenceManager;
 -import android.support.v7.preference.PreferenceScreen;
 +import androidx.preference.Preference;
 +import androidx.preference.PreferenceGroup;
 +import androidx.preference.PreferenceManager;
 +import androidx.preference.PreferenceScreen;
  
  import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
+ import com.android.settings.connecteddevice.dock.DockUpdater;
  import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
  import com.android.settings.dashboard.DashboardFragment;
  import com.android.settings.testutils.SettingsRobolectricTestRunner;

diff --cc tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
index 473e80d,71c1010..2710cd8
--- 1/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
--- 2/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
@@@ -22,11 -22,12 +22,12 @@@ import static com.google.common.truth.T
  import static org.mockito.Mockito.doReturn;
  import static org.mockito.Mockito.spy;
  import static org.mockito.Mockito.verify;
 -import android.arch.lifecycle.LifecycleOwner;
 +import androidx.lifecycle.LifecycleOwner;
  import android.content.Context;
  import android.content.pm.PackageManager;
 -import android.support.v7.preference.PreferenceManager;
 +import androidx.preference.PreferenceManager;
  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;
  import com.android.settingslib.core.lifecycle.Lifecycle;