--- a/sf_config/config/inc/bldcodeline.hrh Wed Apr 21 10:23:46 2010 +0100
+++ b/sf_config/config/inc/bldcodeline.hrh Wed Apr 28 09:51:11 2010 +0100
@@ -401,7 +401,7 @@
To provide timed synchronization feature to be included in the Data
synchronization UI . The flag will be used only in the OmaDsAppUi component.
*/
-#define RD_DSUI_TIMEDSYNC
+#undef RD_DSUI_TIMEDSYNC
/** #RD_DS_ICAL_SUPPORT
Support for iCalendar synchronization
@@ -591,7 +591,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.
@@ -1245,25 +1245,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.
@@ -1427,4 +1427,5 @@
*/
#define SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV
+
#endif // __BLDCODELINE_HRH
--- a/sf_config/config/inc/bldprivate.hrh Wed Apr 21 10:23:46 2010 +0100
+++ b/sf_config/config/inc/bldprivate.hrh Wed Apr 28 09:51:11 2010 +0100
@@ -220,18 +220,18 @@
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
+#define SYMBIAN_EXCLUDE_ECAM_STUBPLUGIN
/** #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_LOCATION_MANAGEMENT
The macro SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT is used to exclude the location
@@ -250,13 +250,13 @@
Related with PREQ1305
*/
-#undef SYMBIAN_EXCLUDE_MSMM_POLICY_PLUGIN
+#define SYMBIAN_EXCLUDE_MSMM_POLICY_PLUGIN
/** #SYMBIAN_EXCLUDE_SCDV
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.
@@ -413,14 +413,14 @@
/** #SYMBIAN_INCLUDE_USB_OTG_HOST
Feature USB Host (and related OTG) binaries are included into romimage
*/
-#undef SYMBIAN_INCLUDE_USB_OTG_HOST
+#define SYMBIAN_INCLUDE_USB_OTG_HOST
/** #SYMBIAN_INCLUDE_USB_RNDIS
plugin, RNDIS agent and IP stack packet driver in the ROM.
Introduced by PREQ1872.
*/
-#undef SYMBIAN_INCLUDE_USB_RNDIS
+#define SYMBIAN_INCLUDE_USB_RNDIS
/** #SYMBIAN_MULTIMEDIA_A3FDEVSOUND
This definition is used in symbian A3F build files.
@@ -442,7 +442,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 65536
/** #SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES
Defines the minimum number of 4k live pages available in the system for code
@@ -451,7 +451,7 @@
performance and memory consumption balance. Increasing the value decreases the
amount of free memory after start up.
*/
-#define SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES 0
+#define SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES 1024
/** #SYMBIAN_SYSTEM_STATE_MANAGEMENT
If SYMBIAN_SYSTEM_STATE_MANAGEMENT is defined, this will enable
@@ -470,7 +470,7 @@
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.
@@ -1346,7 +1346,7 @@
/** #__MP3
Device supports MP3 audio codec.
*/
-#undef __MP3
+#define __MP3
/** #__MROUTER
Device uses Symbian MRrouter technology for PC connectivity. If this feature is
@@ -2090,7 +2090,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 +2130,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,8 +2186,9 @@
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
related components such as WMDRM MTP plugin and WMDRM PK are in place.
@@ -2206,6 +2207,6 @@
showing it to user)."
*/
#define __XSP_EXTENSION_MANAGER
-
+
#endif // __BLDPRIVATE_HRH
--- a/sf_config/config/inc/bldpublic.hrh Wed Apr 21 10:23:46 2010 +0100
+++ b/sf_config/config/inc/bldpublic.hrh Wed Apr 28 09:51:11 2010 +0100
@@ -1647,12 +1647,12 @@
/** #__LAYOUT_240_320
Device supports 240x320 resolution (QVGA)
*/
-#define __LAYOUT_240_320
+#undef __LAYOUT_240_320
/** #__LAYOUT_240_320_LARGE_SCREEN
"Device supports 240x320 resolution (QVGA2 for larger screens, portrait)"
*/
-#define __LAYOUT_240_320_LARGE_SCREEN
+#undef __LAYOUT_240_320_LARGE_SCREEN
/** #__LAYOUT_240_320_QVGA3
Device supports 240x320 resolution (QVGA3)
@@ -1662,12 +1662,12 @@
/** #__LAYOUT_320_240
Device supports 320x240 resolution (QVGA landscape)
*/
-#define __LAYOUT_320_240
+#undef __LAYOUT_320_240
/** #__LAYOUT_320_240_LARGE_SCREEN
"Device supports 320x240 resolution (QVGA2 for larger screens, landscape)"
*/
-#define __LAYOUT_320_240_LARGE_SCREEN
+#undef __LAYOUT_320_240_LARGE_SCREEN
/** #__LAYOUT_320_240_QVGA3
Device supports 320x240 resolution (QVGA3)
@@ -1703,7 +1703,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.
@@ -1747,7 +1747,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
@@ -1957,7 +1957,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.
--- a/sf_config/config/inc/privateruntimeids.hrh Wed Apr 21 10:23:46 2010 +0100
+++ b/sf_config/config/inc/privateruntimeids.hrh Wed Apr 28 09:51:11 2010 +0100
@@ -646,4 +646,252 @@
#define KFeatureIdXspExtensionManager 1692
+#define KFeatureIdCoverToDeskSetting 5061
+
+#define KFeatureIdDmCameraDisable 5064
+
+#define KFeatureIdEmailIpsServices 5089
+
+#define KFeatureIdEsCalendar 5078
+
+#define KFeatureIdEsEmail 5082
+
+#define KFeatureIdEsEmailFramework 5083
+
+#define KFeatureIdFfAiEmailWidget 5138
+
+#define KFeatureIdFfAnykeyAlphabeticalList 5158
+
+#define KFeatureIdFfAnykeyDisablekeytones 5156
+
+#define KFeatureIdFfAnykeyKickstandEnabled 5166
+
+#define KFeatureIdFfAnykeyOnetouchui 5165
+
+#define KFeatureIdFfAnykeyOwnkeyEnabled 5167
+
+#define KFeatureIdFfAnykeyPcfwNgiCheck 5157
+
+#define KFeatureIdFfAtntAtCommands 5200
+
+#define KFeatureIdFfAttAddressBk 5240
+
+#define KFeatureIdFfAttAddressBkGroupSync 5250
+
+#define KFeatureIdFfAttVideoShareUiComplianceFor323 5196
+
+#define KFeatureIdFfAutomaticDisplayOrientation 5137
+
+#define KFeatureIdFfAvcDisplayMipSupport 5219
+
+#define KFeatureIdFfAvcDisplayOledLowpowerSupport 5221
+
+#define KFeatureIdFfCDriveAsLowestPriority 5249
+
+#define KFeatureIdFfCallRestriction 5218
+
+#define KFeatureIdFfCameraLaunchWithCameraKey 5176
+
+#define KFeatureIdFfCameraPda 5131
+
+#define KFeatureIdFfCarrierProfileLocked 5206
+
+#define KFeatureIdFfChinaRichDictionary 5150
+
+#define KFeatureIdFfChinaUdx 5172
+
+#define KFeatureIdFfChinauiMsgMgnt 5143
+
+#define KFeatureIdFfChipmunk 5163
+
+#define KFeatureIdFfCmccTdAppMenus 5252
+
+#define KFeatureIdFfCmccUserPlmn 5258
+
+#define KFeatureIdFfCommonSlide 5214
+
+#define KFeatureIdFfCommunityTmoIntl 5222
+
+#define KFeatureIdFfContactsCompanyNames 236
+
+#define KFeatureIdFfContactsbarCcaEventHistoryTab 5244
+
+#define KFeatureIdFfContactsbarEmail 5193
+
+#define KFeatureIdFfContactsbarImPresence 5194
+
+#define KFeatureIdFfContactsbarOnecontactWidget 5245
+
+#define KFeatureIdFfContactsbarRssFeeds 5192
+
+#define KFeatureIdFfContactsbarUseContactColour 5191
+
+#define KFeatureIdFfContactsbarUseDetailsApp 5188
+
+#define KFeatureIdFfContactsbarWidget 5246
+
+#define KFeatureIdFfCsw9wayScrolling 5140
+
+#define KFeatureIdFfCswPimLocationIntegration 5153
+
+#define KFeatureIdFfDeviceEncryptionFotaDisable 5164
+
+#define KFeatureIdFfDeviceEncryptionFotaSupport 5179
+
+#define KFeatureIdFfDualDisplaySupport 5132
+
+#define KFeatureIdFfDynamicContentDelivery 5205
+
+#define KFeatureIdFfEmailPluginHelpNotAvailable 5152
+
+#define KFeatureIdFfEnablePrintingFramework 5127
+
+#define KFeatureIdFfEsAdvancedWizard 5122
+
+#define KFeatureIdFfEsCalMeetingRequestUi 5130
+
+#define KFeatureIdFfEsContactServices 5093
+
+#define KFeatureIdFfEsContacts 5092
+
+#define KFeatureIdFfEsEmailIntellisync 5119
+
+#define KFeatureIdFfEsEmailMceIntegration 5097
+
+#define KFeatureIdFfEsGenericUiComponents 5121
+
+#define KFeatureIdFfEsMeetingRequestUi 5091
+
+#define KFeatureIdFfEsUsbModem 5096
+
+#define KFeatureIdFfExchangeActivesync 5111
+
+#define KFeatureIdFfFaceDetection 5181
+
+#define KFeatureIdFfFindAndDo 5178
+
+#define KFeatureIdFfFingerprinthandlerUi 5236
+
+#define KFeatureIdFfFsCalendarLocation 5171
+
+#define KFeatureIdFfGpsKeyLed 5162
+
+#define KFeatureIdFfHomeScreenVanityDialing 5098
+
+#define KFeatureIdFfHomescreenNotificationWidget 5235
+
+#define KFeatureIdFfImsDeregistrationInOfflineFor323 5203
+
+#define KFeatureIdFfImsDeregistrationInRfsFor323 5202
+
+#define KFeatureIdFfIntelligentSlide 5213
+
+#define KFeatureIdFfMediaKey 5220
+
+#define KFeatureIdFfMessageBoard 5227
+
+#define KFeatureIdFfMessagingSplitView 5133
+
+#define KFeatureIdFfMobileShareInMyStuff 5199
+
+#define KFeatureIdFfMobiledictionary 5116
+
+#define KFeatureIdFfMyfavesTmoUs 5223
+
+#define KFeatureIdFfNativeFileEncryption 5106
+
+#define KFeatureIdFfNonFsMail 5124
+
+#define KFeatureIdFfPhoneasmodemQuickLink 5190
+
+#define KFeatureIdFfPhotosPdaEnhancements 5141
+
+#define KFeatureIdFfPopupClock 5173
+
+#define KFeatureIdFfProductIncludesPa50 5177
+
+#define KFeatureIdFfQtBearerManagement 319
+
+#define KFeatureIdFfRcs 5247
+
+#define KFeatureIdFfRsswidgetAdvertiserWidget 5248
+
+#define KFeatureIdFfRsswidgetTemplate 5242
+
+#define KFeatureIdFfS60CustomSwWelcome2 5149
+
+#define KFeatureIdFfSearchSw 321
+
+#define KFeatureIdFfSensorBasedSilencing 5175
+
+#define KFeatureIdFfSettingsSplitView 5134
+
+#define KFeatureIdFfSettingwizard6 5160
+
+#define KFeatureIdFfSkype 229
+
+#define KFeatureIdFfSliderLandscapeStartsApp 5126
+
+#define KFeatureIdFfSmallScreenTouch 279
+
+#define KFeatureIdFfSmsSelfRegistration 5207
+
+#define KFeatureIdFfSocialPhonebook 5215
+
+#define KFeatureIdFfSpeechUseWebDownload 5226
+
+#define KFeatureIdFfSwitchProfiletransferDisabled 5139
+
+#define KFeatureIdFfSyncStatusCheckEnabled 5142
+
+#define KFeatureIdFfTakeMeHome 5161
+
+#define KFeatureIdFfTouchscreenKeyfeedback 5174
+
+#define KFeatureIdFfTutorialNoCoverDisplayContent 5144
+
+#define KFeatureIdFfUifwBackgroundOffsetAdjustmentForSplitview 5147
+
+#define KFeatureIdFfUifwListboxHighlightSelection 5146
+
+#define KFeatureIdFfVoiceUiWithDeviceLock 5170
+
+#define KFeatureIdFotaEnterpriseControl 5123
+
+#define KFeatureIdMsgForwardWithSender 5239
+
+#define KFeatureIdMuteNotificationTones 5070
+
+#define KFeatureIdPrintingFrameworkCalendarPlugin 5057
+
+#define KFeatureIdPrintingFrameworkContactsPlugin 5058
+
+#define KFeatureIdPrintingFrameworkHelp 5054
+
+#define KFeatureIdPrintingFrameworkMmsPlugin 5056
+
+#define KFeatureIdPrintingFrameworkSmsPlugin 5055
+
+#define KFeatureIdProductIncludesHomeScreenDeviceLockView 5086
+
+#define KFeatureIdProductIncludesHomeScreenModes 5084
+
+#define KFeatureIdProductIncludesUsch 5117
+
+#define KFeatureIdProductIncludesVoipRel30 5088
+
+#define KFeatureIdProductIncludesWlanWizardForActiveIdle 5060
+
+#define KFeatureIdS60CustomSwTutorialAlwaysPortrait 5125
+
+#define KFeatureIdS60CustomSwWelcome 5151
+
+#define KFeatureIdS60NokiaFarsiCalendar 5187
+
+#define KFeatureIdS60NokiaHijriCalendar 5186
+
+#define KFeatureIdS60NokiaMobilecrashSender2 5155
+
+#define KPrivacyDisclaimerFtrEnabled 5257
+
#endif // __PRIVATERUNTIMEIDS_HRH