Merge "Adding a link to Setting activity for the Home app"
diff --git a/res/values/config.xml b/res/values/config.xml
index 4ba73cc..097350b 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -41,9 +41,6 @@
<!-- Whether to show Connectivity Monitor switch in Developer Options -->
<bool name="config_show_connectivity_monitor">false</bool>
- <!-- Whether to show Camera HAL HDR+ switch in Developer Options -->
- <bool name="config_show_camera_hal_hdrplus">false</bool>
-
<!-- Whether to show Camera laser sensor switch in Developer Options -->
<bool name="config_show_camera_laser_sensor">false</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d08d314..3b474ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8277,12 +8277,6 @@
<!-- Toast message letting the user know the how to apply connectivity monitor change -->
<string name="connectivity_monitor_toast">To apply connectivity monitor change, reboot device</string>
- <!-- Title for Camera HAL HDR+ switch [CHAR LIMIT=50] -->
- <string name="camera_hal_hdrplus_switch">Camera HAL HDR+</string>
-
- <!-- Toast message letting the user know how to enable Camera HAL HDR+ -->
- <string name="camera_hal_hdrplus_toast">To apply Camera HAL HDR+ change, reboot device</string>
-
<!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->
<string name="camera_laser_sensor_switch">Camera Laser Sensor</string>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index c8c57a5..669f4fb 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -172,10 +172,6 @@
android:key="camera_laser_sensor_switch"
android:title="@string/camera_laser_sensor_switch" />
- <SwitchPreference
- android:key="camera_hal_hdrplus_switch"
- android:title="@string/camera_hal_hdrplus_switch" />
-
<Preference
android:key="feature_flags_dashboard"
android:title="@string/feature_flags_dashboard_title"
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index f265f98..a3d26af 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -150,8 +150,8 @@
}
// Prepare help url and enable menu if necessary
- final Bundle arguments = getArguments();
- final int helpResource;
+ Bundle arguments = getArguments();
+ int helpResource;
if (arguments != null && arguments.containsKey(HELP_URI_RESOURCE_KEY)) {
helpResource = arguments.getInt(HELP_URI_RESOURCE_KEY);
} else {
@@ -160,14 +160,6 @@
if (helpResource != 0) {
mHelpUri = getResources().getString(helpResource);
}
-
- // Check if we should keep the preferences expanded.
- if (arguments != null) {
- mPreferenceKey = arguments.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY);
- if (!TextUtils.isEmpty(mPreferenceKey)) {
- getPreferenceScreen().setInitialExpandedChildrenCount(Integer.MAX_VALUE);
- }
- }
}
@Override
@@ -232,7 +224,9 @@
public void onResume() {
super.onResume();
- if (mPreferenceKey != null) {
+ final Bundle args = getArguments();
+ if (args != null) {
+ mPreferenceKey = args.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY);
highlightPreferenceIfNeeded();
}
}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
index 265690b..63d7b5c 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
@@ -72,8 +72,8 @@
@Override
public final void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
init(screen);
+ super.displayPreference(screen);
}
/**
diff --git a/src/com/android/settings/datetime/ZonePicker.java b/src/com/android/settings/datetime/ZonePicker.java
index 00a77df..57f9b7d 100644
--- a/src/com/android/settings/datetime/ZonePicker.java
+++ b/src/com/android/settings/datetime/ZonePicker.java
@@ -22,6 +22,7 @@
import android.app.ListFragment;
import android.content.Context;
import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -39,6 +40,7 @@
import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.datetime.ZoneGetter;
+import java.text.Collator;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@@ -261,15 +263,21 @@
mVisibilityLoggerMixin.onPause();
}
- private static class MyComparator implements Comparator<Map<?, ?>> {
+ @VisibleForTesting
+ static class MyComparator implements Comparator<Map<?, ?>> {
+ private final Collator mCollator;
private String mSortingKey;
+ private boolean mSortedByName;
public MyComparator(String sortingKey) {
+ mCollator = Collator.getInstance();
mSortingKey = sortingKey;
+ mSortedByName = ZoneGetter.KEY_DISPLAY_LABEL.equals(sortingKey);
}
public void setSortingKey(String sortingKey) {
mSortingKey = sortingKey;
+ mSortedByName = ZoneGetter.KEY_DISPLAY_LABEL.equals(sortingKey);
}
public int compare(Map<?, ?> map1, Map<?, ?> map2) {
@@ -286,7 +294,11 @@
return -1;
}
- return ((Comparable) value1).compareTo(value2);
+ if (mSortedByName) {
+ return mCollator.compare(value1, value2);
+ } else {
+ return ((Comparable) value1).compareTo(value2);
+ }
}
private boolean isComparable(Object value) {
diff --git a/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java b/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java
deleted file mode 100644
index a5390cc..0000000
--- a/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java
+++ /dev/null
@@ -1,109 +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.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.widget.Toast;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-/**
- * deprecated in favor of {@link CameraHalHdrPlusPreferenceControllerV2}
- */
-@Deprecated
-public class CameraHalHdrplusPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin {
-
- private static final String KEY_CAMERA_HAL_HDRPLUS_SWITCH = "camera_hal_hdrplus_switch";
- @VisibleForTesting
- static final String BUILD_TYPE = "ro.build.type";
- @VisibleForTesting
- static final String PROPERTY_CAMERA_HAL_HDRPLUS = "persist.camera.hdrplus.enable";
- @VisibleForTesting
- static final String ENABLED = "1";
- @VisibleForTesting
- static final String DISABLED = "0";
-
- private SwitchPreference mPreference;
-
- public CameraHalHdrplusPreferenceController(Context context) {
- super(context);
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- if (isAvailable()) {
- mPreference = (SwitchPreference) screen.findPreference(KEY_CAMERA_HAL_HDRPLUS_SWITCH);
- mPreference.setChecked(isHalHdrplusEnabled());
- }
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_CAMERA_HAL_HDRPLUS_SWITCH;
- }
-
- @Override
- public boolean isAvailable() {
- return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus);
- }
-
- @Override
- public void updateState(Preference preference) {
- updatePreference();
- }
-
- @Override
- public boolean handlePreferenceTreeClick(Preference preference) {
- if (KEY_CAMERA_HAL_HDRPLUS_SWITCH.equals(preference.getKey())) {
- final SwitchPreference switchPreference = (SwitchPreference)preference;
- SystemProperties.set(PROPERTY_CAMERA_HAL_HDRPLUS,
- switchPreference.isChecked() ? ENABLED : DISABLED);
- Toast.makeText(mContext, R.string.camera_hal_hdrplus_toast,
- Toast.LENGTH_LONG).show();
- return true;
- }
- return false;
- }
-
- public void enablePreference(boolean enabled) {
- if (isAvailable()) {
- mPreference.setEnabled(enabled);
- }
- }
-
- public boolean updatePreference() {
- if (!isAvailable()) {
- return false;
- }
- final boolean enabled = isHalHdrplusEnabled();
- mPreference.setChecked(enabled);
- return enabled;
- }
-
- private boolean isHalHdrplusEnabled() {
- return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, true);
- }
-}
diff --git a/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java b/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java
deleted file mode 100644
index b8828fe..0000000
--- a/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java
+++ /dev/null
@@ -1,100 +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.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
-import android.widget.Toast;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class CameraHalHdrplusPreferenceControllerV2 extends
- DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
-
- private static final String KEY_CAMERA_HAL_HDRPLUS_SWITCH = "camera_hal_hdrplus_switch";
- @VisibleForTesting
- static final String BUILD_TYPE = "ro.build.type";
- @VisibleForTesting
- static final String PROPERTY_CAMERA_HAL_HDRPLUS = "persist.camera.hdrplus.enable";
- @VisibleForTesting
- static final String ENABLED = "1";
- @VisibleForTesting
- static final String DISABLED = "0";
-
- private SwitchPreference mPreference;
-
- public CameraHalHdrplusPreferenceControllerV2(Context context) {
- super(context);
- }
-
- @Override
- public boolean isAvailable() {
- final String buildType = SystemProperties.get(BUILD_TYPE);
-
- return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_CAMERA_HAL_HDRPLUS_SWITCH;
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
-
- mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- final boolean isEnabled = (Boolean) newValue;
- SystemProperties.set(PROPERTY_CAMERA_HAL_HDRPLUS, isEnabled ? ENABLED : DISABLED);
- Toast.makeText(mContext, R.string.camera_hal_hdrplus_toast, Toast.LENGTH_LONG).show();
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- final boolean enabled = isHalHdrplusEnabled();
- mPreference.setChecked(enabled);
- }
-
- @Override
- protected void onDeveloperOptionsSwitchEnabled() {
- mPreference.setEnabled(true);
- }
-
- @Override
- protected void onDeveloperOptionsSwitchDisabled() {
- SystemProperties.set(PROPERTY_CAMERA_HAL_HDRPLUS, DISABLED);
- mPreference.setChecked(false);
- mPreference.setEnabled(false);
- }
-
- private boolean isHalHdrplusEnabled() {
- return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, true /* default */);
- }
-}
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 558ebcf..37296cf 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -336,7 +336,6 @@
private BugReportPreferenceController mBugReportController;
private BugReportInPowerPreferenceController mBugReportInPowerController;
private ConnectivityMonitorPreferenceController mConnectivityMonitorController;
- private CameraHalHdrplusPreferenceController mCameraHalHdrplusController;
private CameraLaserSensorPreferenceController mCameraLaserSensorController;
private BroadcastReceiver mEnableAdbReceiver;
@@ -384,7 +383,6 @@
mLogpersistController = new LogpersistPreferenceController(getActivity(), getLifecycle());
mWebViewAppPrefController = new WebViewAppPreferenceController(getActivity());
mVerifyAppsOverUsbController = new VerifyAppsOverUsbPreferenceController(getActivity());
- mCameraHalHdrplusController = new CameraHalHdrplusPreferenceController(getActivity());
mCameraLaserSensorController = new CameraLaserSensorPreferenceController(getActivity());
setIfOnlyAvailableForAdmins(true);
@@ -421,7 +419,6 @@
mLogdSizeController.displayPreference(preferenceScreen);
mLogpersistController.displayPreference(preferenceScreen);
mWebViewAppPrefController.displayPreference(preferenceScreen);
- mCameraHalHdrplusController.displayPreference(preferenceScreen);
mEnableAdbController.displayPreference(preferenceScreen);
mCameraLaserSensorController.displayPreference(getPreferenceScreen());
@@ -646,7 +643,6 @@
mLogdSizeController.enablePreference(enabled);
mLogpersistController.enablePreference(enabled);
mWebViewAppPrefController.enablePreference(enabled);
- mCameraHalHdrplusController.enablePreference(enabled);
mCameraLaserSensorController.enablePreference(enabled);
updateAllOptions();
}
@@ -793,7 +789,6 @@
}
mHaveDebugSettings |= mBugReportInPowerController.updatePreference();
mHaveDebugSettings |= mConnectivityMonitorController.updatePreference();
- mHaveDebugSettings |= mCameraHalHdrplusController.updatePreference();
mHaveDebugSettings |= mCameraLaserSensorController.updatePreference();
updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
@@ -2260,10 +2255,6 @@
return true;
}
- if (mCameraHalHdrplusController.handlePreferenceTreeClick(preference)) {
- return true;
- }
-
if (mEnableAdbController.handlePreferenceTreeClick(preference)) {
return true;
}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 83f395f..e7dcf58 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -377,7 +377,6 @@
controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle));
controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
- controllers.add(new CameraHalHdrplusPreferenceControllerV2(context));
controllers.add(new WifiDisplayCertificationPreferenceController(context));
controllers.add(new WifiVerboseLoggingPreferenceController(context));
controllers.add(new WifiAggressiveHandoverPreferenceController(context));
diff --git a/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java b/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
index 90d4c11..06ed872 100644
--- a/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
@@ -21,9 +21,14 @@
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
+/**
+ * deprecated in favor of {@link BasebandVersionDialogController}
+ */
+@Deprecated
public class BasebandVersionPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java b/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
index f38602a..9b0120e 100644
--- a/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
@@ -23,9 +23,14 @@
import android.util.Log;
import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController;
import com.android.settingslib.DeviceInfoUtils;
import com.android.settingslib.core.AbstractPreferenceController;
+/**
+ * deprecated in favor of {@link SecurityPatchLevelDialogController}
+ */
+@Deprecated
public class SecurityPatchPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java
new file mode 100644
index 0000000..c857f19
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java
@@ -0,0 +1,55 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+public class BasebandVersionDialogController {
+
+ @VisibleForTesting
+ static final int BASEBAND_VERSION_LABEL_ID = R.id.baseband_version_label;
+ @VisibleForTesting
+ static final int BASEBAND_VERSION_VALUE_ID = R.id.baseband_version_value;
+ @VisibleForTesting
+ static final String BASEBAND_PROPERTY = "gsm.version.baseband";
+
+ private final FirmwareVersionDialogFragment mDialog;
+
+ public BasebandVersionDialogController(FirmwareVersionDialogFragment dialog) {
+ mDialog = dialog;
+ }
+
+ /**
+ * Updates the baseband version field of the dialog.
+ */
+ public void initialize() {
+ final Context context = mDialog.getContext();
+ if (Utils.isWifiOnly(context)) {
+ mDialog.removeSettingFromScreen(BASEBAND_VERSION_LABEL_ID);
+ mDialog.removeSettingFromScreen(BASEBAND_VERSION_VALUE_ID);
+ return;
+ }
+
+ mDialog.setText(BASEBAND_VERSION_VALUE_ID, SystemProperties.get(BASEBAND_PROPERTY,
+ context.getString(R.string.device_info_default)));
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java
new file mode 100644
index 0000000..d995867
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java
@@ -0,0 +1,43 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import android.os.Build;
+import android.support.annotation.VisibleForTesting;
+import android.text.BidiFormatter;
+
+import com.android.settings.R;
+
+public class BuildNumberDialogController {
+
+ @VisibleForTesting
+ static final int BUILD_NUMBER_VALUE_ID = R.id.build_number_value;
+
+ private final FirmwareVersionDialogFragment mDialog;
+
+ public BuildNumberDialogController(FirmwareVersionDialogFragment dialog) {
+ mDialog = dialog;
+ }
+
+ /**
+ * Updates the build number to the dialog.
+ */
+ public void initialize() {
+ mDialog.setText(BUILD_NUMBER_VALUE_ID,
+ BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java
new file mode 100644
index 0000000..5794e12
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java
@@ -0,0 +1,112 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils;
+
+public class FirmwareVersionDialogController implements View.OnClickListener {
+
+ private static final String TAG = "firmwareDialogCtrl";
+ private static final int DELAY_TIMER_MILLIS = 500;
+ private static final int ACTIVITY_TRIGGER_COUNT = 3;
+
+ @VisibleForTesting
+ static final int FIRMWARE_VERSION_VALUE_ID = R.id.firmware_version_value;
+ @VisibleForTesting
+ static final int FIRMWARE_VERSION_LABEL_ID = R.id.firmware_version_label;
+
+ private final FirmwareVersionDialogFragment mDialog;
+ private final Context mContext;
+ private final UserManager mUserManager;
+ private final long[] mHits = new long[ACTIVITY_TRIGGER_COUNT];
+
+ private RestrictedLockUtils.EnforcedAdmin mFunDisallowedAdmin;
+ private boolean mFunDisallowedBySystem;
+
+ public FirmwareVersionDialogController(FirmwareVersionDialogFragment dialog) {
+ mDialog = dialog;
+ mContext = dialog.getContext();
+ mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ }
+
+ @Override
+ public void onClick(View v) {
+ arrayCopy();
+ mHits[mHits.length - 1] = SystemClock.uptimeMillis();
+ if (mHits[0] >= (SystemClock.uptimeMillis() - DELAY_TIMER_MILLIS)) {
+ if (mUserManager.hasUserRestriction(UserManager.DISALLOW_FUN)) {
+ if (mFunDisallowedAdmin != null && !mFunDisallowedBySystem) {
+ RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext,
+ mFunDisallowedAdmin);
+ }
+ Log.d(TAG, "Sorry, no fun for you!");
+ return;
+ }
+
+ final Intent intent = new Intent(Intent.ACTION_MAIN)
+ .setClassName(
+ "android", com.android.internal.app.PlatLogoActivity.class.getName());
+ try {
+ mContext.startActivity(intent);
+ } catch (Exception e) {
+ Log.e(TAG, "Unable to start activity " + intent.toString());
+ }
+ }
+ }
+
+ /**
+ * Populates the Android version field in the dialog and registers click listeners.
+ */
+ public void initialize() {
+ initializeAdminPermissions();
+ registerClickListeners();
+
+ mDialog.setText(FIRMWARE_VERSION_VALUE_ID, Build.VERSION.RELEASE);
+ }
+
+ private void registerClickListeners() {
+ mDialog.registerClickListener(FIRMWARE_VERSION_LABEL_ID, this /* listener */);
+ mDialog.registerClickListener(FIRMWARE_VERSION_VALUE_ID, this /* listener */);
+ }
+
+ /**
+ * Copies the array onto itself to remove the oldest hit.
+ */
+ @VisibleForTesting
+ void arrayCopy() {
+ System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);
+ }
+
+ @VisibleForTesting
+ void initializeAdminPermissions() {
+ mFunDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
+ mFunDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
+ mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java
index 3af21a9..0087444 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java
@@ -23,6 +23,7 @@
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
@@ -32,6 +33,8 @@
private static final String TAG = "firmwareVersionDialog";
+ private View mRootView;
+
public static void show(Fragment host) {
final FragmentManager manager = host.getChildFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
@@ -51,9 +54,40 @@
.setTitle(R.string.firmware_title)
.setPositiveButton(android.R.string.ok, null /* listener */);
- final View view = LayoutInflater.from(getActivity()).inflate(
+ mRootView = LayoutInflater.from(getActivity()).inflate(
R.layout.dialog_firmware_version, null /* parent */);
- return builder.setView(view).create();
+ initializeControllers();
+
+ return builder.setView(mRootView).create();
+ }
+
+ public void setText(int viewId, CharSequence text) {
+ final TextView view = mRootView.findViewById(viewId);
+ if (view != null) {
+ view.setText(text);
+ }
+ }
+
+ public void removeSettingFromScreen(int viewId) {
+ final View view = mRootView.findViewById(viewId);
+ if (view != null) {
+ view.setVisibility(View.GONE);
+ }
+ }
+
+ public void registerClickListener(int viewId, View.OnClickListener listener) {
+ final View view = mRootView.findViewById(viewId);
+ if (view != null) {
+ view.setOnClickListener(listener);
+ }
+ }
+
+ private void initializeControllers() {
+ new FirmwareVersionDialogController(this).initialize();
+ new SecurityPatchLevelDialogController(this).initialize();
+ new BasebandVersionDialogController(this).initialize();
+ new KernelVersionDialogController(this).initialize();
+ new BuildNumberDialogController(this).initialize();
}
}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
new file mode 100644
index 0000000..c6c84f6
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
@@ -0,0 +1,41 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settingslib.DeviceInfoUtils;
+
+public class KernelVersionDialogController {
+
+ @VisibleForTesting
+ static int KERNEL_VERSION_VALUE_ID = R.id.kernel_version_value;
+
+ private final FirmwareVersionDialogFragment mDialog;
+
+ public KernelVersionDialogController(FirmwareVersionDialogFragment dialog) {
+ mDialog = dialog;
+ }
+
+ /**
+ * Updates kernel version to the dialog.
+ */
+ public void initialize() {
+ mDialog.setText(KERNEL_VERSION_VALUE_ID, DeviceInfoUtils.getFormattedKernelVersion());
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java
new file mode 100644
index 0000000..01f440d
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java
@@ -0,0 +1,86 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settingslib.DeviceInfoUtils;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+public class SecurityPatchLevelDialogController implements View.OnClickListener {
+
+ private static final String TAG = "SecurityPatchCtrl";
+ private static final Uri INTENT_URI_DATA = Uri.parse(
+ "https://source.android.com/security/bulletin/");
+
+ @VisibleForTesting
+ static final int SECURITY_PATCH_VALUE_ID = R.id.security_patch_level_value;
+ @VisibleForTesting
+ static final int SECURITY_PATCH_LABEL_ID = R.id.security_patch_level_label;
+
+ private final FirmwareVersionDialogFragment mDialog;
+ private final Context mContext;
+ private final PackageManagerWrapper mPackageManager;
+ private final String mCurrentPatch;
+
+ public SecurityPatchLevelDialogController(FirmwareVersionDialogFragment dialog) {
+ mDialog = dialog;
+ mContext = dialog.getContext();
+ mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
+ mCurrentPatch = DeviceInfoUtils.getSecurityPatch();
+ }
+
+ @Override
+ public void onClick(View v) {
+ final Intent intent = new Intent();
+ intent.setAction(Intent.ACTION_VIEW);
+ intent.setData(INTENT_URI_DATA);
+ if (mPackageManager.queryIntentActivities(intent, 0).isEmpty()) {
+ // Don't send out the intent to stop crash
+ Log.w(TAG, "Stop click action on " + SECURITY_PATCH_VALUE_ID + ": "
+ + "queryIntentActivities() returns empty");
+ return;
+ }
+
+ mContext.startActivity(intent);
+ }
+
+ /**
+ * Populates the security patch level field in the dialog and registers click listeners.
+ */
+ public void initialize() {
+ if (TextUtils.isEmpty(mCurrentPatch)) {
+ mDialog.removeSettingFromScreen(SECURITY_PATCH_LABEL_ID);
+ mDialog.removeSettingFromScreen(SECURITY_PATCH_VALUE_ID);
+ return;
+ }
+ registerListeners();
+ mDialog.setText(SECURITY_PATCH_VALUE_ID, mCurrentPatch);
+ }
+
+ private void registerListeners() {
+ mDialog.registerClickListener(SECURITY_PATCH_LABEL_ID, this /* listener */);
+ mDialog.registerClickListener(SECURITY_PATCH_VALUE_ID, this /* listener */);
+ }
+}
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
deleted file mode 100644
index c524346..0000000
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2014 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.search;
-
-import android.support.annotation.VisibleForTesting;
-
-import com.android.settings.DateTimeSettings;
-import com.android.settings.DeviceInfoSettings;
-import com.android.settings.DisplaySettings;
-import com.android.settings.LegalSettings;
-import com.android.settings.ScreenPinningSettings;
-import com.android.settings.accessibility.AccessibilitySettings;
-import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
-import com.android.settings.accessibility.MagnificationPreferenceFragment;
-import com.android.settings.accounts.UserAndAccountDashboardFragment;
-import com.android.settings.applications.AppAndNotificationDashboardFragment;
-import com.android.settings.applications.DefaultAppSettings;
-import com.android.settings.applications.SpecialAccessSettings;
-import com.android.settings.applications.assist.ManageAssist;
-import com.android.settings.backup.BackupSettingsActivity;
-import com.android.settings.backup.BackupSettingsFragment;
-import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
-import com.android.settings.datausage.DataUsageMeteredSettings;
-import com.android.settings.datausage.DataUsageSummary;
-import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
-import com.android.settings.development.DevelopmentSettingsDashboardFragment;
-import com.android.settings.deviceinfo.Status;
-import com.android.settings.deviceinfo.StorageDashboardFragment;
-import com.android.settings.deviceinfo.StorageSettings;
-import com.android.settings.display.AmbientDisplaySettings;
-import com.android.settings.display.ScreenZoomSettings;
-import com.android.settings.dream.DreamSettings;
-import com.android.settings.enterprise.EnterprisePrivacySettings;
-import com.android.settings.fuelgauge.BatterySaverSettings;
-import com.android.settings.fuelgauge.PowerUsageAdvanced;
-import com.android.settings.fuelgauge.PowerUsageSummary;
-import com.android.settings.gestures.AssistGestureSettings;
-import com.android.settings.gestures.DoubleTapPowerSettings;
-import com.android.settings.gestures.DoubleTapScreenSettings;
-import com.android.settings.gestures.DoubleTwistGestureSettings;
-import com.android.settings.gestures.GestureSettings;
-import com.android.settings.gestures.PickupGestureSettings;
-import com.android.settings.gestures.SwipeToNotificationSettings;
-import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment;
-import com.android.settings.inputmethod.VirtualKeyboardFragment;
-import com.android.settings.language.LanguageAndInputSettings;
-import com.android.settings.location.LocationSettings;
-import com.android.settings.location.ScanningSettings;
-import com.android.settings.network.NetworkDashboardFragment;
-import com.android.settings.nfc.PaymentSettings;
-import com.android.settings.notification.ConfigureNotificationSettings;
-import com.android.settings.notification.SoundSettings;
-import com.android.settings.notification.ZenModeAutomationSettings;
-import com.android.settings.notification.ZenModeBehaviorSettings;
-import com.android.settings.notification.ZenModeSettings;
-import com.android.settings.print.PrintSettingsFragment;
-import com.android.settings.security.EncryptionAndCredential;
-import com.android.settings.security.LockscreenDashboardFragment;
-import com.android.settings.security.SecuritySettings;
-import com.android.settings.security.screenlock.ScreenLockSettings;
-import com.android.settings.sim.SimSettings;
-import com.android.settings.support.SupportDashboardActivity;
-import com.android.settings.system.ResetDashboardFragment;
-import com.android.settings.system.SystemDashboardFragment;
-import com.android.settings.tts.TextToSpeechSettings;
-import com.android.settings.tts.TtsEnginePreferenceFragment;
-import com.android.settings.users.UserSettings;
-import com.android.settings.wallpaper.WallpaperTypeSettings;
-import com.android.settings.wifi.ConfigureWifiSettings;
-import com.android.settings.wifi.WifiSettings;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-public final class SearchIndexableResources {
-
- @VisibleForTesting
- static final Set<Class> sProviders = new HashSet<>();
-
- @VisibleForTesting
- static void addIndex(Class indexClass) {
- sProviders.add(indexClass);
- }
-
- static {
- addIndex(WifiSettings.class);
- addIndex(NetworkDashboardFragment.class);
- addIndex(ConfigureWifiSettings.class);
- addIndex(BluetoothSettings.class);
- addIndex(SimSettings.class);
- addIndex(DataUsageSummary.class);
- addIndex(DataUsageMeteredSettings.class);
- addIndex(ScreenZoomSettings.class);
- addIndex(DisplaySettings.class);
- addIndex(AmbientDisplaySettings.class);
- addIndex(WallpaperTypeSettings.class);
- addIndex(AppAndNotificationDashboardFragment.class);
- addIndex(SoundSettings.class);
- addIndex(ZenModeSettings.class);
- addIndex(StorageSettings.class);
- addIndex(PowerUsageAdvanced.class);
- addIndex(DefaultAppSettings.class);
- addIndex(ManageAssist.class);
- addIndex(SpecialAccessSettings.class);
- addIndex(UserSettings.class);
- addIndex(AssistGestureSettings.class);
- addIndex(PickupGestureSettings.class);
- addIndex(DoubleTapScreenSettings.class);
- addIndex(DoubleTapPowerSettings.class);
- addIndex(DoubleTwistGestureSettings.class);
- addIndex(SwipeToNotificationSettings.class);
- addIndex(GestureSettings.class);
- addIndex(LanguageAndInputSettings.class);
- addIndex(LocationSettings.class);
- addIndex(ScanningSettings.class);
- addIndex(SecuritySettings.class);
- addIndex(ScreenLockSettings.class);
- addIndex(EncryptionAndCredential.class);
- addIndex(ScreenPinningSettings.class);
- addIndex(UserAndAccountDashboardFragment.class);
- addIndex(VirtualKeyboardFragment.class);
- addIndex(AvailableVirtualKeyboardFragment.class);
- addIndex(PhysicalKeyboardFragment.class);
- addIndex(BackupSettingsActivity.class);
- addIndex(BackupSettingsFragment.class);
- addIndex(DateTimeSettings.class);
- addIndex(AccessibilitySettings.class);
- addIndex(PrintSettingsFragment.class);
- addIndex(DevelopmentSettingsDashboardFragment.class);
- addIndex(DeviceInfoSettings.class);
- addIndex(Status.class);
- addIndex(LegalSettings.class);
- addIndex(SystemDashboardFragment.class);
- addIndex(ResetDashboardFragment.class);
- addIndex(StorageDashboardFragment.class);
- addIndex(ConnectedDeviceDashboardFragment.class);
- addIndex(EnterprisePrivacySettings.class);
- addIndex(PaymentSettings.class);
- addIndex(TextToSpeechSettings.class);
- addIndex(TtsEnginePreferenceFragment.class);
- addIndex(MagnificationPreferenceFragment.class);
- addIndex(AccessibilityShortcutPreferenceFragment.class);
- addIndex(DreamSettings.class);
- addIndex(SupportDashboardActivity.class);
- addIndex(AutomaticStorageManagerSettings.class);
- addIndex(ConfigureNotificationSettings.class);
- addIndex(PowerUsageSummary.class);
- addIndex(BatterySaverSettings.class);
- addIndex(LockscreenDashboardFragment.class);
- addIndex(ZenModeBehaviorSettings.class);
- addIndex(ZenModeAutomationSettings.class);
- }
-
- private SearchIndexableResources() {
- }
-
- public static Collection<Class> providerValues() { return sProviders;}
-}
\ No newline at end of file
diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
index 968847b..0422e67 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -46,21 +46,164 @@
import android.database.MatrixCursor;
import android.provider.SearchIndexableResource;
import android.provider.SearchIndexablesProvider;
+import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.Log;
+import com.android.settings.DateTimeSettings;
+import com.android.settings.DeviceInfoSettings;
+import com.android.settings.DisplaySettings;
+import com.android.settings.LegalSettings;
+import com.android.settings.ScreenPinningSettings;
+import com.android.settings.accessibility.AccessibilitySettings;
+import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
+import com.android.settings.accessibility.MagnificationPreferenceFragment;
+import com.android.settings.accounts.UserAndAccountDashboardFragment;
+import com.android.settings.applications.AppAndNotificationDashboardFragment;
+import com.android.settings.applications.DefaultAppSettings;
+import com.android.settings.applications.SpecialAccessSettings;
+import com.android.settings.applications.assist.ManageAssist;
+import com.android.settings.backup.BackupSettingsActivity;
+import com.android.settings.backup.BackupSettingsFragment;
+import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.datausage.DataUsageMeteredSettings;
+import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.deviceinfo.Status;
+import com.android.settings.deviceinfo.StorageDashboardFragment;
+import com.android.settings.deviceinfo.StorageSettings;
+import com.android.settings.display.AmbientDisplaySettings;
+import com.android.settings.display.ScreenZoomSettings;
+import com.android.settings.dream.DreamSettings;
+import com.android.settings.enterprise.EnterprisePrivacySettings;
+import com.android.settings.fuelgauge.BatterySaverSettings;
+import com.android.settings.fuelgauge.PowerUsageAdvanced;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.gestures.AssistGestureSettings;
+import com.android.settings.gestures.DoubleTapPowerSettings;
+import com.android.settings.gestures.DoubleTapScreenSettings;
+import com.android.settings.gestures.DoubleTwistGestureSettings;
+import com.android.settings.gestures.GestureSettings;
+import com.android.settings.gestures.PickupGestureSettings;
+import com.android.settings.gestures.SwipeToNotificationSettings;
+import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
+import com.android.settings.inputmethod.PhysicalKeyboardFragment;
+import com.android.settings.inputmethod.VirtualKeyboardFragment;
+import com.android.settings.language.LanguageAndInputSettings;
+import com.android.settings.location.LocationSettings;
+import com.android.settings.location.ScanningSettings;
+import com.android.settings.network.NetworkDashboardFragment;
+import com.android.settings.nfc.PaymentSettings;
+import com.android.settings.notification.ConfigureNotificationSettings;
+import com.android.settings.notification.SoundSettings;
+import com.android.settings.notification.ZenModeAutomationSettings;
+import com.android.settings.notification.ZenModeBehaviorSettings;
+import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.security.EncryptionAndCredential;
+import com.android.settings.security.LockscreenDashboardFragment;
+import com.android.settings.security.SecuritySettings;
+import com.android.settings.security.screenlock.ScreenLockSettings;
+import com.android.settings.sim.SimSettings;
+import com.android.settings.support.SupportDashboardActivity;
+import com.android.settings.system.ResetDashboardFragment;
+import com.android.settings.system.SystemDashboardFragment;
+import com.android.settings.tts.TextToSpeechSettings;
+import com.android.settings.tts.TtsEnginePreferenceFragment;
+import com.android.settings.users.UserSettings;
+import com.android.settings.wallpaper.WallpaperTypeSettings;
+import com.android.settings.wifi.ConfigureWifiSettings;
+import com.android.settings.wifi.WifiSettings;
+
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
public static final boolean DEBUG = false;
private static final String TAG = "SettingsSearchProvider";
+ public static final Set<Class> INDEXABLES = new HashSet<>();
private static final Collection<String> INVALID_KEYS;
+ @VisibleForTesting
+ static void addIndex(Class indexClass) {
+ INDEXABLES.add(indexClass);
+ }
+
static {
+ addIndex(WifiSettings.class);
+ addIndex(NetworkDashboardFragment.class);
+ addIndex(ConfigureWifiSettings.class);
+ addIndex(BluetoothSettings.class);
+ addIndex(SimSettings.class);
+ addIndex(DataUsageSummary.class);
+ addIndex(DataUsageMeteredSettings.class);
+ addIndex(ScreenZoomSettings.class);
+ addIndex(DisplaySettings.class);
+ addIndex(AmbientDisplaySettings.class);
+ addIndex(WallpaperTypeSettings.class);
+ addIndex(AppAndNotificationDashboardFragment.class);
+ addIndex(SoundSettings.class);
+ addIndex(ZenModeSettings.class);
+ addIndex(StorageSettings.class);
+ addIndex(PowerUsageAdvanced.class);
+ addIndex(DefaultAppSettings.class);
+ addIndex(ManageAssist.class);
+ addIndex(SpecialAccessSettings.class);
+ addIndex(UserSettings.class);
+ addIndex(AssistGestureSettings.class);
+ addIndex(PickupGestureSettings.class);
+ addIndex(DoubleTapScreenSettings.class);
+ addIndex(DoubleTapPowerSettings.class);
+ addIndex(DoubleTwistGestureSettings.class);
+ addIndex(SwipeToNotificationSettings.class);
+ addIndex(GestureSettings.class);
+ addIndex(LanguageAndInputSettings.class);
+ addIndex(LocationSettings.class);
+ addIndex(ScanningSettings.class);
+ addIndex(SecuritySettings.class);
+ addIndex(ScreenLockSettings.class);
+ addIndex(EncryptionAndCredential.class);
+ addIndex(ScreenPinningSettings.class);
+ addIndex(UserAndAccountDashboardFragment.class);
+ addIndex(VirtualKeyboardFragment.class);
+ addIndex(AvailableVirtualKeyboardFragment.class);
+ addIndex(PhysicalKeyboardFragment.class);
+ addIndex(BackupSettingsActivity.class);
+ addIndex(BackupSettingsFragment.class);
+ addIndex(DateTimeSettings.class);
+ addIndex(AccessibilitySettings.class);
+ addIndex(PrintSettingsFragment.class);
+ addIndex(DevelopmentSettingsDashboardFragment.class);
+ addIndex(DeviceInfoSettings.class);
+ addIndex(Status.class);
+ addIndex(LegalSettings.class);
+ addIndex(SystemDashboardFragment.class);
+ addIndex(ResetDashboardFragment.class);
+ addIndex(StorageDashboardFragment.class);
+ addIndex(ConnectedDeviceDashboardFragment.class);
+ addIndex(EnterprisePrivacySettings.class);
+ addIndex(PaymentSettings.class);
+ addIndex(TextToSpeechSettings.class);
+ addIndex(TtsEnginePreferenceFragment.class);
+ addIndex(MagnificationPreferenceFragment.class);
+ addIndex(AccessibilityShortcutPreferenceFragment.class);
+ addIndex(DreamSettings.class);
+ addIndex(SupportDashboardActivity.class);
+ addIndex(AutomaticStorageManagerSettings.class);
+ addIndex(ConfigureNotificationSettings.class);
+ addIndex(PowerUsageSummary.class);
+ addIndex(BatterySaverSettings.class);
+ addIndex(LockscreenDashboardFragment.class);
+ addIndex(ZenModeBehaviorSettings.class);
+ addIndex(ZenModeAutomationSettings.class);
+
INVALID_KEYS = new ArraySet<>();
INVALID_KEYS.add(null);
INVALID_KEYS.add("");
@@ -135,10 +278,9 @@
}
private List<String> getNonIndexableKeysFromProvider(Context context) {
- final Collection<Class> values = SearchIndexableResources.providerValues();
final List<String> nonIndexableKeys = new ArrayList<>();
- for (Class<?> clazz : values) {
+ for (Class clazz : INDEXABLES) {
final long startTime = System.currentTimeMillis();
Indexable.SearchIndexProvider provider = DatabaseIndexingUtils.getSearchIndexProvider(
clazz);
@@ -169,10 +311,9 @@
}
private List<SearchIndexableResource> getSearchIndexableResourcesFromProvider(Context context) {
- Collection<Class> values = SearchIndexableResources.providerValues();
List<SearchIndexableResource> resourceList = new ArrayList<>();
- for (Class<?> clazz : values) {
+ for (Class clazz : INDEXABLES) {
Indexable.SearchIndexProvider provider = DatabaseIndexingUtils.getSearchIndexProvider(
clazz);
@@ -196,10 +337,9 @@
}
private List<SearchIndexableRaw> getSearchIndexableRawFromProvider(Context context) {
- final Collection<Class> values = SearchIndexableResources.providerValues();
final List<SearchIndexableRaw> rawList = new ArrayList<>();
- for (Class<?> clazz : values) {
+ for (Class clazz : INDEXABLES) {
Indexable.SearchIndexProvider provider = DatabaseIndexingUtils.getSearchIndexProvider(
clazz);
final List<SearchIndexableRaw> providerRaws = provider.getRawDataToIndex(context,
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index 33a1d95..c2909ac 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -15,7 +15,6 @@
-->
<resources>
- <bool name="config_show_camera_hal_hdrplus">false</bool>
<bool name="config_enableColorTemperature">false</bool>
<bool name="config_show_camera_laser_sensor">false</bool>
<bool name="config_show_connectivity_monitor">false</bool>
diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml
index 0afbe29..9e2d911 100644
--- a/tests/robotests/res/values/config.xml
+++ b/tests/robotests/res/values/config.xml
@@ -19,6 +19,5 @@
<bool name="config_new_device_intro_suggestion_supported">true</bool>
<bool name="config_enableColorTemperature">true</bool>
<bool name="config_show_camera_laser_sensor">true</bool>
- <bool name="config_show_camera_hal_hdrplus">true</bool>
<bool name="config_show_connectivity_monitor">true</bool>
</resources>
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
index aa92ebb..dc4166d 100644
--- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -16,9 +16,9 @@
package com.android.settings;
+
import android.app.Activity;
import android.content.Context;
-import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceManager;
@@ -39,19 +39,19 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsPreferenceFragmentTest {
private static final int ITEM_COUNT = 5;
@Mock
+ private PreferenceManager mPreferenceManager;
+ @Mock
private Activity mActivity;
@Mock
private View mListContainer;
@@ -142,21 +142,6 @@
assertThat(mEmptyView.getVisibility()).isEqualTo(View.GONE);
}
- @Test
- @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
- public void onCreate_hasExtraFragmentKey_shouldExpandPreferences() {
- doReturn(mContext.getTheme()).when(mActivity).getTheme();
- doReturn(mContext.getResources()).when(mFragment).getResources();
- doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
- final Bundle bundle = new Bundle();
- bundle.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, "test_key");
- doReturn(bundle).when(mFragment).getArguments();
-
- mFragment.onCreate(null /* icicle */);
-
- verify(mPreferenceScreen).setInitialExpandedChildrenCount(Integer.MAX_VALUE);
- }
-
public static class TestFragment extends SettingsPreferenceFragment {
@Override
@@ -165,4 +150,5 @@
}
}
+
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
index 240ece1..62e4986 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
@@ -36,7 +36,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
shadows=SettingsShadowBluetoothDevice.class)
public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
index 3b8db04..a02a0c1 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
@@ -37,7 +37,7 @@
import org.robolectric.RuntimeEnvironment;
public class BluetoothDetailsControllerTestBase {
- protected Context mContext = RuntimeEnvironment.application;
+ protected Context mContext;
protected Lifecycle mLifecycle;
protected DeviceConfig mDeviceConfig;
protected BluetoothDevice mDevice;
@@ -58,6 +58,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
mPreferenceManager = new PreferenceManager(mContext);
mScreen = mPreferenceManager.createPreferenceScreen(mContext);
mDeviceConfig = makeDefaultDeviceConfig();
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
index 98a3580..2dc411c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
@@ -45,7 +45,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
shadows={SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class,
SettingsShadowResources.class})
public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsControllerTestBase {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
index 24b28a1..4edcc74 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
@@ -17,8 +17,8 @@
import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
import com.android.settingslib.widget.FooterPreference;
@@ -27,9 +27,10 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows=SettingsShadowBluetoothDevice.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+ shadows = SettingsShadowBluetoothDevice.class)
public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase {
+
private BluetoothDetailsMacAddressController mController;
@Override
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
index 445e4e3..eca5df9 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -54,7 +54,7 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
shadows=SettingsShadowBluetoothDevice.class)
public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase {
private BluetoothDetailsProfilesController mController;
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
new file mode 100644
index 0000000..4c1794c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
@@ -0,0 +1,123 @@
+package com.android.settings.datetime;
+
+import com.android.settings.datetime.ZonePicker;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.datetime.ZoneGetter;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TimeZone;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ZonePickerComparatorTest {
+
+ // Strings in Chinese are sorted by alphabet order of their Pinyin.
+ // "伦敦" -> "lundun"; "纽约" -> "niuyue"; "悉尼" -> "xini"
+ // "开罗" -> "kailuo"; "雅典" -> "yadian"; "上海" -> "shanghai"
+ private static final String[] TEST_CHINESE_NAME =
+ new String[]{"伦敦", "纽约", "悉尼", "开罗", "雅典", "上海"};
+ private static final String[] ORDERED_CHINESE_NAME =
+ new String[]{"开罗", "伦敦", "纽约", "上海", "悉尼", "雅典"};
+
+ private static final String[] TEST_ENGLISH_NAME =
+ new String[]{"London", "New York", "Sydney", "Cairo", "Athens", "Shanghai"};
+ private static final String[] ORDERED_ENGLISH_NAME =
+ new String[]{"Athens", "Cairo", "London", "New York", "Shanghai", "Sydney"};
+
+ private static final Locale INIT_LOCALE = Locale.getDefault();
+
+ private Map<String, List> mTestDataMap;
+ private List<Map<String, Object>> mTestList;
+
+ @Before
+ public void setUp() {
+ mTestDataMap = new HashMap<>();
+ mTestDataMap.put("zh_CN", Arrays.asList(TEST_CHINESE_NAME));
+ mTestDataMap.put("en_US", Arrays.asList(TEST_ENGLISH_NAME));
+ }
+
+ @After
+ public void tearDown() {
+ Locale.setDefault(INIT_LOCALE);
+ }
+
+ @Test
+ public void testComparator_sortChineseString() {
+ String sortKey = ZoneGetter.KEY_DISPLAY_LABEL;
+ mTestList = getMockZonesList("zh_CN");
+ Locale.setDefault(new Locale("zh"));
+ final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
+ assertThat(comparator).isNotNull();
+ Collections.sort(mTestList, comparator);
+ for (int i = 0; i < mTestList.size(); i++) {
+ assertThat(mTestList.get(i).get(sortKey).toString())
+ .isEqualTo(ORDERED_CHINESE_NAME[i]);
+ }
+ }
+
+ @Test
+ public void testComparator_sortEnglishString() {
+ String sortKey = ZoneGetter.KEY_DISPLAY_LABEL;
+ mTestList = getMockZonesList("en_US");
+ Locale.setDefault(new Locale("en"));
+ final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
+ assertThat(comparator).isNotNull();
+ Collections.sort(mTestList, comparator);
+ for (int i = 0; i < mTestList.size(); i++) {
+ assertThat(mTestList.get(i).get(sortKey).toString())
+ .isEqualTo(ORDERED_ENGLISH_NAME[i]);
+ }
+ }
+
+ @Test
+ public void testComparator_sortInteger() {
+ String sortKey = ZoneGetter.KEY_OFFSET;
+ // TestList of any locale can be selected to test integer sorting.
+ mTestList = getMockZonesList("en_US");
+ final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
+ assertThat(comparator).isNotNull();
+ Collections.sort(mTestList, comparator);
+ for (int i = 0; i < mTestList.size(); i++) {
+ assertThat(mTestList.get(i).get(sortKey)).isEqualTo(i);
+ }
+ }
+
+ private List<Map<String, Object>> getMockZonesList(String locale) {
+ List<Map<String, Object>> zones = new ArrayList<>();
+ List<String> testData = mTestDataMap.get(locale);
+ TimeZone tz = TimeZone.getDefault();
+ int testSize = testData.size();
+ for (int i = 0; i < testSize; i++) {
+ zones.add(createMockDisplayEntry(tz, "GMT+08:00",
+ testData.get(i), testSize - i - 1));
+ }
+ return zones;
+ }
+
+ private Map<String, Object> createMockDisplayEntry(
+ TimeZone tz, CharSequence gmtOffsetText, CharSequence displayName, int offsetMillis) {
+ Map<String, Object> map = new HashMap<>();
+ map.put(ZoneGetter.KEY_ID, tz.getID());
+ map.put(ZoneGetter.KEY_DISPLAYNAME, displayName.toString());
+ map.put(ZoneGetter.KEY_DISPLAY_LABEL, displayName);
+ map.put(ZoneGetter.KEY_GMT, gmtOffsetText.toString());
+ map.put(ZoneGetter.KEY_OFFSET_LABEL, gmtOffsetText);
+ map.put(ZoneGetter.KEY_OFFSET, offsetMillis);
+ return map;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java
deleted file mode 100644
index 48833e4..0000000
--- a/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java
+++ /dev/null
@@ -1,150 +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.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-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.shadow.SettingsShadowSystemProperties;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.RuntimeEnvironment;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * deprecated in favor of {@link CameraHalHdrPlusPreferenceControllerV2}
- */
-@Deprecated
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
-public class CameraHalHdrplusPreferenceControllerTest {
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock
- private PreferenceScreen mScreen;
- @Mock
- private SwitchPreference mPreference;
-
- static final String USERDEBUG_BUILD = "userdebug";
-
- private CameraHalHdrplusPreferenceController mController;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mController = new CameraHalHdrplusPreferenceController(mContext);
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
- when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
- }
-
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
- @Test
- public void isAvailable_withConfigNoShow_shouldReturnFalse() {
- when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
- .thenReturn(false);
- assertThat(mController.isAvailable()).isFalse();
- }
-
- @Test
- public void displayPreference_cameraHalHdrplusEnabled_shouldCheckedPreference() {
- when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
- .thenReturn(true);
-
- SettingsShadowSystemProperties.set(
- CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
- CameraHalHdrplusPreferenceController.ENABLED);
- SettingsShadowSystemProperties.set(
- CameraHalHdrplusPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
- mController.displayPreference(mScreen);
-
- verify(mPreference).setChecked(true);
- }
-
- @Test
- public void displayPreference_cameraHalHdrplusEnabled_shouldUncheckedPreference() {
- when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
- .thenReturn(true);
-
- SettingsShadowSystemProperties.set(
- CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
- CameraHalHdrplusPreferenceController.DISABLED);
- SettingsShadowSystemProperties.set(
- CameraHalHdrplusPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
- mController.displayPreference(mScreen);
-
- verify(mPreference).setChecked(false);
- }
-
- @Test
- public void handlePreferenceTreeClick_preferenceChecked_shouldEnableCameraHalHdrplus() {
- when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
- .thenReturn(true);
-
- when(mPreference.isChecked()).thenReturn(true);
-
- when(mContext.getResources().getString(R.string.camera_hal_hdrplus_toast)).thenReturn(
- RuntimeEnvironment.application.getString(R.string.camera_hal_hdrplus_toast));
-
- mController.handlePreferenceTreeClick(mPreference);
-
- assertThat(CameraHalHdrplusPreferenceController.ENABLED.equals(
- SystemProperties.get(
- CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
- CameraHalHdrplusPreferenceController.DISABLED))).isTrue();
- }
-
- @Test
- public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraHalHdrplus() {
- when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
- .thenReturn(true);
-
- when(mPreference.isChecked()).thenReturn(false);
-
- when(mContext.getResources().getString(R.string.camera_hal_hdrplus_toast)).thenReturn(
- RuntimeEnvironment.application.getString(R.string.camera_hal_hdrplus_toast));
-
- mController.handlePreferenceTreeClick(mPreference);
-
- assertThat(CameraHalHdrplusPreferenceController.DISABLED.equals(
- SystemProperties.get(
- CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
- CameraHalHdrplusPreferenceController.DISABLED))).isTrue();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java
deleted file mode 100644
index e0e137c..0000000
--- a/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java
+++ /dev/null
@@ -1,145 +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 static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
-public class CameraHalHdrplusPreferenceControllerV2Test {
-
- @Mock
- private PreferenceScreen mScreen;
- @Mock
- private SwitchPreference mPreference;
-
- private Context mContext;
- private CameraHalHdrplusPreferenceControllerV2 mController;
-
- static final String USERDEBUG_BUILD = "userdebug";
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new CameraHalHdrplusPreferenceControllerV2(mContext);
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
- when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
- mController.displayPreference(mScreen);
- }
-
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
- @Test
- @Config(qualifiers = "mcc999")
- public void isAvailable_withConfigNoShowAndUserDebugBuild_shouldReturnFalse() {
- SettingsShadowSystemProperties.set(
- CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
-
- assertThat(mController.isAvailable()).isFalse();
- }
-
- @Test
- public void updateState_cameraHalHdrplusEnabled_shouldCheckedPreference() {
- SettingsShadowSystemProperties.set(
- CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
- CameraHalHdrplusPreferenceControllerV2.ENABLED);
- SettingsShadowSystemProperties.set(
- CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
-
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(true);
- }
-
- @Test
- public void updateState_cameraHalHdrplusEnabled_shouldUncheckedPreference() {
- SettingsShadowSystemProperties.set(
- CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
- CameraHalHdrplusPreferenceControllerV2.DISABLED);
- SettingsShadowSystemProperties.set(
- CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
-
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(false);
- }
-
- @Test
- public void onPreferenceChange_preferenceChecked_shouldEnableCameraHalHdrplus() {
- mController.onPreferenceChange(mPreference, true /* new value */);
-
- assertThat(CameraHalHdrplusPreferenceControllerV2.ENABLED).isEqualTo(
- SystemProperties.get(
- CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
- CameraHalHdrplusPreferenceControllerV2.DISABLED));
- }
-
- @Test
- public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraHalHdrplus() {
- mController.onPreferenceChange(mPreference, false /* new value */);
-
- assertThat(CameraHalHdrplusPreferenceControllerV2.DISABLED).isEqualTo(
- SystemProperties.get(
- CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
- CameraHalHdrplusPreferenceControllerV2.DISABLED));
- }
-
- @Test
- public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
- mController.onDeveloperOptionsSwitchEnabled();
-
- verify(mPreference).setEnabled(true);
- }
-
- @Test
- public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
- mController.onDeveloperOptionsSwitchDisabled();
-
- verify(mPreference).setEnabled(false);
- verify(mPreference).setChecked(false);
- assertThat(CameraHalHdrplusPreferenceControllerV2.DISABLED).isEqualTo(
- SystemProperties.get(
- CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
- CameraHalHdrplusPreferenceControllerV2.DISABLED));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java
new file mode 100644
index 0000000..0584a53
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
+ .BASEBAND_PROPERTY;
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
+ .BASEBAND_VERSION_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
+ .BASEBAND_VERSION_VALUE_ID;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.shadow.api.Shadow.extract;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.os.SystemProperties;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION_O,
+ shadows = {ShadowConnectivityManager.class, SettingsShadowSystemProperties.class})
+public class BasebandVersionDialogControllerTest {
+
+ @Mock
+ private FirmwareVersionDialogFragment mDialog;
+
+ private Context mContext;
+ private BasebandVersionDialogController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ when(mDialog.getContext()).thenReturn(mContext);
+ mController = new BasebandVersionDialogController(mDialog);
+ }
+
+ @After
+ public void teardown() {
+ SettingsShadowSystemProperties.clear();
+ }
+
+ @Test
+ public void initialize_wifiOnly_shouldRemoveSettingFromDialog() {
+ ShadowConnectivityManager connectivityManager =
+ extract(mContext.getSystemService(ConnectivityManager.class));
+ connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
+
+ mController.initialize();
+
+ verify(mDialog).removeSettingFromScreen(BASEBAND_VERSION_LABEL_ID);
+ verify(mDialog).removeSettingFromScreen(BASEBAND_VERSION_VALUE_ID);
+ }
+
+ @Test
+ public void initialize_hasMobile_shouldSetDialogTextToBasebandVersion() {
+ final String text = "test";
+ SystemProperties.set(BASEBAND_PROPERTY, text);
+ ShadowConnectivityManager connectivityManager =
+ extract(mContext.getSystemService(ConnectivityManager.class));
+ connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
+
+ mController.initialize();
+
+ verify(mDialog).setText(BASEBAND_VERSION_VALUE_ID, text);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
new file mode 100644
index 0000000..8bdf84c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
@@ -0,0 +1,59 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController
+ .BUILD_NUMBER_VALUE_ID;
+
+import static org.mockito.Mockito.verify;
+
+import android.os.Build;
+import android.text.BidiFormatter;
+
+import com.android.settings.TestConfig;
+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.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class BuildNumberDialogControllerTest {
+
+ @Mock
+ private FirmwareVersionDialogFragment mDialog;
+
+ private BuildNumberDialogController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mController = new BuildNumberDialogController(mDialog);
+ }
+
+ @Test
+ public void initialize_shouldUpdateBuildNumberToDialog() {
+ mController.initialize();
+
+ verify(mDialog).setText(BUILD_NUMBER_VALUE_ID,
+ BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java
new file mode 100644
index 0000000..00d1386
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java
@@ -0,0 +1,104 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController
+ .FIRMWARE_VERSION_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController
+ .FIRMWARE_VERSION_VALUE_ID;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+import android.view.View;
+
+import com.android.settings.TestConfig;
+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.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class FirmwareVersionDialogControllerTest {
+
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private FirmwareVersionDialogFragment mDialog;
+ @Mock
+ private View mView;
+
+ private Context mContext;
+ private FirmwareVersionDialogController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ when(mDialog.getContext()).thenReturn(mContext);
+ mController = spy(new FirmwareVersionDialogController(mDialog));
+ ReflectionHelpers.setField(mController, "mUserManager", mUserManager);
+ doNothing().when(mController).arrayCopy();
+ doNothing().when(mController).initializeAdminPermissions();
+ }
+
+ @Test
+ public void initialize_shouldRegisterListenersAndSetBuildVersion() {
+ mController.initialize();
+
+ verify(mDialog).registerClickListener(eq(FIRMWARE_VERSION_VALUE_ID), any());
+ verify(mDialog).registerClickListener(eq(FIRMWARE_VERSION_LABEL_ID), any());
+ verify(mDialog).setText(FIRMWARE_VERSION_VALUE_ID, Build.VERSION.RELEASE);
+ }
+
+ @Test
+ public void handleSettingClicked_userRestricted_shouldDoNothing() {
+ final long[] hits = ReflectionHelpers.getField(mController, "mHits");
+ hits[0] = Long.MAX_VALUE;
+ when(mUserManager.hasUserRestriction(UserManager.DISALLOW_FUN)).thenReturn(true);
+
+ mController.onClick(mView);
+
+ verify(mContext, never()).startActivity(any());
+ }
+
+ @Test
+ public void handleSettingClicked_userNotRestricted_shouldStartActivity() {
+ final long[] hits = ReflectionHelpers.getField(mController, "mHits");
+ hits[0] = Long.MAX_VALUE;
+ when(mUserManager.hasUserRestriction(UserManager.DISALLOW_FUN)).thenReturn(false);
+
+ mController.onClick(mView);
+
+ verify(mContext).startActivity(any());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
new file mode 100644
index 0000000..c679af5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController
+ .KERNEL_VERSION_VALUE_ID;
+
+import static org.mockito.Mockito.verify;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.DeviceInfoUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class KernelVersionDialogControllerTest {
+
+ @Mock
+ private FirmwareVersionDialogFragment mDialog;
+
+ private KernelVersionDialogController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mController = new KernelVersionDialogController(mDialog);
+ }
+
+ @Test
+ public void initialize_shouldUpdateKernelVersionToDialog() {
+ mController.initialize();
+
+ verify(mDialog).setText(KERNEL_VERSION_VALUE_ID,
+ DeviceInfoUtils.getFormattedKernelVersion());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java
new file mode 100644
index 0000000..ea37c2e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java
@@ -0,0 +1,117 @@
+/*
+ * 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.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController
+ .SECURITY_PATCH_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController
+ .SECURITY_PATCH_VALUE_ID;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Build;
+import android.view.View;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.Collections;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SecurityPatchLevelDialogControllerTest {
+
+ @Mock
+ private PackageManagerWrapper mPackageManager;
+ @Mock
+ private FirmwareVersionDialogFragment mDialog;
+ @Mock
+ private View mView;
+
+ private Context mContext;
+ private SecurityPatchLevelDialogController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ when(mDialog.getContext()).thenReturn(mContext);
+ }
+
+ @Test
+ public void initialize_noPatchInfo_shouldRemoveSettingFromDialog() {
+ ReflectionHelpers.setStaticField(Build.VERSION.class, "SECURITY_PATCH", "");
+ mController = new SecurityPatchLevelDialogController(mDialog);
+
+ mController.initialize();
+
+ verify(mDialog).removeSettingFromScreen(SECURITY_PATCH_VALUE_ID);
+ verify(mDialog).removeSettingFromScreen(SECURITY_PATCH_LABEL_ID);
+ }
+
+ @Test
+ public void initialize_patchInfoAvailable_shouldRegisterListeners() {
+ ReflectionHelpers.setStaticField(Build.VERSION.class, "SECURITY_PATCH", "foobar");
+ mController = new SecurityPatchLevelDialogController(mDialog);
+
+ mController.initialize();
+
+ verify(mDialog).registerClickListener(eq(SECURITY_PATCH_LABEL_ID), any());
+ verify(mDialog).registerClickListener(eq(SECURITY_PATCH_VALUE_ID), any());
+ }
+
+ @Test
+ public void onClick_noActivityIntent_shouldDoNothing() {
+ when(mPackageManager.queryIntentActivities(any(), anyInt())).thenReturn(
+ Collections.emptyList());
+ mController = new SecurityPatchLevelDialogController(mDialog);
+ ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+
+ mController.onClick(mView);
+
+ verify(mContext, never()).startActivity(any());
+ }
+
+ @Test
+ public void onClick_activityIntentFound_shouldStartActivity() {
+ when(mPackageManager.queryIntentActivities(any(), anyInt())).thenReturn(
+ Collections.singletonList(null));
+ mController = new SecurityPatchLevelDialogController(mDialog);
+ ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+
+ mController.onClick(mView);
+
+ verify(mContext).startActivity(any());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index 3c51a90..faf4280 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -16,6 +16,8 @@
package com.android.settings.search;
+import static com.google.common.truth.Truth.assertWithMessage;
+
import android.util.ArraySet;
import android.util.Log;
@@ -28,8 +30,6 @@
import java.util.List;
import java.util.Set;
-import static com.google.common.truth.Truth.assertWithMessage;
-
/**
* {@link CodeInspector} to ensure fragments implement search components correctly.
*/
@@ -47,7 +47,7 @@
+ " these are not: \n";
private static final String NOT_IN_INDEXABLE_PROVIDER_REGISTRY =
"Class containing " + DatabaseIndexingManager.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER
- + " must be added to " + SearchIndexableResources.class.getName()
+ + " must be added to " + SettingsSearchIndexablesProvider.class.getName()
+ " but these are not: \n";
private final List<String> notImplementingIndexableGrandfatherList;
@@ -114,7 +114,7 @@
continue;
}
// Must be in SearchProviderRegistry
- if (!SearchIndexableResources.providerValues().contains(clazz)) {
+ if (!SettingsSearchIndexablesProvider.INDEXABLES.contains(clazz)) {
if (!notInSearchIndexableRegistryGrandfatherList.remove(className)) {
notInSearchProviderRegistry.add(className);
}
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
index eedb324..bb9d0ca 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
@@ -18,9 +18,7 @@
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
import static com.google.common.truth.Truth.assertThat;
-
import static junit.framework.Assert.fail;
-
import static org.mockito.Mockito.spy;
import android.database.Cursor;
@@ -40,45 +38,45 @@
import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class SearchIndexableResourcesTest {
- Set<Class> sProviderClassCopy;
+ private Set<Class> mProviderClassCopy;
@Before
public void setUp() {
- sProviderClassCopy = new HashSet<>(SearchIndexableResources.sProviders);
+ mProviderClassCopy = new HashSet<>(SettingsSearchIndexablesProvider.INDEXABLES);
}
@After
public void cleanUp() {
- SearchIndexableResources.sProviders.clear();
- SearchIndexableResources.sProviders.addAll(sProviderClassCopy);
+ SettingsSearchIndexablesProvider.INDEXABLES.clear();
+ SettingsSearchIndexablesProvider.INDEXABLES.addAll(mProviderClassCopy);
}
@Test
public void testAddIndex() {
final Class stringClass = java.lang.String.class;
// Confirms that String.class isn't contained in SearchIndexableResources.
- assertThat(SearchIndexableResources.sProviders).doesNotContain(stringClass);
- final int beforeCount = SearchIndexableResources.providerValues().size();
+ assertThat(SettingsSearchIndexablesProvider.INDEXABLES).doesNotContain(stringClass);
+ final int beforeCount = SettingsSearchIndexablesProvider.INDEXABLES.size();
- SearchIndexableResources.addIndex(java.lang.String.class);
+ SettingsSearchIndexablesProvider.addIndex(java.lang.String.class);
- assertThat(SearchIndexableResources.sProviders).contains(stringClass);
- final int afterCount = SearchIndexableResources.providerValues().size();
+ assertThat(SettingsSearchIndexablesProvider.INDEXABLES).contains(stringClass);
+ final int afterCount = SettingsSearchIndexablesProvider.INDEXABLES.size();
assertThat(afterCount).isEqualTo(beforeCount + 1);
}
@Test
public void testIndexHasWifiSettings() {
- assertThat(sProviderClassCopy).contains(WifiSettings.class);
+ assertThat(mProviderClassCopy).contains(WifiSettings.class);
}
@Test
public void testNonIndexableKeys_GetsKeyFromProvider() {
- SearchIndexableResources.sProviders.clear();
- SearchIndexableResources.addIndex(FakeIndexProvider.class);
+ SettingsSearchIndexablesProvider.INDEXABLES.clear();
+ SettingsSearchIndexablesProvider.addIndex(FakeIndexProvider.class);
SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider());
@@ -97,8 +95,8 @@
@Test
public void testAllClassNamesHaveProviders() {
- for (Class clazz: sProviderClassCopy) {
- if(DatabaseIndexingUtils.getSearchIndexProvider(clazz) == null) {
+ for (Class clazz : mProviderClassCopy) {
+ if (DatabaseIndexingUtils.getSearchIndexProvider(clazz) == null) {
fail(clazz.getName() + "is not an index provider");
}
}
diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
index efeaed7..921dcb6 100644
--- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -2,8 +2,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-
import android.Manifest;
import android.content.Context;
import android.content.pm.ProviderInfo;
@@ -27,21 +25,21 @@
import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class SettingsSearchIndexablesProviderTest {
private final String BASE_AUTHORITY = "com.android.settings";
private SettingsSearchIndexablesProvider mProvider;
- Set<Class> sProviderClasses;
- Context mContext;
+ private Set<Class> mProviderClasses;
+ private Context mContext;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mProvider = spy(new SettingsSearchIndexablesProvider());
+ mProvider = new SettingsSearchIndexablesProvider();
ProviderInfo info = new ProviderInfo();
info.exported = true;
info.grantUriPermissions = true;
@@ -49,15 +47,15 @@
info.readPermission = Manifest.permission.READ_SEARCH_INDEXABLES;
mProvider.attachInfo(mContext, info);
- sProviderClasses = new HashSet<>(SearchIndexableResources.sProviders);
- SearchIndexableResources.sProviders.clear();
- SearchIndexableResources.sProviders.add(FakeSettingsFragment.class);
+ mProviderClasses = new HashSet<>(SettingsSearchIndexablesProvider.INDEXABLES);
+ SettingsSearchIndexablesProvider.INDEXABLES.clear();
+ SettingsSearchIndexablesProvider.INDEXABLES.add(FakeSettingsFragment.class);
}
@After
public void cleanUp() {
- SearchIndexableResources.sProviders.clear();
- SearchIndexableResources.sProviders.addAll(sProviderClasses);
+ SettingsSearchIndexablesProvider.INDEXABLES.clear();
+ SettingsSearchIndexablesProvider.INDEXABLES.addAll(mProviderClasses);
}
@Test
diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
index bc82125..5296c36 100644
--- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
+++ b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.platform.test.annotations.Presubmit;
-import android.provider.SearchIndexableResource;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
@@ -28,7 +27,7 @@
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableResources;
+import com.android.settings.search.SettingsSearchIndexablesProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before;
@@ -54,7 +53,7 @@
public void controllersInSearchShouldImplementPreferenceControllerMixin() {
final Set<String> errorClasses = new ArraySet<>();
- for (Class clazz: SearchIndexableResources.providerValues()) {
+ for (Class clazz: SettingsSearchIndexablesProvider.INDEXABLES) {
final Indexable.SearchIndexProvider provider =
DatabaseIndexingUtils.getSearchIndexProvider(clazz);
diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
index 5f3e512..87b1a32 100644
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
@@ -33,7 +33,7 @@
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableResources;
+import com.android.settings.search.SettingsSearchIndexablesProvider;
import com.android.settings.search.XmlParserUtils;
import org.junit.Before;
@@ -90,7 +90,7 @@
final Set<String> uniqueKeys = new HashSet<>();
final Set<String> nullKeyClasses = new HashSet<>();
final Set<String> duplicatedKeys = new HashSet<>();
- for (Class<?> clazz : SearchIndexableResources.providerValues()) {
+ for (Class<?> clazz : SettingsSearchIndexablesProvider.INDEXABLES) {
verifyPreferenceIdInXml(uniqueKeys, duplicatedKeys, nullKeyClasses, clazz);
}
diff --git a/tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java b/tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java
new file mode 100644
index 0000000..974518f
--- /dev/null
+++ b/tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.search;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SearchResultTrampolineTest {
+
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = InstrumentationRegistry.getTargetContext();
+ }
+
+ @Test
+ public void canLaunchSettingsTrampolineWithIntentAction() {
+ final PackageManager pm = mContext.getPackageManager();
+ final ResolveInfo info =
+ pm.resolveActivity(new Intent("com.android.settings.SEARCH_RESULT_TRAMPOLINE"), 0);
+
+ assertThat(info.activityInfo.name)
+ .isEqualTo(SearchResultTrampoline.class.getName());
+
+ }
+}