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

Commit 2e3ec1d7 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'issue_#1171_fixed' into 'master' 

issue_#1171_fixed remove hardcoded string and add in string.xml

See merge request e/apps/GmsCore!18
parents fa73c559 ec9f1f96

play-services-core/src/main/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -180,4 +180,9 @@ This can take a couple of minutes."</string> 
    <string name="pref_snet_self_signed_summary">Instead of requesting a server, sign SafetyNet responses locally using a self-signed certificate. Most apps will refuse to use self-signed responses.</string>

    <string name="pref_snet_status_self_signed_info">self-signed certificate</string>



    <string name="allow_connecting_google_servers">Allow connecting to Google servers</string>

    <string name="connecting_google_servers_summary">If disabled, all connections to Google servers usually done by microG will be denied. This overrides service specific settings.</string>

    <string name="connect_google_via_tor_network">Connect to Google via Tor network</string>

    <string name="connect_google_via_tor_network_summary">Requires Orbot to be installed\nNot yet supported</string>



</resources>

play-services-core/src/main/res/xml/preferences_google_more.xml

+4 −4
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 
        android:defaultValue="true"

        android:enabled="false"

        android:key="network_google_enabled"

        android:summary="If disabled, all connections to Google servers usually done by microG will be denied. This overrides service specific settings."

        android:title="Allow connecting to Google servers"/>

        android:summary="@string/connecting_google_servers_summary"

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

    <SwitchPreference

        android:defaultValue="false"

        android:dependency="network_google_enabled"

        android:enabled="false"

        android:key="network_google_use_tor"

        android:summary="Requires Orbot to be installed\nNot yet supported"

        android:title="Connect to Google via Tor network"/>

        android:summary="@string/connect_google_via_tor_network_summary"

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

</PreferenceScreen>
 
 No newline at end of file