Mercurial Mercurial > oss > FCL > sf > app > phone / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phoneapp/phoneuiutils/inc/phoneresourceids.h
changeset 72 c76a0b1755b9
parent 45 6b911d05207e
child 74 d1c62c765e48 
--- a/phoneapp/phoneuiutils/inc/phoneresourceids.h	Thu Sep 02 20:26:16 2010 +0300
+++ b/phoneapp/phoneuiutils/inc/phoneresourceids.h	Fri Sep 17 08:29:19 2010 +0300
@@ -25,81 +25,52 @@
     R_PHONEUI_IDLE_MENUBAR,
     R_PHONEUIDIALER_NUMBERACQ_MENUBAR,
     R_PHONEUI_NUMBERACQ_VIDEOCALL_MENUBAR,
-    R_PHONEUI_NUMBERACQ_MENUBAR,
     R_PHONEUI_NUMBERACQ_OK_VIDEOCALL_MENUBAR,
     R_PHONEUI_NUMBERACQ_OK_MENUBAR,
     R_PHONEUI_CALLHANDLING_MENUBAR,
-    R_PHONEUI_CALLHANDLING_EMERGENCY_MENUBAR,//10
-    R_PHONEUIDIALER_NUMBERACQ_EMERGENCY_MENUBAR,
-    R_PHONEUI_CALLHANDLING_EMERGENCY_MENUBAR_WITH_NUMBERENTRY,
+    R_PHONEUI_CALLHANDLING_EMERGENCY_MENUBAR,
+    R_PHONEUIDIALER_NUMBERACQ_EMERGENCY_MENUBAR, // 10
     R_PHONEUI_INCOMINGCALL_MENUBAR,
     R_PHONEUI_INCOMINGVIDEOCALL_MENUBAR,
-    R_PHONEUI_INCOMINGCALL_MENUBAR_WITH_NUMBERENTRY,
-    R_PHONEUI_INCOMINGVIDEOCALL_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_ALERTINGCALL_MENUBAR,
-    R_PHONEUI_ALERTINGCALL_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_ACTIVEANDHELD_MENUBAR,
-    R_PHONEUI_ACTIVEANDHELD_MENUBAR_WITH_NUMBERENTRY,//20
     R_PHONEUI_CALLWAITING_MENUBAR, 
-    R_PHONEUI_CALLWAITING_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_CALLACTIVEHELDANDWAITING_MENUBAR,
     R_PHONEUI_CALLACTIVEHELDANDWAITING_MENUBAR_VARIED,
-    R_PHONEUI_CALLACTIVEHELDANDWAITING_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_ALERTINGANDHELDCALL_MENUBAR,
-    R_PHONEUI_ALERTINGANDHELDCALL_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_ALERTINGANDCONFHELDCALL_MENUBAR,
-    R_PHONEUI_ALERTINGANDCONFHELDCALL_MENUBAR_WITH_NUMBERENTRY,
-    R_PHONEUI_ALERTINGWAITINGANDHELDCONFCALL_MENUBAR,//30
-    R_PHONEUI_ALERTINGWAITINGANDHELDCONFCALL_MENUBAR_WITH_NUMBERENTRY,
+    R_PHONEUI_ALERTINGWAITINGANDHELDCONFCALL_MENUBAR, // 20
     R_PHONEUI_ALERTINGHELDANDWAITINGCALL_MENUBAR,
-    R_PHONEUI_ALERTINGHELDANDWAITINGCALL_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_ALERTINGANDWAITINGCALL_MENUBAR,
     R_PHONEUI_TOUCH_CONFCALL_MENUBAR,
-    R_PHONEUI_CONFCALL_MENUBAR,
-    R_PHONEUI_CONFCALL_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_TOUCH_CONFANDCALLWAITING_MENUBAR,
-    R_PHONEUI_CONFANDCALLWAITING_MENUBAR,
-    R_PHONEUI_CONFANDCALLWAITING_MENUBAR_WITH_NUMBERENTRY,//40
     R_PHONEUI_TOUCH_ACTIVECONFANDHELD_MENUBAR,
-    R_PHONEUI_ACTIVECONFANDHELD_MENUBAR,
-    R_PHONEUI_ACTIVECONFANDHELD_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_TOUCH_ACTIVEANDHELDCONF_MENUBAR,
-    R_PHONEUI_ACTIVEANDHELDCONF_MENUBAR,
-    R_PHONEUI_ACTIVEANDHELDCONF_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_TOUCH_CONFCALLACTIVEHELDANDWAITING_MENUBAR,
-    R_PHONEUI_CONFCALLACTIVEHELDANDWAITING_MENUBAR,
-    R_PHONEUI_CONFCALLACTIVEHELDANDWAITING_MENUBAR_WITH_NUMBERENTRY,
-    R_PHONEUI_TOUCH_CALLACTIVEHELDCONFANDWAITING_MENUBAR,//50
-    R_PHONEUI_CALLACTIVEHELDCONFANDWAITING_MENUBAR,
-    R_PHONEUI_CALLACTIVEHELDCONFANDWAITING_MENUBAR_WITH_NUMBERENTRY,
+    R_PHONEUI_TOUCH_CALLACTIVEHELDCONFANDWAITING_MENUBAR,
     R_PHONEUI_PARTICIPANT_LIST_MENUBAR,
