FCL/sf/os/deviceplatformrelease: comparison sf_config/config/inc/bldpublic.hrh

equal deleted inserted replaced

-:584378214d5b
+:2fdbc30f1dad
 *
 * Description:
 *
 */
 #ifndef __BLDPUBLIC_HRH
 #define __BLDPUBLIC_HRH
-//Defining only language 01 for SF build purposes
+#define LANGUAGE_IDS LANG sc 37 102 42 44 45 25 07 18 01 10 129 158 160 159 157 161 49 50 09 02 51 103 03 54 57 30 17 15 59 327 05 32 65 67 68 70 326 08 27 13 76 31 78 16 79 26 28 04 83 06 39 29 33 14 93 94 96
-#define LANGUAGE_IDS LANG sc 01
+/** #Camera
+Container for camera specific features
+*/
+#undef Camera
 /** #FF_3D_RINGING_TONES
 Device supports 3D ringing tones.
 */
 #undef FF_3D_RINGING_TONES
 /** #FF_3G_CELLBROADCAST
 Cell Broadcasting support on 3G mode.
 */
 #undef FF_3G_CELLBROADCAST
+/** #FF_ABC_AGRESSIVE_UI
+Display driver will provide an interface for switching Automatic Brightness
+Control (ABC). More agressive Automatic Display Control (ABC) UI for display
+driver will be in Settings display plug in, and as configurable for products,
+but not neccessarily available for user. The agressive UI for ABC is
+enabled/disabled by the feature flag.
+*/
+#undef FF_ABC_AGRESSIVE_UI
 /** #FF_ADAPTIVE_WLAN_SCANNING_SUPPORT
 Adaptive WLAN Scanning (AWS) is a component that tells WLAN engine how often to
 perform WLAN background scanning. AWS listens and receives events from other
 components, concludes what would be the preferred scanning period, and then
 tells it to WLAN engine.
 */
 #undef FF_ADAPTIVE_WLAN_SCANNING_SUPPORT
+/** #FF_ADDITIONAL_FONTS
+This flag is to enable new font supports namely equivalents of Arial, Times New
+Roman, Courier for content viewing mainly to be used in browser. If this flag is
+not enabled it means it will continue to have only current fonts and no
+additional font support.
+*/
+#define FF_ADDITIONAL_FONTS
 /** #FF_AI_WLANSNIFFER_WIDGET
 Flag for WLANSniffer Homescreen widget.
 */
 #undef FF_AI_WLANSNIFFER_WIDGET
+/** #FF_ALTERNATIVE_CALL_WAITING_TONE
+When this flag is enabled an alternative call waiting tone will be used
+*/
+#undef FF_ALTERNATIVE_CALL_WAITING_TONE
+/** #FF_ARABIC_HANDWRITING_RECOGNITION_INPUT
+This flag is used to enable arabic finger handwriting input in capacitive touch
+screen phone.
+*/
+#undef FF_ARABIC_HANDWRITING_RECOGNITION_INPUT
 /** #FF_ASYNCH_FILE_SAVE_QUEUE
 Camcorder requires support from the Asynchronous File Save Queue.
 */
 #define FF_ASYNCH_FILE_SAVE_QUEUE
+/** #FF_AT_COMMANDS_TEST_AUTOMATION
+Using FF_AT_COMMANDS_TEST_AUTOMATION will either include or exclude
+atcmdplugin.dll from ROM
+*/
+#undef FF_AT_COMMANDS_TEST_AUTOMATION
 /** #FF_AUDIO_MESSAGING_INCLUDE_IN_ROM
 This flags controls whether the Audio Messaing ROM files are included in the
 build.
 */
 Device supports Always Up-to-date Device Time (AUDT). This is an ability to
 update the device time, date and country/city automatically in phone start-up.
 */
 #undef FF_AUDT
+/** #FF_AUTOMOTIVESTACK
+S60_PUBLIC Feature Flag for In-Car Optimized device EPIC
+*/
+#undef FF_AUTOMOTIVESTACK
 /** #FF_AUTO_REDIAL_FOR_VIDEO_CALL
-"This flag indicates redial sequence, when video call is not succeeded for
+This flag indicates redial sequence, when video call is not succeeded for
-certain reasons."
+certain reasons.
 */
 #define FF_AUTO_REDIAL_FOR_VIDEO_CALL
 /** #FF_AVKON_EMOTION_ICON_ENABLED
 to enable/disable the emotion icon support in avkon editor control
 */
-#undef FF_AVKON_EMOTION_ICON_ENABLED
+#define FF_AVKON_EMOTION_ICON_ENABLED
 /** #FF_BIRTHDAY_IMPROVEMENT
 This feature flag is required for the enabling/disabling customized birthday &
 anniversary notifications for MyFaves contact in Calendar (under Community 1.0)
 into 3.2.3 platform.
 The requirement is
-Bâ€™day & Anniversary Notification for MyFaves contact
+B’day & Anniversary Notification for MyFaves contact
-â€¢	Picture of the MyFaves contact in the popup which can be masked as circular
+•	Picture of the MyFaves contact in the popup which can be masked as circular
-â€¢	Currently Birthday notification is same as any other Calendar alarm
+•	Currently Birthday notification is same as any other Calendar alarm
 */
 #undef FF_BIRTHDAY_IMPROVEMENT
+/** #FF_BLUETOOTH_DATA_PROFILES_DISABLED
+This flag is used to turn off bluetooth data profiles, and is to be used as part
+of Enterprise Disabling of Bluetooth, allowing the device to use bluetooh for
+hands free purposes only
+*/
+#undef FF_BLUETOOTH_DATA_PROFILES_DISABLED
+/** #FF_BLUETOOTH_DISABLED
+Flag used to disable all Bluetooth functionality in the device.  This will be
+used for Enterprise Disabling of Bluetooth.
+This flag is required to be used instead of the __BT flag so that the Bluetooth
+UI is still present after Bluetooth has been disabled, allowing the user to be
+notified of why they cannot use it if they attempt to
+*/
+#undef FF_BLUETOOTH_DISABLED
 /** #FF_BROWSER_PROGRESSIVE_DOWNLOAD
 This feature flag is needed to enable/disable the progressiveness of the
 downloads in download manager server and its clients.
 */
 #define FF_BROWSER_PROGRESSIVE_DOWNLOAD
+/** #FF_CALENDAR_DAY_VIEW
+This flag is needed for run time configuration of Business calendar day view.
+The day view will be loaded as a plug-in based on this flag being enabled. Day
+view will be integrated along with other native views(month, week, agenda &
+Todo).
+*/
+#undef FF_CALENDAR_DAY_VIEW
+/** #FF_CALENDAR_SCROLLABLE_PREVIEW
+This flag is needed for run time configuration of scrollable preview pane in
+calendar. The scrollable preview pane will be loaded as a plug-in with calendar
+month view and week view based on this flag being enabled. Layouts with
+scrollable preview pane will be loaded on run time based on this flag being
+enabled for month / week view
+*/
+#undef FF_CALENDAR_SCROLLABLE_PREVIEW
+/** #FF_CAL_MEETING_REQUEST_UI
+With this flag it is selected if Meeting Request UI included with flag
+FF_MEETING_REQUEST_UI is available on Calendar side or not. If flag is not
+defined MRUI is available only when MR Emails are opened from Email application.
+If flag is defined then meeting requests can be opened also from Calendar
+application and Calendar application will offer possibility to create new
+meeting requests.
+*/
+#undef FF_CAL_MEETING_REQUEST_UI
 /** #FF_CAPACITIVE_DISPLAY
 Device uses capacitive touch technology in its display.
 */
