From b6c30a2c31e6d0fe8089f51d13128c6f78242cea Mon Sep 17 00:00:00 2001 From: Yanting Yang Date: Wed, 1 Apr 2020 20:00:23 +0800 Subject: [PATCH] Do not generate copyable slices for Settings Search Copyable slices is to provide user a quickly sub-text copying way on Settings Search. Since we plan to remove all sub-text from Settings Search, the copying feature is no longer available. Therefore, we don't need to generate copyable slices in Settings anymore. Impact search result: Build number, Phone number, Hardware version, Serial number and IMEI Bug: 143118037 Test: visual and robotests Change-Id: I81474aed994678c42d73cc59e169573880de1378 --- .../BuildNumberPreferenceController.java | 15 --------------- .../PhoneNumberPreferenceController.java | 15 --------------- .../HardwareRevisionPreferenceController.java | 15 --------------- .../SerialNumberPreferenceController.java | 15 --------------- .../imei/ImeiInfoPreferenceController.java | 15 --------------- .../BuildNumberPreferenceControllerTest.java | 5 ----- .../PhoneNumberPreferenceControllerTest.java | 10 ---------- .../HardwareRevisionPreferenceControllerTest.java | 15 --------------- .../SerialNumberPreferenceControllerTest.java | 11 ----------- .../imei/ImeiInfoPreferenceControllerTest.java | 5 ----- 10 files changed, 121 deletions(-) diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index 52dbb5b21ed..185c8eaca74 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -97,21 +97,6 @@ public class BuildNumberPreferenceController extends BasePreferenceController im return AVAILABLE; } - @Override - public boolean isSliceable() { - return true; - } - - @Override - public boolean isPublicSlice() { - return true; - } - - @Override - public boolean isCopyableSlice() { - return true; - } - @Override public boolean useDynamicSliceSummary() { return true; diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java index 41a598b1e5d..abf58d80454 100644 --- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java @@ -90,21 +90,6 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { } } - @Override - public boolean isSliceable() { - return true; - } - - @Override - public boolean isPublicSlice() { - return true; - } - - @Override - public boolean isCopyableSlice() { - return true; - } - @Override public boolean useDynamicSliceSummary() { return true; diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java index 62da4776b68..955c60c8ff0 100644 --- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java @@ -40,21 +40,6 @@ public class HardwareRevisionPreferenceController extends BasePreferenceControll return true; } - @Override - public boolean isSliceable() { - return true; - } - - @Override - public boolean isPublicSlice() { - return true; - } - - @Override - public boolean isCopyableSlice() { - return true; - } - @Override public void copy() { Sliceable.setCopyContent(mContext, getSummary(), diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java b/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java index 91504821231..3ed8e346acc 100644 --- a/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java @@ -35,21 +35,6 @@ public class SerialNumberPreferenceController extends BasePreferenceController { ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } - @Override - public boolean isSliceable() { - return true; - } - - @Override - public boolean isPublicSlice() { - return true; - } - - @Override - public boolean isCopyableSlice() { - return true; - } - @Override public boolean useDynamicSliceSummary() { return true; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index bdce2f5f408..967eea6155d 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -118,21 +118,6 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { && !Utils.isWifiOnly(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } - @Override - public boolean isSliceable() { - return true; - } - - @Override - public boolean isPublicSlice() { - return true; - } - - @Override - public boolean isCopyableSlice() { - return true; - } - @Override public boolean useDynamicSliceSummary() { return true; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 851e56fc390..80a3a111b26 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -205,9 +205,4 @@ public class BuildNumberPreferenceControllerTest { final CharSequence data = clipboard.getPrimaryClip().getItemAt(0).getText(); assertThat(data.toString()).isEqualTo(mController.getSummary()); } - - @Test - public void isPublicSlice_returnTrue() { - assertThat(mController.isPublicSlice()).isTrue(); - } } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 55b3d1aa2b1..9bb2d3f4bea 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -158,11 +158,6 @@ public class PhoneNumberPreferenceControllerTest { assertThat(primaryNumber).isEqualTo(mContext.getString(R.string.device_info_default)); } - @Test - public void isSliceable_shouldBeTrue() { - assertThat(mController.isSliceable()).isTrue(); - } - @Test public void copy_shouldCopyPhoneNumberToClipboard() { final List list = new ArrayList<>(); @@ -178,9 +173,4 @@ public class PhoneNumberPreferenceControllerTest { final CharSequence data = clipboard.getPrimaryClip().getItemAt(0).getText(); assertThat(phoneNumber.contentEquals(data)).isTrue(); } - - @Test - public void isPublicSlice_returnTrue() { - assertThat(mController.isPublicSlice()).isTrue(); - } } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java index ce022fd63d7..d705b646d3f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java @@ -45,21 +45,6 @@ public class HardwareRevisionPreferenceControllerTest { "hardware_info_device_revision"); } - @Test - public void isSliceable_shouldBeSliceable() { - assertThat(mController.isSliceable()).isTrue(); - } - - @Test - public void isPublicSlice_returnTrue() { - assertThat(mController.isPublicSlice()).isTrue(); - } - - @Test - public void isCopyableSlice_shouldBeCopyableSlice() { - assertThat(mController.isCopyableSlice()).isTrue(); - } - @Test public void copy_shouldCopyHardwareRevisionToClipboard() { final String fakeHardwareVer = "FakeVer1.0"; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceControllerTest.java index 93762b17653..2106b54114d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceControllerTest.java @@ -42,17 +42,6 @@ public class SerialNumberPreferenceControllerTest { mController = new SerialNumberPreferenceController(mContext, "test"); } - @Test - public void isPublicSlice_returnTrue() { - assertThat(mController.isPublicSlice()).isTrue(); - } - - @Test - public void isCopyableSlice() { - assertThat(mController.isSliceable()).isTrue(); - assertThat(mController.isCopyableSlice()).isTrue(); - } - @Test public void copy_shouldPutSerialNumberToClipBoard() { mController.copy(); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index 24277fc83ba..997c35e19e5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -186,9 +186,4 @@ public class ImeiInfoPreferenceControllerTest { final CharSequence data = clipboard.getPrimaryClip().getItemAt(0).getText(); assertThat(data.toString()).isEqualTo(meid); } - - @Test - public void isPublicSlice_returnTrue() { - assertThat(mController.isPublicSlice()).isTrue(); - } }