-    R_PHONEUI_PARTICIPANT_LIST_DROP_MENUBAR,
+    R_PHONEUI_PARTICIPANT_LIST_DROP_MENUBAR, // 30
     R_PHONE_INCALL_VIDEOCALL_MENUBAR_WITH_NUMBERENTRY,
-    R_PHONE_INCALL_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUIDIALER_DTMFVIEW_MENUBAR,
     R_PHONEUI_EMPTY_CBA,
     R_PHONEUI_EMERGENCY_IDLE_CBA,
-    R_PHONEUI_SEND_DTMF_NO_CBA,//60
+    R_PHONEUI_SEND_DTMF_NO_CBA,
     R_PHONEUI_SEND_DTMF_EMPTY_EDIT_BOX_CBA,
     R_PHONEUI_SEND_DTMF_NORMAL_EDIT_BOX_CBA,
     R_PHONEUI_DTMF_SPEED_DIAL_NORMAL_EDIT_BOX_CBA,
     R_PHONEUI_NUMBERACQ_VIDEOCALL_CBA,
-    R_PHONEUI_DIALER_CBA,
-    R_PHONEUI_NUMBERACQ_CBA,
+    R_PHONEUI_DIALER_CBA, // 40
     R_PHONEUI_INCALL_NUMBERACQ_CBA,
     R_PHONEUI_SETTINGSUI_CBA,
     R_PHONEUI_CALLHANDLING_CALLSETUP_CBA,
-    R_PHONEUI_CALLHANDLING_CALLSETUP_TOIHF_CBA,//70
+    R_PHONEUI_CALLHANDLING_CALLSETUP_TOIHF_CBA,
     R_PHONEUI_CALLHANDLING_CALLSETUP_TOHANDSET_CBA,
     R_PHONEUI_INCALL_DIALER_CBA,
-    R_PHONEUI_CALLHANDLING_INCALL_CBA,
-    R_PHONEUI_CALLHANDLING_INCALL_NOIHF_CBA,
+    R_PHONEUI_CALLHANDLING_INCALL_UNHOLD_CBA,
     R_PHONEUI_CALLHANDLING_INCALL_UNMUTE_CBA,
-    R_PHONEUI_CALLHANDLING_INCALL_UNHOLD_CBA,
     R_PHONEUI_CALLHANDLING_INCALL_HANDSET_CBA,
-    R_PHONEUI_CALLHANDLING_INCALL_BTAA_CBA,
+    R_PHONEUI_CALLHANDLING_INCALL_BTAA_CBA, // 50
     R_PHONEUI_CALLHANDLING_EMERGENCY_CBA,
-    R_PHONEUI_CALLHANDLING_EMERGENCY_HANDSET_CBA,//80
     R_PHONEUI_CALLHANDLING_EMERGENCY_NOIHF_CBA,
     R_PHONEUI_CALLHANDLING_EMERGENCY_NO_OPTIONS_CBA,
     R_PHONEUI_CALLHANDLING_EMERGENCY_NO_OPTIONS_HANDSET_CBA,
@@ -108,9 +79,8 @@
     R_PHONEUI_CALLHANDLING_INCOMINGCALL_REJECT_CBA,
     R_PHONEUI_CALLHANDLING_INCOMINGCALL_SOFT_REJECT_CBA,
     R_PHONEUI_CALLHANDLING_CALLWAITING_CBA,
-    R_PHONEUI_CALLHANDLING_NEW_CALL_FIND_CBA,
-    R_PHONEUI_CALLHANDLING_NEW_CALL_CALL_CBA,//90
-    R_PHONEUI_CALLHANDLING_NEW_CALL_SWAP_CBA,
+    R_PHONEUI_CALLHANDLING_NEW_CALL_FIND_CBA, // 60
+    R_PHONEUI_CALLHANDLING_NEW_CALL_CALL_CBA,
     R_PHONEUI_NEW_CALL_FETCH_CBA,
     R_PHONEUI_EXIT_EMERGENCY_MODE_CBA,
     R_PHONEUI_EMERGENCY_MODE_NOTE_CBA,
@@ -119,7 +89,7 @@
     R_PHONEUI_CALLHANDLING_INCALL_ENDACTIVE_CBA,
     R_NOTETEXT_NUMBER_NOT_IN_USE,
     R_NOTETEXT_NUMBER_BARRED,
-    R_NOTETEXT_NUMBER_NOT_IN_CUG,//100
+    R_NOTETEXT_NUMBER_NOT_IN_CUG, // 70
     R_NOTETEXT_NO_ANSWER,
     R_NOTETEXT_NETWORK_BUSY,
     R_NOTETEXT_OUT_OF_RANGE,