-#undef FF_CAPACITIVE_DISPLAY
+#define FF_CAPACITIVE_DISPLAY
 /** #FF_CHINESE_FONTS_HIRES
 This flag controls whether Chinese variants use TrueType fonts instead of the
 current stroke fonts in high resolution devices.
 Note: The feature name intentionally avoids mentioning TrueType or TTF, as the
 font technology is irrelevant, high resolution being the operative keywords.
 */
 #undef FF_CHINESE_FONTS_HIRES
+/** #FF_CHINESE_SELECTION_KEY
+Device uses this flag to differentiate if selection key existed
+*/
+#undef FF_CHINESE_SELECTION_KEY
 /** #FF_CLOCK_MULTIPROCOL_SUPPORT
 This flag shall be used to determine if product programs need clock's
 multiprotocol support, i.e. getting time information from different time source
 protocols like GPS, SNTP, etc.. Product program can make a choice such that
 multiprotocol feature support can be made on or off. When multiprotocol support
 is off, then default NITZ protocol shall be choosen.
 */
 #undef FF_CLOCK_MULTIPROCOL_SUPPORT
+/** #FF_CMAIL_INTEGRATION
+5250+ specific features in Cmail are variated with this flag.
+*/
+#undef FF_CMAIL_INTEGRATION
 /** #FF_COMMSDAT_CREATION_FROM_XML
 There will be a new component in S60 called CommsDatCreator (CDC) that will
 initialize CommsDat using an input XML file which is generated by the
 Configuration Tool.
 connection' is enforced by default. The user can still control the utilisation
 of the 'user connection' by enabling/disabling the connection enforcement from
 WLAN settings.
 */
 #define FF_CONNECTION_OVERRIDE
+/** #FF_CONTACTS_COMPANY_NAMES
+When enabled, contacts’ company names are shown after first+last name in
+Phonebook Names list.
+*/
+#undef FF_CONTACTS_COMPANY_NAMES
 /** #FF_CONTACTS_GROUP_FUNCTIONALITY
 We need a feature flag for ROM Creation time variation. The Phonebook2
 application is constructed on a plugin based architecture. This design allows
 the Phonebook2 application to be composed of various plugin components. The S60
 implements the whole contacts group functionality. To enable a variant to create
 their own contact group functionality we need a feature flag so that the variant
 can remove the platform group plugin component. This allow the component to be
 removed from the ROM image, thus making the ROM size smaller.
 */
-#undef FF_CONTACTS_GROUP_FUNCTIONALITY
+#define FF_CONTACTS_GROUP_FUNCTIONALITY
+/** #FF_CONTACTS_MERGE
+If enabled, then phonebook UI contains the command for Merge.
+*/
+#define FF_CONTACTS_MERGE
+/** #FF_CONTACTS_MYCARD
+This feature flag controls whether phonebook application supports MyCard.
+If flag is enabled:
+- Phonebook has MyCard item at top of names list
+- The user can open MyCard view from phonebook
+- Other applications can launch the MyCard view
+*/
+#define FF_CONTACTS_MYCARD
 /** #FF_CONTACTS_NICKNAME
 The nickname functionality needs a feature flag for the following reasons:
 -Phonebook2 component exports a central repository initialization file, which is
 used to improve the Phonebook application launch -The initialization file is
 maintain existing performance, see above description
 */
 #undef FF_CONTACTS_NICKNAME
+/** #FF_CONTACTS_PREDICTIVE_SEARCH
+When enabled, User can turn on/off Phonebook’s predictive search functionality,
+using an item in Names list’s Option-menu.
+*/
+#undef FF_CONTACTS_PREDICTIVE_SEARCH
+/** #FF_CONTACTS_REMOTE_LOOKUP
+When enabled, and a remote search service is installed in device, item “Search
+remotely” is shown in Phonebook Names list.
+*/
+#define FF_CONTACTS_REMOTE_LOOKUP
+/** #FF_CONTACTS_SOCIAL
+When flag is enabled, phonebook application has the following features:
+- Names list shows social status texts
+- Contact Card shows social status text & allows jumping to external social
+application.
+- MyCard shows social status text & allows jumping to external social
+application.
+- MyCard has button(s) that show(s) presence & allow jumping to external IM
+application.
+*/
+#define FF_CONTACTS_SOCIAL
+/** #FF_CONTACT_WIDGET
+	Defines if Friends widget exists or not
+*/
+#undef FF_CONTACT_WIDGET
+/** #FF_CONTEXT_FRAMEWORK_V2
+This flag enables Context Framework version 2.
+*/
+#undef FF_CONTEXT_FRAMEWORK_V2
+/** #FF_CONTEXT_PROFILES
+Context profiles enable the device to automatically adapt in users every day
+life and combine current Profiles functionality with concepted and studied
+Situations functionality. If the flag sets to true, context profiles are
+enabled. If flase, otherwises.
+*/
+#undef FF_CONTEXT_PROFILES
 /** #FF_CUSTOMER_HELPS_IN_USE
 Customer helps are included into image based on this flag.
 */
 #undef FF_CUSTOMER_HELPS_IN_USE
 offers self-test service on the Mobile Applications and hardware for the phone
 users.
 */
 #define FF_DEVICE_DIAGNOSTICS_APP
+/** #FF_DEVICE_ENCRYPTION_FEATURE
+This flag is required for Device Encryption feature which goes to Symbian
+Foundation. The existing flag (FF_NATIVE_FILE_ENCRYPTION) will exclusively be
+used by NFE, which doesn't go to SF. Hence a different flag is required for all
+those middleware and application layer components of DE.
+*/
+#define FF_DEVICE_ENCRYPTION_FEATURE
+/** #FF_DISABLE_OMA_SUPL_V2
+When this flag is ON SUPL v2.0 is NOT supported. Note that this flag is a
+negative flag in order to minimize the risk for the master code line.
+*/
+#undef FF_DISABLE_OMA_SUPL_V2
+/** #FF_DM_BROWSER_ADAPTER
+Browser adaper is used by Device Management to Set/Get the browser settings from
+the operator server. This feature is requested by CMCC. The feature flag is used
+to differentiate between Nokia Specific implemenation and OMA DM implementation.
+*/
+#define FF_DM_BROWSER_ADAPTER
+/** #FF_DM_CONNMO_ADAPTER
+OMA Device Management Connectivity Managment Object (ConnMO) provides management
+of connectivity settings. This flag will help in enabling ConnMO plugin.
+*/
+#undef FF_DM_CONNMO_ADAPTER
 /** #FF_DM_INSTALL_SECURITY
 OMA DM SW installer implementation included in build.
 */
 #undef FF_DM_INSTALL_SECURITY
