Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eff77d28 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add a RTT setting in A11y screen" into qt-qpr1-dev am: fb44d744 

Change-Id: I1716dc3e0b13a430ed4d5ff525b95bb09eb0b90a
parents fc8e7f17 fb44d744

res/values/arrays.xml

+12 −0
Original line number Diff line number Diff line
@@ -1422,4 +1422,16 @@ 
        <item>@string/enhanced_4g_lte_mode_summary_4g_calling</item>

    </string-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>

res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -420,4 +420,8 @@ 


    <!-- RTT setting intent action -->

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

res/xml/accessibility_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -144,6 +144,12 @@ 
            android:summary="@string/accessibility_hearingaid_not_connected_summary"

            android:title="@string/accessibility_hearingaid_title"/>



        <Preference

            android:key="rtt_setting"

            android:summary="@string/summary_placeholder"

            android:title="@string/rtt_settings_title"

            settings:controller="com.android.settings.accessibility.RTTSettingPreferenceController"/>



        <Preference

                android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"

                android:key="captioning_preference_screen"

src/com/android/settings/accessibility/AccessibilitySettings.java

+13 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            "accessibility_shortcut_preference";

    private static final String HEARING_AID_PREFERENCE =

            "hearing_aid_preference";

    private static final String RTT_SETTINGS_SCREEN = "rtt_setting";

    private static final String CAPTIONING_PREFERENCE_SCREEN =

            "captioning_preference_screen";

    private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
@@ -240,6 +241,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
    private Preference mAccessibilityShortcutPreferenceScreen;

    private Preference mDisplayDaltonizerPreferenceScreen;

    private Preference mHearingAidPreference;

    private Preference mRTTPreference;

    private Preference mVibrationPreferenceScreen;

    private Preference mLiveCaptionPreference;

    private SwitchPreference mToggleInversionPreference;
@@ -248,6 +250,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
    private SwitchPreference mDarkUIModePreference;

    private DarkUIPreferenceController mDarkUIPreferenceController;

    private LiveCaptionPreferenceController mLiveCaptionPreferenceController;

    private RTTSettingPreferenceController mRTTSettingPreferenceController;



    private int mLongPressTimeoutDefault;
@@ -309,6 +312,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 


        mLiveCaptionPreferenceController = new LiveCaptionPreferenceController(context,

                LIVE_CAPTION_PREFERENCE_KEY);

        mRTTSettingPreferenceController =

                new RTTSettingPreferenceController(context, RTT_SETTINGS_SCREEN);



    }



    @Override
@@ -503,6 +509,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
        mHearingAidPreference = findPreference(HEARING_AID_PREFERENCE);

        mHearingAidPreferenceController.displayPreference(getPreferenceScreen());



        // RTT Setting

        mRTTPreference = findPreference(RTT_SETTINGS_SCREEN);

        mRTTSettingPreferenceController.displayPreference(getPreferenceScreen());





        // Captioning.

        mCaptioningPreferenceScreen = findPreference(CAPTIONING_PREFERENCE_SCREEN);
@@ -787,6 +798,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 


        mHearingAidPreferenceController.updateState(mHearingAidPreference);



        mRTTSettingPreferenceController.updateState(mRTTPreference);



        mLiveCaptionPreferenceController.updateState(mLiveCaptionPreference);



        updateFeatureSummary(Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED,

src/com/android/settings/accessibility/RTTSettingPreferenceController.java

0 → 100644
+87 −0
Original line number Diff line number Diff line 
/*

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

    }

}