Merge "Limit displayable rows in BluetoothDevicesSlice"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index da05a41..126a835 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6944,7 +6944,7 @@
<string name="keywords_sounds">speaker beep, speaker, volume, mute, silence, audio, music</string>
<string name="keywords_sounds_and_notifications_interruptions">dont don\u2019t disturb, interrupt, interruption, break</string>
<string name="keywords_app">RAM</string>
- <string name="keywords_location">nearby, location, history, reporting</string>
+ <string name="keywords_location">nearby, location, history, reporting, GPS</string>
<string name="keywords_accounts">account</string>
<string name="keywords_users">restriction, restrict, restricted</string>
<string name="keywords_keyboard_and_ime">text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international</string>
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 950c2da..3960103 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -33,7 +33,7 @@
android:order="1"
android:title="@string/my_device_info_device_name_preference_title"
android:summary="@string/summary_placeholder"
- settings:enableCopying="true" />
+ settings:enableCopying="true"/>
<!-- Account name -->
<Preference
@@ -52,7 +52,7 @@
settings:allowDynamicSummaryInSlice="true"
settings:controller=
"com.android.settings.deviceinfo.PhoneNumberPreferenceController"
- settings:enableCopying="true" />
+ settings:enableCopying="true"/>
<Preference
android:key="emergency_info"
@@ -103,7 +103,7 @@
android:summary="@string/summary_placeholder"
settings:allowDynamicSummaryInSlice="true"
settings:controller=
- "com.android.settings.deviceinfo.DeviceModelPreferenceController" />
+ "com.android.settings.deviceinfo.DeviceModelPreferenceController"/>
<!-- IMEI -->
<Preference
@@ -122,7 +122,7 @@
android:summary="@string/summary_placeholder"
settings:allowDynamicSummaryInSlice="true"
settings:controller=
- "com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController" />
+ "com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>
<!--IP address -->
<Preference
@@ -132,7 +132,7 @@
android:summary="@string/summary_placeholder"
android:selectable="false"
settings:allowDividerAbove="true"
- settings:enableCopying="true" />
+ settings:enableCopying="true"/>
<!-- Wi-Fi MAC address -->
<Preference
@@ -141,7 +141,7 @@
android:title="@string/status_wifi_mac_address"
android:summary="@string/summary_placeholder"
android:selectable="false"
- settings:enableCopying="true" />
+ settings:enableCopying="true"/>
<!-- Bluetooth address -->
<Preference
@@ -150,7 +150,7 @@
android:title="@string/status_bt_address"
android:summary="@string/summary_placeholder"
android:selectable="false"
- settings:enableCopying="true" />
+ settings:enableCopying="true"/>
<!-- Device up time -->
<Preference
@@ -158,7 +158,7 @@
android:order="37"
android:title="@string/status_up_time"
android:summary="@string/summary_placeholder"
- android:selectable="false" />
+ android:selectable="false"/>
<!-- Manual -->
<Preference
@@ -173,7 +173,7 @@
android:key="device_feedback"
android:order="41"
android:title="@string/device_feedback"
- settings:keywords="@string/keywords_device_feedback" />
+ settings:keywords="@string/keywords_device_feedback"/>
<!-- Device FCC equipment id -->
<Preference
@@ -189,6 +189,7 @@
android:title="@string/build_number"
android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true"
- settings:enableCopying="true" />
+ settings:enableCopying="true"
+ settings:controller="com.android.settings.deviceinfo.BuildNumberPreferenceController"/>
</PreferenceScreen>
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index 65492d5..5883e21 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -16,7 +16,11 @@
package com.android.settings.deviceinfo;
+import static android.content.Context.CLIPBOARD_SERVICE;
+
import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -29,34 +33,30 @@
import android.widget.Toast;
import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.slices.Copyable;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
-public class BuildNumberPreferenceController extends AbstractPreferenceController implements
- PreferenceControllerMixin, LifecycleObserver, OnResume {
+public class BuildNumberPreferenceController extends BasePreferenceController implements Copyable,
+ LifecycleObserver, OnStart {
static final int TAPS_TO_BE_A_DEVELOPER = 7;
static final int REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF = 100;
- private static final String KEY_BUILD_NUMBER = "build_number";
-
- private final Activity mActivity;
- private final InstrumentedPreferenceFragment mFragment;
+ private Activity mActivity;
+ private InstrumentedPreferenceFragment mFragment;
private final UserManager mUm;
private final MetricsFeatureProvider mMetricsFeatureProvider;
@@ -66,44 +66,28 @@
private int mDevHitCountdown;
private boolean mProcessingLastDevHit;
- public BuildNumberPreferenceController(Context context, Activity activity,
- InstrumentedPreferenceFragment fragment, Lifecycle lifecycle) {
- super(context);
- mActivity = activity;
- mFragment = fragment;
+ public BuildNumberPreferenceController(Context context, String key) {
+ super(context, key);
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
- if (lifecycle != null) {
- lifecycle.addObserver(this);
+ }
+
+ public void setHost(InstrumentedPreferenceFragment fragment) {
+ mFragment = fragment;
+ mActivity = fragment.getActivity();
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ try {
+ return BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY);
+ } catch (Exception e) {
+ return mContext.getText(R.string.device_info_default);
}
}
@Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- final Preference preference = screen.findPreference(KEY_BUILD_NUMBER);
- if (preference != null) {
- try {
- preference.setSummary(BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
- preference.setEnabled(true);
- } catch (Exception e) {
- preference.setSummary(R.string.device_info_default);
- }
- }
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_BUILD_NUMBER;
- }
-
- @Override
- public boolean isAvailable() {
- return true;
- }
-
- @Override
- public void onResume() {
+ public void onStart() {
mDebuggingFeaturesDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.myUserId());
mDebuggingFeaturesDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
@@ -114,8 +98,30 @@
}
@Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public boolean isSliceable() {
+ return true;
+ }
+
+ @Override
+ public void copy() {
+ final ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(
+ CLIPBOARD_SERVICE);
+ final ClipData clip = ClipData.newPlainText("text", getSummary());
+ clipboard.setPrimaryClip(clip);
+
+ final String toast = mContext.getString(R.string.copyable_slice_toast,
+ mContext.getText(R.string.build_number));
+ Toast.makeText(mContext, toast, Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
public boolean handlePreferenceTreeClick(Preference preference) {
- if (!TextUtils.equals(preference.getKey(), KEY_BUILD_NUMBER)) {
+ if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
return false;
}
if (Utils.isMonkeyRunning()) {
diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
index 8b21f0d..19b6975 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
@@ -64,6 +64,8 @@
private static final String LOG_TAG = "MyDeviceInfoFragment";
private static final String KEY_MY_DEVICE_INFO_HEADER = "my_device_info_header";
+ private BuildNumberPreferenceController mBuildNumberPreferenceController;
+
@Override
public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO;
@@ -79,6 +81,8 @@
super.onAttach(context);
use(FirmwareVersionPreferenceController.class).setHost(this /*parent*/);
use(DeviceModelPreferenceController.class).setHost(this /* parent */);
+ mBuildNumberPreferenceController = use(BuildNumberPreferenceController.class);
+ mBuildNumberPreferenceController.setHost(this /* parent */);
}
@Override
@@ -126,17 +130,13 @@
controllers.add(new ManualPreferenceController(context));
controllers.add(new FeedbackPreferenceController(fragment, context));
controllers.add(new FccEquipmentIdPreferenceController(context));
- controllers.add(
- new BuildNumberPreferenceController(context, activity, fragment, lifecycle));
controllers.add(new UptimePreferenceController(context, lifecycle));
return controllers;
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
- final BuildNumberPreferenceController buildNumberPreferenceController =
- use(BuildNumberPreferenceController.class);
- if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) {
+ if (mBuildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) {
return;
}
super.onActivityResult(requestCode, resultCode, data);
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 4112340..78a1541 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -16,7 +16,6 @@
package com.android.settings.location;
-import android.app.Activity;
import android.content.Context;
import android.location.SettingInjectorService;
import android.os.Bundle;
@@ -29,7 +28,6 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.widget.SwitchBar;
@@ -103,12 +101,8 @@
static void addPreferencesSorted(List<Preference> prefs, PreferenceGroup container) {
// If there's some items to display, sort the items and add them to the container.
- Collections.sort(prefs, new Comparator<Preference>() {
- @Override
- public int compare(Preference lhs, Preference rhs) {
- return lhs.getTitle().toString().compareTo(rhs.getTitle().toString());
- }
- });
+ Collections.sort(prefs,
+ Comparator.comparing(lhs -> lhs.getTitle().toString()));
for (Preference entry : prefs) {
container.addPreference(entry);
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 5fb1747..8fae45c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -16,22 +16,22 @@
package com.android.settings.deviceinfo;
+import static android.content.Context.CLIPBOARD_SERVICE;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import android.app.Activity;
+import android.content.ClipboardManager;
import android.content.Context;
-import android.os.Build;
import android.os.Process;
import android.os.UserManager;
import android.provider.Settings;
-import android.text.BidiFormatter;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
@@ -61,6 +61,8 @@
@Config(shadows = ShadowUtils.class)
public class BuildNumberPreferenceControllerTest {
+ private static final String KEY_BUILD_NUMBER = "build_number";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Activity mActivity;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -86,8 +88,8 @@
mFactory = FakeFeatureFactory.setupForTest();
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
- mController =
- new BuildNumberPreferenceController(mContext, mActivity, mFragment, mLifecycle);
+ mController = new BuildNumberPreferenceController(mContext, KEY_BUILD_NUMBER);
+ mController.setHost(mFragment);
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
@@ -102,15 +104,6 @@
}
@Test
- public void displayPref_shouldAlwaysDisplay() {
- mController.displayPreference(mScreen);
-
- verify((Preference) mScreen.findPreference(mController.getPreferenceKey()))
- .setSummary(BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
- verify(mScreen, never()).removePreference(any(Preference.class));
- }
-
- @Test
public void handlePrefTreeClick_onlyHandleBuildNumberPref() {
assertThat(mController.handlePreferenceTreeClick(mock(Preference.class))).isFalse();
}
@@ -198,8 +191,6 @@
@Test
public void onActivityResult_confirmPasswordRequestCompleted_enableDevPref() {
mShadowUserManager.setIsAdminUser(true);
- mController =
- new BuildNumberPreferenceController(mContext, mActivity, mFragment, mLifecycle);
final boolean activityResultHandled = mController.onActivityResult(
BuildNumberPreferenceController.REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF,
@@ -209,4 +200,14 @@
assertThat(activityResultHandled).isTrue();
assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isTrue();
}
+
+ @Test
+ public void copy_shouldCopyBuildNumberToClipboard() {
+ mController.copy();
+
+ final ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(
+ CLIPBOARD_SERVICE);
+ final CharSequence data = clipboard.getPrimaryClip().getItemAt(0).getText();
+ assertThat(data.toString()).isEqualTo(mController.getSummary());
+ }
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java
index fefad5e..90dcf71 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java
@@ -104,12 +104,7 @@
public void onActivityResult_shouldCallBuildNumberPreferenceController() {
final BuildNumberPreferenceController controller =
mock(BuildNumberPreferenceController.class);
- final Map<Class, List<AbstractPreferenceController>> preferenceControllers =
- new ArrayMap<>();
- final List<AbstractPreferenceController> controllerList = new ArrayList<>();
- controllerList.add(controller);
- preferenceControllers.put(BuildNumberPreferenceController.class, controllerList);
- ReflectionHelpers.setField(mSettings, "mPreferenceControllers", preferenceControllers);
+ ReflectionHelpers.setField(mSettings, "mBuildNumberPreferenceController", controller);
final int requestCode = 1;
final int resultCode = 2;