Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
8fe0178
merge in nyc-release history after reset to master
Nov 23, 2015
13750d8
merge in nyc-release history after reset to master
Nov 23, 2015
c743214
merge in nyc-release history after reset to master
Nov 26, 2015
98f4150
merge in nyc-release history after reset to master
Dec 1, 2015
0fe89d0
merge in nyc-release history after reset to master
Dec 6, 2015
88479d2
merge in nyc-release history after reset to master
Dec 7, 2015
9f1a334
merge in nyc-release history after reset to master
Dec 8, 2015
dce8568
merge in nyc-release history after reset to master
Dec 9, 2015
673a994
merge in nyc-release history after reset to master
Dec 10, 2015
70b34f6
merge in nyc-release history after reset to master
Dec 16, 2015
1de0fcd
Fix NPE which is causing com.android.phone to crash.
Dec 16, 2015
6994306
merge in nyc-release history after reset to master
Dec 17, 2015
d378dda
merge in nyc-release history after reset to master
Dec 20, 2015
5114f9d
Fix NPE in ImapHelper.updateQuota()
azureblaze Dec 22, 2015
7c54bbf
merge in nyc-release history after reset to master
Dec 24, 2015
2915f05
merge in nyc-release history after reset to master
Jan 5, 2016
9aeae6c
merge in nyc-release history after reset to master
Jan 7, 2016
9ed6ec4
merge in nyc-release history after reset to master
Jan 10, 2016
473624e
merge in nyc-release history after reset to master
Jan 12, 2016
1119686
merge in nyc-release history after reset to master
Jan 14, 2016
e9ed90e
merge in nyc-release history after reset to master
Jan 17, 2016
4f0122d
merge in nyc-release history after reset to master
Jan 19, 2016
e4f06f2
merge in nyc-release history after reset to master
Jan 21, 2016
4208986
merge in nyc-release history after reset to master
Jan 26, 2016
4cb6f42
merge in nyc-release history after reset to master
Jan 27, 2016
0c2abf9
merge in nyc-release history after reset to master
Jan 28, 2016
81ce391
Return empty ModemActivityInfo in error case instead of null.
Jan 28, 2016
3583d55
merge in nyc-release history after reset to master
Feb 1, 2016
3135b91
merge in nyc-release history after reset to master
Feb 2, 2016
e9ca598
merge in nyc-release history after reset to master
Feb 2, 2016
9eb96a9
merge in nyc-release history after reset to master
Feb 3, 2016
a8d544e
merge in nyc-release history after reset to master
Feb 4, 2016
4b219ce
merge in nyc-release history after reset to nyc-dev
Feb 9, 2016
7bba285
merge in nyc-release history after reset to nyc-dev
Feb 10, 2016
3a05ed9
merge in nyc-release history after reset to nyc-dev
Feb 11, 2016
d1ddd9a
merge in nyc-release history after reset to nyc-dev
Feb 14, 2016
b24d33e
merge in nyc-release history after reset to nyc-dev
Feb 16, 2016
9436b0b
merge in nyc-release history after reset to nyc-dev
Feb 17, 2016
3e8d9f7
merge in nyc-release history after reset to nyc-dev
Feb 18, 2016
84b09bc
merge in nyc-release history after reset to nyc-dev
Feb 19, 2016
6c99045
merge in nyc-release history after reset to nyc-dev
Feb 23, 2016
383a41a
merge in nyc-release history after reset to nyc-dev
Feb 24, 2016
f3b1c07
merge in nyc-release history after reset to nyc-dev
Feb 25, 2016
88fe011
merge in nyc-release history after reset to nyc-dev
Feb 28, 2016
de50667
merge in nyc-release history after reset to nyc-dev
Mar 1, 2016
058fa39
merge in nyc-release history after reset to nyc-dev
Mar 3, 2016
1cd7098
merge in nyc-release history after reset to nyc-dev
Mar 6, 2016
8439d0d
merge in nyc-release history after reset to nyc-dev
Mar 8, 2016
b77ae72
merge in nyc-release history after reset to nyc-dev
Mar 9, 2016
21825b6
merge in nyc-release history after reset to nyc-dev
Mar 10, 2016
af67b4d
merge in nyc-release history after reset to nyc-dev
Mar 15, 2016
bed849a
Fix OmtpVvmSyncService logging
azureblaze Mar 11, 2016
1055fa9
merge in nyc-release history after reset to nyc-dev
Mar 16, 2016
ff20f53
merge in nyc-release history after reset to nyc-dev
Mar 17, 2016
a497486
merge in nyc-release history after reset to nyc-dev
Mar 20, 2016
b41a34a
merge in nyc-release history after reset to nyc-dev
Mar 22, 2016
b8e0ca7
merge in nyc-release history after reset to nyc-dev
Mar 23, 2016
0c35fff
merge in nyc-release history after reset to nyc-dev
Mar 24, 2016
e657ae8
merge in nyc-release history after reset to nyc-dev
Mar 24, 2016
68f0a0e
merge in nyc-release history after reset to nyc-dev
Mar 27, 2016
c76f44a
merge in nyc-release history after reset to nyc-dev
Mar 29, 2016
4c80506
merge in nyc-release history after reset to nyc-dev
Mar 30, 2016
34c33b1
merge in nyc-release history after reset to nyc-dev
Mar 31, 2016
b49e6e9
merge in nyc-release history after reset to nyc-dev
Apr 3, 2016
307b3c5
merge in nyc-release history after reset to nyc-dev
Apr 4, 2016
4eca3e2
merge in nyc-release history after reset to nyc-dev
Apr 4, 2016
0e04c6d
merge in nyc-release history after reset to nyc-dev
Apr 5, 2016
fd24ad3
merge in nyc-release history after reset to nyc-dev
Apr 7, 2016
e3b235d
merge in nyc-release history after reset to nyc-dev
Apr 10, 2016
4f68907
merge in nyc-release history after reset to nyc-dev
Apr 11, 2016
be4c4ec
merge in nyc-release history after reset to nyc-dev
Apr 11, 2016
1c52a2f
merge in nyc-release history after reset to nyc-dev
Apr 11, 2016
debca89
merge in nyc-release history after reset to nyc-dev
Apr 11, 2016
a898a9f
merge in nyc-release history after reset to nyc-dev
Apr 12, 2016
cb274ec
merge in nyc-release history after reset to nyc-dev
Apr 13, 2016
9448e4f
merge in nyc-release history after reset to nyc-dev
Apr 14, 2016
5e79d04
merge in nyc-release history after reset to nyc-dev
Apr 17, 2016
155f194
merge in nyc-release history after reset to nyc-dev
Apr 19, 2016
4636172
merge in nyc-release history after reset to nyc-dev
Apr 20, 2016
ae6a134
merge in nyc-release history after reset to nyc-dev
Apr 24, 2016
03a69cb
merge in nyc-release history after reset to nyc-dev
Apr 26, 2016
9d8afcc
merge in nyc-release history after reset to nyc-dev
Apr 28, 2016
d21acc4
merge in nyc-release history after reset to nyc-dev
May 3, 2016
dc6c7ef
merge in nyc-release history after reset to nyc-dev
May 5, 2016
c44ad81
merge in nyc-release history after reset to nyc-dev
May 18, 2016
191993a
merge in nyc-release history after reset to nyc-dev
May 22, 2016
e597069
merge in nyc-release history after reset to nyc-dev
May 23, 2016
5006258
Clone extras Bundle when operating on it in onExtrasChanged
May 26, 2016
b1ebc1a
Check for NPE when creating Bundle
May 26, 2016
1b91789
merge in nyc-release history after reset to nyc-dev
Jun 1, 2016
62f1697
merge in nyc-release history after reset to nyc-dev
Jun 5, 2016
505b935
merge in nyc-release history after reset to nyc-dev
Jun 9, 2016
d1d248d
Make TTY broadcasts protected
Jul 18, 2016
82ac6dc
[2/3] Proximity speaker
dankoman30 Mar 10, 2016
8c05984
[2/3] Flip to Mute/Reject Call
kagwind Feb 28, 2016
9f85acd
[2/2] Telephony: Intrusive InCall UI switch
victorlapin Feb 28, 2016
ef578ab
CarrierSelection: do not run a search when entering fragment
yank555-lu Apr 3, 2016
04054cf
[2/2] Telephony: show data connection type in signal icon when roamin…
yank555-lu Oct 31, 2016
d166e9f
Create yaosp_strings.xml
glehel Oct 31, 2016
6a248bb
Update yaosp_strings.xml
glehel Oct 31, 2016
506e4a8
Hungarian language update
glehel Oct 31, 2016
0093b58
Hungarian language update
glehel Oct 31, 2016
bb7943a
Hungarian language update
glehel Oct 31, 2016
9c8e0d7
Hungarian language update
glehel Nov 1, 2016
b4f9e6e
Hungarian language update
glehel Nov 1, 2016
c49b7a2
Hungarian language update
glehel Nov 2, 2016
10718c5
Hungarian language update
glehel Nov 2, 2016
b8f7342
Hungarian language update
glehel Dec 15, 2016
897b5c3
Hungarian language update
glehel Jan 18, 2017
4ca88f0
Hungarian language update
glehel Jan 26, 2017
c0d9820
hungarian language update
glehel Jan 26, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

<original-package android:name="com.android.phone" />

<protected-broadcast android:name="android.telecom.action.TTY_PREFERRED_MODE_CHANGED" />
<protected-broadcast android:name="android.telecom.action.CURRENT_TTY_MODE_CHANGED" />
<protected-broadcast android:name="android.intent.action.SERVICE_STATE" />
<protected-broadcast android:name="android.intent.action.RADIO_TECHNOLOGY" />
<protected-broadcast android:name="android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED" />
Expand Down
54 changes: 54 additions & 0 deletions res/values-de/yaosp_strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 Yank555.lu Android Open Source Project
Copyright (C) 2012-2015 SlimRoms 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.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<!-- Proximity speaker -->
<string name="display_category_prox_auto_speaker_title">Freisprecheinrichtung Einstellungen</string>
<string name="prox_auto_speaker_title">Automatische Annäherungssensor Freisprecheinrichtung</string>
<string name="prox_auto_speaker_summary">Aktiviert die Freisprecheinrichtung wenn das Gerät vom Gesicht entfernt wird.</string>
<string name="prox_auto_speaker_delay_title">Annäherungssensor Verzögerung</string>
<string name="prox_auto_speaker_delay_summary">Verzögerung bis Lautsprecher eingeschaltet wird</string>
<string name="prox_auto_speaker_incall_only_title">Nur bei eingehenden Anrufen</string>
<string name="prox_auto_speaker_incall_only_summary_on">Bei ausgehenden Anrufen wird der Lautsprecher erst eingeschaltet nachdem der andere Teilnehmer abnimmt</string>
<string name="prox_auto_speaker_incall_only_summary_off">Der Lautsprecher wird immer wärend eines Anrufes eingeschaltet (Standard)</string>

