From b48cecbe68abbecd15991b4476a5304ee8f38bcd Mon Sep 17 00:00:00 2001 From: Ihab Awad Date: Mon, 18 Nov 2013 16:02:15 -0800 Subject: Remove an extra logging call left over from development. Change-Id: I41cda7bc38bad1acc3ad3e1270947fe77fab9416 Bug: 11748959 --- InCallUI/src/com/android/incallui/StatusBarNotifier.java | 1 - 1 file changed, 1 deletion(-) diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index 6d9fd600c..2de1b2d0a 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -236,7 +236,6 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener { mNotificationTimer.getState() == NotificationTimer.State.FIRED); if (showNotificationNow) { - Log.e(this, "showNotificationNow == true case", new Exception()); showNotification(call, allowFullScreenIntent); } else { cancelInCall(); -- cgit v1.2.3 From eb857b7f5fe3bef77dde91693f18cabd8c6d15d5 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Mon, 18 Nov 2013 17:03:04 -0800 Subject: Decrease the timeout for unknown endcall screen from 5 to 2 sec. bug:11651065 Change-Id: I1ab2b3690a4bb655e94811c8831a6da0d9400edb --- InCallUI/src/com/android/incallui/CallList.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java index ba123b0c1..dee275570 100644 --- a/InCallUI/src/com/android/incallui/CallList.java +++ b/InCallUI/src/com/android/incallui/CallList.java @@ -25,6 +25,7 @@ import android.os.Handler; import android.os.Message; import com.android.services.telephony.common.Call; +import com.android.services.telephony.common.Call.DisconnectCause; import java.util.ArrayList; import java.util.HashMap; @@ -310,7 +311,9 @@ public class CallList { if (state != Call.State.IDLE && state != Call.State.INVALID && state != Call.State.DISCONNECTED) { + call.setState(Call.State.DISCONNECTED); + call.setDisconnectCause(DisconnectCause.UNKNOWN); updateCallInMap(call); } } @@ -380,6 +383,7 @@ public class CallList { delay = DISCONNECTED_CALL_SHORT_TIMEOUT_MS; break; case NORMAL: + case UNKNOWN: delay = DISCONNECTED_CALL_MEDIUM_TIMEOUT_MS; break; case INCOMING_REJECTED: -- cgit v1.2.3 From bc3fbe89f1c7f2b8f370e5043a033a82a2e5ac9d Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Wed, 11 Dec 2013 08:53:03 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I73485cfe4185ca79d23a5e5d82fc6ffcbf7f0119 Auto-generated-cl: translation import --- InCallUI/res/values-cs/strings.xml | 2 +- InCallUI/res/values-de/strings.xml | 2 +- InCallUI/res/values-fr/strings.xml | 2 +- InCallUI/res/values-pl/strings.xml | 10 +++++----- InCallUI/res/values-zh-rTW/strings.xml | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/InCallUI/res/values-cs/strings.xml b/InCallUI/res/values-cs/strings.xml index 6e299dd4b..6b7620926 100644 --- a/InCallUI/res/values-cs/strings.xml +++ b/InCallUI/res/values-cs/strings.xml @@ -531,7 +531,7 @@ "Odebrat účet" "Účty SIP" "Ukládání účtu..." - "Odebírání účtu..." + "Odstraňování účtu..." "Uložit" "Zahodit" "Zavřít profil" diff --git a/InCallUI/res/values-de/strings.xml b/InCallUI/res/values-de/strings.xml index 66121c928..53b7be625 100644 --- a/InCallUI/res/values-de/strings.xml +++ b/InCallUI/res/values-de/strings.xml @@ -24,7 +24,7 @@ "Telefonzelle" "Leitung besetzt" "Netzwerk ausgelastet" - "Keine Antwort, Timeout" + "Keine Antwort, Zeitüberschreitung" "Server nicht erreichbar" "Nummer nicht erreichbar" "Ungültiger Nutzername oder ungültiges Passwort" diff --git a/InCallUI/res/values-fr/strings.xml b/InCallUI/res/values-fr/strings.xml index c525d3640..04045024e 100644 --- a/InCallUI/res/values-fr/strings.xml +++ b/InCallUI/res/values-fr/strings.xml @@ -555,7 +555,7 @@ "Serveur" "Nom d\'utilisateur" "Mot de passe" - "Nom affiché" + "Nom à afficher" "Adresse de proxy sortant" "N° de port" "Type de transport" diff --git a/InCallUI/res/values-pl/strings.xml b/InCallUI/res/values-pl/strings.xml index ea528e9e4..424f8e51c 100644 --- a/InCallUI/res/values-pl/strings.xml +++ b/InCallUI/res/values-pl/strings.xml @@ -200,11 +200,11 @@ "Minęło %1$d٪ cyklu\nNastępny okres za: %2$d dni (%3$s)" "Zmniejsz transfer do %1$d Kb/s jeśli przekroczę limit użycia danych" "Więcej informacji na temat zasad dotyczących użycia danych w sieci komórkowej tego operatora" - "Wiadomość SMS transmisji komórkowej" - "Wiadomość SMS transmisji komórkowej" - "Wiadomość SMS transmisji komórkowej włączona" - "Wiadomość SMS transmisji komórkowej wyłączona" - "Ustawienia wiadomości SMS transmisji komórkowej" + "Komunikaty SMS z sieci komórkowej" + "Komunikaty SMS z sieci komórkowej" + "Komunikaty SMS z sieci komórkowej są włączone" + "Komunikaty SMS z sieci komórkowej są wyłączone" + "Ustawienia komunikatów SMS z sieci komórkowej" "Transmisja alarmowa" "Transmisja alarmowa włączona" "Transmisja alarmowa wyłączona" diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml index 69392e68e..8074480fe 100644 --- a/InCallUI/res/values-zh-rTW/strings.xml +++ b/InCallUI/res/values-zh-rTW/strings.xml @@ -180,11 +180,11 @@ "僅限 GSM" "GSM/WCDMA 優先" - "已啟用資料" + "啟用行動數據服務" "啟用行動數據服務網路" "漫遊服務" - "漫遊時連線到資料傳輸服務" - "漫遊時連線到資料傳輸服務" + "漫遊時連線到數據傳輸服務" + "漫遊時連線到數據傳輸服務" "您已離開國內網路涵蓋範圍，且已關閉數據傳輸漫遊服務，因此數據連線已中斷。" "要允許漫遊服務嗎？您可能會需要支付龐大漫遊費用！" "GSM/UMTS 選項" -- cgit v1.2.3 From e993eb61bbc37dbe7aa8e98e5ac5c9eb1fcd7456 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Wed, 18 Dec 2013 12:22:58 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I207ed9f246e80a924c86268171fb9444b16e63ac Auto-generated-cl: translation import --- InCallUI/res/values-zh-rCN/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml index f33cda083..b46916aa7 100644 --- a/InCallUI/res/values-zh-rCN/strings.xml +++ b/InCallUI/res/values-zh-rCN/strings.xml @@ -412,7 +412,7 @@ "短信" "要进行呼叫，请先关闭飞行模式。" "尚未注册网络。" - "无法访问移动网络" + "无法连接到移动网络" "拨号未送出，因为输入的号码无效。" "拨号未送出。" "正在启动 MMI 序列..." -- cgit v1.2.3 From fb0c640aaceb5aa7c154b2dc1e56b8d83528ddd4 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 26 Dec 2013 07:38:08 -0800 Subject: Import translations. DO NOT MERGE Change-Id: Id0577c8b328def05d8a88908d0e7f3b313f49edf Auto-generated-cl: translation import --- InCallUI/res/values-zh-rTW/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml index 8074480fe..8999bea7d 100644 --- a/InCallUI/res/values-zh-rTW/strings.xml +++ b/InCallUI/res/values-zh-rTW/strings.xml @@ -455,7 +455,7 @@ "開啟助聽器相容功能" "關閉 TTY" - "TTY 全能" + "TTY 完整功能" "TTY HCO" "TTY VCO" -- cgit v1.2.3 From bfae028677b556cf7d544205c55d85f8adfa409f Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Wed, 19 Feb 2014 15:42:22 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I09773ffc6aa6d068cc57f70d281445dd27b3c576 Auto-generated-cl: translation import --- InCallUI/res/values-ca/strings.xml | 4 ++-- InCallUI/res/values-da/strings.xml | 4 ++-- InCallUI/res/values-km-rKH/strings.xml | 2 +- InCallUI/res/values-sk/strings.xml | 4 ++-- InCallUI/res/values-sw/strings.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/InCallUI/res/values-ca/strings.xml b/InCallUI/res/values-ca/strings.xml index 352fecfe1..a2c43ce4d 100644 --- a/InCallUI/res/values-ca/strings.xml +++ b/InCallUI/res/values-ca/strings.xml @@ -66,7 +66,7 @@ "Desbloqueig de la xarxa correcte." "Configuració de trucades GSM" "Configuració de trucades CDMA" - "Noms de punts d\'accés" + "APN" "Configuració de xarxa" "Correu de veu" "CV:" @@ -181,7 +181,7 @@ "GSM/WCDMA preferit" "Dades activades" - "Permet l\'accés a dades a través de la xarxa mòbil" + "Permet l\'accés a dades a les través de la xarxa mòbil" "Itinerància de dades" "Estableix connexió amb serveis de dades en itinerància" "Estableix connexió amb serveis de dades en itinerància" diff --git a/InCallUI/res/values-da/strings.xml b/InCallUI/res/values-da/strings.xml index 69c3d56cf..a9244ed82 100644 --- a/InCallUI/res/values-da/strings.xml +++ b/InCallUI/res/values-da/strings.xml @@ -155,8 +155,8 @@ "Foretrukken netværkstilstand: kun GSM" "Foretrukken netværkstilstand: kun WCDMA" "Foretrukken netværkstilstand: GSM/WCDMA" - "Foretrukket netværkstilstand: CDMA" - "Foretrukket netværkstilstand: CDMA / EvDo" + "Foretrukkennetværkstilstand: CDMA" + "Foretrukkennetværkstilstand: CDMA / EvDo" "Foretrukken netværkstilstand: kun CDMA" "Foretrukken netværkstilstand: kun EvDo" "Foretrukken netværkstilstand: CDMA/EvDo/GSM/WCDMA" diff --git a/InCallUI/res/values-km-rKH/strings.xml b/InCallUI/res/values-km-rKH/strings.xml index 7b25fe26e..74a67a193 100644 --- a/InCallUI/res/values-km-rKH/strings.xml +++ b/InCallUI/res/values-km-rKH/strings.xml @@ -180,7 +180,7 @@ "តែ GSM ប៉ុណ្ណោះ" "GSM/WCDMA ដែល​ចូលចិត្ត" - "បាន​បិទ​ទិន្នន័យ" + "បាន​បើក​ទិន្នន័យ" "បើក​ចូល​ដំណើរការ​ទិន្នន័យ​លើ​​បណ្ដាញ​ឧបករណ៍​ចល័ត" "រ៉ូមីង​​ទិន្នន័យ" "តភ្ជាប់​ទៅ​កាន់​សេវា​កម្ម​ទិន្នន័យ​នៅ​ពេល​ដែល​រ៉ូ​មីង" diff --git a/InCallUI/res/values-sk/strings.xml b/InCallUI/res/values-sk/strings.xml index 76a7d8f41..fd6f1361c 100644 --- a/InCallUI/res/values-sk/strings.xml +++ b/InCallUI/res/values-sk/strings.xml @@ -60,7 +60,7 @@ "Karta SIM bola odblokovaná. Prebieha odomykanie telefónu..." "Kód PIN odomknutia siete pre kartu SIM" "Odomknúť" - "Zrušiť" + "Zatvoriť" "Žiadosť o odomknutie siete..." "Žiadosť o odomknutie siete nebola úspešná." "Sieť bola odomknutá." @@ -498,7 +498,7 @@ "Ukončenie režimu tiesňového spätného volania" "Áno" "Nie" - "Zrušiť" + "Zatvoriť" "Služba" "Nastavenie" "<Nenastavené>" diff --git a/InCallUI/res/values-sw/strings.xml b/InCallUI/res/values-sw/strings.xml index 4d1d339c4..67f799327 100644 --- a/InCallUI/res/values-sw/strings.xml +++ b/InCallUI/res/values-sw/strings.xml @@ -40,7 +40,7 @@ "Simu zote zimezuiwa na kidhibiti ufikiaji." "Simu za dharura zimezuiwa na kidhibiti ufikiaji." "Simu za kawaida zimezuiwa na kidhibiti ufikiaji." - "Nambari batili" + "Nambari isiyo sahihi" "Simu ya kongamano" "Simu imepotea." "Sawa" -- cgit v1.2.3 From e5fbbea9f992a695bead99e5f0407bd920ba6b38 Mon Sep 17 00:00:00 2001 From: Jay Shrauner Date: Thu, 5 Dec 2013 15:50:47 -0800 Subject: Fix NPE in onPostDialCharWait Handle calls to onPostDialCharWait when mInCallActivity is null. Bug:12021342 Change-Id: Id8da6074f7bd3a0c0962dbaa9246c2de18e6e38b (cherry picked from commit 01563b04e60e34845ed57d8bb0e90ed01c8462ab) --- InCallUI/src/com/android/incallui/InCallPresenter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 8bec492d9..140262127 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -425,7 +425,9 @@ public class InCallPresenter implements CallList.Listener { } public void onPostDialCharWait(int callId, String chars) { - mInCallActivity.showPostCharWaitDialog(callId, chars); + if (isActivityStarted()) { + mInCallActivity.showPostCharWaitDialog(callId, chars); + } } /** -- cgit v1.2.3 From 1a080105cabdd938ccb1550803674e26cf180f28 Mon Sep 17 00:00:00 2001 From: Jay Shrauner Date: Tue, 19 Nov 2013 15:58:46 -0800 Subject: Remove unused strings Remove unused strings left over from telephone/incall split. (Change from original CL on master: don't modify any translation files.) Bug:13242270 Change-Id: I8383644ca31e66aa43b184368606cc693583da22 (cherry picked from commit 2604a129668c69a283822e1b1d2eb70bb8ba0be5) --- InCallUI/res/values/array.xml | 33 -- InCallUI/res/values/attrs.xml | 35 -- InCallUI/res/values/strings.xml | 967 ---------------------------------------- 3 files changed, 1035 deletions(-) mode change 100755 => 100644 InCallUI/res/values/strings.xml diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml index c47164532..3902e842f 100644 --- a/InCallUI/res/values/array.xml +++ b/InCallUI/res/values/array.xml @@ -17,39 +17,6 @@ - - UDP - TCP - - - - @string/sip_call_options_entry_1 - @string/sip_call_options_entry_2 - @string/sip_call_options_entry_3 - - - - @string/sip_call_options_wifi_only_entry_1 - @string/sip_call_options_entry_2 - @string/sip_call_options_entry_3 - - - - @string/sip_always - @string/sip_address_only - @string/sip_ask_me_each_time - - - - @string/pstn_phone - @string/internet_phone - - - - @string/sip_system_decide - @string/sip_always_send_keepalive - - diff --git a/InCallUI/res/values/attrs.xml b/InCallUI/res/values/attrs.xml index bc00c9534..e135fb72d 100644 --- a/InCallUI/res/values/attrs.xml +++ b/InCallUI/res/values/attrs.xml @@ -16,41 +16,6 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml old mode 100755 new mode 100644 index 62a1d5bfa..513cd9191 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -114,638 +114,6 @@ replace the "wild" character. --> Replace wild character with - - - Missing voicemail number - - No voicemail number is stored on the SIM card. - - Add number - - - Your SIM card has been unblocked. Your phone is unlocking\u2026 - - - SIM network unlock PIN - - Unlock - - Dismiss - - Requesting network unlock\u2026 - - Network unlock request unsuccessful. - - Network unlock successful. - - - - - GSM call settings - - CDMA call settings - - Access Point Names - - Network settings - - Voicemail - - VM: - - Network operators - - Call settings - - Additional settings - - Additional GSM only call settings - - Additional CDMA call settings - - Additional CDMA only call settings - - Network service settings - - Caller ID - - Loading settings\u2026 - - Number hidden in outgoing calls - - Number displayed in outgoing calls - - Use default operator settings to display my number in outgoing calls - - Call waiting - - During a call, notify me of incoming calls - - During a call, notify me of incoming calls - - Call forwarding settings - - Call forwarding - - - Always forward - - Always use this number - - Forwarding all calls - - Forwarding all calls to {0} - - Number is unavailable - - Disabled - - - Forward when busy - - Number when busy - - Forwarding to {0} - - Disabled - - Your operator doesn\'t support disabling call forwarding when your phone is busy. - - - Forward when unanswered - - Number when unanswered - - Forwarding to {0} - - Disabled - - Your operator doesn\'t support disabling call forwarding when your phone doesn\'t answer. - - - Forward when unreachable - - Number when unreachable - - Forwarding to {0} - - Disabled - - Your carrier doesn\'t support disabling call forwarding when your phone is unreachable. - - - Call settings - - Call settings error - - Reading settings\u2026 - - Updating settings\u2026 - - Reverting settings\u2026 - - Unexpected response from network. - - Network or SIM card error. - - Your Phone app\'s Fixed Dialing Numbers setting is turned on. As a result, some call-related features aren\'t working. - - Turn on the radio before viewing these settings. - - OK - - Enable - - Disable - - Update - - - - Network default - - Hide number - - Show number - - - - - DEFAULT - - HIDE - - SHOW - - - - - Voicemail number changed. - - Couldn\'t change the voicemail number.\nContact your carrier if this problem persists. - - Couldn\'t change the forwarding number.\nContact your carrier if this problem persists. - - Couldn\'t retrieve and save current forwarding number settings.\nSwitch to the new provider anyway? - - No changes were made. - - Choose voicemail service - - My carrier - - - - Mobile network settings - - Available networks - - Searching\u2026 - - No networks found. - - Search networks - - Error while searching for networks. - - Registering on %s\u2026 - - Your SIM card doesn\'t allow a connection to this network. - - Can\'t connect to this network right now. Try again later. - - Registered on network. - - Choose a network operator - - Search for all available networks - - Choose automatically - - Automatically choose preferred network - Automatic registration\u2026 - Network Mode - Change the network operating mode - Preferred network mode - - Preferred network mode: WCDMA preferred - - Preferred network mode: GSM only - - Preferred network mode: WCDMA only - - Preferred network mode: GSM / WCDMA - - Preferred network mode: CDMA - - Preferred network mode: CDMA / EvDo - - Preferred network mode: CDMA only - - Preferred network mode: EvDo only - - Preferred network mode: CDMA/EvDo/GSM/WCDMA - - Preferred network mode: LTE - - Preferred network mode: GSM/WCDMA/LTE - - Preferred network mode: CDMA+LTE/EVDO - - Preferred network mode: Global - - Preferred network mode: LTE / WCDMA - - - - LTE / WCDMA - LTE - Global - GSM/WCDMA/LTE - CDMA + LTE/EvDo - CDMA/EvDo/GSM/WCDMA - EvDo only - CDMA w/o EvDo - CDMA/EvDo auto - GSM/WCDMA auto - WCDMA only - GSM only - GSM/WCDMA preferred - - - "12" - "11" - "10" - "9" - "8" - "7" - "6" - "5" - "4" - "3" - "2" - "1" - "0" - - - Data enabled - - Enable data access over Mobile network - - Data roaming - - Connect to data services when roaming - - Connect to data services when roaming - - You\'ve lost data connectivity because you left your home network with data roaming turned off. - - Allow data roaming? You may incur significant roaming charges! - GSM/UMTS Options - CDMA Options - - - Data usage - - Data used in current period - - Data use period - - Data rate policy - - Learn more - - %1$s (%2$d\u066A) of %3$s period maximum\nNext period starts in %4$d days (%5$s) - - %1$s (%2$d\u066A) of %3$s period maximum - - %1$s maximum exceeded\nData rate reduced to %2$d Kb/s - - %1$d\u066A of cycle elapsed\nNext period starts in %2$d days (%3$s) - - Data rate reduced to %1$d Kb/s if data use limit is exceeded - - More information about your carrier\'s mobile network data use policy - - Cell Broadcast SMS - - Cell Broadcast SMS - Cell Broadcast SMS enabled - Cell Broadcast SMS disabled - - Cell Broadcast SMS settings - - Emergency Broadcast - Emergency Broadcast enabled - Emergency Broadcast disabled - - Administrative - Administrative enabled - Administrative disabled - - Maintenance - Maintenance enabled - Maintenance disabled - - General News - Business and Financial News - Sports News - Entertainment News - - Local - Local news enabled - Local news disabled - - Regional - Regional news enabled - Regional news disabled - - National - National news enabled - National news disabled - - International - International news enabled - International news disabled - - Language - Select the news language - - English - French - Spanish - Japanese - Korean - Chinese - Hebrew - - - "1" - "2" - "3" - "4" - "5" - "6" - "7" - - Languages - - Local Weather - Local Weather enabled - Local Weather disabled - - Area Traffic Reports - Area Traffic Reports enabled - Area Traffic Reports disabled - - Local Airport Flight Schedules - Local Airport Flight Schedules enabled - Local Airport Flight Schedules disabled - - Restaurants - Restaurants enabled - Restaurants disabled - - Lodgings - Lodgings enabled - Lodgings disabled - - Retail Directory - Retail Directory enabled - Retail Directory disabled - - Advertisements - Advertisements enabled - Advertisements disabled - - Stock Quotes - Stock Quotes enabled - Stock Quotes disabled - - Employment Opportunities - Employment Opportunities enabled - Employment Opportunities disabled - - Medical, Health, and Hospital - Medical, Health, and Hospital enabled - Medical, Health, and Hospital disabled - - Technology News - Technology News enabled - Technology News disabled - - Multi-category - Multi-category enabled - Multi-category disabled - - - Use only 2G networks - - Saves battery - - - - System select - - Change the CDMA roaming mode - - System select - - - Home only - - - - Automatic - - - - "0" - - - - "2" - - - CDMA subscription - Change between RUIM/SIM and NV - subscription - - RUIM/SIM - NV - - - "0" - "1" - - - Activate device - - Set up data service - - - - Fixed Dialing Numbers - - FDN list - - FDN activation - - Fixed Dialing Numbers are enabled - - Fixed Dialing Numbers are disabled - - Enable FDN - - Disable FDN - - Change PIN2 - - Disable FDN - - Enable FDN - - Manage Fixed Dialing Numbers - - Change PIN for FDN access - - Manage phone number list - - Voice privacy - Enable enhanced privacy mode - TTY mode - Set TTY mode - Auto-retry - Enable Auto-retry mode - - - Add contact - - Edit contact - - Delete contact - - - - Type PIN2 - - Name - - Number - - Save - - Add fixed dialing number - - Adding fixed dialing number\u2026 - - Fixed dialing number added. - - Edit fixed dialing number - - Updating fixed dialing number\u2026 - - Fixed dialing number updated. - - Delete fixed dialing number - - Deleting fixed dialing number\u2026 - - Fixed dialing number deleted. - - FDN wasn\'t updated because you typed an incorrect PIN. - - FDN wasn\'t updated because the number can\'t exceed 20 digits. - - FDN wasn\'t updated. The PIN2 was incorrect, or the phone number was rejected. - - - - Reading from SIM card\u2026 - - No contacts on your SIM card. - - Select contacts to import - - To import contacts from the SIM card, first turn off Airplane mode. - - - - Enable/disable SIM PIN - - Change SIM PIN - - SIM PIN: - - Old PIN - - New PIN - - Confirm new PIN - - The old PIN you typed isn\'t correct. Try again. - - The PINs you typed don\'t match. Try again. - - Type a PIN that is 4 to 8 numbers. - - Disable SIM PIN - - Enable SIM PIN - - Please wait\u2026 - - SIM PIN enabled. - - SIM PIN disabled. - - The PIN you typed was incorrect. - - SIM PIN changed successfully. - - Password incorrect, SIM is locked! PUK2 requested. - - - - PIN2 - - Old PIN2 - - New PIN2 - - Confirm new PIN2 - - The PUK2 you typed isn\'t correct. Try again. - - The old PIN2 you typed isn\'t correct. Try again. - - The PIN2s you typed don\'t match. Try again. - - Type a PIN2 that is 4 to 8 numbers. - - Type a PUK2 that is 8 numbers. - - PIN2 changed successfully. - - Type PUK2 code - - Password incorrect. Change PIN2 and retry. - - Password incorrect, SIM is locked. PUK2 requested. - - - Done - Conference call %s @@ -903,144 +271,6 @@ to a video call. [CHAR LIMIT=10] --> Video call - - Import - - Import all - - Importing SIM contacts - - Import from contacts - - - Hearing aids - Turn on hearing aid compatibility - - - - TTY Off - TTY Full - TTY HCO - TTY VCO - - - - - - 0 - - 1 - - 2 - - 3 - - - - - DTMF tones - - Set the length of DTMF tones - - - Normal - Long - - - - 0 - 1 - - - - Network message - - - - Activate your phone - - A special call needs to be made to activate your phone service. - \n\nAfter pressing \u201CActivate\u201D, listen to the instructions provided to activate your phone. - - - Skip activation\? - - If you skip activation, you can\'t place calls or connect to mobile data networks (though you can connect to Wi-Fi networks). Until you activate your phone, you are asked to activate it each time you turn it on. - - Skip - - - Activate - - Phone is activated. - - Problem with activation - - Follow the spoken instructions until you hear that activation is complete. - - - Speaker - - Wait while your phone is being programmed. - - Programming unsuccessful - - Your phone is now activated. It may take up to 15 minutes for service to start. - - Your phone didn\'t activate. - \nYou may need to find an area with better coverage (near a window, or outside). - \n\nTry again or call customer service for more options. - - EXCESS SPC FAILURES - - Back - - Try again - - Next - - - EcmExitDialog - - Entered Emergency Callback Mode - - Emergency Callback Mode - - Data connection disabled - - - No data connection for %s minute - - No data connection for %s minutes - - - - - The phone will be in Emergency Callback mode for %s minute. While in this mode no apps using a data connection can be used. Do you want to exit now? - - The phone will be in Emergency Callback mode for %s minutes. While in this mode no applications using a data connection can be used. Do you want to exit now? - - - - - The selected action isn\'t available while in the Emergency Callback mode. The phone will be in this mode for %s minute. Do you want to exit now? - - The selected action isn\'t available while in the Emergency Callback mode. The phone will be in this mode for %s minutes. Do you want to exit now? - - - The selected action isn\'t available while in an emergency call. - - Exiting Emergency Callback mode - - Yes - - No - - Dismiss - @@ -1073,203 +303,6 @@ select contact - - - - - Internet call settings - - Internet calling (SIP) accounts - - Accounts - - Receive incoming calls - - Reduces battery life - - Use Internet calling - - Use Internet calling (Wi-Fi only) - - - For all calls when data network is available - - Only for Internet calls - - Ask for each call - - For all calls - - - Place call - - - Use Internet calling account: - - - Always use to place Internet calls - - - You can change which Internet calling account to use by default from the Phone > Settings > Internet call settings > Accounts screen. - - - Cell phone call - - - Internet call - - - No Internet calling account - - There are no Internet calling accounts on this phone. Do you want to add one now? - - Add - - - Add account - - Remove account - - SIP accounts - - Saving the account\u2026 - - Removing the account\u2026 - - - Save - - Discard - - - Close the profile - - OK - - Close - - - Primary account. %s - - Checking status... - - Registering\u2026 - - Still trying\u2026 - - Not receiving calls. - - Account registration stopped because there is no Internet connection. - - Account registration stopped because there is no Wi-Fi connection. - - Account registration unsuccessful. - - Receiving calls. - - Account registration unsuccessful: (%s); will try later - - Account registration unsuccessful: Incorrect username or password. - - Account registration unsuccessful: Check the server name. - - This account is currently in use by the %s app. - - - - SIP account details - - SIP account details - - - Server - - Username - - Password - - Display name - - Outbound proxy address - - Port number - - Transport type - - Send keep-alive - - Set as primary account - - Used for outbound calls - - Optional settings - - Authentication username - - Username used for authentication - - - <Not set> - - <Same as username> - - <Optional> - - - 5060 - - UDP - - - - ▷ Touch to show all - - ▽ Touch to hide all - - - %s is required and can\'t be left blank. - - Port number should be within 1000 and 65534. - - - No Internet connection - - No Wi-Fi connection - - To place an Internet call, check your Internet connection first. - - You need to be connected to a Wi-Fi network for Internet calls (use the Wireless & Network settings). - - Internet calling not supported - - - Automatic - - Always send - - - SIP_ALWAYS - SIP_ADDRESS_ONLY - SIP_ASK_ME_EACH_TIME - - - SipDomain - UserName - Password - DisplayName - ProxyAddress - Port - Protocol - SendKeepAlive - SetPrimary - advanced settings container - AuthUserName - - - - Voice calling not supported - Can\'t talk now. What\'s up? -- cgit v1.2.3 From 30c8387f8d446b23d96bc2a99679324e9a21418f Mon Sep 17 00:00:00 2001 From: Ihab Awad Date: Mon, 3 Mar 2014 14:12:57 -0800 Subject: Update dialpad to new look and feel. DO NOT MERGE. http://b/13189041 Change-Id: I26b306300e11fd6830d40b51a705c472c89925f4 (cherry picked from commit a389ad358b723ce1725662c79bfc175ddc2e558c) --- InCallUI/proguard.flags | 6 + InCallUI/res/anim/slide_in.xml | 23 ++++ InCallUI/res/anim/slide_out.xml | 23 ++++ InCallUI/res/drawable/dialpad_key_colors.xml | 22 +++ InCallUI/res/layout/dialpad.xml | 76 +++++++++++ InCallUI/res/layout/dialpad_key.xml | 34 +++++ .../res/layout/dtmf_twelve_key_dialer_view.xml | 135 ++++++------------- InCallUI/res/values/colors.xml | 22 ++- InCallUI/res/values/dimens.xml | 16 ++- InCallUI/res/values/strings.xml | 50 +++++++ InCallUI/res/values/styles.xml | 49 +++++-- .../src/com/android/incallui/DialpadFragment.java | 147 +++++++++++++++++++-- .../src/com/android/incallui/InCallActivity.java | 17 ++- .../com/android/incallui/NeededForReflection.java | 30 +++++ 14 files changed, 525 insertions(+), 125 deletions(-) create mode 100644 InCallUI/res/anim/slide_in.xml create mode 100644 InCallUI/res/anim/slide_out.xml create mode 100644 InCallUI/res/drawable/dialpad_key_colors.xml create mode 100644 InCallUI/res/layout/dialpad.xml create mode 100644 InCallUI/res/layout/dialpad_key.xml create mode 100644 InCallUI/src/com/android/incallui/NeededForReflection.java diff --git a/InCallUI/proguard.flags b/InCallUI/proguard.flags index bc8814355..4e8310ca9 100644 --- a/InCallUI/proguard.flags +++ b/InCallUI/proguard.flags @@ -6,3 +6,9 @@ -keepclasseswithmembers class com.android.incallui.AnimationUtils$CrossFadeDrawable { *** setCrossFadeAlpha(...); } + +# Any class or method annotated with NeededForTesting or NeededForReflection. +-keepclassmembers class * { +@com.android.contacts.common.test.NeededForTesting *; +@com.android.incallui.NeededForReflection *; +} diff --git a/InCallUI/res/anim/slide_in.xml b/InCallUI/res/anim/slide_in.xml new file mode 100644 index 000000000..c8372ce27 --- /dev/null +++ b/InCallUI/res/anim/slide_in.xml @@ -0,0 +1,23 @@ + + + \ No newline at end of file diff --git a/InCallUI/res/anim/slide_out.xml b/InCallUI/res/anim/slide_out.xml new file mode 100644 index 000000000..2861db275 --- /dev/null +++ b/InCallUI/res/anim/slide_out.xml @@ -0,0 +1,23 @@ + + + \ No newline at end of file diff --git a/InCallUI/res/drawable/dialpad_key_colors.xml b/InCallUI/res/drawable/dialpad_key_colors.xml new file mode 100644 index 000000000..27b4d4fc5 --- /dev/null +++ b/InCallUI/res/drawable/dialpad_key_colors.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/InCallUI/res/layout/dialpad.xml b/InCallUI/res/layout/dialpad.xml new file mode 100644 index 000000000..d537e6200 --- /dev/null +++ b/InCallUI/res/layout/dialpad.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/InCallUI/res/layout/dialpad_key.xml b/InCallUI/res/layout/dialpad_key.xml new file mode 100644 index 000000000..180074dec --- /dev/null +++ b/InCallUI/res/layout/dialpad_key.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml b/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml index fe84010c7..7240cb119 100644 --- a/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml +++ b/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml @@ -14,9 +14,7 @@ limitations under the License. --> - - - - + android:layout_height="0dp" + android:layout_weight="1"/> - + android:layout_height="wrap_content" + android:background="@color/background_dialpad"> - - - - - + - - - - - + + - - - - - - - - - - - - - + + + diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index 6080e910b..ca53f272e 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -23,9 +23,6 @@ #8033b5e5 #FFFFFF - - #FFFFFF - #33B5E5 @@ -44,9 +41,24 @@ #303030 - - #000000 + + #000000 + + + #ffffff + + + #ececec #000000 + + + #3B77E7 + + + #8b8b8b + + + #33999999 diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index ebfb93494..9bde442e6 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -71,7 +71,8 @@ 4dp 2dp - 35sp + 36sp + 47dp 0px @@ -116,4 +117,17 @@ -48dip 0dip + + 40sp + 13sp + 26sp + 30dp + 50dp + 56dp + 18sp + 11dp + 5dp + + + 2dp diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 513cd9191..046917182 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -517,4 +517,54 @@ Emergency number + + + 0 + + 1 + + 2 + + 3 + + 4 + + 5 + + 6 + + 7 + + 8 + + 9 + + * + + # + + + + + + + + ABC + + DEF + + GHI + + JKL + + MNO + + PQRS + + TUV + + WXYZ + + + + diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml index 91090b844..1b15d2937 100644 --- a/InCallUI/res/values/styles.xml +++ b/InCallUI/res/values/styles.xml @@ -131,21 +131,46 @@ @style/InCallAnimationStyle - + + + + + + - - + + - - - -