Change print setting from a dynamic tile to static pref
...because dynamic tile is a lot harder to index correctly.
- Removed metadata that makes PrintSettings a dynamic tile.
- Added PrintSettings into connected_device xml.
- Added a new PreferenceController - all summary updating logic is
copied from PrintSettingsFragment
Change-Id: I41e7c9d23e97ecd5a043ac7c33f2d404260c92e7
Fixes: 73128944
Test: robotests
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f5c368f..dec12ba 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1984,11 +1984,6 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
- <intent-filter android:priority="2">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.device" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.print.PrintSettingsFragment" />
</activity>
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 62a2e43..8af69c7 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,5 +1,3 @@
[Hook Scripts]
-checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
- -fw src/com/android/settings/print/
checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index 4ad94c8..a5d48fd 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -51,6 +51,14 @@
android:order="-2"/>
<Preference
+ android:key="connected_device_printing"
+ android:title="@string/print_settings"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_settings_print"
+ android:fragment="com.android.settings.print.PrintSettingsFragment"
+ android:order="-1"/>
+
+ <Preference
android:key="bt_received_files"
android:icon="@drawable/ic_folder_vd_theme_24"
android:title="@string/bluetooth_show_received_files" />
diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml
index 75a767a..8d840d1 100644
--- a/res/xml/print_settings.xml
+++ b/res/xml/print_settings.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="print_settings_screen"
- android:title="@string/print_settings_title"
+ android:title="@string/print_settings"
settings:keywords="@string/keywords_printing">
<PreferenceCategory
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index f9aaf84..76b48d1 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -802,11 +802,6 @@
!UserManager.isDeviceInDemoMode(this), isAdmin)
|| somethingChanged;
- somethingChanged = setTileEnabled(new ComponentName(packageName,
- Settings.PrintSettingsActivity.class.getName()),
- pm.hasSystemFeature(PackageManager.FEATURE_PRINTING), isAdmin)
- || somethingChanged;
-
final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
&& !Utils.isMonkeyRunning();
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
index d8838f2..32c2af7 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -29,6 +29,7 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.nfc.NfcPreferenceController;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.print.PrintSettingPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,7 +44,6 @@
public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment {
private static final String TAG = "AdvancedConnectedDeviceFrag";
- private UsbModePreferenceController mUsbPrefController;
@Override
public int getMetricsCategory() {
@@ -67,22 +67,32 @@
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+ return buildControllers(context, getLifecycle());
+ }
+
+ private static List<AbstractPreferenceController> buildControllers(Context context,
+ Lifecycle lifecycle) {
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.addObserver(mUsbPrefController);
- controllers.add(mUsbPrefController);
+ controllers.add(new UsbModePreferenceController(
+ context, new UsbBackend(context), lifecycle));
final BluetoothSwitchPreferenceController bluetoothPreferenceController =
new BluetoothSwitchPreferenceController(context);
- lifecycle.addObserver(bluetoothPreferenceController);
controllers.add(bluetoothPreferenceController);
controllers.add(new BluetoothFilesPreferenceController(context));
controllers.add(new BluetoothOnWhileDrivingPreferenceController(context));
+ final PrintSettingPreferenceController printerController =
+ new PrintSettingPreferenceController(context);
+ if (lifecycle != null) {
+ lifecycle.addObserver(printerController);
+ lifecycle.addObserver(nfcPreferenceController);
+ lifecycle.addObserver(bluetoothPreferenceController);
+ }
+ controllers.add(printerController);
+
return controllers;
}
@@ -111,5 +121,11 @@
return keys;
}
+
+ @Override
+ public List<AbstractPreferenceController> getPreferenceControllers(
+ Context context) {
+ return buildControllers(context, null /* lifecycle */);
+ }
};
}
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java
index b732e1e..54ae8f6 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java
@@ -80,8 +80,8 @@
new NfcPreferenceController(context);
lifecycle.addObserver(nfcPreferenceController);
controllers.add(nfcPreferenceController);
- mUsbPrefController = new UsbModePreferenceController(context, new UsbBackend(context));
- lifecycle.addObserver(mUsbPrefController);
+ mUsbPrefController = new UsbModePreferenceController(context, new UsbBackend(context),
+ lifecycle);
controllers.add(mUsbPrefController);
final BluetoothMasterSwitchPreferenceController bluetoothPreferenceController =
new BluetoothMasterSwitchPreferenceController(
diff --git a/src/com/android/settings/connecteddevice/usb/UsbModePreferenceController.java b/src/com/android/settings/connecteddevice/usb/UsbModePreferenceController.java
index e342460..d7624f0 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbModePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbModePreferenceController.java
@@ -23,6 +23,7 @@
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;
@@ -37,12 +38,16 @@
UsbConnectionBroadcastReceiver mUsbReceiver;
private Preference mUsbPreference;
- public UsbModePreferenceController(Context context, UsbBackend usbBackend) {
+ 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
diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java
index 4bd7ba4..777f3dd 100644
--- a/src/com/android/settings/core/BasePreferenceController.java
+++ b/src/com/android/settings/core/BasePreferenceController.java
@@ -21,6 +21,7 @@
import com.android.settings.search.ResultPayload;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -70,6 +71,8 @@
protected final String mPreferenceKey;
+ protected Lifecycle mLifecycle;
+
public BasePreferenceController(Context context, String preferenceKey) {
super(context);
mPreferenceKey = preferenceKey;
diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java
new file mode 100644
index 0000000..bb8a81e
--- /dev/null
+++ b/src/com/android/settings/print/PrintSettingPreferenceController.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2018 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.print;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.print.PrintJob;
+import android.print.PrintJobId;
+import android.print.PrintJobInfo;
+import android.print.PrintManager;
+import android.printservice.PrintServiceInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.wrapper.PrintManagerWrapper;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+import java.util.List;
+
+/**
+ * {@link BasePreferenceController} for Print settings.
+ */
+public class PrintSettingPreferenceController extends BasePreferenceController implements
+ LifecycleObserver, OnStart, OnStop, PrintManager.PrintJobStateChangeListener {
+
+ private final PackageManager mPackageManager;
+ private PrintManagerWrapper mPrintManager;
+ private Preference mPreference;
+
+ public PrintSettingPreferenceController(Context context) {
+ super(context, "connected_device_printing" /* preferenceKey */);
+ mPackageManager = context.getPackageManager();
+ mPrintManager = new PrintManagerWrapper(context);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING)
+ ? AVAILABLE : DISABLED_UNSUPPORTED;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void onStart() {
+ mPrintManager.addPrintJobStateChanegListener(this);
+ }
+
+ @Override
+ public void onStop() {
+ mPrintManager.removePrintJobStateChangeListener(this);
+ }
+
+ @Override
+ public void onPrintJobStateChanged(PrintJobId printJobId) {
+ updateState(mPreference);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ if (preference == null) {
+ return;
+ }
+ preference.setSummary(getSummary());
+ }
+
+ @Override
+ public String getSummary() {
+ final List<PrintJob> printJobs = mPrintManager.getPrintJobs();
+
+ int numActivePrintJobs = 0;
+ if (printJobs != null) {
+ for (PrintJob job : printJobs) {
+ if (shouldShowToUser(job.getInfo())) {
+ numActivePrintJobs++;
+ }
+ }
+ }
+
+ if (numActivePrintJobs > 0) {
+ return mContext.getResources().getQuantityString(
+ R.plurals.print_jobs_summary, numActivePrintJobs, numActivePrintJobs);
+ } else {
+ final List<PrintServiceInfo> services =
+ mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
+ if (services == null || services.isEmpty()) {
+ return mContext.getString(R.string.print_settings_summary_no_service);
+ } else {
+ final int count = services.size();
+ return mContext.getResources().getQuantityString(
+ R.plurals.print_settings_summary, count, count);
+ }
+ }
+ }
+
+ /**
+ * Should the print job the shown to the user in the settings app.
+ *
+ * @param printJob The print job in question.
+ * @return true iff the print job should be shown.
+ */
+ static boolean shouldShowToUser(PrintJobInfo printJob) {
+ switch (printJob.getState()) {
+ case PrintJobInfo.STATE_QUEUED:
+ case PrintJobInfo.STATE_STARTED:
+ case PrintJobInfo.STATE_BLOCKED:
+ case PrintJobInfo.STATE_FAILED: {
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 56bebcc..21ee360 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -16,6 +16,8 @@
package com.android.settings.print;
+import static com.android.settings.print.PrintSettingPreferenceController.shouldShowToUser;
+
import android.app.LoaderManager.LoaderCallbacks;
import android.content.ActivityNotFoundException;
import android.content.AsyncTaskLoader;
@@ -37,7 +39,6 @@
import android.printservice.PrintServiceInfo;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.text.TextUtils;
@@ -52,7 +53,6 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.utils.ProfileSettingsPreferenceFragment;
@@ -131,11 +131,6 @@
}
@Override
- public void onStop() {
- super.onStop();
- }
-
- @Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ViewGroup contentRoot = (ViewGroup) getListView().getParent();
@@ -359,7 +354,7 @@
printJob.getCreationTime(), printJob.getCreationTime(),
DateFormat.SHORT, DateFormat.SHORT)));
- TypedArray a = getActivity().obtainStyledAttributes(new int[]{
+ TypedArray a = getActivity().obtainStyledAttributes(new int[] {
android.R.attr.colorControlNormal});
int tintColor = a.getColor(0, 0);
a.recycle();
@@ -494,136 +489,17 @@
}
}
- /**
- * Should the print job the shown to the user in the settings app.
- *
- * @param printJob The print job in question.
- * @return true iff the print job should be shown.
- */
- private static boolean shouldShowToUser(PrintJobInfo printJob) {
- switch (printJob.getState()) {
- case PrintJobInfo.STATE_QUEUED:
- case PrintJobInfo.STATE_STARTED:
- case PrintJobInfo.STATE_BLOCKED:
- case PrintJobInfo.STATE_FAILED: {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Provider for the print settings summary
- */
- @VisibleForTesting
- static class PrintSummaryProvider
- implements SummaryLoader.SummaryProvider, PrintJobStateChangeListener {
- private final Context mContext;
- private final PrintManagerWrapper mPrintManager;
- private final SummaryLoader mSummaryLoader;
-
- /**
- * Create a new {@link PrintSummaryProvider}.
- *
- * @param context The context this provider is for
- * @param summaryLoader The summary load using this provider
- */
- PrintSummaryProvider(Context context, SummaryLoader summaryLoader,
- PrintManagerWrapper printManager) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- mPrintManager = printManager;
- }
-
- @Override
- public void setListening(boolean isListening) {
- if (mPrintManager != null) {
- if (isListening) {
- mPrintManager.addPrintJobStateChanegListner(this);
- onPrintJobStateChanged(null);
- } else {
- mPrintManager.removePrintJobStateChangeListener(this);
- }
- }
- }
-
- @Override
- public void onPrintJobStateChanged(PrintJobId printJobId) {
- final List<PrintJob> printJobs = mPrintManager.getPrintJobs();
-
- int numActivePrintJobs = 0;
- if (printJobs != null) {
- for (PrintJob job : printJobs) {
- if (shouldShowToUser(job.getInfo())) {
- numActivePrintJobs++;
- }
- }
- }
-
- if (numActivePrintJobs > 0) {
- mSummaryLoader.setSummary(this, mContext.getResources().getQuantityString(
- R.plurals.print_jobs_summary, numActivePrintJobs, numActivePrintJobs));
- } else {
- List<PrintServiceInfo> services =
- mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
- if (services == null || services.isEmpty()) {
- mSummaryLoader.setSummary(this,
- mContext.getString(R.string.print_settings_summary_no_service));
- } else {
- final int count = services.size();
- mSummaryLoader.setSummary(this,
- mContext.getResources().getQuantityString(
- R.plurals.print_settings_summary, count, count));
- }
- }
- }
-
- static class PrintManagerWrapper {
-
- private final PrintManager mPrintManager;
-
- PrintManagerWrapper(Context context) {
- mPrintManager = ((PrintManager) context.getSystemService(Context.PRINT_SERVICE))
- .getGlobalPrintManagerForUser(context.getUserId());
- }
-
- public List<PrintServiceInfo> getPrintServices(int selectionFlags) {
- return mPrintManager.getPrintServices(selectionFlags);
- }
-
- public void addPrintJobStateChanegListner(PrintJobStateChangeListener listener) {
- mPrintManager.addPrintJobStateChangeListener(listener);
- }
-
- public void removePrintJobStateChangeListener(PrintJobStateChangeListener listener) {
- mPrintManager.removePrintJobStateChangeListener(listener);
- }
-
- public List<PrintJob> getPrintJobs() {
- return mPrintManager.getPrintJobs();
- }
- }
- }
-
- /**
- * A factory for {@link PrintSummaryProvider providers} the settings app can use to read the
- * print summary.
- */
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY =
- (activity, summaryLoader) -> new PrintSummaryProvider(activity, summaryLoader,
- new PrintSummaryProvider.PrintManagerWrapper(activity));
-
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- List<SearchIndexableResource> indexables = new ArrayList<>();
- SearchIndexableResource indexable = new SearchIndexableResource(context);
- indexable.xmlResId = R.xml.print_settings;
- indexables.add(indexable);
- return indexables;
- }
- };
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ List<SearchIndexableResource> indexables = new ArrayList<>();
+ SearchIndexableResource indexable = new SearchIndexableResource(context);
+ indexable.xmlResId = R.xml.print_settings;
+ indexables.add(indexable);
+ return indexables;
+ }
+ };
}
diff --git a/src/com/android/settings/wrapper/PrintManagerWrapper.java b/src/com/android/settings/wrapper/PrintManagerWrapper.java
new file mode 100644
index 0000000..d05eaed
--- /dev/null
+++ b/src/com/android/settings/wrapper/PrintManagerWrapper.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2018 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.wrapper;
+
+import android.content.Context;
+import android.print.PrintJob;
+import android.print.PrintManager;
+import android.printservice.PrintServiceInfo;
+
+import java.util.List;
+
+/**
+ * Wrapper class for {@link PrintManager}. This is necessary to increase testability in Robolectric.
+ */
+public class PrintManagerWrapper {
+
+ private final PrintManager mPrintManager;
+
+ public PrintManagerWrapper(Context context) {
+ mPrintManager = ((PrintManager) context.getSystemService(Context.PRINT_SERVICE))
+ .getGlobalPrintManagerForUser(context.getUserId());
+ }
+
+ public List<PrintServiceInfo> getPrintServices(int selectionFlags) {
+ return mPrintManager.getPrintServices(selectionFlags);
+ }
+
+ public void addPrintJobStateChanegListener(PrintManager.PrintJobStateChangeListener listener) {
+ mPrintManager.addPrintJobStateChangeListener(listener);
+ }
+
+ public void removePrintJobStateChangeListener(
+ PrintManager.PrintJobStateChangeListener listener) {
+ mPrintManager.removePrintJobStateChangeListener(listener);
+ }
+
+ public List<PrintJob> getPrintJobs() {
+ return mPrintManager.getPrintJobs();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
index 24cb9b3..9f1409c 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
@@ -16,7 +16,6 @@
package com.android.settings.connecteddevice;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -24,9 +23,6 @@
import android.provider.SearchIndexableResource;
import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.nfc.NfcPreferenceController;
-import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settingslib.drawer.CategoryKey;
@@ -52,16 +48,14 @@
@Mock
private PackageManager mManager;
- private FakeFeatureFactory mFeatureFactory;
private AdvancedConnectedDeviceDashboardFragment mFragment;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mFeatureFactory = FakeFeatureFactory.setupForTest();
mFragment = new AdvancedConnectedDeviceDashboardFragment();
- when(mContext.getPackageManager()).thenReturn(mManager);
+ when(mContext.getApplicationContext().getPackageManager()).thenReturn(mManager);
}
@Test
@@ -80,28 +74,6 @@
}
@Test
- public void testSearchIndexProvider_NoNfc_KeyAdded() {
- when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
- final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
- mContext);
-
- assertThat(keys).isNotNull();
- assertThat(keys).contains(NfcPreferenceController.KEY_TOGGLE_NFC);
- assertThat(keys).contains(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
- }
-
- @Test
- public void testSearchIndexProvider_NFC_KeyNotAdded() {
- when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
- final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
- mContext);
-
- assertThat(keys).isNotNull();
- assertThat(keys).doesNotContain(NfcPreferenceController.KEY_TOGGLE_NFC);
- assertThat(keys).doesNotContain(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
- }
-
- @Test
public void testGetCategoryKey_returnCategoryDevice() {
assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE);
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbModePreferenceControllerTest.java
index d15a57f..a1c599f 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbModePreferenceControllerTest.java
@@ -1,12 +1,15 @@
package com.android.settings.connecteddevice.usb;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
@@ -16,20 +19,12 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UsbModePreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS)
private UsbBackend mUsbBackend;
- @Mock(answer = RETURNS_DEEP_STUBS)
- private PreferenceScreen mScreen;
@Mock
private UsbConnectionBroadcastReceiver mUsbConnectionBroadcastReceiver;
@@ -40,7 +35,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = ShadowApplication.getInstance().getApplicationContext();
- mController = new UsbModePreferenceController(mContext, mUsbBackend);
+ mController = new UsbModePreferenceController(mContext, mUsbBackend, null /* lifecycle */);
mController.mUsbReceiver = mUsbConnectionBroadcastReceiver;
}
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
index da2197c..c0ac961 100644
--- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
@@ -16,14 +16,11 @@
package com.android.settings.core;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController
- .DISABLED_DEPENDENT_SETTING;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.when;
import com.android.settings.TestConfig;
@@ -41,7 +38,7 @@
public class BasePreferenceControllerTest {
@Mock
- BasePreferenceController mPreferenceController;
+ private BasePreferenceController mPreferenceController;
@Before
public void setUp() {
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
deleted file mode 100644
index cf34f45..0000000
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
+++ /dev/null
@@ -1,102 +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.print;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.res.Resources;
-import android.print.PrintJob;
-import android.print.PrintJobInfo;
-import android.print.PrintManager;
-import android.printservice.PrintServiceInfo;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PrintSettingsFragmentTest {
-
- @Mock
- private PrintSettingsFragment.PrintSummaryProvider.PrintManagerWrapper mPrintManager;
- @Mock
- private Activity mActivity;
- @Mock
- private Resources mRes;
- @Mock
- private SummaryLoader mSummaryLoader;
- private SummaryLoader.SummaryProvider mSummaryProvider;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- when(mActivity.getResources()).thenReturn(mRes);
- mSummaryProvider = new PrintSettingsFragment.PrintSummaryProvider(mActivity, mSummaryLoader,
- mPrintManager);
- }
-
- @Test
- public void testSummary_hasActiveJob_shouldSetSummaryToNumberOfJobs() {
- final List<PrintJob> printJobs = new ArrayList<>();
- final PrintJob job = mock(PrintJob.class, Mockito.RETURNS_DEEP_STUBS);
- printJobs.add(job);
- when(job.getInfo().getState()).thenReturn(PrintJobInfo.STATE_STARTED);
- when(mPrintManager.getPrintJobs()).thenReturn(printJobs);
-
- mSummaryProvider.setListening(true);
-
- verify(mRes).getQuantityString(R.plurals.print_jobs_summary, 1, 1);
- }
-
- @Test
- public void testSummary_shouldSetSummaryToNumberOfPrintServices() {
- final List<PrintServiceInfo> printServices = mock(List.class);
- when(printServices.isEmpty()).thenReturn(false);
- when(printServices.size()).thenReturn(2);
- // 2 services
- when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES))
- .thenReturn(printServices);
-
- mSummaryProvider.setListening(true);
-
- verify(mRes).getQuantityString(R.plurals.print_settings_summary, 2, 2);
-
- // No service
- when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES)).thenReturn(null);
-
- mSummaryProvider.setListening(true);
-
- verify(mActivity).getString(R.string.print_settings_summary_no_service);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
new file mode 100644
index 0000000..de1625b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2018 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.print;
+
+import static android.arch.lifecycle.Lifecycle.Event.ON_START;
+import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.arch.lifecycle.LifecycleOwner;
+import android.content.Context;
+import android.print.PrintJob;
+import android.print.PrintJobInfo;
+import android.print.PrintManager;
+import android.printservice.PrintServiceInfo;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.PrintManagerWrapper;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PrintSettingsPreferenceControllerTest {
+
+ @Mock
+ private PrintManagerWrapper mPrintManager;
+ private Context mContext;
+ private Preference mPreference;
+ private PrintSettingPreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
+ private Lifecycle mLifecycle;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mPreference = new Preference(mContext);
+ mController = new PrintSettingPreferenceController(mContext);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
+ ReflectionHelpers.setField(mController, "mPrintManager", mPrintManager);
+ mLifecycle.addObserver(mController);
+ }
+
+ @Test
+ public void onStartStop_shouldRegisterPrintStateListener() {
+ mLifecycle.handleLifecycleEvent(ON_START);
+ mLifecycle.handleLifecycleEvent(ON_STOP);
+
+ verify(mPrintManager).addPrintJobStateChanegListener(mController);
+ verify(mPrintManager).removePrintJobStateChangeListener(mController);
+ }
+
+ @Test
+ public void updateState_hasActiveJob_shouldSetSummaryToNumberOfJobs() {
+ final List<PrintJob> printJobs = new ArrayList<>();
+ final PrintJob job = mock(PrintJob.class, Mockito.RETURNS_DEEP_STUBS);
+ printJobs.add(job);
+ when(job.getInfo().getState()).thenReturn(PrintJobInfo.STATE_STARTED);
+ when(mPrintManager.getPrintJobs()).thenReturn(printJobs);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getResources()
+ .getQuantityString(R.plurals.print_jobs_summary, 1, 1));
+ }
+
+ @Test
+ public void updateState_shouldSetSummaryToNumberOfPrintServices() {
+ final List<PrintServiceInfo> printServices = mock(List.class);
+ when(printServices.isEmpty()).thenReturn(false);
+ when(printServices.size()).thenReturn(2);
+ // 2 services
+ when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES))
+ .thenReturn(printServices);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getResources()
+ .getQuantityString(R.plurals.print_settings_summary, 2, 2));
+
+ // No service
+ when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES)).thenReturn(null);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getString(R.string.print_settings_summary_no_service));
+ }
+}