<!-- Setting title for the flip action setting. -->
<string name="flip_action_title">Umdreh-Aktion</string>

<!-- Dialog title of the flip action setting. -->
<string name="flip_action_dialog_title">Gerät umdrehen um\u2026</string>

<!-- Setting summary for the flip action setting. -->
<string name="flip_action_summary">Gerät umdrehen wird <xliff:g id="action">%s</xliff:g></string>

<!-- Values for flip action array entries -->
<string name="entry_do_nothing">Nichts zu tun</string>
<string name="entry_mute_ringer">Klingelton stumm zu schalten</string>
<string name="entry_dismiss_call">Anruf zu beenden</string>
<string name="summary_do_nothing">nichts tun</string>
<string name="summary_mute_ringer">den Klingelton stumm schalten</string>
<string name="summary_dismiss_call">den Anruf beenden</string>

<!-- Title for the option managing whether or not to use intrusive incall UI. -->
<string name="use_intrusive_call_title">Vollbild Anrufanzeige</string>
<string name="use_intrusive_call_summary">Eingehende Anrufe in Vollbild anzeigen selbst bei nicht gesperrtem Bildschirm</string>

<!-- Title for the option managing whether or not to show data connection type when roaming. -->
<string name="roaming_dataconnection_title">Verbindungsart beim Daten-Roaming anzeigen</string>
<string name="roaming_dataconnection_summary">Beim Daten-Roaming die Datenverbindungsart (LTE, 3G, H...) in der Statusleiste / QS Kachel anzeigen wenn Daten verbunden sind (statt nur "R")</string>

