Transplanted FCL config changes from sfl repo @changeset 1708ba8e710e (tagged as PDK_3.0.f)
--- a/sf_config/config/apac/inc/bldregional.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/apac/inc/bldregional.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -129,4 +129,4 @@
#undef __THAI_CALENDAR
-#endif // __BLDREGIONAL_HRH
\ No newline at end of file
+#endif // __BLDREGIONAL_HRH
--- a/sf_config/config/inc/PlatformStaticFeatures.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/PlatformStaticFeatures.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -11,10 +11,15 @@
*
* Contributors:
*
-* Description:
+* Description: Defines Series 60 specific feature constants for common
+* Feature Manager component. This file is included by
+* Feature Manager component when building it.
+* The counterpart for this file is the generic SpdStaticFeatures.hrh.
*
*/
+
+
/*
*
Usage of the file in the FeatMgr/featmgrstaticfeatures.hrh:
@@ -30,4 +35,4 @@
//includes domain specific Carbon generated files
#include <PrivateStaticFeatures.hrh>
-#include <PublicStaticFeatures.hrh>
\ No newline at end of file
+#include <PublicStaticFeatures.hrh>
--- a/sf_config/config/inc/PrivateStaticFeatures.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/PrivateStaticFeatures.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -15,6 +15,7 @@
*
*/
+
#ifdef FF_M3G_ICON_RESOURCES
KFeatureIdM3gIconResources,
#endif
--- a/sf_config/config/inc/ProductVariant.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/ProductVariant.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -13,8 +13,20 @@
*
* Description:
*
+* The file is included by any code (cpp and resource) that needs to
+* have static (compilation time, link time, image build time) or
+* dynamic (run time) variation support for variant specific features.
+*
+* This file is meant for licensees to customize the default variability
+* settings configured for the release. The existing values can overridden
+* in this file by defining/undefining feature flags.
+*
+*
+*
*/
+
+
#ifndef PRODUCTVARIANT_HRH
#define PRODUCTVARIANT_HRH
--- a/sf_config/config/inc/PublicStaticFeatures.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/PublicStaticFeatures.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -15,6 +15,7 @@
*
*/
+
#ifdef FF_3D_RINGING_TONES
KFeatureId3DRingingTones,
#endif
@@ -23,10 +24,18 @@
KFeatureIdFf3gCellbroadcast,
#endif
+#ifdef FF_ABC_AGRESSIVE_UI
+KFeatureIdFfAbcAgressiveUi,
+#endif
+
#ifdef FF_ADAPTIVE_WLAN_SCANNING_SUPPORT
KFeatureIdFfAdaptiveWlanScanningSupport,
#endif
+#ifdef FF_ADDITIONAL_FONTS
+KFeatureIdFfAdditionalFonts,
+#endif
+
#ifdef FF_AI_WLANSNIFFER_WIDGET
KFeatureIdFfAiWlansnifferWidget,
#endif
@@ -51,10 +60,22 @@
KFeatureIdFfBirthdayImprovement,
#endif
+#ifdef FF_BLUETOOTH_DATA_PROFILES_DISABLED
+KFeatureIdFfBluetoothDataProfilesDisabled,
+#endif
+
+#ifdef FF_BLUETOOTH_DISABLED
+KFeatureIdFfBluetoothDisabled,
+#endif
+
#ifdef FF_BROWSER_PROGRESSIVE_DOWNLOAD
KFeatureIdBrowserProgressiveDownload,
#endif
+#ifdef FF_CAL_MEETING_REQUEST_UI
+KFeatureIdFfCalMeetingRequestUi,
+#endif
+
#ifdef FF_CAPACITIVE_DISPLAY
KFeatureIdFfCapacitiveDisplay,
#endif
@@ -63,10 +84,18 @@
KFeatureIdChineseFontsHires,
#endif
+#ifdef FF_CHINESE_SELECTION_KEY
+KFeatureIdFfChineseSelectionKey,
+#endif
+
#ifdef FF_CLOCK_MULTIPROCOL_SUPPORT
KFeatureIdFfClockMultiprocolSupport,
#endif
+#ifdef FF_CMAIL_INTEGRATION
+KFeatureIdFfCmailIntegration,
+#endif
+
#ifdef FF_COMMSDAT_CREATION_FROM_XML
KFeatureIdCommsDatCreationFromXml,
#endif
@@ -75,10 +104,50 @@
KFeatureIdFfConnectionOverride,
#endif
+#ifdef FF_CONTACTS_COMPANY_NAMES
+KFeatureIdFfContactsCompanyNames,
+#endif
+
+#ifdef FF_CONTACTS_MERGE
+KFeatureIdFfContactsMerge,
+#endif
+
+#ifdef FF_CONTACTS_MYCARD
+KFeatureIdffContactsMycard,
+#endif
+
#ifdef FF_CONTACTS_NICKNAME
KFeatureIdFfContactsNickname,
#endif
+#ifdef FF_CONTACTS_PREDICTIVE_SEARCH
+KFeatureIdFfContactsPredictiveSearch,
+#endif
+
+#ifdef FF_CONTACTS_REMOTE_LOOKUP
+KFeatureIdFfContactsRemoteLookup,
+#endif
+
+#ifdef FF_CONTACTS_SOCIAL
+KFeatureIdFfContactsSocial,
+#endif
+
+#ifdef FF_CONTEXT_PROFILES
+KFeatureIdFfContextProfiles,
+#endif
+
+#ifdef FF_DEVICE_ENCRYPTION_FEATURE
+KFeatureIdFfDeviceEncryptionFeature,
+#endif
+
+#ifdef FF_DISABLE_OMA_SUPL_V2
+KFeatureIdFfDisableOmaSuplV2,
+#endif
+
+#ifdef FF_DM_CONNMO_ADAPTER
+KFeatureIdFfDmConnmoAdapter,
+#endif
+
#ifdef FF_DM_INSTALL_SECURITY
KFeatureIdDmInstallSecurity,
#endif
@@ -87,6 +156,10 @@
KFeatureIdFfDualLanguageSupport,
#endif
+#ifdef FF_DUAL_MODEM
+KFeatureIdDualModem,
+#endif
+
#ifdef FF_EMAIL_FRAMEWORK
KFeatureIdFfEmailFramework,
#endif
@@ -107,6 +180,14 @@
KFeatureIdFfEmailUi,
#endif
+#ifdef FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE
+KFeatureIdCertificationTesting,
+#endif
+
+#ifdef FF_ENHANCED_CALENDAR_EVENT_UI
+KFeatureIdFfEnhancedCalendarEventUi,
+#endif
+
#ifdef FF_FARSI_CALENDAR
KFeatureIdFfFarsiCalendar,
#endif
@@ -115,10 +196,18 @@
KFeatureIdFmtx,
#endif
+#ifdef FF_FMTX_RDS_TEXT
+KFeatureIdFfFmtxRdsText,
+#endif
+
#ifdef FF_FULLSCR_HWR_INPUT
KFeatureIdFullscrHwrInput,
#endif
+#ifdef FF_GENERIC_ACCESS_NETWORK
+KFeatureIdFfGenericAccessNetwork,
+#endif
+
#ifdef FF_GENERIC_FONTS_ASSETS
KFeatureIdFfGenericFontsAssets,
#endif
@@ -159,18 +248,46 @@
KFeatureIdFfIntelligentTextInput,
#endif
+#ifdef FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT
+KFeatureIdFfItiVirtualTouchFirstGenerationSupport,
+#endif
+
#ifdef FF_JAVA_GLOBAL_INDICATORS_API
KFeatureIdFfJavaGlobalIndicatorsApi,
#endif
+#ifdef FF_KEYPAD_NO_SEND_KEY
+KFeatureIdFfKeypadNoSendKey,
+#endif
+
#ifdef FF_KOREAN
KFeatureIdKorean,
#endif
+#ifdef FF_LAYOUT_480_640_VGA3
+KFeatureIdFfLayout480640Vga3,
+#endif
+
+#ifdef FF_LAYOUT_640_480_VGA3
+KFeatureIdFfLayout640480Vga3,
+#endif
+
+#ifdef FF_LIMITED_MESSAGE_AND_ALARM_TONE_SIZE
+KFeatureIdFfLimitedMessageAndAlarmToneSize,
+#endif
+
#ifdef FF_LINKED_FONTS_CHINESE
KFeatureIdFfLinkedFontsChinese,
#endif
+#ifdef FF_LOCATION_MW_APE_CENTRIC_ARCH_SUPPORT
+KFeatureIdFfLocationMwApeCentricArchSupport,
+#endif
+
+#ifdef FF_MECO_XMPP
+KFeatureIdFfMecoXmpp,
+#endif
+
#ifdef FF_MEETING_REQUEST_UI
KFeatureIdFfMeetingRequestUi,
#endif
@@ -179,6 +296,10 @@
KFeatureIdFfMenuTexturePreloading,
#endif
+#ifdef FF_MTP_CONTROLLER
+KFeatureIdS60MtpController,
+#endif
+
#ifdef FF_NCD_ENGINE
KFeatureIdFfNcdEngine,
#endif
@@ -239,6 +360,10 @@
KFeatureIdProvAuthtypePlugin,
#endif
+#ifdef FF_QT
+KFeatureIdFfQt,
+#endif
+
#ifdef FF_QWERTY_FN_KEY
KFeatureIdQwertyFnKey,
#endif
@@ -255,10 +380,30 @@
KFeatureIdSelectableEmail,
#endif
+#ifdef FF_SIP_CUSTOM_PDP_HANDLING
+KFeatureIdFfSipCustomPdpHandling,
+#endif
+
+#ifdef FF_SMALL_SCREEN_TOUCH
+KFeatureIdFfSmallScreenTouch,
+#endif
+
#ifdef FF_STARTUP_OMA_DM_SUPPORT
KFeatureStartupOmaDmSupport,
#endif
+#ifdef FF_STROKE_INPUTMODE_IN_TAIWAN
+KFeatureIdFfStrokeInputmodeInTaiwan,
+#endif
+
+#ifdef FF_SUPL_IMSI_GENERATED_SERVER_PRIORITY_DEFAULT
+KFeatureIdFfSuplImsiGeneratedServerPriorityDefault,
+#endif
+
+#ifdef FF_SYNCML_STATUS_EXTENDED_ERROR_CODES
+KFeatureIdFfSyncmlStatusExtendedErrorCodes,
+#endif
+
#ifdef FF_TACTICONS
KFeatureIdFfTacticons,
#endif
@@ -271,6 +416,10 @@
KFeatureIdFfTarmCapabilityBasedAccess,
#endif
+#ifdef FF_TARM_CAPABILITY_CHECKING
+KFeatureIdFfTarmCapabilityChecking,
+#endif
+
#ifdef FF_TCP_MYFAVES_FEATURE
KFeatureIdTcpMyfavesFeature,
#endif
@@ -279,6 +428,10 @@
KFeatureIdFfTcpMyprofile,
#endif
+#ifdef FF_TD_SCDMA
+KFeatureIdFfTdScdma,
+#endif
+
#ifdef FF_TOUCHSCREENCALIB_IN_STARTUP
KFeatureIdTouchscreencalibInStartup,
#endif
@@ -299,10 +452,22 @@
KFeatureIdUsbHost,
#endif
+#ifdef FF_USB_MODEM
+KFeatureIdUsbModem,
+#endif
+
#ifdef FF_USE_EGPRS_ICON
KFeatureIdUseEGprsIcon,
#endif
+#ifdef FF_USE_NAVIKEY_FOR_VOLUME
+KFeatureIdFfUseNavikeyForVolume,
+#endif
+
+#ifdef FF_VIDEO_AUDIO_BRANDING
+KFeatureIdFfVideoAudioBranding,
+#endif
+
#ifdef FF_VIRTUAL_FULLSCR_QWERTY_INPUT
KFeatureIdVirtualFullscrQwertyInput,
#endif
@@ -327,10 +492,6 @@
KFeatureIdWebvideoPh2,
#endif
-#ifdef FF_WLANSNIFFER_VOIP_ENHANCEMENTS
-KFeatureIdFfWlansnifferVoipEnhancements,
-#endif
-
#ifdef FF_WLAN_EXTENSIONS
KFeatureIdFfWlanExtensions,
#endif
@@ -339,6 +500,18 @@
KFeatureIdFfWlanWapi,
#endif
+#ifdef SYMBIAN_INCLUDE_LOCATION_NPE_DSM
+KFeatureIdSymbianIncludeLocationNpeDsm,
+#endif
+
+#ifdef SYMBIAN_INCLUDE_LOCATION_SUPL_POS_INIT
+KFeatureIdSymbianIncludeLocationSuplPosInit,
+#endif
+
+#ifdef SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY
+KFeatureIdSymbianIncludeLocationSuplProxy,
+#endif
+
#ifdef __3D_MENU
KFeatureId3DMenu,
#endif
@@ -995,3 +1168,68 @@
KFeatureIdXdmXcap,
#endif
+/** Features added from customswstaticfeatures.hrh (removed from customswstaticfeatures.hrh) */
+
+#ifdef FF_MTP_ALBUM_ART
+KFeatureIdFfMtpAlbumArt,
+#endif
+
+#ifdef FF_MUSIC_PATH_PLUGIN
+KFeatureIdFfMusicPathPlugin,
+#endif
+
+#ifdef FF_POWER_KEY_AS_KEYGUARD
+KFeatureIdFfPowerKeyAsKeyguard,
+#endif
+
+#ifdef FF_DISPLAY_NETWORK_NAME_AFTER_CS_REGISTRATION
+KFeatureIdFfDisplayNetworkNameAfterCsRegistration,
+#endif
+
+#ifdef FF_MANUAL_SELECTION_POPULATED_PLMN_LIST
+KFeatureIdFfManualSelectionPopulatedPlmnList,
+#endif
+
+#ifdef FF_MOBILITY_MANAGEMENT_ERRORS
+KFeatureIdFfMobilityManagementErrors,
+#endif
+
+#ifdef FF_SERVICE_CALL_WHILE_PHONE_LOCKED
+KFeatureIdFfServiceCallWhilePhoneLocked,
+#endif
+
+#ifdef FF_LOCATIONSYSUI_HIDE_POSITIONING_MENU
+KFeatureIdFfLocationsysuiHidePositioningMenu,
+#endif
+
+#ifdef FF_MASTER_RESET_AND_CLEAR_SUBMENU
+KFeatureIdFfMasterResetAndClearSubmenu,
+#endif
+
+#ifdef FF_SIMLOCK_UI
+KFeatureIdFfSimlockUi,
+#endif
+
+#ifdef FF_ENTRY_POINT_FOR_VIDEO_SHARE
+KFeatureIdFfEntryPointForVideoShare,
+#endif
+
+#ifdef FF_IMS_DEREGISTRATION_IN_OFFLINE
+KFeatureIdFfImsDeregistrationInOffline,
+#endif
+
+#ifdef FF_IMS_DEREGISTRATION_IN_RFS
+KFeatureIdFfImsDeregistrationInRfs,
+#endif
+
+#ifdef FF_IMS_DEREGISTRATION_IN_VPN
+KFeatureIdFfImsDeregistrationInVpn,
+#endif
+
+#ifdef FF_INTRANET_BROWSING
+KFeatureIdFfIntranetBrowsing,
+#endif
+
+#ifdef FF_HOME_SCREEN_EASY_DIALING
+KFeatureIdProductIncludesHomeScreenEasyDialing,
+#endif
--- a/sf_config/config/inc/bldcodeline.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/bldcodeline.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -15,6 +15,7 @@
*
*/
+
#ifndef __BLDCODELINE_HRH
#define __BLDCODELINE_HRH
@@ -585,7 +586,7 @@
/** #RD_IMAGEPREVIEW
ImageViewer's ImagePreview API and DLL are available in release.
*/
-#define RD_IMAGEPREVIEW
+#undef RD_IMAGEPREVIEW
/** #RD_IMAGINGCONFIGMANAGER
Flag to include/exclude Imaging Configuration Manager component.
@@ -1239,25 +1240,25 @@
done behind this flag to secure that existing functionality won't suffer
regression during implementation.
*/
-#undef RD_UI_TRANSITION_EFFECTS_LAYOUT_SWITCH
+#define RD_UI_TRANSITION_EFFECTS_LAYOUT_SWITCH
/** #RD_UI_TRANSITION_EFFECTS_LIST
This flag will be used to secure that development of list transition effects
won't break existing fullscreen and components transition effects.
*/
-#undef RD_UI_TRANSITION_EFFECTS_LIST
+#define RD_UI_TRANSITION_EFFECTS_LIST
/** #RD_UI_TRANSITION_EFFECTS_PHASE2
Feature enables early development of 2nd phase UI transition effects.
*/
-#undef RD_UI_TRANSITION_EFFECTS_PHASE2
+#define RD_UI_TRANSITION_EFFECTS_PHASE2
/** #RD_UI_TRANSITION_EFFECTS_POPUPS
"Development of transition effects in popups (notes, queries, etc) will be done
behind this flag to secure that existing functionality won't suffer regression
during implementation."
*/
-#undef RD_UI_TRANSITION_EFFECTS_POPUPS
+#define RD_UI_TRANSITION_EFFECTS_POPUPS
/** #RD_UI_ZOOM
This feature activates the zooming support in Series 60 UI.
@@ -1414,4 +1415,4 @@
#define RD_XML_ENGINE_API_CHANGE
-#endif // __BLDCODELINE_HRH
\ No newline at end of file
+#endif // __BLDCODELINE_HRH
--- a/sf_config/config/inc/bldprivate.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/bldprivate.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -15,6 +15,7 @@
*
*/
+
#ifndef __BLDPRIVATE_HRH
#define __BLDPRIVATE_HRH
@@ -73,6 +74,16 @@
*/
#define FF_TOUCH_CALL_HANDLING
+/** #FF_WDP_EMMC
+Select writable demand paging eMMC flash driver build .
+*/
+#undef FF_WDP_EMMC
+
+/** #FF_WDP_NAND
+Select writable demand paging NAND flash driver build.
+*/
+#undef FF_WDP_NAND
+
/** #FF_WS_NCIM
This run-time flag is required for enableing NCIM at the run-time.
NCIM, here onwards called as "Nokia account".
@@ -96,6 +107,12 @@
*/
#undef HLP_ADDITIONAL_CALENDAR
+/** #HLP_APAC_VARIATION
+Flag to be used for image creation time variation -- need to separate 3G/APAC
+help variants.
+*/
+#undef HLP_APAC_VARIATION
+
/** #HLP_CAMERA_KEY
USED ONLY FOR HELP CONTENT VARIATION
*/
@@ -155,6 +172,35 @@
*/
#define JSR_135_SUPPORT
+/** #NO_CBCP_PARSER_IN_ROM
+Do not include symbian CBCP parser in rom
+*/
+#define NO_CBCP_PARSER_IN_ROM
+
+/** #NO_ENP_PARSER_IN_ROM
+This feature flag can be used to not to include symbian ENP Parser into ROM
+image.
+*/
+#define NO_ENP_PARSER_IN_ROM
+
+/** #NO_GFP_PARSER_IN_ROM
+This feature flag can be used to not to include symbian GFP Parser into ROM
+image.
+*/
+#define NO_GFP_PARSER_IN_ROM
+
+/** #NO_IACP_PARSER_IN_ROM
+his feature flag can be used to not to include symbian IACP Parser into ROM
+image.
+*/
+#define NO_IACP_PARSER_IN_ROM
+
+/** #NO_WAPP_PARSER_IN_ROM
+This feature flag can be used to not to include symbian WAPP parser into ROM
+image.
+*/
+#define NO_WAPP_PARSER_IN_ROM
+
/** #RD_XML_PARSER_TOOLCHAIN
"Used to turn on and off the use of the arabica and xercesc components in the
build system, and code in the layout compiler."
@@ -198,7 +244,7 @@
@see SysUtil::DiskSpaceBelowCriticalLevelL
*/
-#undef SYMBIAN_BAFL_SYSUTIL
+#define SYMBIAN_BAFL_SYSUTIL
/** #SYMBIAN_DOS_SERVER_SERVICES
Indicate that the DOS Server Services is present. This is needed to turn the RF
@@ -220,18 +266,44 @@
This flag can be used to exclude Symbian's d_exc.exe from rom image when
Symbian's base.iby is included
*/
-#undef SYMBIAN_EXCLUDE_D_EXC
+#define SYMBIAN_EXCLUDE_D_EXC
/** #SYMBIAN_EXCLUDE_ECAM_STUBPLUGIN
This flag is used to exclude Symbian Camera API stub
*/
#undef SYMBIAN_EXCLUDE_ECAM_STUBPLUGIN
+/** #SYMBIAN_EXCLUDE_FAX
+Flag to exclude fax related binaries from images. No runtime variation, only
+used at image creation.
+*/
+#undef SYMBIAN_EXCLUDE_FAX
+
+/** #SYMBIAN_EXCLUDE_INFRARED
+removes symbian infrared components from rom
+*/
+#undef SYMBIAN_EXCLUDE_INFRARED
+
/** #SYMBIAN_EXCLUDE_KEYMAP
This flag can be used to include/exclude Symbian's KEYMAP_FILE (EKData.dll) from
rom image if base.iby is included
*/
-#undef SYMBIAN_EXCLUDE_KEYMAP
+#define SYMBIAN_EXCLUDE_KEYMAP
+
+/** #SYMBIAN_EXCLUDE_LIBXML2
+This feature flag removes libxml2.dll from image.
+*/
+#undef SYMBIAN_EXCLUDE_LIBXML2
+
+/** #SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
+This feature flag removes libxml2.dll from image.
+*/
+#undef SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
+
+/** #SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
+This feature flag removes libxml2.dll from image.
+*/
+#undef SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
/** #SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT
The macro SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT is used to exclude the location
@@ -256,13 +328,18 @@
This flag can be used to exclude Symbian ScDv.dll from rom image when Symbian's
base.iby is included
*/
-#undef SYMBIAN_EXCLUDE_SCDV
+#define SYMBIAN_EXCLUDE_SCDV
/** #SYMBIAN_EXCLUDE_SIP
Excludes Symbian SIP components.
*/
#undef SYMBIAN_EXCLUDE_SIP
+/** #SYMBIAN_EXCLUDE_WIFI
+Removes Symbian wlan componets
+*/
+#undef SYMBIAN_EXCLUDE_WIFI
+
/** #SYMBIAN_GRAPHICS_ADAPTATION
This flag is used to take right graphics adaptation components to the ROM build
*/
@@ -278,7 +355,12 @@
/** #SYMBIAN_GRAPHICS_USE_WSERV2
WServ2 binaries are used instead of WSERV1 versions.
*/
-#define SYMBIAN_GRAPHICS_USE_WSERV2
+#undef SYMBIAN_GRAPHICS_USE_WSERV2
+
+/** #SYMBIAN_HAL_NONSECUREOFFSET_PERSISTENCE_DISABLED
+Non secure offset persistence must be disabled in secure time
+*/
+#define SYMBIAN_HAL_NONSECUREOFFSET_PERSISTENCE_DISABLED 1
/** #SYMBIAN_HAL_PENSTATE_PERSISTENCE_DISABLED
Provide an option to allow platform to not save HALData::EPenState attribute.
@@ -420,7 +502,28 @@
Introduced by PREQ1872.
*/
-#undef SYMBIAN_INCLUDE_USB_RNDIS
+#define SYMBIAN_INCLUDE_USB_RNDIS
+
+/** #SYMBIAN_MBUF_POOL_SIZE
+The size of the MBuf pool is adjustable. The MBuf pool is used for creating
+buffers for communication data.
+
+The MBuf is configurable in c32start.ini :
+\src\common\generic\comms-infras\rootserver\etc\
+It is runtime read configuration file, e.g.:
+
+[Global]
+MBufPoolSize=<initial size>,<max size> [bytes]
+
+Default MBufPoolSize=262144,262144.
+If single value => interpreted as max size.
+
+When an initial size is specified the pool grows when necessary until it reaches
+the maximum size. It does not shrink, however, so the RAM is not released until
+the device is rebooted.
+
+*/
+#define SYMBIAN_MBUF_POOL_SIZE 0
/** #SYMBIAN_MULTIMEDIA_A3FDEVSOUND
This definition is used in symbian A3F build files.
@@ -442,7 +545,7 @@
performance and memory consumption balance. Increasing the value increases the
memory consumption.
*/
-#define SYMBIAN_ODP_NUMBER_OF_MAX_LIVE_PAGES 4096
+#define SYMBIAN_ODP_NUMBER_OF_MAX_LIVE_PAGES 0
/** #SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES
Defines the minimum number of 4k live pages available in the system for code
@@ -463,14 +566,14 @@
This define supports PREQ1871.
*/
-#undef SYMBIAN_SYSTEM_STATE_MANAGEMENT
+#define SYMBIAN_SYSTEM_STATE_MANAGEMENT
/** #SYMBIAN_USE_DOS_SERVER_SERVICES
The DOS_SERVER_SERVICES should indicate that the DOS Server Services is present.
This is needed to turn the RF on in an emergency call when the phone is in
flight mode.
*/
-#define SYMBIAN_USE_DOS_SERVER_SERVICES
+#undef SYMBIAN_USE_DOS_SERVER_SERVICES
/** #SYMBIAN_USE_HCI_V2
Defines if HCIv2 (bluetooth v2.0) is used in image or not.
@@ -482,7 +585,7 @@
Feature Manager is present. The Feature Manager was part of the CoreOS, and
there is a Symbian version of it in 9.5.
*/
-#define SYMBIAN_USE_NOKIA_FEATURE_MANAGER
+#undef SYMBIAN_USE_NOKIA_FEATURE_MANAGER
/** #USE_MSCDB
Enable usage of mass storage double buffering.
@@ -507,7 +610,7 @@
/** #__AAC
Device supports Advanced Audio Coding (AAC) codec.
*/
-#undef __AAC
+#define __AAC
/** #__ACCESSORY_FW
Accessory framework is a Series 60 subsystem that enables adding various
@@ -540,12 +643,12 @@
/** #__AMR_NB
Device supports Adaptive Multi-Rate (AMR) narrowband codec.
*/
-#undef __AMR_NB
+#define __AMR_NB
/** #__AMR_WB
Device supports Adaptive Multi-Rate (AMR) wideband codec.
*/
-#undef __AMR_WB
+#define __AMR_WB
/** #__APPLICATION_CONTROLLABLE_AUDIO_ROUTING
"An application UI can control audio routing in addition to adaption layer. If
@@ -895,6 +998,15 @@
*/
#define __EMAIL_UI
+/** #__ENABLE_BACKSTEPPING
+A flag that defines whether Backstepping -service is in use in Music Player.
+With Backstepping, MusicSuite and Music Widget interaction with music player is
+much more fluent. Back takes back to Music Suite, instead of Music Player
+library view. This flag will enable compilation of mpxbacksteppingutility, which
+music player uses to implement Backstepping. Synergy Change: ou1cimx1#122317
+*/
+#undef __ENABLE_BACKSTEPPING
+
/** #__EN_POLICY_DOS
"ENPolicy provides emergency number policy APIs and is used by phoneserver
component.DOS emergency number policy checks emergency number by using ETel
@@ -1346,7 +1458,7 @@
/** #__MP3
Device supports MP3 audio codec.
*/
-#undef __MP3
+#define __MP3
/** #__MROUTER
Device uses Symbian MRrouter technology for PC connectivity. If this feature is
@@ -1681,9 +1793,9 @@
#define __SAT_LANGUAGE_NOTIFICATION
/** #__SAT_LAUNCH_BROWSER
-"If this flag is enabled, upon receiving SAT Launch Browser command, the ME
+When this flag is enabled, upon receiving SAT Launch Browser command, the ME
shall decide if it is able to execute the command. See details from 3GPP
-specifications."
+specifications.
*/
#define __SAT_LAUNCH_BROWSER
@@ -1821,7 +1933,7 @@
subscriber is able to see A subscriber's number and name even the caller's ID is
not stored in the phone. The name of the subscriber comes from network.
*/
-#undef __SERIES60_PHONE_CNAP
+#define __SERIES60_PHONE_CNAP
/** #__SERIES60_PHONE_NUMBER_GROUPING
Deprecated flag. Included for compatibility reasons. Value must equal to
@@ -2090,7 +2202,7 @@
Defines whether transition effects are used in UI. Also controls whether the
effect engine is included in ROM or not.
*/
-#undef __UI_TRANSITION_EFFECTS
+#define __UI_TRANSITION_EFFECTS
/** #__UI_ZOOM
This feature activates the zooming support in Series 60 UI.
@@ -2130,7 +2242,7 @@
/** #__USB_PTP
Includes and excludes PTP (Picture Transfer Protocol) components.
*/
-#define __USB_PTP
+#undef __USB_PTP
/** #__USB_REMOTE_PERSONALITY
Includes and excludes S60 USB Remote Personality component.
@@ -2186,7 +2298,7 @@
Device supports Windows Media. In other words it indicates whether WM-related
components such as ASF-parser and codecs are in place.
*/
-#undef __WINDOWS_MEDIA
+#define __WINDOWS_MEDIA
/** #__WINDOWS_MEDIA_DRM
Device supports Windows Media DRM. In other words it indicates whether WMDRM
@@ -2208,4 +2320,4 @@
#define __XSP_EXTENSION_MANAGER
-#endif // __BLDPRIVATE_HRH
\ No newline at end of file
+#endif // __BLDPRIVATE_HRH
--- a/sf_config/config/inc/bldpublic.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/bldpublic.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -15,12 +15,16 @@
*
*/
+
#ifndef __BLDPUBLIC_HRH
#define __BLDPUBLIC_HRH
-//Defining only language 01 for SF build purposes
-#define LANGUAGE_IDS LANG sc 01
-
+#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
+
+/** #Camera
+Container for camera specific features
+*/
+#undef Camera
/** #FF_3D_RINGING_TONES
Device supports 3D ringing tones.
@@ -32,6 +36,15 @@
*/
#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
@@ -40,6 +53,14 @@
*/
#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.
*/
@@ -50,6 +71,12 @@
*/
#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.
@@ -63,15 +90,15 @@
#undef FF_AUDT
/** #FF_AUTO_REDIAL_FOR_VIDEO_CALL
-"This flag indicates redial sequence, when video call is not succeeded for
-certain reasons."
+This flag indicates redial sequence, when video call is not succeeded for
+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 &
@@ -80,26 +107,53 @@
The requirement is
-B’day & Anniversary Notification for MyFaves contact
-
-• Picture of the MyFaves contact in the popup which can be masked as circular
-
-• Currently Birthday notification is same as any other Calendar alarm
+B’day & Anniversary Notification for MyFaves contact
+
+• Picture of the MyFaves contact in the popup which can be masked as circular
+
+• 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_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
@@ -120,6 +174,11 @@
*/
#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
@@ -129,6 +188,11 @@
*/
#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
@@ -158,6 +222,12 @@
*/
#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
@@ -168,7 +238,21 @@
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:
@@ -198,6 +282,45 @@
*/
#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_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.
*/
@@ -211,11 +334,46 @@
*/
#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
@@ -223,6 +381,11 @@
*/
#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:
@@ -284,6 +447,21 @@
*/
#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.
+*/
+#undef 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.
@@ -311,11 +489,31 @@
*/
#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_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
@@ -461,23 +659,47 @@
*/
#undef FF_INTELLIGENT_TEXT_INPUT
+/** #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.
*/
@@ -490,11 +712,21 @@
*/
#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.
*/
@@ -503,7 +735,7 @@
/** #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
@@ -531,6 +763,12 @@
*/
#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.
@@ -541,11 +779,33 @@
*/
#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
@@ -553,7 +813,7 @@
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
@@ -570,6 +830,21 @@
*/
#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.
*/
@@ -631,7 +906,7 @@
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
@@ -656,7 +931,7 @@
/** #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.
@@ -683,7 +958,7 @@
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
@@ -693,7 +968,7 @@
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
@@ -717,11 +992,26 @@
*/
#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
@@ -753,7 +1043,7 @@
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
@@ -764,7 +1054,7 @@
/** #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.
@@ -802,19 +1092,49 @@
*/
#undef FF_SHOW_MMPLAYER
+/** #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
@@ -827,7 +1147,13 @@
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
@@ -842,6 +1168,11 @@
*/
#undef FF_TCP_MYPROFILE
+/** #FF_TD_SCDMA
+This is a feature flag used to turn on/off TD-SCDMA releated features
+*/
+#undef FF_TD_SCDMA
+
/** #FF_THEME_HAZE
Haze theme is included in ROM image.
@@ -885,6 +1216,20 @@
*/
#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.
@@ -900,7 +1245,15 @@
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
@@ -935,6 +1288,12 @@
*/
#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_VIRTUAL_FULLSCR_QWERTY_INPUT
Indicates whether a device needs Virtual full-screen qwerty input or not.
@@ -975,18 +1334,6 @@
*/
#undef FF_WEBVIDEO_PH2
-/** #FF_WLANSNIFFER
-The purpose of the flag is to control whether the WlanSniffer2 application is to
-be integrated into 3.2 product builds or not.
-*/
-#undef FF_WLANSNIFFER
-
-/** #FF_WLANSNIFFER_VOIP_ENHANCEMENTS
-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.
@@ -1012,7 +1359,7 @@
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_XML_IDLE_THEME_BASIC_IDLE
Controls if Basic idle theme is going to image or not.
@@ -1038,7 +1385,7 @@
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
@@ -1331,6 +1678,23 @@
*/
#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.
*/
@@ -1340,7 +1704,7 @@
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.
@@ -1353,16 +1717,16 @@
#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
-dlls to be upgraded using a SISX file. "
+Support for Aftermarket update of Codecs, and File Formats. To allow the helix
+dlls to be upgraded using a SISX file.
*/
#define __ALLOW_UPGRADE_HELIX
@@ -1372,9 +1736,9 @@
#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
@@ -1412,9 +1776,9 @@
#undef __BRIGHTNESS_CONTROL
/** #__BTIC_BINARIES_CHECK_ENABLED
-"In addition to the SWI certificate store check (defined by __BTIC_ENABLED),
-also binaries (having TCB or DRM capability) in c: drive are integrity checked
-during boot."
+In addition to the SWI certificate store check (defined by __BTIC_ENABLED), also
+binaries (having TCB or DRM capability) in c: drive are integrity checked during
+boot.
*/
#undef __BTIC_BINARIES_CHECK_ENABLED
@@ -1473,9 +1837,9 @@
#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
@@ -1532,13 +1896,13 @@
/** #__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).
@@ -1551,7 +1915,7 @@
#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
@@ -1577,31 +1941,31 @@
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
@@ -1690,8 +2054,8 @@
#undef __LOCATIONGPSHW
/** #__LOCATION_CENTRE
-"Support for Location Centre. When enabled, Location Centre will be visible in
-Application Shell."
+Support for Location Centre. When enabled, Location Centre will be visible in
+Application Shell.
*/
#define __LOCATION_CENTRE
@@ -1703,7 +2067,7 @@
/** #__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.
@@ -1733,8 +2097,8 @@
#define __MTP_PROTOCOL_SUPPORT
/** #__NEWSTICKER
-"This feature displays a 'CNN type' ticker of text pushed via cell broadcast,
-onto the idle screen of the phone."
+This feature displays a 'CNN type' ticker of text pushed via cell broadcast,
+onto the idle screen of the phone.
*/
#undef __NEWSTICKER
@@ -1747,7 +2111,7 @@
/** #__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
@@ -1762,9 +2126,9 @@
#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
@@ -1776,9 +2140,9 @@
#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
@@ -1957,7 +2321,7 @@
/** #__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.
@@ -2079,7 +2443,7 @@
/** #__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.
@@ -2145,4 +2509,54 @@
*/
#define __XDM_XCAP
-#endif // __BLDPUBLIC_HRH
\ No newline at end of file
+/** 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
--- a/sf_config/config/inc/defaultcaps.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/defaultcaps.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -11,10 +11,13 @@
*
* Contributors:
*
-* Description:
+* Description: Platform security capabilities - Default capabilities for ROM
+* based sw.
*
*/
+
+
#ifndef DEFAULTCAPS_HRH
#define DEFAULTCAPS_HRH
--- a/sf_config/config/inc/features.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/features.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -14,7 +14,6 @@
* Description:
*
*/
-
/*
* deprecated, use bldvariant.hrh instead
*/
--- a/sf_config/config/inc/privateruntimeids.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/privateruntimeids.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -15,6 +15,7 @@
*
*/
+
#ifndef __PRIVATERUNTIMEIDS_HRH
#define __PRIVATERUNTIMEIDS_HRH
--- a/sf_config/config/inc/publicruntimeids.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/publicruntimeids.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -15,6 +15,7 @@
*
*/
+
#ifndef __PUBLICRUNTIMEIDS_HRH
#define __PUBLICRUNTIMEIDS_HRH
@@ -22,8 +23,12 @@
#define KFeatureIdFf3gCellbroadcast 175
+#define KFeatureIdFfAbcAgressiveUi 252
+
#define KFeatureIdFfAdaptiveWlanScanningSupport 140
+#define KFeatureIdFfAdditionalFonts 241
+
#define KFeatureIdFfAiWlansnifferWidget 172
#define KFeatureIdAsynchFileSaveQueue 1703
@@ -36,24 +41,56 @@
#define KFeatureIdFfBirthdayImprovement 189
+#define KFeatureIdFfBluetoothDataProfilesDisabled 271
+
+#define KFeatureIdFfBluetoothDisabled 270
+
#define KFeatureIdBrowserProgressiveDownload 1724
+#define KFeatureIdFfCalMeetingRequestUi 296
+
#define KFeatureIdFfCapacitiveDisplay 183
#define KFeatureIdChineseFontsHires 138
+#define KFeatureIdFfChineseSelectionKey 233
+
#define KFeatureIdFfClockMultiprocolSupport 190
+#define KFeatureIdFfCmailIntegration 247
+
#define KFeatureIdCommsDatCreationFromXml 67
#define KFeatureIdFfConnectionOverride 179
+#define KFeatureIdFfContactsCompanyNames 236
+
+#define KFeatureIdFfContactsMerge 268
+
+#define KFeatureIdffContactsMycard 267
+
#define KFeatureIdFfContactsNickname 182
+#define KFeatureIdFfContactsPredictiveSearch 235
+
+#define KFeatureIdFfContactsRemoteLookup 234
+
+#define KFeatureIdFfContactsSocial 273
+
+#define KFeatureIdFfContextProfiles 254
+
+#define KFeatureIdFfDeviceEncryptionFeature 250
+
+#define KFeatureIdFfDisableOmaSuplV2 308
+
+#define KFeatureIdFfDmConnmoAdapter 277
+
#define KFeatureIdDmInstallSecurity 5065
#define KFeatureIdFfDualLanguageSupport 194
+#define KFeatureIdDualModem 230
+
#define KFeatureIdFfEmailFramework 135
#define KFeatureIdFfEmailIpsServices 137
@@ -64,12 +101,20 @@
#define KFeatureIdFfEmailUi 136
+#define KFeatureIdCertificationTesting 309
+
+#define KFeatureIdFfEnhancedCalendarEventUi 295
+
#define KFeatureIdFfFarsiCalendar 213
#define KFeatureIdFmtx 1705
+#define KFeatureIdFfFmtxRdsText 220
+
#define KFeatureIdFullscrHwrInput 66
+#define KFeatureIdFfGenericAccessNetwork 257
+
#define KFeatureIdFfGenericFontsAssets 188
#define KFeatureIdFfHdmi 169
@@ -90,16 +135,32 @@
#define KFeatureIdFfIntelligentTextInput 216
+#define KFeatureIdFfItiVirtualTouchFirstGenerationSupport 218
+
#define KFeatureIdFfJavaGlobalIndicatorsApi 134
+#define KFeatureIdFfKeypadNoSendKey 278
+
#define KFeatureIdKorean 180
+#define KFeatureIdFfLayout480640Vga3 240
+
+#define KFeatureIdFfLayout640480Vga3 239
+
+#define KFeatureIdFfLimitedMessageAndAlarmToneSize 300
+
#define KFeatureIdFfLinkedFontsChinese 159
+#define KFeatureIdFfLocationMwApeCentricArchSupport 258
+
+#define KFeatureIdFfMecoXmpp 232
+
#define KFeatureIdFfMeetingRequestUi 174
#define KFeatureIdFfMenuTexturePreloading 118
+#define KFeatureIdS60MtpController 272
+
#define KFeatureIdFfNcdEngine 61
#define KFeatureIdFfNcdUi 62
@@ -130,6 +191,8 @@
#define KFeatureIdProvAuthtypePlugin 100
+#define KFeatureIdFfQt 238
+
#define KFeatureIdQwertyFnKey 1714
#define KFeatureIdRockerKey 120
@@ -138,18 +201,32 @@
#define KFeatureIdSelectableEmail 125
+#define KFeatureIdFfSipCustomPdpHandling 269
+
+#define KFeatureIdFfSmallScreenTouch 279
+
#define KFeatureStartupOmaDmSupport 40
+#define KFeatureIdFfStrokeInputmodeInTaiwan 280
+
+#define KFeatureIdFfSuplImsiGeneratedServerPriorityDefault 301
+
+#define KFeatureIdFfSyncmlStatusExtendedErrorCodes 299
+
#define KFeatureIdFfTacticons 184
#define KFeatureIdTactileFeedback 1718
#define KFeatureIdFfTarmCapabilityBasedAccess 214
+#define KFeatureIdFfTarmCapabilityChecking 237
+
#define KFeatureIdTcpMyfavesFeature 1722
#define KFeatureIdFfTcpMyprofile 186
+#define KFeatureIdFfTdScdma 274
+
#define KFeatureIdTouchscreencalibInStartup 69
#define KFeatureIdFfTouchUnlockStroke 173
@@ -160,8 +237,14 @@
#define KFeatureIdUsbHost 1704
+#define KFeatureIdUsbModem 265
+
#define KFeatureIdUseEGprsIcon 121
+#define KFeatureIdFfUseNavikeyForVolume 248
+
+#define KFeatureIdFfVideoAudioBranding 266
+
#define KFeatureIdVirtualFullscrQwertyInput 64
#define KFeatureIdVirtualItutInput 65
@@ -174,12 +257,16 @@
#define KFeatureIdWebvideoPh2 39
-#define KFeatureIdFfWlansnifferVoipEnhancements 156
-
#define KFeatureIdFfWlanExtensions 177
#define KFeatureIdFfWlanWapi 129
+#define KFeatureIdSymbianIncludeLocationNpeDsm 261
+
+#define KFeatureIdSymbianIncludeLocationSuplPosInit 263
+
+#define KFeatureIdSymbianIncludeLocationSuplProxy 262
+
#define KFeatureId3DMenu 1511
#define KFeatureId3GpExtension 1592
@@ -508,4 +595,38 @@
#define KFeatureIdXdmXcap 1524
+/** Features added from customswruntimeids.hrh (removed from customswruntimeids.hrh) */
+
+#define KFeatureIdFfMtpAlbumArt 5229
+
+#define KFeatureIdFfMusicPathPlugin 5232
+
+#define KFeatureIdFfPowerKeyAsKeyguard 5243
+
+#define KFeatureIdFfDisplayNetworkNameAfterCsRegistration 5217
+
+#define KFeatureIdFfManualSelectionPopulatedPlmnList 5184
+
+#define KFeatureIdFfMobilityManagementErrors 5228
+
+#define KFeatureIdFfServiceCallWhilePhoneLocked 5198
+
+#define KFeatureIdFfLocationsysuiHidePositioningMenu 5224
+
+#define KFeatureIdFfMasterResetAndClearSubmenu 5195
+
+#define KFeatureIdFfSimlockUi 5197
+
+#define KFeatureIdFfEntryPointForVideoShare 5225
+
+#define KFeatureIdFfImsDeregistrationInOffline 5230
+
+#define KFeatureIdFfImsDeregistrationInRfs 5231
+
+#define KFeatureIdFfImsDeregistrationInVpn 5209
+
+#define KFeatureIdFfIntranetBrowsing 5109
+
+#define KFeatureIdProductIncludesHomeScreenEasyDialing 5085
+
#endif // __PUBLICRUNTIMEIDS_HRH
--- a/sf_config/config/inc/variant.cfg Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/inc/variant.cfg Mon Feb 08 13:30:22 2010 +0000
@@ -1,1 +1,2 @@
\epoc32\include\bldvariant.hrh
+ENABLE_ABIV2_MODE
--- a/sf_config/config/japan/inc/bldregional.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/japan/inc/bldregional.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -129,4 +129,4 @@
#undef __THAI_CALENDAR
-#endif // __BLDREGIONAL_HRH
\ No newline at end of file
+#endif // __BLDREGIONAL_HRH
--- a/sf_config/config/western/inc/bldregional.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/sf_config/config/western/inc/bldregional.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -129,4 +129,4 @@
#define __THAI_CALENDAR
-#endif // __BLDREGIONAL_HRH
\ No newline at end of file
+#endif // __BLDREGIONAL_HRH
--- a/symbianosbld/cedarutils/inc/Symbian_OS_tb92sf.hrh Tue Feb 02 01:12:20 2010 +0200
+++ b/symbianosbld/cedarutils/inc/Symbian_OS_tb92sf.hrh Mon Feb 08 13:30:22 2010 +0000
@@ -2060,3 +2060,9 @@
*/
#define SYMBIAN_OE_LIBSTDCPP
+/**
+SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV
+
+If SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV, the windowserver component is built to use the OpenWF version of NGA.
+*/
+#define SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV