etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix resources

This commit is contained in:
Oizaro 2020-09-27 23:26:14 +02:00
parent d11177d69f
commit 6dea657b89
8 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
play-services-core/src/main/java/org/microg/gms/ui/GcmAdvancedFragment.java
View File

@ -69,9 +69,9 @@ public class GcmAdvancedFragment extends ResourceSettingsFragment {
if (state == 0) {
int heartbeat = prefs.getHeartbeatMsFor(preference.getKey(), true);
if (heartbeat == 0) {
preference.setSummary(getString(R.string.service_status_enabled_short) + " / " + getString(R.string.gcm_status_pref_auto));
preference.setSummary(getString(R.string.service_status_enabled_short) + " / " + getString(R.string.gcm_status_pref_default));
} else {
preference.setSummary(getString(R.string.service_status_enabled_short) + " / " + getString(R.string.gcm_status_pref_auto) + ": " + getHeartbeatString(heartbeat));
preference.setSummary(getString(R.string.service_status_enabled_short) + " / " + getString(R.string.gcm_status_pref_default) + ": " + getHeartbeatString(heartbeat));
}
} else if (state == -1) {
preference.setSummary(getString(R.string.service_status_disabled_short));

2
play-services-core/src/main/res/values-in/arrays.xml
View File

@ -2,6 +2,8 @@
<resources>
<string-array name="gcm_network_config_names" translatables="false">
<item>Dinonaktifkan</item>
<item>Default</item>
<item>Ping interval: 2 menit</item>
<item>Ping interval: 5 menit</item>
<item>Ping interval: 10 menit</item>

2
play-services-core/src/main/res/values-in/strings.xml
View File

@ -97,7 +97,7 @@ Ini bisa berlangsung beberapa menit."</string>
<string name="pref_device_registration_android_id">Android ID</string>
<string name="pref_info_status">Status</string>
<string name="gcm_status_pref_auto">Default</string>
<string name="gcm_status_pref_default">Default</string>
<string name="gcm_status_pref_manual">Manual</string>
<string name="gcm_status_pref_sec">detik</string>
<string name="gcm_status_pref_min">menit</string>

2
play-services-core/src/main/res/values-it/arrays.xml
View File

@ -2,6 +2,8 @@
<resources>
<string-array name="gcm_network_config_names" translatables="false">
<item>Disattivato</item>
<item>Predefinita</item>
<item>Intervallo ping: 2 minuti</item>
<item>Intervallo ping: 5 minuti</item>
<item>Intervallo ping: 10 minuti</item>

2
play-services-core/src/main/res/values-it/strings.xml
View File

@ -97,7 +97,7 @@ Questo potrà richiedere un paio di minuti"</string>
<string name="pref_device_registration_android_id">ID Android</string>
<string name="pref_info_status">Stato</string>
<string name="gcm_status_pref_auto">Predefinito</string>
<string name="gcm_status_pref_default">Predefinito</string>
<string name="gcm_status_pref_manual">Manuale</string>
<string name="gcm_status_pref_sec">secondi</string>
<string name="gcm_status_pref_min">minuti</string>

3
play-services-core/src/main/res/values/arrays.xml
View File

@ -20,7 +20,6 @@
<string-array name="gcm_network_config_values" translatables="false">
<item>-1</item>
<item>0</item>
<item>1</item>
<item>2</item>
<item>5</item>
<item>10</item>
@ -34,6 +33,8 @@
<item>@string/service_status_automatic</item>
<!-- These will be automatically generated from the OS, no need to translate them -->
<item>Disabled</item>
<item>Automatic</item>
<item>Ping interval: 2 minutes</item>
<item>Ping interval: 5 minutes</item>
<item>Ping interval: 10 minutes</item>

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

@ -111,7 +111,7 @@ This can take a couple of minutes."</string>
<string name="pref_device_registration_android_id">Android ID</string>
<string name="pref_info_status">Status</string>
<string name="gcm_status_pref_auto">Default</string>
<string name="gcm_status_pref_default">Default</string>
<string name="gcm_status_pref_manual">Manual</string>
<string name="gcm_status_pref_sec">seconds</string>
<string name="gcm_status_pref_min">minutes</string>

6
play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
View File

@ -32,7 +32,7 @@
android:entries="@array/gcm_network_config_names"
android:entryValues="@array/gcm_network_config_values"
android:key="gcm_network_mobile"
android:summary="ON / Automatic: 13 min"
android:summary="ON / Default: 60 sec"
android:title="@string/network_type_mobile"/>
<ListPreference
@ -40,7 +40,7 @@
android:entries="@array/gcm_network_config_names"
android:entryValues="@array/gcm_network_config_values"
android:key="gcm_network_wifi"
android:summary="ON / Manual: 30 min"
android:summary="ON / Manual: 2 min"
android:title="@string/network_type_wifi"/>
<ListPreference
@ -56,7 +56,7 @@
android:entries="@array/gcm_network_config_names"
android:entryValues="@array/gcm_network_config_values"
android:key="gcm_network_other"
android:summary="ON / Automatic: 30 min"
android:summary="ON / Default: 60 sec"
android:title="@string/network_type_other"/>
</PreferenceCategory>