+/** #FF_DM_STREAMING_ADAPTER
+Streaming adapter is used by Device Mangement to Set/Get the streaming settings
+from the operator server. CMCC has requested support for this new adapter. This
+feature flag is used to differentiate the Nokia specfic implementation and OMA
+DM implementation.
+*/
+#define FF_DM_STREAMING_ADAPTER
 /** #FF_DUAL_LANGUAGE_SUPPORT
 This Flag is used to develop support for dual language feature. This is an
 enhancement to the basic prediction feature where words predicted will come from
 2 different language databases.
 */
 #undef FF_DUAL_LANGUAGE_SUPPORT
+/** #FF_DUAL_MODEM
+Flag for developing Dual Modem feature
+*/
+#undef FF_DUAL_MODEM
 /** #FF_EMAIL_FRAMEWORK
 Defines whether the product includes the email multiprotocol framework. When the
 flag is defined all parts constituting new email solution are in ROM:
 application, plugin framework + imap/pop plugin and related settings UIs.
 legacy email (__EMAIL_UI) must be disabled when FF_EMAIL_FRAMEWORK is enabled.
 */
 #define FF_EMAIL_FRAMEWORK
+/** #FF_EMAIL_FULLSCREENVIEWER
+This flag enables full screen mode in email viewer
+*/
+#undef FF_EMAIL_FULLSCREENVIEWER
 /** #FF_EMAIL_IPS_SERVICES
 Defines whether the product includes IMAP4, POP3 and SMTP protocol support.
 */
 #undef FF_EMAIL_IPS_SERVICES
 key.
 */
 #define FF_EMAIL_MCE_INTEGRATION
+/** #FF_EMAIL_PREDICTIVESEARCH
+This flag enables predictive address search in email editor
+*/
+#undef FF_EMAIL_PREDICTIVESEARCH
 /** #FF_EMAIL_PROTOCOL_PLUGINS
 When defined, default email protocol plugins are enabled.
 */
 #define FF_EMAIL_PROTOCOL_PLUGINS
 /** #FF_EMAIL_UI
 Defines whether the product includes email UI application
 */
 #undef FF_EMAIL_UI
+/** #FF_EMAIL_UI_SPLITSCREEN
+This feature enables split screen usage in email editors instead of touch input
+window
+*/
+#undef FF_EMAIL_UI_SPLITSCREEN
 /** #FF_EMPTY_COMMSDAT
 The override flags FF_EMPTY_COMMSDAT, FF_VANILLA_COMMSDAT and FF_RND_COMMSDAT
 determine which default CommsDat will be put to the image independent of image
 type (prd or rnd):
 used if some special functionality is needed.
 */
 #undef FF_EMPTY_COMMSDAT
+/** #FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE
+Feature info adaptation will read the PP-bit value from ISA info server and map
+the value of PP bit into KFeatureIdCertTesting. SSM then will read
+KFeatureIdCertificationTesting and if system is in USB charging mode , then
+start USB components into the mode where ISI communication is possible.
+*/
+#define FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE
+/** #FF_ENHANCED_CALENDAR_EVENT_UI
+This flag controls inclusion of enhanced Calendar Event Viewers and Editors that
+replace standard ones and provide consistent look and feel with Meeting Request
+UI included with flag FF_MEETING_REQUEST_UI.
+*/
+#undef FF_ENHANCED_CALENDAR_EVENT_UI
 /** #FF_FARSI_CALENDAR
 S60 calendar should provide possibility to integrate Farsi calendar application
 to S60 calendar.
 S60 calendar should provide variation point to calendar main menu, from where
 /** #FF_FMTX
 FMTX application and Nseries Music Player support for FMTX
 */
 #define FF_FMTX
+/** #FF_FMTX_RDS_TEXT
+Flag to enable RDS text transmission through FM transmitter (FMTX). Runtime
+variation needed in SysAp. FMTX UI SW uses this flag in .iby files so it is not
+runtime variated in UI SW.
+RDS text transmission not enabled currently (ELZG-7PE3G9)
+*/
+#undef FF_FMTX_RDS_TEXT
+/** #FF_FOTA_CHECK_LIMITATION
+When this flag is enabled user can only check for FOTA updates from the server
+once in defined time period. The time period is defined by a cenrep value -
+default value is 24h.
+*/
+#undef FF_FOTA_CHECK_LIMITATION
 /** #FF_FULLSCR_HWR_INPUT
 Indicates whether a device needs fullscreen HWR (HandWritingRecognition) input
 or not.
 */
-#define FF_FULLSCR_HWR_INPUT
+#undef FF_FULLSCR_HWR_INPUT
+/** #FF_GENERIC_ACCESS_NETWORK
+Generic Access Network (GAN), previously known as Unlicensed Mobile Access (UMA)
+technology provides access to GSM/3G and GPRS mobile services over unlicensed
+spectrum technologies. By deploying GAN technology, service providers can enable
+subscribers to roam and handover between cellular networks and public and
+private unlicensed wireless networks using dual-mode mobile handsets. However
+GAN needed some platform changes to be fully functional and those changes must
+be run time variable.
+*/
+#undef FF_GENERIC_ACCESS_NETWORK
 /** #FF_GENERIC_FONTS_ASSETS
 This flag is used to check if generic font assets are to be used, this is used
 for Symbian foundation where freetype rasterize as well as EFF fonts need to be
 used.
 /** #FF_IMAGEPRINT_UPNP_PROTOCOL
 Flag to define whether ImagePrint supports UPnP printing
 */
 #define FF_IMAGEPRINT_UPNP_PROTOCOL
+/** #FF_IMAGE_EDITOR
+Feature flag for Image Editor support in the platform. Applications could check
+for this feature support and make use of it.
+Note: In Symbian Foundation context, Image Editor is not available in Sym ^3,
+hence there is a need to have feature flag in public domain. Other vendors can
+bring in their own implementation of the editor and make use of this flag to
+pulish the feature support.
+*/
+#undef FF_IMAGE_EDITOR
 /** #FF_INCLUDE_CHINESE_DICTIONARY
 This feature flag  controls the inclusion/exclusion of chinese dictionary in
 chinese variants. The flag is used in dictionary_variant.iby
 */
 /** #FF_INTELLIGENT_TEXT_INPUT
 Generic QWERTY framework and 2nd generation text input engine integration
 */
 #undef FF_INTELLIGENT_TEXT_INPUT
+/** #FF_IPSEC_UMA_SUPPORT_ENABLE
+The default behaviour in IPSec policy conflict resolution logic is to put “Drop”
+mode over the “bypass” mode. Hence the resulting action is to drop the IP
+packets with the merged policies.
+According to the default behaviour UMA is always with “bypass” property and
+whenever mVPN with drop mode connection rove-in or rove out from GAN (UMAN)
+results in a selector conflict.
+With the macro enabled IPSec handles UMA conflict gracefully allowing UMA to
+work.
+*/
+#undef FF_IPSEC_UMA_SUPPORT_ENABLE
+/** #FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT
+ITI feature (2nd generation text input features) are enabled in 5.0 & 9.1 TBD,
+i.e MCL, but these features are not supported in touch input modes like Virtual
+ITU-T, VKB & FSQ. Hence, to support 1st generation features to touch input
+methods, this flag is required.
+*/
+#undef FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT
 /** #FF_JAVA_GLOBAL_INDICATORS_API
 Enables Java Global Indicator API. Global Indicator API can be used to add
 indicators to phone status pane.
 */
 #undef FF_JAVA_GLOBAL_INDICATORS_API