</resources>
54 changes: 54 additions & 0 deletions res/values-fr/yaosp_strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 Yank555.lu Android Open Source Project
Copyright (C) 2012-2015 SlimRoms 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.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<!-- Proximity speaker -->
<string name="display_category_prox_auto_speaker_title">Réglages mains libres par proximité</string>
<string name="prox_auto_speaker_title">Mains libres automatique</string>
<string name="prox_auto_speaker_summary">Activer le mode mains libres dès que le téléphone est éloigné du visage</string>
<string name="prox_auto_speaker_delay_title">Délai mains libres automatique</string>
<string name="prox_auto_speaker_delay_summary">Délai avant d\'activer le mode mains libres</string>
<string name="prox_auto_speaker_incall_only_title">Uniquement pendant un appel</string>
<string name="prox_auto_speaker_incall_only_summary_on">Lors d\'appels sortants le haut parleur ne sera activé que lorseque l\'appelé déchroche</string>
<string name="prox_auto_speaker_incall_only_summary_off">Le haut parleur sera actif dès que vous êtes en ligne (défaut)</string>

<!-- Setting title for the flip action setting. -->
<string name="flip_action_title">Retourner le téléphone</string>

<!-- Dialog title of the flip action setting. -->
<string name="flip_action_dialog_title">Retourner le téléphone pour\u2026</string>

<!-- Setting summary for the flip action setting. -->
<string name="flip_action_summary">Retourner le téléphone <xliff:g id="action">%s</xliff:g></string>

<!-- Values for flip action array entries -->
<string name="entry_do_nothing">Ne rien faire</string>
<string name="entry_mute_ringer">Arréter la sonnerie</string>
<string name="entry_dismiss_call">Refuser l\'appel</string>
<string name="summary_do_nothing">ne fera rien</string>
<string name="summary_mute_ringer">arrêtera la sonnerie</string>
<string name="summary_dismiss_call">refuserera l\'appel</string>

<!-- Title for the option managing whether or not to use intrusive incall UI. -->
<string name="use_intrusive_call_title">Notification d\'appel en plein écran</string>
<string name="use_intrusive_call_summary">Notifier les appels entrant en plein écran même si l\'appareil n\'est pas vérouillé</string>

<!-- Title for the option managing whether or not to show data connection type when roaming. -->
<string name="roaming_dataconnection_title">Afficher type de connection de données an itinérance</string>
<string name="roaming_dataconnection_summary">Afficher le type de connection de données (LTE, 3G, H...) dans l\'icône de la barre d\'état / tuile QS lorsque en itinérance les données sont connectées (au lieu de simplement "R")</string>

