Remove unused classes and tests.
Old usb pages have been replaced by UsbDetailsFragment
and UsbDefaultFragment. Old connected devices has
been replaced by new connected devices.
Bug: 70848054
Test: Passes
Change-Id: I538cbb88d4f878449a83da9a4a0381e74e840c6a
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 599d6fb..b543581 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -16,10 +16,7 @@
package com.android.settings;
-import static com.android.settings.core.FeatureFlags.CONNECTED_DEVICE_V2;
-
import android.os.Bundle;
-import android.util.FeatureFlagUtils;
import com.android.settings.enterprise.EnterprisePrivacySettings;
@@ -157,11 +154,7 @@
// Top level categories for new IA
public static class NetworkDashboardActivity extends SettingsActivity {}
- public static class ConnectedDeviceDashboardActivity extends SettingsActivity {
- public static final boolean isEnabled() {
- return FeatureFlagUtils.isEnabled(null /* context */, CONNECTED_DEVICE_V2);
- }
- }
+ public static class ConnectedDeviceDashboardActivity extends SettingsActivity {}
public static class ConnectedDeviceDashboardActivityOld extends SettingsActivity {}
public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }
public static class PowerUsageSummaryLegacyActivity extends SettingsActivity { /* empty */ }
@@ -169,10 +162,6 @@
public static class StorageDashboardActivity extends SettingsActivity {}
public static class AccountDashboardActivity extends SettingsActivity {}
public static class SystemDashboardActivity extends SettingsActivity {}
- public static class AdvancedConnectedDeviceActivity extends SettingsActivity {
- public static final boolean isEnabled() {
- return FeatureFlagUtils.isEnabled(null /* context */, CONNECTED_DEVICE_V2);
- }
- }
+ public static class AdvancedConnectedDeviceActivity extends SettingsActivity {}
}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3144ae2..63214d5 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -631,19 +631,10 @@
Utils.isBandwidthControlEnabled() /* enabled */,
isAdmin) || somethingChanged;
- final boolean isConnectedDeviceV2Enabled =
- Settings.ConnectedDeviceDashboardActivity.isEnabled();
- // Enable new connected page if v2 enabled
somethingChanged = setTileEnabled(
new ComponentName(packageName,
Settings.ConnectedDeviceDashboardActivity.class.getName()),
- isConnectedDeviceV2Enabled && !UserManager.isDeviceInDemoMode(this) /* enabled */,
- isAdmin) || somethingChanged;
- // Enable old connected page if v2 disabled
- somethingChanged = setTileEnabled(
- new ComponentName(packageName,
- Settings.ConnectedDeviceDashboardActivityOld.class.getName()),
- !isConnectedDeviceV2Enabled && !UserManager.isDeviceInDemoMode(this) /* enabled */,
+ !UserManager.isDeviceInDemoMode(this) /* enabled */,
isAdmin) || somethingChanged;
somethingChanged = setTileEnabled(new ComponentName(packageName,
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
index 6a1568d..f06b35a 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -24,8 +24,6 @@
import com.android.settings.bluetooth.BluetoothFilesPreferenceController;
import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
import com.android.settings.bluetooth.BluetoothSwitchPreferenceController;
-import com.android.settings.connecteddevice.usb.UsbBackend;
-import com.android.settings.connecteddevice.usb.UsbModePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.nfc.NfcPreferenceController;
import com.android.settings.print.PrintSettingPreferenceController;
@@ -75,8 +73,6 @@
final NfcPreferenceController nfcPreferenceController =
new NfcPreferenceController(context);
controllers.add(nfcPreferenceController);
- controllers.add(new UsbModePreferenceController(
- context, new UsbBackend(context), lifecycle));
final BluetoothSwitchPreferenceController bluetoothPreferenceController =
new BluetoothSwitchPreferenceController(context);
controllers.add(bluetoothPreferenceController);
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java
deleted file mode 100644
index 304a369..0000000
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2016 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;
-
-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.bluetooth.BluetoothMasterSwitchPreferenceController;
-import com.android.settings.bluetooth.Utils;
-import com.android.settings.connecteddevice.usb.UsbBackend;
-import com.android.settings.connecteddevice.usb.UsbModePreferenceController;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.nfc.NfcPreferenceController;
-import com.android.settings.search.BaseSearchIndexProvider;
-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;
-
-/**
- * This is the previous {@link ConnectedDeviceDashboardFragment} in Android O, in Android P the
- * main entry will be {@link ConnectedDeviceDashboardFragment}
- *
- * @deprecated
- */
-@Deprecated
-public class ConnectedDeviceDashboardFragmentOld extends DashboardFragment {
-
- private static final String TAG = "ConnectedDeviceFrag2";
- private UsbModePreferenceController mUsbPrefController;
-
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY;
- }
-
- @Override
- protected String getLogTag() {
- return TAG;
- }
-
- @Override
- public int getHelpResource() {
- return R.string.help_url_connected_devices;
- }
-
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.connected_devices_old;
- }
-
- @Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- final Lifecycle lifecycle = getLifecycle();
- final NfcPreferenceController nfcPreferenceController =
- new NfcPreferenceController(context);
- lifecycle.addObserver(nfcPreferenceController);
- controllers.add(nfcPreferenceController);
- mUsbPrefController = new UsbModePreferenceController(context, new UsbBackend(context),
- lifecycle);
- controllers.add(mUsbPrefController);
- final BluetoothMasterSwitchPreferenceController bluetoothPreferenceController =
- new BluetoothMasterSwitchPreferenceController(
- context, Utils.getLocalBtManager(context), this);
- lifecycle.addObserver(bluetoothPreferenceController);
- controllers.add(bluetoothPreferenceController);
-
- return controllers;
- }
-
- @VisibleForTesting
- static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
- private final NfcPreferenceController mNfcPreferenceController;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- mNfcPreferenceController = new NfcPreferenceController(context);
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- if (mNfcPreferenceController.isAvailable()) {
- mSummaryLoader.setSummary(this,
- mContext.getString(R.string.connected_devices_dashboard_summary));
- } else {
- mSummaryLoader.setSummary(this, mContext.getString(
- R.string.connected_devices_dashboard_no_nfc_summary));
- }
- }
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = new SummaryLoader.SummaryProviderFactory() {
- @Override
- public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
- return new SummaryProvider(activity, summaryLoader);
- }
- };
-
- /**
- * For Search.
- */
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(
- Context context, boolean enabled) {
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.connected_devices_old;
- return Arrays.asList(sir);
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = super.getNonIndexableKeys(context);
- PackageManager pm = context.getPackageManager();
- if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
- keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
- keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
- }
- keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
-
- return keys;
- }
- };
-}
diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
index b637e35..1201b85 100644
--- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
@@ -40,8 +40,7 @@
UsbConnectionBroadcastReceiver.UsbConnectionListener mUsbConnectionListener =
(connected, newMode) -> {
if (connected) {
- mUsbPreference.setSummary(
- UsbModePreferenceController.getSummary(mUsbBackend.getCurrentMode()));
+ mUsbPreference.setSummary(getSummary(mUsbBackend.getCurrentMode()));
mDevicePreferenceCallback.onDeviceAdded(mUsbPreference);
} else {
mDevicePreferenceCallback.onDeviceRemoved(mUsbPreference);
@@ -94,4 +93,31 @@
//TODO(b/70336520): Use an API to get data instead of sticky intent
mUsbReceiver.register();
}
+
+ public static int getSummary(int mode) {
+ switch (mode) {
+ case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
+ return R.string.usb_summary_charging_only;
+ case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
+ return R.string.usb_summary_power_only;
+ case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
+ return R.string.usb_summary_file_transfers;
+ case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
+ return R.string.usb_summary_photo_transfers;
+ case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
+ return R.string.usb_summary_MIDI;
+ case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_TETHER:
+ return R.string.usb_summary_tether;
+ case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_MTP:
+ return R.string.usb_summary_file_transfers_power;
+ case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_PTP:
+ return R.string.usb_summary_photo_transfers_power;
+ case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_MIDI:
+ return R.string.usb_summary_MIDI_power;
+ case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_TETHER:
+ return R.string.usb_summary_tether_power;
+ default:
+ return R.string.usb_summary_charging_only;
+ }
+ }
}
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java
index 7ac0235..6605be8 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java
@@ -53,7 +53,7 @@
mHeaderController.setLabel(mContext.getString(R.string.usb_pref));
mHeaderController.setIcon(mContext.getDrawable(R.drawable.ic_usb));
mHeaderController.setSummary(
- mContext.getString(UsbModePreferenceController.getSummary(newMode)));
+ mContext.getString(ConnectedUsbDeviceUpdater.getSummary(newMode)));
mHeaderController.done(mFragment.getActivity(), true /* rebindActions */);
}
diff --git a/src/com/android/settings/connecteddevice/usb/UsbModeChooserActivity.java b/src/com/android/settings/connecteddevice/usb/UsbModeChooserActivity.java
deleted file mode 100644
index b3b0718..0000000
--- a/src/com/android/settings/connecteddevice/usb/UsbModeChooserActivity.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2015 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.annotation.Nullable;
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.drawable.Drawable;
-import android.graphics.PorterDuff;
-import android.hardware.usb.UsbManager;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.annotation.VisibleForTesting;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Checkable;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settingslib.RestrictedLockUtils;
-
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-/**
- * UI for the USB chooser dialog.
- *
- */
-public class UsbModeChooserActivity extends Activity {
-
- public static final int[] DEFAULT_MODES = {
- UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE,
- UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE,
- UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP,
- UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP,
- UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI
- };
-
- private UsbBackend mBackend;
- private AlertDialog mDialog;
- private LayoutInflater mLayoutInflater;
- private EnforcedAdmin mEnforcedAdmin;
-
- private BroadcastReceiver mDisconnectedReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
- if (UsbManager.ACTION_USB_STATE.equals(action)) {
- boolean connected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);
- boolean hostConnected =
- intent.getBooleanExtra(UsbManager.USB_HOST_CONNECTED, false);
- if (!connected && !hostConnected) {
- mDialog.dismiss();
- }
- }
- }
- };
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
-
- super.onCreate(savedInstanceState);
-
- mLayoutInflater = LayoutInflater.from(this);
-
- mDialog = new AlertDialog.Builder(this)
- .setTitle(R.string.usb_use)
- .setView(R.layout.usb_dialog_container)
- .setOnDismissListener(new DialogInterface.OnDismissListener() {
- @Override
- public void onDismiss(DialogInterface dialog) {
- finish();
- }
- })
- .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- finish();
- }
- }).create();
- mDialog.show();
-
- LinearLayout container = (LinearLayout) mDialog.findViewById(R.id.container);
-
- mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(this,
- UserManager.DISALLOW_USB_FILE_TRANSFER, UserHandle.myUserId());
- mBackend = new UsbBackend(this);
- int current = mBackend.getCurrentMode();
- for (int i = 0; i < DEFAULT_MODES.length; i++) {
- if (mBackend.isModeSupported(DEFAULT_MODES[i])
- && !mBackend.isModeDisallowedBySystem(DEFAULT_MODES[i])) {
- inflateOption(DEFAULT_MODES[i], current == DEFAULT_MODES[i], container,
- mBackend.isModeDisallowed(DEFAULT_MODES[i]));
- }
- }
- }
-
- @Override
- public void onStart() {
- super.onStart();
-
- IntentFilter filter = new IntentFilter(UsbManager.ACTION_USB_STATE);
- registerReceiver(mDisconnectedReceiver, filter);
- }
-
- @Override
- protected void onStop() {
- unregisterReceiver(mDisconnectedReceiver);
- super.onStop();
- }
-
- private void inflateOption(final int mode, boolean selected, LinearLayout container,
- final boolean disallowedByAdmin) {
- View v = mLayoutInflater.inflate(R.layout.restricted_radio_with_summary, container, false);
-
- TextView titleView = (TextView) v.findViewById(android.R.id.title);
- titleView.setText(getTitle(mode));
- TextView summaryView = (TextView) v.findViewById(android.R.id.summary);
- updateSummary(summaryView, mode);
-
- if (disallowedByAdmin) {
- if (mEnforcedAdmin != null) {
- setDisabledByAdmin(v, titleView, summaryView);
- } else {
- return;
- }
- }
-
- v.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- if (disallowedByAdmin && mEnforcedAdmin != null) {
- RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
- UsbModeChooserActivity.this, mEnforcedAdmin);
- return;
- }
- if (!ActivityManager.isUserAMonkey()) {
- mBackend.setMode(mode);
- }
- mDialog.dismiss();
- finish();
- }
- });
- ((Checkable) v).setChecked(selected);
- container.addView(v);
- }
-
- private void setDisabledByAdmin(View rootView, TextView titleView, TextView summaryView) {
- if (mEnforcedAdmin != null) {
- titleView.setEnabled(false);
- summaryView.setEnabled(false);
- rootView.findViewById(R.id.restricted_icon).setVisibility(View.VISIBLE);
- Drawable[] compoundDrawables = titleView.getCompoundDrawablesRelative();
- compoundDrawables[0 /* start */].mutate().setColorFilter(
- getColor(R.color.disabled_text_color), PorterDuff.Mode.MULTIPLY);
- }
- }
-
- @VisibleForTesting
- static void updateSummary(TextView summaryView, int mode) {
- if (mode == (UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE)) {
- summaryView.setText(R.string.usb_use_power_only_desc);
- }
- }
-
- @VisibleForTesting
- static int getTitle(int mode) {
- switch (mode) {
- case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
- return R.string.usb_use_charging_only;
- case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
- return R.string.usb_use_power_only;
- case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
- return R.string.usb_use_file_transfers;
- case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
- return R.string.usb_use_photo_transfers;
- case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
- return R.string.usb_use_MIDI;
- }
- return 0;
- }
-}
diff --git a/src/com/android/settings/connecteddevice/usb/UsbModePreferenceController.java b/src/com/android/settings/connecteddevice/usb/UsbModePreferenceController.java
deleted file mode 100644
index d7624f0..0000000
--- a/src/com/android/settings/connecteddevice/usb/UsbModePreferenceController.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2016 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.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-
-public class UsbModePreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
-
- private static final String KEY_USB_MODE = "usb_mode";
-
- private UsbBackend mUsbBackend;
- @VisibleForTesting
- UsbConnectionBroadcastReceiver mUsbReceiver;
- private Preference mUsbPreference;
-
- public UsbModePreferenceController(Context context, UsbBackend usbBackend,
- Lifecycle lifecycle) {
- super(context);
- mUsbBackend = usbBackend;
- mUsbReceiver = new UsbConnectionBroadcastReceiver(mContext, (connected, newMode) -> {
- updateSummary(mUsbPreference, connected, newMode);
- }, mUsbBackend);
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mUsbPreference = screen.findPreference(KEY_USB_MODE);
- }
-
- @Override
- public void updateState(Preference preference) {
- updateSummary(preference, mUsbReceiver.isConnected(), mUsbBackend.getCurrentMode());
- }
-
- @Override
- public boolean isAvailable() {
- return true;
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_USB_MODE;
- }
-
- @Override
- public void onPause() {
- mUsbReceiver.unregister();
- }
-
- @Override
- public void onResume() {
- mUsbReceiver.register();
- }
-
- public static int getSummary(int mode) {
- switch (mode) {
- case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
- return R.string.usb_summary_charging_only;
- case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
- return R.string.usb_summary_power_only;
- case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
- return R.string.usb_summary_file_transfers;
- case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
- return R.string.usb_summary_photo_transfers;
- case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
- return R.string.usb_summary_MIDI;
- case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_TETHER:
- return R.string.usb_summary_tether;
- case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_MTP:
- return R.string.usb_summary_file_transfers_power;
- case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_PTP:
- return R.string.usb_summary_photo_transfers_power;
- case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_MIDI:
- return R.string.usb_summary_MIDI_power;
- case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_TETHER:
- return R.string.usb_summary_tether_power;
- default:
- return R.string.usb_summary_charging_only;
- }
- }
-
- private void updateSummary(Preference preference, boolean connected, int mode) {
- if (preference != null) {
- if (connected) {
- preference.setEnabled(true);
- preference.setSummary(getSummary(mode));
- } else {
- preference.setSummary(R.string.disconnected);
- preference.setEnabled(false);
- }
- }
- }
-}
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index fd756df..a5edf3c 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -20,7 +20,6 @@
* This class keeps track of all feature flags in Settings.
*/
public class FeatureFlags {
- public static final String CONNECTED_DEVICE_V2 = "settings_connected_device_v2";
public static final String BATTERY_SETTINGS_V2 = "settings_battery_v2";
public static final String BATTERY_DISPLAY_APP_LIST = "settings_battery_display_app_list";
public static final String ZONE_PICKER_V2 = "settings_zone_picker_v2";
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index c75b0c6..468bd3d 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -55,9 +55,7 @@
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
-import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
import com.android.settings.datausage.DataUsageList;
import com.android.settings.datausage.DataUsageSummary;
@@ -242,7 +240,6 @@
SystemDashboardFragment.class.getName(),
NetworkDashboardFragment.class.getName(),
ConnectedDeviceDashboardFragment.class.getName(),
- ConnectedDeviceDashboardFragmentOld.class.getName(),
UsbDetailsFragment.class.getName(),
AppAndNotificationDashboardFragment.class.getName(),
AccountDashboardFragment.class.getName(),
@@ -252,7 +249,6 @@
BluetoothDeviceDetailsFragment.class.getName(),
DataUsageList.class.getName(),
DirectoryAccessDetails.class.getName(),
- AdvancedConnectedDeviceDashboardFragment.class.getName()
};
public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/development/SelectUsbConfigPreferenceController.java b/src/com/android/settings/development/SelectUsbConfigPreferenceController.java
deleted file mode 100644
index 5f9fcca..0000000
--- a/src/com/android/settings/development/SelectUsbConfigPreferenceController.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * 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.development;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.hardware.usb.UsbManager;
-import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.wrapper.UsbManagerWrapper;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnCreate;
-import com.android.settingslib.core.lifecycle.events.OnDestroy;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class SelectUsbConfigPreferenceController extends
- DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener, LifecycleObserver, OnCreate, OnDestroy,
- PreferenceControllerMixin {
-
- private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
-
- private final String[] mListValues;
- private final String[] mListSummaries;
- private final UsbManager mUsbManager;
- @VisibleForTesting
- UsbManagerWrapper mUsbManagerWrapper;
- private BroadcastReceiver mUsbReceiver;
- private ListPreference mPreference;
-
- public SelectUsbConfigPreferenceController(Context context, Lifecycle lifecycle) {
- super(context);
-
- mListValues = context.getResources().getStringArray(R.array.usb_configuration_values);
- mListSummaries = context.getResources().getStringArray(R.array.usb_configuration_titles);
- mUsbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
- mUsbManagerWrapper = new UsbManagerWrapper(mUsbManager);
- mUsbReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (mPreference != null) {
- updateUsbConfigurationValues();
- }
- }
- };
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- IntentFilter filter = new IntentFilter();
- filter.addAction(UsbManager.ACTION_USB_STATE);
- mContext.registerReceiver(mUsbReceiver, filter);
- }
-
- @Override
- public String getPreferenceKey() {
- return USB_CONFIGURATION_KEY;
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
-
- mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (Utils.isMonkeyRunning()) {
- return false;
- }
-
- writeUsbConfigurationOption(mUsbManagerWrapper
- .usbFunctionsFromString(newValue.toString()));
- updateUsbConfigurationValues();
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- updateUsbConfigurationValues();
- }
-
- @Override
- public void onDestroy() {
- mContext.unregisterReceiver(mUsbReceiver);
- }
-
- @Override
- public boolean isAvailable() {
- final PackageManager packageManager = mContext.getPackageManager();
-
- return packageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)
- || packageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY);
- }
-
- @Override
- protected void onDeveloperOptionsSwitchEnabled() {
- mPreference.setEnabled(true);
- }
-
- @Override
- protected void onDeveloperOptionsSwitchDisabled() {
- mPreference.setEnabled(false);
- }
-
- @VisibleForTesting
- void setCurrentFunctions(long functions) {
- mUsbManager.setCurrentFunctions(functions);
- }
-
- private void updateUsbConfigurationValues() {
- long functions = mUsbManagerWrapper.getCurrentFunctions();
- int index = 0;
- for (int i = 0; i < mListValues.length; i++) {
- if (functions == mUsbManagerWrapper.usbFunctionsFromString(mListValues[i])) {
- index = i;
- break;
- }
- }
- mPreference.setValue(mListValues[index]);
- mPreference.setSummary(mListSummaries[index]);
- }
-
- private void writeUsbConfigurationOption(long newValue) {
- setCurrentFunctions(newValue);
- }
-}
diff --git a/src/com/android/settings/search/SearchIndexableResourcesImpl.java b/src/com/android/settings/search/SearchIndexableResourcesImpl.java
index 55235a4..f8da560 100644
--- a/src/com/android/settings/search/SearchIndexableResourcesImpl.java
+++ b/src/com/android/settings/search/SearchIndexableResourcesImpl.java
@@ -21,7 +21,7 @@
import com.android.settings.DateTimeSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.LegalSettings;
-import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
+import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.datausage.DataUsageSummaryLegacy;
import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
import com.android.settings.accessibility.AccessibilitySettings;
@@ -36,7 +36,6 @@
import com.android.settings.backup.BackupSettingsActivity;
import com.android.settings.backup.BackupSettingsFragment;
import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
import com.android.settings.datausage.DataUsageSummary;
@@ -45,7 +44,6 @@
import com.android.settings.deviceinfo.DeviceInfoSettings;
import com.android.settings.deviceinfo.StorageDashboardFragment;
import com.android.settings.deviceinfo.StorageSettings;
-import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
import com.android.settings.display.AmbientDisplaySettings;
import com.android.settings.display.NightDisplaySettings;
import com.android.settings.display.ScreenZoomSettings;
@@ -157,7 +155,6 @@
addIndex(ResetDashboardFragment.class);
addIndex(StorageDashboardFragment.class);
addIndex(ConnectedDeviceDashboardFragment.class);
- addIndex(ConnectedDeviceDashboardFragmentOld.class);
addIndex(AdvancedConnectedDeviceDashboardFragment.class);
addIndex(EnterprisePrivacySettings.class);
addIndex(PaymentSettings.class);