+/** #FF_KEYPAD_NO_SEND_KEY
+Device does not have a send key to activate phone call.
+*/
+#undef FF_KEYPAD_NO_SEND_KEY
 /** #FF_LAYOUT_360_640_NONTOUCH
 New non touch NHD (=QHD) resolution. Flag determine which layout dlls are put to
 hw image.
 */
 #undef FF_LAYOUT_360_640_NONTOUCH
+/** #FF_LAYOUT_360_640_TOUCH_NHD4
+layout for nhd4
+*/
+#undef FF_LAYOUT_360_640_TOUCH_NHD4
 /** #FF_LAYOUT_360_640_TOUCH_QHD2
 Layout data for QHD2_TOUCH resolution.
 */
 #undef FF_LAYOUT_360_640_TOUCH_QHD2
+/** #FF_LAYOUT_480_640_TOUCH_VGA4
+layout for vga4
+*/
+#undef FF_LAYOUT_480_640_TOUCH_VGA4
 /** #FF_LAYOUT_480_640_VGA3
 Layout data for VGA3 resolution.
 */
 #undef FF_LAYOUT_480_640_VGA3
 to hw image.
 */
 #undef FF_LAYOUT_640_360_NONTOUCH
+/** #FF_LAYOUT_640_360_TOUCH_NHD4
+layout for nhd4
+*/
+#undef FF_LAYOUT_640_360_TOUCH_NHD4
 /** #FF_LAYOUT_640_360_TOUCH_QHD2
 Layout data for QHD2 TOUCH resolution.
 */
 #undef FF_LAYOUT_640_360_TOUCH_QHD2
+/** #FF_LAYOUT_640_480_TOUCH_VGA4
+layout for vga4 landscape
+*/
+#undef FF_LAYOUT_640_480_TOUCH_VGA4
 /** #FF_LAYOUT_640_480_VGA3
 Layout data for VGA3 resolution.
 */
 #undef FF_LAYOUT_640_480_VGA3
 /** #FF_LBT_ENGINE
 To enable/disable LBT engine from S60. By default this should be ON
 The Location Triggering subsystem provides a service to applications for
-notifications based on the userâ€™s location. Applications can create and remove
+notifications based on the user’s location. Applications can create and remove
 location based triggers, and applications can be notified or started when one of
 their triggers is fired, i.e. the triggering conditions are met
 Feature wiki : https://s60wiki.nokia.com/S60Wiki/Location_based_triggering
 REQ: 101-34742
 BREL : 405-1756
 REQ : 403-1621
 BREl : 405-1781
 */
 #define FF_LBT_MGTUI
+/** #FF_LIMITED_MESSAGE_AND_ALARM_TONE_SIZE
+When this flag is on the message alert tones and alarm (calendar, clock) tones
+maximum size is defined by cenrep key KProEngRingingToneMaxSize
+*/
+#undef FF_LIMITED_MESSAGE_AND_ALARM_TONE_SIZE
 /** #FF_LINKED_FONTS_CHINESE
 For enabling linked font in Chinese a new feature flag FF_LINKED_FONTS_CHINESE
 is needed.
 This flag controls whether a single Chinese font or a linked font is used in
 Chinese builds. The linked font will contain latin set from normal S60 latin
 fonts and a Chinese part which is the current Chinese font unchanged. To be used
 in Chinese variants only.
 */
 #undef FF_LINKED_FONTS_CHINESE
+/** #FF_LIVETV
+support for DVBH live tv 1.1 (using bluetooth accessory SU-33W)
+*/
+#undef FF_LIVETV
+/** #FF_LOCATION_MW_APE_CENTRIC_ARCH_SUPPORT
+S60 Location FW and its related components are going to change to support APE
+Centric architecture. In order to toggle architecture support between new and
+old,we have introduced this flag. If this flag is ON, then new architecture will
+get into use. If its OFF then old architecure will get into use.
+*/
+#undef FF_LOCATION_MW_APE_CENTRIC_ARCH_SUPPORT
 /** #FF_MDS_CAMERA_SUPPORT
 Enables camera application support for Metadata system.
 */
 #define FF_MDS_CAMERA_SUPPORT
+/** #FF_MECO_XMPP
+XMPP is an Instant Messaging Protocol. MECO (MEssaging COnvergence)
+implementation of XMPP is disabled by the use of this flag. This is to be used
+for run-time purposes. If this flag is false, then the functionality covered by
+this flag cannot be used although the library itself exists.
+*/
+#undef FF_MECO_XMPP
 /** #FF_MEETING_REQUEST_UI
 Meeting request UI from Custom SW will be is part of Common Email. This new flag
 replaces Custom SW specific flag FF_ES_MEETING_REQUEST_UI used in Freestyle. MR
 UI (viewer) is visible to Email application as Ecom plugin.
 If the flag is not defined, MR UI related components are not in ROM.
 */
-#define FF_MEETING_REQUEST_UI
+#undef FF_MEETING_REQUEST_UI
 /** #FF_MENU_TEXTURE_PRELOADING
 In Menu (AppShell) application the performance of changing the folder has been
 poor in 5.0 (uses Hitchcock). By loading the Hitchcock textures for all the
 icons in advance improves the performance radically. The side effect is the
 /** #FF_MMS_POSTCARD_INCLUDE_IN_ROM
 This flags controls whether the MMS Postcard ROM files are included in the
 build.
 */
 #undef FF_MMS_POSTCARD_INCLUDE_IN_ROM
+/** #FF_MPX_VIDEO_PLAYER
+When this flag is on, MPX framework in platform supports video playback and
+mpxvideoplayer.exe is included in ROM. Platform's default video player is
+mpxvideoplayer.exe. This flag can be used at build time, if necessary, to decide
+if code can be build against services provided by MPX video player instead of
+libraries provided by Media Player and Video Center, which both are replaced by
+MPX Video Player.
+*/
+#define FF_MPX_VIDEO_PLAYER
+/** #FF_MTP_CONTROLLER
+The feature enables device to support MTP Controller service
+*/
+#define FF_MTP_CONTROLLER
 /** #FF_NCD_ENGINE
 This flag enables building the NCD Engine to S60 release.
 */
 #define FF_NCD_ENGINE
 by switching the boolean flag defined/undefined.
 */
 #undef FF_OFN_FEATURE
+/** #FF_OMADRM1_FULL_SUPPORT
+This boolean feature flag indicates if OMA DRM v1 is fully (including combined
+delivery and separate delivery) supported or not.
+*/
+#undef FF_OMADRM1_FULL_SUPPORT
+/** #FF_OMADRM2_SUPPORT
+This boolean feature flag indicates if OMA DRM v2 is supported or not.
+*/
+#undef FF_OMADRM2_SUPPORT
 /** #FF_OMA_SCOMO_ADAPTER
 This feature enables OMA SCOMO feature in "application management component".
 */