</resources>
50 changes: 50 additions & 0 deletions res/values-hu/yaosp_strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012-2015 SlimRoms 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.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<!-- Proximity speaker -->
<string name="display_category_prox_auto_speaker_title">Kihangosító beállítások</string>
<string name="prox_auto_speaker_title">Automatikus kihangosító mód</string>
<string name="prox_auto_speaker_summary">Ha a telefon az arctól eltávolodik, a kihangosító mód automatikusan bekapcsol</string>
<string name="prox_auto_speaker_delay_title">Kihangosító mód késleltetés</string>
<string name="prox_auto_speaker_delay_summary">Idő, miután a kihangosító mód aktiválódik</string>
<string name="prox_auto_speaker_incall_only_title">Csak hívás közben</string>
<string name="prox_auto_speaker_incall_only_summary_on">A kimenő hívások esetén a kihangosító mód csak akkor lesz aktív, ha a fogadó fél válaszolt</string>
<string name="prox_auto_speaker_incall_only_summary_off">A kihangosító mód az összes bejövő hívásnál aktív (alapértelmezett)</string>

<!-- Setting title for the flip action setting. -->
<string name="flip_action_title">Lefordítási művelet</string>

<!-- Dialog title of the flip action setting. -->
<string name="flip_action_dialog_title">A telefon lefordításakor\u2026</string>

<!-- Setting summary for the flip action setting. -->
<string name="flip_action_summary">A telefon lefordításakor <xliff:g id="action">%s</xliff:g></string>

<!-- Values for flip action array entries -->
<string name="entry_do_nothing">Nem történik semmi</string>
<string name="entry_mute_ringer">Csengés elnémítása</string>
<string name="entry_dismiss_call">Hívás elutasítása</string>
<string name="summary_do_nothing">nem történik semmi</string>
<string name="summary_mute_ringer">a csengést elnémítja</string>
<string name="summary_dismiss_call">a bejövő hívásokat elutasítja</string>

<!-- Title for the option managing whether or not to use intrusive incall UI. -->
<string name="use_intrusive_call_title">Tolakodó bejövő hívás</string>
<string name="use_intrusive_call_summary">Teljes kijelzős értesítés bejövő hívásnál akkor is ha a képernyő nincs lezárva</string>

<!-- Title for the option managing whether or not to show data connection type when roaming. -->
<string name="roaming_dataconnection_title">Adatkapcsolat kijelzése barangoláskor</string>
<string name="roaming_dataconnection_summary">Kijelzi az adatkapcsolat típusát (LTE, 3G, H...) az állapotsávon / gyorsbeállítás ikonon ha a barangolás (roaming) és az adatkapcsolat aktív (az "R" helyett)</string>

</resources>
3 changes: 3 additions & 0 deletions res/values/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,7 @@

<!-- Whether the emergency only account can make emergency calls -->
<bool name="config_pstnCanPlaceEmergencyCalls">true</bool>

<!-- Disable speaker proximity preference for problematic devices -->
<bool name="config_enabled_speakerprox" translatable="false">true</bool>
</resources>
41 changes: 41 additions & 0 deletions res/values/yaosp_arrays.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 Yank555.lu Android Open Source Project
Copyright (C) 2012-2014 SlimRoms 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.
-->
<resources>

<!-- Values for the flip action settings. -->
<string-array name="flip_action_setting_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>

<!-- Entries listed in the setting for the flip action. -->
<string-array name="flip_action_setting_entries">
<item>@string/entry_mute_ringer</item>
<item>@string/entry_dismiss_call</item>
<item>@string/entry_do_nothing</item>
</string-array>

<!-- Summary texts for flip action. Must be ordered by numerical
value (do mute = 0, dismiss = 1, nothing = 2 (default)) -->
<string-array name="flip_action_summary_entries">
<item>@string/summary_mute_ringer</item>
<item>@string/summary_dismiss_call</item>
<item>@string/summary_do_nothing</item>
</string-array>

</resources>
53 changes: 53 additions & 0 deletions res/values/yaosp_strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012-2015 SlimRoms 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.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<!-- Proximity speaker -->
<string name="display_category_prox_auto_speaker_title">Proximity speaker settings</string>
<string name="prox_auto_speaker_title">Automatic proximity speaker</string>
<string name="prox_auto_speaker_summary">Enable speakerphone when the device is removed from your face</string>
<string name="prox_auto_speaker_delay_title">Proximity speaker delay</string>
<string name="prox_auto_speaker_delay_summary">Time delay before speaker is activated</string>
<string name="prox_auto_speaker_incall_only_title">Only while in call</string>
<string name="prox_auto_speaker_incall_only_summary_on">On outgoing calls, listener will only become active after the receiving party answers</string>
<string name="prox_auto_speaker_incall_only_summary_off">Listener will be active during all offhook call states (default)</string>

