Merge "Do not generate copyable slices for Settings Search" into rvc-dev

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;

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;

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(),

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;

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;

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();
-    }
 }

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<SubscriptionInfo> 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();
-    }
 }

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";

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();

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();
-    }
 }