-#undef FF_OMA_SCOMO_ADAPTER
+#define FF_OMA_SCOMO_ADAPTER
 /** #FF_OOM_MONITOR2_COMPONENT
 Feature flag for controlling the inclusion of Out-of-Memory2 component into the
 ROM image.
 */
-#undef FF_OOM_MONITOR2_COMPONENT
+#define FF_OOM_MONITOR2_COMPONENT
+/** #FF_OPENMAX_AL
+OpenMax AL is a Khronos API (http://www.khronos.org) included as a platform API
+to support QtMobility multimedia.
+*/
+#undef FF_OPENMAX_AL
 /** #FF_OSS_LEGAL_NOTICE
 This feature adds OSS legal notice to About application. The notice is needed if
 any of the sw components, e.g. WRT widgets include any Open Source components.
 #undef FF_OSS_LEGAL_NOTICE
 /** #FF_PLATFORM_SIMULATOR
 Platform Simulator product makes it possible to execute software on simulated
 target hardware using a Windows or Linux workstation. Platform Simulator is
-based on ARMÂ® RealViewÂ® tools that support modeling terminal hardware using LISA
+based on ARM® RealView® tools that support modeling terminal hardware using LISA
 language. Platform Simulator runs any OS e.g. S60 or Linux. The OS is introduced
 to the simulator as a core image loaded into the simulated flash memory.
 Compared to WINS emulator Platform Simulator based S60 simulation is much closer
 to exeuction on real hardware. Yet there has to be some differences in the S60
 configuration. In the future the Platform Simulator targets to support selected
 new reference hardware configurations. This makes the flag lifetime permanent.
 */
 #undef FF_PLATFORM_SIMULATOR
+/** #FF_PLAYREADY_SUPPORT
+This boolean feature flag indicates if PlayReady technology is supported or not.
+*/
+#undef FF_PLAYREADY_SUPPORT
 /** #FF_PNPMS_PROV_FILTER
 On enabling this feature flag pnpprovfilter.dll will be created and this feature
 flag is used to enable PNPProvisioning HTTP filter which by passes the download
 manager launching PNPMS provisioning engine.
 */
-#define FF_PNPMS_PROV_FILTER
+#undef FF_PNPMS_PROV_FILTER
 /** #FF_PNPMS_SERVICE_HELP_PLUGIN
 This feature flag is required for launching PNPMS application from general
 settings/Control Panel. On enabling this feature flag servicehelpplugin.dll will
 be created and when this feature is enabled Service Help Icon will be present in
 General Settings/Control Panel. Service Help will launch browser on selection
 and direct the browser with predefined PnPMS server URL where user can download
 provisioning settings over HTTP from web server.
 */
-#define FF_PNPMS_SERVICE_HELP_PLUGIN
+#undef FF_PNPMS_SERVICE_HELP_PLUGIN
 /** #FF_POWER_SAVE
 "Power save mode is a collection of features which are put in a power saving
 mode. These features are i.e. display light brightness, light time outs etc.
 Power save mode can be extended to be supported by any application which can do
 enable item in General Settings and on selection of this item will open list
 dialog for changing the authentication type.
 */
 #undef FF_PROV_AUTHTYPE_PLUGIN
+/** #FF_QT
+Generic feature flag for for QT based features (to be used in image creation and
+run-time variation)
+*/
+#undef FF_QT
 /** #FF_QWERTY_FN_KEY
 The device has a Fn key
 */
 #undef FF_QWERTY_FN_KEY
+/** #FF_RFSUICON_ERASE_ALL_DATA
+This feature flag is required to either enable or disable the display of “Erase
+all data” icon (deep RFS) in S60 UI menu. Using this feature flag the
+functioanlity can either be totally enabled or disabled. Not all devices may
+require this feature and hence it needs to be configurable.
+*/
+#undef FF_RFSUICON_ERASE_ALL_DATA
 /** #FF_RND_COMMSDAT
 The override flags FF_EMPTY_COMMSDAT, FF_VANILLA_COMMSDAT and FF_RND_COMMSDAT
 determine which default CommsDat will be put to the image independent of image
 type (prd or rnd):
 /** #FF_ROCKER_KEY
 The device has multidirectional "rocker" key.
 */
-#undef FF_ROCKER_KEY
+#define FF_ROCKER_KEY
 /** #FF_ROM_INCLUDE_ALF
 This flags controls whether the UI Accelerator toolkit (ALF) is included in the
 build.
 */
 #define FF_ROM_INCLUDE_ALF
 /** #FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
 To enable the feature to variate the device capability on runtime
 */
-#undef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
+#define FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
 /** #FF_S60_HELPS_IN_USE
 Platform helps are included into image based on this flag.
 */
 #define FF_S60_HELPS_IN_USE
 display it in the application shell if desired.
 */
 #undef FF_SHOW_MMPLAYER
+/** #FF_SIDESLIDER_SUPPORT
+To make the side slier support available at platform build which is currently
+not. System application requires this flag
+*/
+#undef FF_SIDESLIDER_SUPPORT
+/** #FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING
+When this flag is enabled UI error note will shonwn in case of consecutive 6F 00
+errors from UICC (SIM card)
+*/
+#undef FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING
+/** #FF_SIP_APN_SWITCHING
+Provides a mechanism to manipulate APN name of a IAP based SIP registration
+status
+*/
+#undef FF_SIP_APN_SWITCHING
+/** #FF_SIP_CUSTOM_PDP_HANDLING
+Controls the handling of PDP activation failures in operator specified method
+*/
+#undef FF_SIP_CUSTOM_PDP_HANDLING
+/** #FF_SMALL_SCREEN_TOUCH
+for small physical screen but big resolution and touch(for example 2.4" vga
+touch)
+*/
+#undef FF_SMALL_SCREEN_TOUCH
 /** #FF_STARTUP_OMA_DM_SUPPORT
 The flag will be used to enable receiving OMA CP/DM messages during system
 start-up in those devices that need the feature.
 */
 #undef FF_STARTUP_OMA_DM_SUPPORT
+/** #FF_STROKE_INPUTMODE_IN_TAIWAN
+The flag to switch stroke input mode in taiwan language. This flag is introduced
+from 9.2
+*/
+#undef FF_STROKE_INPUTMODE_IN_TAIWAN
+/** #FF_SUPL_IMSI_GENERATED_SERVER_PRIORITY_DEFAULT
+When this flag is enabled IMSI based autogenerated SUPL server has higher
+priority on the SUPL server list than the hard coded servers from startup
+settings DB
+*/
+#undef FF_SUPL_IMSI_GENERATED_SERVER_PRIORITY_DEFAULT
+/** #FF_SYNCML_STATUS_EXTENDED_ERROR_CODES
+When this flag is ON it is possible to write extended syncml error codes to sync
+log
+*/
+#undef FF_SYNCML_STATUS_EXTENDED_ERROR_CODES
 /** #FF_TACTICONS
 Tacticons are haptic effects that can be played by the applications to indicate
 success or failure of actions. Tacticons can be also automatically played
 together with some Sound IDs.
 */