<!-- Setting title for the flip action setting. -->
<string name="flip_action_title">Flip action</string>

<!-- Dialog title of the flip action setting. -->
<string name="flip_action_dialog_title">Flip device to\u2026</string>

<!-- Setting summary for the flip action setting. -->
<string name="flip_action_summary">Flipping the phone down will <xliff:g id="action">%s</xliff:g></string>

<!-- Values for flip action array entries -->
<string name="entry_do_nothing">Do nothing</string>
<string name="entry_mute_ringer">Mute ringer</string>
<string name="entry_dismiss_call">Dismiss call</string>
<string name="summary_do_nothing">do nothing</string>
<string name="summary_mute_ringer">mute the ringer</string>
<string name="summary_dismiss_call">dismiss the call</string>

<!-- Title for the option managing whether or not to use intrusive incall UI. -->
<string name="use_intrusive_call_title">Intrusive incoming calls</string>
<string name="use_intrusive_call_summary">Show a full screen notification on incoming call even when not on lockscreen</string>

<!-- Title for the option managing whether or not to show data connection type when roaming. -->
<string name="roaming_dataconnection_title">Show data connection type when roaming</string>
<string name="roaming_dataconnection_summary">Show data connection type (LTE, 3G, H...) in statusbar / QS icon when roaming and data is connected (instead of just "R")</string>

</resources>
43 changes: 43 additions & 0 deletions res/xml/call_feature_setting.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,47 @@
android:summary="@string/sum_cdma_call_settings"
android:persistent="false" />

<ListPreference
android:key="flip_action"
android:title="@string/flip_action_title"
android:dialogTitle="@string/flip_action_dialog_title"
android:entries="@array/flip_action_setting_entries"
android:entryValues="@array/flip_action_setting_values"
android:persistent="false" />

<SwitchPreference
android:key="use_intrusive_call"
android:title="@string/use_intrusive_call_title"
android:summary="@string/use_intrusive_call_summary"
android:persistent="false" />

<PreferenceCategory
android:key="category_prox_auto_speaker"
android:title="@string/display_category_prox_auto_speaker_title" >

<SwitchPreference
android:key="prox_auto_speaker"
android:title="@string/prox_auto_speaker_title"
android:summary="@string/prox_auto_speaker_summary"
android:persistent="false"
android:defaultValue="false" />

<SlimSeekBarPreference
android:key="prox_auto_speaker_delay"
android:title="@string/prox_auto_speaker_delay_title"
android:summary="@string/prox_auto_speaker_delay_summary"
android:persistent="false"
android:dependency="prox_auto_speaker" />

<SwitchPreference
android:key="prox_auto_speaker_incall_only"
android:title="@string/prox_auto_speaker_incall_only_title"
android:summaryOff="@string/prox_auto_speaker_incall_only_summary_off"
android:summaryOn="@string/prox_auto_speaker_incall_only_summary_on"
android:persistent="false"
android:defaultValue="false"
android:dependency="prox_auto_speaker" />

</PreferenceCategory>

</PreferenceScreen>
6 changes: 6 additions & 0 deletions res/xml/network_setting.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
android:summaryOn="@string/roaming_enable"
android:summaryOff="@string/roaming_disable"/>

<SwitchPreference
android:key="button_roaming_dataconnection_key"
android:title="@string/roaming_dataconnection_title"
android:persistent="false"
android:summary="@string/roaming_dataconnection_summary" />

<ListPreference
android:key="preferred_network_mode_key"
android:title="@string/preferred_network_mode_title"
Expand Down
Loading