Add new USB details screen for Connected Devices 2.0

Also updated UsbBackend to use the new UsbFunctions api. Added new unit tests for UsbDetailsHeaderController and UsbDetailsProfilesController. Bug: 69333961 Test: make RunSettingsRoboTests Change-Id: I133750190bb61dfe0e20b06f50e50ea13b347f1e
2018-01-11 16:47:14 -08:00
parent 85fd529cc4
commit d18d6f1022
34 changed files with 1342 additions and 243 deletions
--- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
@@ -0,0 +1,99 @@
+/*
+ * 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.connecteddevice.usb;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.PreferenceFragment;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.widget.GearPreference;
+
+/**
+ * Controller to maintain connected usb device
+ */
+public class ConnectedUsbDeviceUpdater {
+    private PreferenceFragment mFragment;
+    private UsbBackend mUsbBackend;
+    private DevicePreferenceCallback mDevicePreferenceCallback;
+    @VisibleForTesting
+    GearPreference mUsbPreference;
+    @VisibleForTesting
+    UsbConnectionBroadcastReceiver mUsbReceiver;
+
+    @VisibleForTesting
+    UsbConnectionBroadcastReceiver.UsbConnectionListener mUsbConnectionListener =
+            (connected, newMode) -> {
+                if (connected) {
+                    mUsbPreference.setSummary(
+                            UsbModePreferenceController.getSummary(mUsbBackend.getCurrentMode()));
+                    mDevicePreferenceCallback.onDeviceAdded(mUsbPreference);
+                } else {
+                    mDevicePreferenceCallback.onDeviceRemoved(mUsbPreference);
+                }
+            };
+
+    public ConnectedUsbDeviceUpdater(DashboardFragment fragment,
+            DevicePreferenceCallback devicePreferenceCallback) {
+        this(fragment, devicePreferenceCallback, new UsbBackend(fragment.getContext()));
+    }
+
+    @VisibleForTesting
+    ConnectedUsbDeviceUpdater(DashboardFragment fragment,
+            DevicePreferenceCallback devicePreferenceCallback, UsbBackend usbBackend) {
+        mFragment = fragment;
+        mDevicePreferenceCallback = devicePreferenceCallback;
+        mUsbBackend = usbBackend;
+        mUsbReceiver = new UsbConnectionBroadcastReceiver(fragment.getContext(),
+                mUsbConnectionListener, mUsbBackend);
+    }
+
+    public void registerCallback() {
+        // This method could handle multiple register
+        mUsbReceiver.register();
+    }
+
+    public void unregisterCallback() {
+        mUsbReceiver.unregister();
+    }
+
+    public void initUsbPreference(Context context) {
+        mUsbPreference = new GearPreference(context, null /* AttributeSet */);
+        mUsbPreference.setTitle(R.string.usb_pref);
+        mUsbPreference.setIcon(R.drawable.ic_usb);
+        mUsbPreference.setSelectable(false);
+        mUsbPreference.setOnGearClickListener((GearPreference p) -> {
+            // New version - uses a separate screen.
+            final Bundle args = new Bundle();
+            final SettingsActivity activity = (SettingsActivity) mFragment.getContext();
+            activity.startPreferencePanel(mFragment,
+                    UsbDetailsFragment.class.getName(), args,
+                    R.string.device_details_title, null /* titleText */, null /* resultTo */, 0);
+        });
+
+        forceUpdate();
+    }
+
+    private void forceUpdate() {
+        // Register so we can get the connection state from sticky intent.
+        //TODO(b/70336520): Use an API to get data instead of sticky intent
+        mUsbReceiver.register();
+    }
+}