-#undef FF_TACTICONS
+#define FF_TACTICONS
 /** #FF_TACTILE_FEEDBACK
 Device supports Tactile Feedback. Tactile feedback is produced by UI components
 and applications on pointer down events. Actual physical feedback effect
 (vibra/audio/no feedback) depends on current settings and device configuration.
 /** #FF_TARM_CAPABILITY_BASED_ACCESS
 This is the feature flag to allow branching of the code flow based on the
 capability check or SID check for the third party applications.
 */
-#undef FF_TARM_CAPABILITY_BASED_ACCESS
+#define FF_TARM_CAPABILITY_BASED_ACCESS
+/** #FF_TARM_CAPABILITY_CHECKING
+This is a feature flag to decide the code flow base on either the Application
+capability check or the SID check in case of third party applications
+*/
+#undef FF_TARM_CAPABILITY_CHECKING
 /** #FF_TCP_MYFAVES_FEATURE
 The feature flag is to turn ON/OFF MyFaves feature in a S60 3.2 complementary
 package.
 */
 Complementary package(both International & US)on S60 3.2.3. This feature flag is
 valid for MyProfile UI & MyProfile synchronization.
 */
 #undef FF_TCP_MYPROFILE
+/** #FF_TD_CLMContactReplicationFromPhonebookToUSIMCard
+Support for CMCC standard USIM contact format.
+*/
+#undef FF_TD_CLMContactReplicationFromPhonebookToUSIMCard
+/** #FF_TD_CMCCATCommandsSupport
+When enabled, this flag will extend the set of supported AT commands
+• AT+CMGD (Delete message)
+• AT+CMGW (Write message to memory)
+• AT^HVER (Hardware version)
+• AT^SYSINFO (System information query)
+• AT^DSCI (Call state indication)
+• AT^DMUX (Multiplexing)
+• AT^DDSETEX (Data card voice channel configuration)
+*/
+#undef FF_TD_CMCCATCommandsSupport
+/** #FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer
+When this flag is enabled, the device will give appropriate UI prompt to the
+user, if status code 420 is received during data synchronization.
+*/
+#undef FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer
+/** #FF_TD_CMCCPIMSynchronizationProgressIndicatorUI
+This flag enables an enhanced progress status UI. Instead of standard progress
+bar or percentage information, the UI will show following information:
+x/y for uplink (x = current item, y = total items) and z for downlink (z =
+current item).
+*/
+#undef FF_TD_CMCCPIMSynchronizationProgressIndicatorUI
+/** #FF_TD_SCDMA
+This is a feature flag used to turn on/off TD-SCDMA releated features
+*/
+#undef FF_TD_SCDMA
+/** #FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY
+This feature is used enable Forbidden operator icon display feature.
+*/
+#undef FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY
+/** #FF_TD_SCDMA_VIDEOCALL_KEY
+This FF is used to enable video call key feature for TD-SCDMA product
+*/
+#undef FF_TD_SCDMA_VIDEOCALL_KEY
 /** #FF_THEME_HAZE
 Haze theme is included in ROM image.
 */
 #define FF_THEME_HAZE
 /** #FF_USB_HOST
 The flag excludes all S60 USB host and OTG related components.
 */
 #undef FF_USB_HOST
+/** #FF_USB_MODEM
+FF_USB_MODEM will be used to en/disable PAM(Phone As Modem) feature. When flag
+is enabled, the feature is included in image.
+KFeatureIdUsbModem is used for runtime variant.
+*/
+#undef FF_USB_MODEM
+/** #FF_USE_DEFAULT_KEYMAP
+Default Keymappings are included into image based on this flag
+*/
+#undef FF_USE_DEFAULT_KEYMAP
 /** #FF_USE_EGPRS_ICON
 The flag is used to enable EGPRS icon in the status pane. If the flag is
 disabled, GPRS icon must be shown instead of EGPRS icon.
 */
 C=Phone memory, E=Internal mass storage and F=Memory card.
 The flag affects how S60 components see the drives setup from estart
 txt-file(s).
 */
-#undef FF_USE_MASS_STORAGE_CONFIG
+#define FF_USE_MASS_STORAGE_CONFIG
+/** #FF_USE_NAVIKEY_FOR_VOLUME
+This feature flag is used to enable/disable the use of the navikey for volume
+adjustment. In products with no dedicated side volume key, this flag can be
+enabled. When the flag is enabled, the "up" navikey is used to increment volume
+by one step, and the "down" navikey is used to decrement volume by one step.
+*/
+#undef FF_USE_NAVIKEY_FOR_VOLUME
 /** #FF_USE_ZI_ENGINE
 On enabling this feature flag eZitext engine will be part of the Image and
 Ptiengine will utilize eZitext engine for editing features.
 */
 image. This is typically how it should be and the override flags should only be
 used if some special functionality is needed.
 */
 #undef FF_VANILLA_COMMSDAT
+/** #FF_VIDEO_AUDIO_BRANDING
+When this flag is set on, videoplayer UI supports audio track type based
+branding elements.
+*/
+#undef FF_VIDEO_AUDIO_BRANDING
+/** #FF_VIDEO_EDITOR
+Feature flag for Video Editor support in the platform. Applications could check
+for this feature support and make use of it.
+Note: In Symbian Foundation context, Video Editor is not available in Sym ^3,
+hence there is a need to have feature flag in public domain. Other vendors can
+bring in their own implementation of the editor and make use of this flag to
+pulish the feature support.
+*/
+#undef FF_VIDEO_EDITOR
 /** #FF_VIRTUAL_FULLSCR_QWERTY_INPUT
 Indicates whether a device needs Virtual full-screen qwerty input or not.
 */
 When enabled/defined, WEBVIDEO for ph2 is used. This will use Helix XPS
 interface for video decoding and postprocessing.
 */
 #undef FF_WEBVIDEO_PH2
-/** #FF_WLANSNIFFER
+/** #FF_WLAN_AUTHENTICATION_ONLY_SUPPORT
-The purpose of the flag is to control whether the WlanSniffer2 application is to
+When defined, the flag enables support for WLAN connections that are
-be integrated into 3.2 product builds or not.
+authenticated but the agreed keys are not used for data frame protection. That
-*/
+is, data is transferred in plaintext and with no cryptographic integrity
-#undef FF_WLANSNIFFER
+protection.
+*/
-/** #FF_WLANSNIFFER_VOIP_ENHANCEMENTS
+#undef FF_WLAN_AUTHENTICATION_ONLY_SUPPORT
-The WLAN Sniffer VoIP enhancements will provide easy way to connect to VoIP
-service via Sniffer's Active Idle plugin.
-*/
-#undef FF_WLANSNIFFER_VOIP_ENHANCEMENTS
 /** #FF_WLAN_EXTENSIONS
 Device supports extended WLAN functionalities e.g. for association and
 authentication.
 */
 authentication and data link protection.
 This feature flag is used only for including WAPI binaries to ROM. WAPI
 functionality can be (run-time) enabled with FF_WLAN_WAPI.
 */
