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

Commit 0ef05db3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6639787 from 837bda1f to rvc-release 

Change-Id: I58a957e0da461e3a30f1fa0a30531c37bab8475d
parents c6a33f73 837bda1f

res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1734,7 +1734,7 @@ 
    <string name="location_sources_heading" msgid="6126965815860570524">"Fonts d\'ubicació"</string>

    <string name="about_settings" product="tablet" msgid="2888705054709289693">"Informació sobre la tauleta"</string>

    <string name="about_settings" product="default" msgid="4038626127378127613">"Informació del telèfon"</string>

    <string name="about_settings" product="device" msgid="9012888717090302815">"Informació sobre el dispositiu"</string>

    <string name="about_settings" product="device" msgid="9012888717090302815">"Informació del dispositiu"</string>

    <string name="about_settings" product="emulator" msgid="2516560858771320366">"Sobre el dispositiu emulat"</string>

    <string name="about_settings_summary" msgid="4831942939227432513">"Mostra informació legal, estat, versió de programari"</string>

    <string name="legal_information" msgid="7509900979811934843">"Informació legal"</string>

res/values/arrays.xml

+3 −3
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ 
    <string-array name="dark_ui_scheduler_preference_titles">

        <!-- 0: None -->

        <item>@string/dark_ui_auto_mode_never</item>

        <!-- 1: Auto -->

        <item>@string/dark_ui_auto_mode_auto</item>

        <!-- 2: Custom -->

        <!-- 1: Custom -->

        <item>@string/dark_ui_auto_mode_custom</item>

        <!-- 2: Auto -->

        <item>@string/dark_ui_auto_mode_auto</item>

    </string-array>



    <!-- Security settings.  The delay after screen is turned off until device locks.

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -12117,11 +12117,11 @@ 
    <!-- Content description for the 5G limited VoLTE dialog. [CHAR LIMIT=NONE] -->

    <string name="volte_5G_limited_text">This also turns off your 5G connection.\nDuring a voice call, you can\u2019t use the internet and some apps may not work.</string>

    <!-- Footer to show current limitation of 5G on DSDS mode. [CHAR LIMIT=NONE] -->

    <string name="no_5g_in_dsds_text" product="default">When using 2 SIMs, this phone will be limited to 4G. <annotation id="url">Learn more</annotation>.</string>

    <string name="no_5g_in_dsds_text" product="default">When using 2 SIMs, this phone will be limited to 4G. <annotation id="url">Learn more</annotation></string>

    <!-- Footer to show current limitation of 5G on DSDS mode for tablets. [CHAR LIMIT=NONE] -->

    <string name="no_5g_in_dsds_text" product="tablet">When using 2 SIMs, this tablet will be limited to 4G. <annotation id="url">Learn more</annotation>.</string>

    <string name="no_5g_in_dsds_text" product="tablet">When using 2 SIMs, this tablet will be limited to 4G. <annotation id="url">Learn more</annotation></string>

    <!-- Footer to show current limitation of 5G on DSDS mode for general devices. [CHAR LIMIT=NONE] -->

    <string name="no_5g_in_dsds_text" product="device">When using 2 SIMs, this device will be limited to 4G. <annotation id="url">Learn more</annotation>.</string>

    <string name="no_5g_in_dsds_text" product="device">When using 2 SIMs, this device will be limited to 4G. <annotation id="url">Learn more</annotation></string>

    <!-- Help URI, 5G limitation in DSDS condition. [DO NOT TRANSLATE] -->

    <string name="help_uri_5g_dsds" translatable="false"></string>

























src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -69,7 +69,7 @@ public class NrDisabledInDsdsFooterPreferenceController extends BasePreferenceCo







        if (linkInfo.isActionable()) {









            return AnnotationSpan.linkify(mContext.getText(R.string.no_5g_in_dsds_text), linkInfo);









        } else {









            return mContext.getText(R.string.no_5g_in_dsds_text);









            return AnnotationSpan.textWithoutLink(mContext.getText(R.string.no_5g_in_dsds_text));









        }









    }










































src/com/android/settings/utils/AnnotationSpan.java



+20
−0






























Original line number
Diff line number
Diff line







@@ -27,6 +27,9 @@ import android.text.style.URLSpan;







import android.util.Log;









import android.view.View;



















import java.util.Arrays;









import java.util.Comparator;



















/**









 * This class is used to add {@link View.OnClickListener} for the text been wrapped by









 * annotation.








@@ -75,6 +78,23 @@ public class AnnotationSpan extends URLSpan {







        return builder;









    }



















    /**









     * get the text part without having text for link part









     */









    public static CharSequence textWithoutLink(CharSequence encodedText) {









        SpannableString msg = new SpannableString(encodedText);









        Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class);









        if (spans == null) {









            return encodedText;









        }









        Arrays.sort(spans, Comparator.comparingInt(span -> -msg.getSpanStart(span)));









        StringBuilder msgWithoutLink = new StringBuilder(msg.toString());









        for (Annotation span : spans) {









            msgWithoutLink.delete(msg.getSpanStart(span), msg.getSpanEnd(span));









        }









        return msgWithoutLink.toString();









    }



















    /**









     * Data class to store the annotation and the click action









     */