@@ -129,7 +99,7 @@
     R_NOTETEXT_INVALID_PHONENUMBER,
     R_NOTETEXT_EMPTY_SIM_LOCATION,
     R_PHONEUI_CONFERENCE_CALL,
-    R_PHONE_ERROR_EMERGENCY_CALLS_ONLY,
+    R_PHONE_ERROR_EMERGENCY_CALLS_ONLY, // 80
     R_PHONE_ERROR_CALL_NOT_ALLOWED,
     R_PHONE_ERROR_CALL_NOT_ALLOWED_FDN,
     R_PHONE_ERROR_CHECK_NETWORK_SERVICES,
@@ -139,16 +109,11 @@
     R_PHONEUI_NO_VIDEO_NETWORK,
     R_PHONEUI_VIDEO_CALL_INCOMING,
     R_PHONEUI_VIDEO_CALL_INCOMING_SHORT,
-    R_PHONEUI_VIDEOCALL_2G_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_VIDEOCALL_MENUBAR,
-    R_PHONEUI_VIDEOCALL_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_VIDEOCALL_WAITING_MENUBAR,
     R_PHONEUI_WAITING_LOCK_MENUBAR,
     R_PHONEUI_TWOSINGLES_WAITING_LOCK_MENUBAR,
-    R_PHONEUI_VIDEOCALL_WAITING_MENUBAR_WITH_NUMBERENTRY,
     R_PHONEUI_SOFTKEYS_EMPTY_BACK,
-//    R_AVKON_IHF_ACTIVATED_CONFIRMATION_NOTE_TEXT,
-//    R_AVKON_IHF_DEACTIVATED_CONFIRMATION_NOTE_TEXT,
     R_NOTE_TEXT_CONF_AUDIOS_HANDSET,
     R_NOTE_TEXT_CONF_AUDIOS_BT_ACCESSORY,
     R_PHONEUI_STRING_LIST,
@@ -156,7 +121,6 @@
     R_NOTETEXT_ACTIVE_DIVERTS,
     R_PHONEUI_DEFAULT_SKEY_LIST,
     R_PHONEUI_EMERGENCY_CALL_HEADER,
-    R_PHONE_EMERGENCY_NETWORK_CONNECT_WAIT_NOTE,
     R_PHONE_EMERGENCY_NETWORK_CONNECT_WAIT_NOTE_TOIHF,
     R_PHONE_EMERGENCY_NETWORK_CONNECT_WAIT_NOTE_TOHANDSET,
     R_PHONE_EMERGENCY_MODE_INFORMATION_NOTE,
@@ -167,7 +131,6 @@
     R_PHONEUI_OUT_GOING_CALL_SHORT,
     R_PHONEUI_OUT_GOING_VIDEO_CALL,
     R_PHONEUI_OUT_GOING_VIDEO_CALL_SHORT,
-//    R_QTN_TIME_DURAT_LONG_WITH_ZERO,
     R_PHONEUI_SEND_DTMF_QUERY,
     R_PHONEUI_SENDING_DTMF_WAIT_NOTE,
     R_PHONEUI_SENDING_DTMF_WAIT_NOTE_TEXT,
@@ -249,7 +212,6 @@
     R_PHONEUI_VIDEO_CALL_NOT_POSSIBLE,
     R_PHONEUI_CONTINUE_IN_HANDSET,
     R_PHONEUI_CONTINUE_IN_LOUDSPEAKER,
-//    R_AVKON_SOFTKEYS_YES_NO,
     R_PHONEUI_ALERTINGVIDEOCALL_MENUBAR,
     R_PHONEUI_CALLCOMING_SOFTKEYS_WHEN_SLIDER,
     R_PHONEUI_CALLCOMING_SOFTKEYS_WHEN_SILENT_SLIDER,
@@ -297,11 +259,8 @@
     R_NOTE_TEXT_CUG_IN_USE,
     R_PHONEUI_MTCAL_DIVERTED_CALL,
     R_PHONEUI_CALLHANDLING_CALLSETUP_EMPTY_DTMFDIALER_CBA,
-    R_PHONEUI_CALLHANDLING_CALLSETUP_EMPTY_ENDOUTGOING_CBA,
     R_PHONEUI_CALLHANDLING_CALLSETUP_TOIHF_DTMFDIALER_CBA,
-    R_PHONEUI_CALLHANDLING_CALLSETUP_TOIHF_ENDOUTGOING_CBA,
     R_PHONEUI_CALLHANDLING_CALLSETUP_TOHANDSET_DTMFDIALER_CBA,
-    R_PHONEUI_CALLHANDLING_CALLSETUP_TOHANDSET_ENDOUTGOING_CBA,
     R_PHONE_EMERGENCY_NETWORK_CONNECT_WAIT_NOTE_EMPTY_DIALER,
     R_PHONEUI_NUMBERACQ_OPTIONS_CALL_MENU,
     R_PHONEUI_NUMBERACQ_OPTIONS_MENU,
FCL/sf/app/phone