-#undef FF_WLAN_WAPI_INCLUDE_IN_ROM
+#define FF_WLAN_WAPI_INCLUDE_IN_ROM
+/** #FF_WMDRM_DLA_SUPPORT
+This boolean feature flag indicates if WMDRM Direct License Acquisition is
+supported or not.
+*/
+#undef FF_WMDRM_DLA_SUPPORT
 /** #FF_XML_IDLE_THEME_BASIC_IDLE
 Controls if Basic idle theme is going to image or not.
 */
 #define FF_XML_IDLE_THEME_BASIC_IDLE
 /** #LANGPACK_DEFAULTLANG
 The default language that is selected during bootup (this selection is
 overridden by the sim language selection).
 */
-#define LANGPACK_DEFAULTLANG
+#define LANGPACK_DEFAULTLANG                               DEFINED
 /** #LANGUAGE_ARABIC
 included Arabic
 */
 #define LANGUAGE_ARABIC
 /** #LANGUAGE_VIETNAMESE
 included Vietnamese
 */
 #define LANGUAGE_VIETNAMESE
+/** #SYMBIAN_INCLUDE_LOCATION_NPE_DSM
+To Include the AGPS NPE Integration module.
+*/
+#undef SYMBIAN_INCLUDE_LOCATION_NPE_DSM
+/** #SYMBIAN_INCLUDE_LOCATION_SUPL_POS_INIT
+Includes the SUPL Pos message plugin.
+*/
+#undef SYMBIAN_INCLUDE_LOCATION_SUPL_POS_INIT
+/** #SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY
+Includes the SUPL proxy protocol module and supporting APIs (Terminal initiation
+API, Pos message API, Privacy request API, Network privacy API).
+*/
+#undef SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY
 /** #__3D_MENU
 3D Menu feature enhances Application Shell with animating 3D icons.
 */
 #define __3D_MENU
 /** #__3GP_EXTENTION
 This flag indicates that the 3GP Extention feature is supported in
 MetadataUtility.
 */
-#undef __3GP_EXTENTION
+#define __3GP_EXTENTION
 /** #__AAC_ENCODER_PLUGIN
 Device supports all-ARM AAC encoding capabilities.
 */
 #define __AAC_ENCODER_PLUGIN
 Device supports all-ARM AAC+ and Enhanced AAC+ decoding capabilities
 */
 #define __AAC_PLUS_DECODER_PLUGIN
 /** #__ACTIVE_IDLE
-"The Active Idle includes several plugins to display different content.
+The Active Idle includes several plugins to display different content.
 Additional feature flags for them will be requested separately as the necessity
 for them to be optional arises.At the moment this flag will cover all Active
-Idle mandatory features."
+Idle mandatory features.
 */
 #undef __ACTIVE_IDLE
 /** #__ALLOW_UPGRADE_HELIX
-"Support for Aftermarket update of Codecs, and File Formats. To allow the helix
+Support for Aftermarket update of Codecs, and File Formats. To allow the helix
-dlls to be upgraded using a SISX file. "
+dlls to be upgraded using a SISX file.
 */
 #define __ALLOW_UPGRADE_HELIX
 /** #__APP_CSD_SUPPORT
 Device supports internal (HS)CSD in application UIs.
 */
 #undef __APP_CSD_SUPPORT
 /** #__AUDIO_EFFECTS_API
-"Device supports utility APIs and framework for Series 60 Audio applications to
+Device supports utility APIs and framework for Series 60 Audio applications to
 enable predefined audio effects with audio play/record utilities. Features lilke
-Volume, Graphical Equalizer, Reverb are possible."
+Volume, Graphical Equalizer, Reverb are possible.
 */
 #define __AUDIO_EFFECTS_API
 /** #__AUDIO_MESSAGING
 Flag for Xpress Audio Messaging feature. Device supports recording and sending a
 General settings application supports controlling display brightness.
 */
 #undef __BRIGHTNESS_CONTROL
 /** #__BTIC_BINARIES_CHECK_ENABLED
-"In addition to the SWI certificate store check (defined by __BTIC_ENABLED),
+In addition to the SWI certificate store check (defined by __BTIC_ENABLED), also
-also binaries (having TCB or DRM capability) in c: drive are integrity checked
+binaries (having TCB or DRM capability) in c: drive are integrity checked during
-during boot."
+boot.
 */
 #undef __BTIC_BINARIES_CHECK_ENABLED
 /** #__BT_FAX_PROFILE
 Device supports Bluetooth fax profile.
 user area image."
 */
 #undef __CUSTOMISED_RFS
 /** #__DEFAULT_CONNECTION
-Initial connection selection enables automatic 'usage of default destination
+Initial connection selection enables automatic usage of default destination
 groups (like Internet) instead of single IAPs when starting network connections.
-Deprecated in 5.0.
+Deprecated in S60 5.0.
 */
 #undef __DEFAULT_CONNECTION
 /** #__DRM
 "Device supports OMA Digital Rights Management (DRM) partially, only forward
 #define __EQUALIZER
 /** #__FLASH_LITE_BROWSER_PLUGIN
 Device supports Macromedia Flash Lite plugin for Web Browser
 */
-#undef __FLASH_LITE_BROWSER_PLUGIN
+#define __FLASH_LITE_BROWSER_PLUGIN
 /** #__FLASH_LITE_VIEWER
 Device supports Macromedia Flash Lite Viewer for opening and playing Flash
 content files (.SWF).
 */
-#undef __FLASH_LITE_VIEWER
+#define __FLASH_LITE_VIEWER
 /** #__FM_RADIO
 Device contains support for FM radio (TunerUtility and RadioServer components).
 */
 #define __FM_RADIO
 Device supports handwriting recognition input.
 */
 #define __HANDWRITING_RECOGNITION_INPUT
 /** #__HSXPA_SUPPORT
-"When the feature flag is set, HSDPA setting item is visible for the user."
+When the feature flag is set, HSDPA setting item is visible for the user.
 */
 #define __HSXPA_SUPPORT
 /** #__IM
 Device supports Instant Messaging feature of the Wireless Village initiative
 /** #__INCLUDE_AAC_CMMFCODEC
 AAC CMMFCodec (all-ARM software implementation) is included in build  to be used
 by some other client than controller plug-in component.
 */
-#undef __INCLUDE_AAC_CMMFCODEC
+#define __INCLUDE_AAC_CMMFCODEC
 /** #__INCLUDE_AMR_NB_CMMFCODEC
 AMR NB CMMFCodec (all-ARM software implementation) is included in build to be
 used by some other client  than controller plug-in component.
 */
-#undef __INCLUDE_AMR_NB_CMMFCODEC
+#define __INCLUDE_AMR_NB_CMMFCODEC
 /** #__INCLUDE_AMR_WB_CMMFCODEC
 AMR WB CMMFCodec (all-ARM software implementation) is included in build  to be
 used by some other client than controller plug-in component.
 */
