Add a RTT setting in A11y screen
- Add RTT setting in Accessibility screen. - Create a controller for RTT setting preference. - Create an array strings. Test: Rebuild, and visual Change-Id: I248654c822284473b8a8265de4a3938af89cdf7a Fix: 146540478
This commit is contained in:
@@ -1492,4 +1492,17 @@
|
|||||||
<item>@color/palette_list_color_purple</item>
|
<item>@color/palette_list_color_purple</item>
|
||||||
<item>@color/palette_list_color_pink</item>
|
<item>@color/palette_list_color_pink</item>
|
||||||
</array>
|
</array>
|
||||||
|
|
||||||
|
<!--String arrays for showing the rtt settings options -->
|
||||||
|
<string-array name="rtt_setting_mode">
|
||||||
|
<!-- 0: Invalid value -->
|
||||||
|
<item></item>
|
||||||
|
<!-- 1: Not visible -->
|
||||||
|
<item>@string/rtt_settings_no_visible</item>
|
||||||
|
<!-- 2: Visible during call -->
|
||||||
|
<item>@string/rtt_settings_visible_during_call</item>
|
||||||
|
<!-- 3: Always visible -->
|
||||||
|
<item>@string/rtt_settings_always_visible</item>
|
||||||
|
</string-array>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
@@ -431,4 +431,7 @@
|
|||||||
|
|
||||||
<!-- RTT setting intent action -->
|
<!-- RTT setting intent action -->
|
||||||
<string name="config_rtt_setting_intent_action" translatable="false"></string>
|
<string name="config_rtt_setting_intent_action" translatable="false"></string>
|
||||||
|
|
||||||
|
<!-- Package name of dialer supports RTT setting-->
|
||||||
|
<string name="config_rtt_setting_package_name" translatable="false"></string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -181,6 +181,12 @@
|
|||||||
android:title="@string/accessibility_hearingaid_title"
|
android:title="@string/accessibility_hearingaid_title"
|
||||||
settings:controller="com.android.settings.accessibility.AccessibilityHearingAidPreferenceController"/>
|
settings:controller="com.android.settings.accessibility.AccessibilityHearingAidPreferenceController"/>
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="rtt_setting"
|
||||||
|
android:summary="@string/summary_placeholder"
|
||||||
|
android:title="@string/rtt_settings_title"
|
||||||
|
settings:controller="com.android.settings.accessibility.RTTSettingPreferenceController"/>
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
|
android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
|
||||||
android:key="captioning_preference_screen"
|
android:key="captioning_preference_screen"
|
||||||
|
@@ -0,0 +1,88 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 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 android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.content.pm.ResolveInfo;
|
||||||
|
import android.provider.Settings;
|
||||||
|
import android.telecom.TelecomManager;
|
||||||
|
import android.text.TextUtils;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/** A controller to control the status for RTT setting in Accessibility screen.*/
|
||||||
|
public class RTTSettingPreferenceController extends BasePreferenceController {
|
||||||
|
|
||||||
|
private static final String DIALER_RTT_CONFIGURATION = "dialer_rtt_configuration";
|
||||||
|
|
||||||
|
private final Context mContext;
|
||||||
|
private final PackageManager mPackageManager;
|
||||||
|
private final TelecomManager mTelecomManager;
|
||||||
|
private final CharSequence[] mModes;
|
||||||
|
private final String mDialerPackage;
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
Intent mRTTIntent;
|
||||||
|
|
||||||
|
public RTTSettingPreferenceController(Context context, String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
mContext = context;
|
||||||
|
mModes = mContext.getResources().getTextArray(R.array.rtt_setting_mode);
|
||||||
|
mDialerPackage = mContext.getString(R.string.config_rtt_setting_package_name);
|
||||||
|
mPackageManager = context.getPackageManager();
|
||||||
|
mTelecomManager = context.getSystemService(TelecomManager.class);
|
||||||
|
mRTTIntent = new Intent(context.getString(R.string.config_rtt_setting_intent_action));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
final List<ResolveInfo> resolved =
|
||||||
|
mPackageManager.queryIntentActivities(mRTTIntent, 0 /* flags */);
|
||||||
|
return resolved != null && !resolved.isEmpty() && isDialerSupportRTTSetting()
|
||||||
|
? AVAILABLE
|
||||||
|
: UNSUPPORTED_ON_DEVICE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
final Preference pref = screen.findPreference(getPreferenceKey());
|
||||||
|
pref.setIntent(mRTTIntent);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CharSequence getSummary() {
|
||||||
|
final int option = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||||
|
DIALER_RTT_CONFIGURATION, 1 /* not visible */);
|
||||||
|
return mModes[option];
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
boolean isDialerSupportRTTSetting() {
|
||||||
|
return TextUtils.equals(mTelecomManager.getDefaultDialerPackage(), mDialerPackage);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,91 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 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.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.robolectric.Shadows.shadowOf;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.ResolveInfo;
|
||||||
|
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
import com.android.settings.testutils.ResolveInfoBuilder;
|
||||||
|
|
||||||
|
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.ShadowPackageManager;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class RTTSettingPreferenceControllerTest {
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private ShadowPackageManager mShadowPackageManager;
|
||||||
|
private RTTSettingPreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
mContext = RuntimeEnvironment.application;
|
||||||
|
mShadowPackageManager = shadowOf(mContext.getPackageManager());
|
||||||
|
mController = spy(new RTTSettingPreferenceController(mContext, "rtt_setting"));
|
||||||
|
mController.mRTTIntent = new Intent("com.android.test.action.example");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_defaultDialerIsExpected_intentCanBeHandled_returnAVAILABLE() {
|
||||||
|
// Default dialer is expected.
|
||||||
|
doReturn(true).when(mController).isDialerSupportRTTSetting();
|
||||||
|
// Intent can be handled.
|
||||||
|
final ResolveInfo info = new ResolveInfoBuilder("pkg")
|
||||||
|
.setActivity("pkg", "class").build();
|
||||||
|
final Intent intent = new Intent("com.android.test.action.example");
|
||||||
|
mShadowPackageManager.addResolveInfoForIntent(intent, info);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus())
|
||||||
|
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_intentCanNotBeHandled_shouldReturnUNSUPPORTED_ON_DEVICE() {
|
||||||
|
// Default dialer is expected.
|
||||||
|
doReturn(true).when(mController).isDialerSupportRTTSetting();
|
||||||
|
// Intent can not be handled.
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus())
|
||||||
|
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_defaultDialerIsNotExpected_returnUNSUPPORTED_ON_DEVICE() {
|
||||||
|
// Default dialer is not expected.
|
||||||
|
doReturn(false).when(mController).isDialerSupportRTTSetting();
|
||||||
|
// Intent can be handled.
|
||||||
|
final ResolveInfo info = new ResolveInfoBuilder("pkg")
|
||||||
|
.setActivity("pkg", "class").build();
|
||||||
|
final Intent intent = new Intent("com.android.test.action.example");
|
||||||
|
mShadowPackageManager.addResolveInfoForIntent(intent, info);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus())
|
||||||
|
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,71 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 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.testutils;
|
||||||
|
|
||||||
|
import android.content.pm.ActivityInfo;
|
||||||
|
import android.content.pm.ApplicationInfo;
|
||||||
|
import android.content.pm.PackageInfo;
|
||||||
|
import android.content.pm.ProviderInfo;
|
||||||
|
import android.content.pm.ResolveInfo;
|
||||||
|
|
||||||
|
import com.google.common.base.Preconditions;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper for building {@link ResolveInfo}s to be used in Robolectric tests.
|
||||||
|
*
|
||||||
|
* <p>The resulting {@link PackageInfo}s should typically be added to {@link
|
||||||
|
* org.robolectric.shadows.ShadowPackageManager#addResolveInfoForIntent(Intent, ResolveInfo)}.
|
||||||
|
*/
|
||||||
|
public final class ResolveInfoBuilder {
|
||||||
|
|
||||||
|
private final String mPackageName;
|
||||||
|
private ActivityInfo mActivityInfo;
|
||||||
|
private ProviderInfo mProviderInfo;
|
||||||
|
|
||||||
|
public ResolveInfoBuilder(String packageName) {
|
||||||
|
this.mPackageName = Preconditions.checkNotNull(packageName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ResolveInfoBuilder setActivity(String packageName, String className) {
|
||||||
|
mActivityInfo = new ActivityInfo();
|
||||||
|
mActivityInfo.packageName = packageName;
|
||||||
|
mActivityInfo.name = className;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ResolveInfoBuilder setProvider(
|
||||||
|
String packageName, String className, String authority, boolean isSystemApp) {
|
||||||
|
mProviderInfo = new ProviderInfo();
|
||||||
|
mProviderInfo.authority = authority;
|
||||||
|
mProviderInfo.applicationInfo = new ApplicationInfo();
|
||||||
|
if (isSystemApp) {
|
||||||
|
mProviderInfo.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
|
||||||
|
}
|
||||||
|
mProviderInfo.packageName = mPackageName;
|
||||||
|
mProviderInfo.applicationInfo.packageName = mPackageName;
|
||||||
|
mProviderInfo.name = className;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ResolveInfo build() {
|
||||||
|
ResolveInfo info = new ResolveInfo();
|
||||||
|
info.activityInfo = mActivityInfo;
|
||||||
|
info.resolvePackageName = mPackageName;
|
||||||
|
info.providerInfo = mProviderInfo;
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user