diff --git a/res/values/strings.xml b/res/values/strings.xml index a0ec3a9cc83..19f6d9e8477 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7407,12 +7407,6 @@ Turn off now - - Live Caption - - - Auto-convert on-device audio to captions - Do Not Disturb is on until %s diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index b3e1704967c..cc07ce119e9 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -124,12 +124,6 @@ android:key="audio_and_captions_category" android:title="@string/audio_and_captions_category_title"> - - resolved = - mPackageManager.queryIntentActivities(LIVE_CAPTION_INTENT, 0 /* flags */); - return resolved != null && !resolved.isEmpty() - ? AVAILABLE - : UNSUPPORTED_ON_DEVICE; - } - - @Override - public void updateState(Preference preference) { - super.updateState(preference); - preference.setIntent(LIVE_CAPTION_INTENT); - } -} diff --git a/tests/robotests/src/com/android/settings/accessibility/LiveCaptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/LiveCaptionPreferenceControllerTest.java deleted file mode 100644 index f6160b285cb..00000000000 --- a/tests/robotests/src/com/android/settings/accessibility/LiveCaptionPreferenceControllerTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2019 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.accessibility; - -import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - -import static com.google.common.truth.Truth.assertThat; - -import android.content.pm.ResolveInfo; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.Shadows; -import org.robolectric.shadows.ShadowPackageManager; - -import java.util.Collections; - -@RunWith(RobolectricTestRunner.class) -public class LiveCaptionPreferenceControllerTest { - - private LiveCaptionPreferenceController mController; - - @Before - public void setUp() { - mController = new LiveCaptionPreferenceController(RuntimeEnvironment.application, - "test_key"); - } - - @Test - public void getAvailabilityStatus_canResolveIntent_shouldReturnAvailable() { - final ShadowPackageManager pm = Shadows.shadowOf( - RuntimeEnvironment.application.getPackageManager()); - pm.addResolveInfoForIntent(LiveCaptionPreferenceController.LIVE_CAPTION_INTENT, - new ResolveInfo()); - - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); - } - - @Test - public void getAvailabilityStatus_noResolveIntent_shouldReturnUnavailable() { - final ShadowPackageManager pm = Shadows.shadowOf( - RuntimeEnvironment.application.getPackageManager()); - pm.setResolveInfosForIntent(LiveCaptionPreferenceController.LIVE_CAPTION_INTENT, - Collections.emptyList()); - - assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); - } -}