-#undef __INCLUDE_AMR_WB_CMMFCODEC
+#define __INCLUDE_AMR_WB_CMMFCODEC
 /** #__INCLUDE_EAACPLUS_CMMFCODEC
 This flag is used to indicate that the eAAC+ soft codec should be included in
 ROM.
 */
-#undef __INCLUDE_EAACPLUS_CMMFCODEC
+#define __INCLUDE_EAACPLUS_CMMFCODEC
 /** #__INCLUDE_MP3_CMMFCODEC
 MP3 CMMFCodec (all-ARM software implementation) is included in build  to be used
 by some other client than controller plug-in component.
 */
-#undef __INCLUDE_MP3_CMMFCODEC
+#define __INCLUDE_MP3_CMMFCODEC
 /** #__INCLUDE_QCELP_CMMFCODEC
 QCELP CMMFCodec (all-ARM software implementation) is included in build  to be
 used by some other client  than controller plug-in component.
 */
 Device has internal GPS hardware.
 */
 #undef __LOCATIONGPSHW
 /** #__LOCATION_CENTRE
-"Support for Location Centre. When enabled, Location Centre will be visible in
+Support for Location Centre. When enabled, Location Centre will be visible in
-Application Shell."
+Application Shell.
 */
 #define __LOCATION_CENTRE
 /** #__MACROMEDIA_FLASH_6
 Device supports macrodia flash 6.
 #define __MACROMEDIA_FLASH_6
 /** #__MEDIA_TRANSFER_PROTOCOL
 Device supports MTP application.
 */
-#undef __MEDIA_TRANSFER_PROTOCOL
+#define __MEDIA_TRANSFER_PROTOCOL
 /** #__MMS_POSTCARD
 Flag is used ro incorporate Postcard application into the release.
 */
 #undef __MMS_POSTCARD
 variation only.
 */
 #define __MTP_PROTOCOL_SUPPORT
 /** #__NEWSTICKER
-"This feature displays a 'CNN type' ticker of text pushed via cell broadcast,
+This feature displays a 'CNN type' ticker of text pushed via cell broadcast,
-onto the idle screen of the phone."
+onto the idle screen of the phone.
 */
 #undef __NEWSTICKER
 /** #__NO_POWERKEY
 "Device does not have dedicated key for power management, but the functionality
 #undef __NO_POWERKEY
 /** #__OMA_POC
 OMA Push-to-talk over Cellular.
 */
-#define __OMA_POC
+#undef __OMA_POC
 /** #__ON_SCREEN_DIALER
 This flag indicates that the dialer.dll is included to the rom image and
 On-Screen Dialer is used for phone number entering.
 */
 rendering
 */
 #define __OPENGL_ES_3DAPI
 /** #__OPENGL_ES_SW_IMPLEMENTATION
-"Device has a software implementation of OpenGL ES and EGL. No hardware support.
+Device has a software implementation of OpenGL ES and EGL. No hardware support.
 If __OPENGL_ES_3DAPI is enabled, either HW or SW implementation should exist. If
-HW is not present, this flag should be enabled."
+HW is not present, this flag should be enabled.
 */
 #define __OPENGL_ES_SW_IMPLEMENTATION
 /** #__OPERATOR_CACHE
 Browser application supports persistent cache in addition to default volatile
 (also through power cycles of the phone.)
 */
 #define __OPERATOR_CACHE
 /** #__OPERATOR_MENU
-"Device contains Operator menu application.  It is a wrapper to Browser
+Device contains Operator menu application.  It is a wrapper to Browser
 application and allows using operator specific application icon (and label), and
-allows opening wanted URL initially."
+allows opening wanted URL initially.
 */
 #define __OPERATOR_MENU
 /** #__PEN_SUPPORT
 Indicates whether a device has a pen support.
 #define __SYNCML_DM_IMPS
 /** #__SYNCML_DM_OBEX
 Device supports device management over OBEX.
 */
-#undef __SYNCML_DM_OBEX
+#define __SYNCML_DM_OBEX
 /** #__SYNCML_DM_OTA
 SyncML DM OMA provisioning adapter.
 */
 #define __SYNCML_DM_OTA
 #define __USE_QCELP_CMMFCODEC
 /** #__VFP_HW_SUPPORT
 The device supports for vector floating-point (VFP) architecture
 */
-#undef __VFP_HW_SUPPORT
+#define __VFP_HW_SUPPORT
 /** #__VIBRA
 Indicates whether a device has a vibra support.
 */
 #define __VIBRA
 This flag is used to control the existance of the XCAP protocol implementation
 of XDM
 */
 #define __XDM_XCAP
-#endif // __BLDPUBLIC_HRH
+/** Features added from bldcustomsw.hrh (copied from bldcustomsw.hrh)*/
+/** #FF_MTP_ALBUM_ART */
+#undef FF_MTP_ALBUM_ART
+/** #FF_MUSIC_PATH_PLUGIN */
+#undef FF_MUSIC_PATH_PLUGIN
+/** #FF_POWER_KEY_AS_KEYGUARD */
+#undef FF_POWER_KEY_AS_KEYGUARD
+/** #FF_DISPLAY_NETWORK_NAME_AFTER_CS_REGISTRATION */
+#undef FF_DISPLAY_NETWORK_NAME_AFTER_CS_REGISTRATION
+/** #FF_MANUAL_SELECTION_POPULATED_PLMN_LIST */
+#undef FF_MANUAL_SELECTION_POPULATED_PLMN_LIST
+/** #FF_MOBILITY_MANAGEMENT_ERRORS */
+#undef FF_MOBILITY_MANAGEMENT_ERRORS
+/** #FF_SERVICE_CALL_WHILE_PHONE_LOCKED */
+#undef FF_SERVICE_CALL_WHILE_PHONE_LOCKED
+/** #FF_LOCATIONSYSUI_HIDE_POSITIONING_MENU */
+#undef FF_LOCATIONSYSUI_HIDE_POSITIONING_MENU
+/** #FF_MASTER_RESET_AND_CLEAR_SUBMENU */
+#undef FF_MASTER_RESET_AND_CLEAR_SUBMENU
+/** #FF_SIMLOCK_UI */
+#undef FF_SIMLOCK_UI
+/** #FF_ENTRY_POINT_FOR_VIDEO_SHARE */
+#undef FF_ENTRY_POINT_FOR_VIDEO_SHARE
+/** #FF_IMS_DEREGISTRATION_IN_OFFLINE */
+#undef FF_IMS_DEREGISTRATION_IN_OFFLINE
+/** #FF_IMS_DEREGISTRATION_IN_RFS */
+#undef FF_IMS_DEREGISTRATION_IN_RFS
+/** #FF_IMS_DEREGISTRATION_IN_VPN */
+#undef FF_IMS_DEREGISTRATION_IN_VPN
+/** #FF_INTRANET_BROWSING */
+#undef FF_INTRANET_BROWSING
+/** #FF_HOME_SCREEN_EASY_DIALING */
+#define FF_HOME_SCREEN_EASY_DIALING
+#endif // __BLDPUBLIC_HRH

branch	RCL_3
changeset 88	2fdbc30f1dad
parent 57	d0917ab8b45e
child 111	b5c26a629af8