# HG changeset patch # User William Roberts # Date 1271767654 -3600 # Node ID eae91afea9e50527711d72b098981ae8771e7df8 # Parent 96f7513ad2d70cc1cec8520ccd61b5e6a9c854bb Reenable ABIV2 mode (Bug 301), define SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV, + random guesses There's reason to believe that some older #defines should be switched off,bu not confidence that this drop represents a sensible attempt to do that. diff -r 96f7513ad2d7 -r eae91afea9e5 sf_config/config/inc/bldcodeline.hrh --- a/sf_config/config/inc/bldcodeline.hrh Fri Apr 16 16:15:22 2010 +0300 +++ b/sf_config/config/inc/bldcodeline.hrh Tue Apr 20 13:47:34 2010 +0100 @@ -58,6 +58,12 @@ Flag enables ui accelerator toolkit development. */ #define RD_ALF_IN_PLATFORM + +/** #ALF_USE_OPENWF_COMPOSITION +Bug 1391 - UI Acceleration migration to OpenWF +*/ +#define ALF_USE_OPENWF_COMPOSITION + /** #RD_ALR_AND_NLR_ENABLERS Enables Application and Network Level Roaming. @@ -1414,4 +1420,11 @@ #define RD_XML_ENGINE_API_CHANGE -#endif // __BLDCODELINE_HRH \ No newline at end of file +/** +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 + +#endif // __BLDCODELINE_HRH diff -r 96f7513ad2d7 -r eae91afea9e5 sf_config/config/inc/bldprivate.hrh --- a/sf_config/config/inc/bldprivate.hrh Fri Apr 16 16:15:22 2010 +0300 +++ b/sf_config/config/inc/bldprivate.hrh Tue Apr 20 13:47:34 2010 +0100 @@ -266,7 +266,7 @@ /** #SYMBIAN_GRAPHICS_ADAPTATION This flag is used to take right graphics adaptation components to the ROM build */ -#define SYMBIAN_GRAPHICS_ADAPTATION None +#define SYMBIAN_GRAPHICS_ADAPTATION SGA_SW /** #SYMBIAN_GRAPHICS_USE_GCE Includes the Symbian the Surface Manager and Graphics Composition Engine on ROM @@ -463,7 +463,7 @@ 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. @@ -482,7 +482,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. @@ -1681,9 +1681,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 @@ -2208,4 +2208,4 @@ #define __XSP_EXTENSION_MANAGER -#endif // __BLDPRIVATE_HRH \ No newline at end of file +#endif // __BLDPRIVATE_HRH diff -r 96f7513ad2d7 -r eae91afea9e5 sf_config/config/inc/publicruntimeids.hrh --- a/sf_config/config/inc/publicruntimeids.hrh Fri Apr 16 16:15:22 2010 +0300 +++ b/sf_config/config/inc/publicruntimeids.hrh Tue Apr 20 13:47:34 2010 +0100 @@ -15,6 +15,7 @@ * */ + #ifndef __PUBLICRUNTIMEIDS_HRH #define __PUBLICRUNTIMEIDS_HRH @@ -22,54 +23,116 @@ #define KFeatureIdFf3gCellbroadcast 175 +#define KFeatureIdFfAbcAgressiveUi 252 + #define KFeatureIdFfAdaptiveWlanScanningSupport 140 +#define KFeatureIdFfAdditionalFonts 241 + #define KFeatureIdFfAiWlansnifferWidget 172 +#define KFeatureIdFfAlternativeCallWaitingTone 315 + +#define KFeatureIdArabicHandwritingRecognitionInput 338 + #define KFeatureIdAsynchFileSaveQueue 1703 #define KFeatureIdFfAudt 63 +#define KFeatureIdFfAutomotivestack 330 + #define KFeatureIdAutoRedialForVideoCall 1723 #define KFeatureIdFfAvkonEmotionIconEnabled 211 #define KFeatureIdFfBirthdayImprovement 189 +#define KFeatureIdFfBluetoothDataProfilesDisabled 271 + +#define KFeatureIdFfBluetoothDisabled 270 + #define KFeatureIdBrowserProgressiveDownload 1724 +#define KFeatureIdFfCalDayView 306 + +#define KFeatureIdFfCalScrollablePreview 307 + +#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 KFeatureIdFfEmailFullscreenviewer 325 + #define KFeatureIdFfEmailIpsServices 137 #define KFeatureIdEmailMceIntegration 126 +#define KFeatureIdFfEmailPredictivesearch 324 + #define KFeatureIdFfEmailProtocolPlugins 215 #define KFeatureIdFfEmailUi 136 +#define KFeatureIdFfEmailUiSplitscreen 323 + +#define KFeatureIdEnableIsiCommunicationInUsbChargingMode 309 + +#define KFeatureIdFfEnhancedCalendarEventUi 295 + #define KFeatureIdFfFarsiCalendar 213 #define KFeatureIdFmtx 1705 +#define KFeatureIdFfFmtxRdsText 220 + +#define KFeatureIdFfFotaCheckLimitation 326 + #define KFeatureIdFullscrHwrInput 66 +#define KFeatureIdFfGenericAccessNetwork 257 + #define KFeatureIdFfGenericFontsAssets 188 #define KFeatureIdFfHdmi 169 @@ -86,20 +149,40 @@ #define KFeatureIdFfIaupdatePhase2 185 +#define KFeatureIdFfImageEditor 255 + #define KFeatureIdFfInputsPerOrientation 192 #define KFeatureIdFfIntelligentTextInput 216 +#define KFeatureIdFfIpsecUmaSupportEnable 332 + +#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 @@ -116,10 +199,16 @@ #define KFeatureIdFfOfnFeature 193 +#define KFeatureIdFfOmadrm1FullSupport 329 + +#define KFeatureIdFfOmadrm2Support 328 + #define KFeatureIdFfOmaScomoAdapter 197 #define KFeatureIdFfOssLegalNotice 196 +#define KFeatureIdFfPlayreadySupport 322 + #define KFeatureIdFfPnpmsProvFilter 133 #define KFeatureIdPnpmsServiceHelpPlugin 128 @@ -130,6 +219,8 @@ #define KFeatureIdProvAuthtypePlugin 100 +#define KFeatureIdFfQt 238 + #define KFeatureIdQwertyFnKey 1714 #define KFeatureIdRockerKey 120 @@ -138,18 +229,50 @@ #define KFeatureIdSelectableEmail 125 +#define KFeatureIdFfSidesliderSupport 320 + +#define KFeatureIdFfSimConsecutive6f00ErrorsHandling 327 + +#define KFeatureIdFfSipApnSwitching 318 + +#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 KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard 337 + +#define KFeatureIdFfTdCmccatcommandssupport 336 + +#define KFeatureIdFfTdCmccpimpromptserverfullwhenreceive420statuscodefromserver 335 + +#define KFeatureIdFfTdCmccpimsynchronizationprogressindicatorui 334 + +#define KFeatureIdFfTdScdma 274 + +#define KFeatureIdFfTdScdmaForbiddenoperatoricondisplay 316 + +#define KFeatureIdFfTdScdmaVideocallKey 317 + #define KFeatureIdTouchscreencalibInStartup 69 #define KFeatureIdFfTouchUnlockStroke 173 @@ -160,8 +283,16 @@ #define KFeatureIdUsbHost 1704 +#define KFeatureIdUsbModem 265 + #define KFeatureIdUseEGprsIcon 121 +#define KFeatureIdFfUseNavikeyForVolume 248 + +#define KFeatureIdFfVideoAudioBranding 266 + +#define KFeatureIdFfVideoEditor 256 + #define KFeatureIdVirtualFullscrQwertyInput 64 #define KFeatureIdVirtualItutInput 65 @@ -174,12 +305,20 @@ #define KFeatureIdWebvideoPh2 39 -#define KFeatureIdFfWlansnifferVoipEnhancements 156 +#define KFeatureIdFfWlanAuthenticationOnlySupport 314 #define KFeatureIdFfWlanExtensions 177 #define KFeatureIdFfWlanWapi 129 +#define KFeatureIdFfWmdrmDlaSupport 310 + +#define KFeatureIdSymbianIncludeLocationNpeDsm 261 + +#define KFeatureIdSymbianIncludeLocationSuplPosInit 263 + +#define KFeatureIdSymbianIncludeLocationSuplProxy 262 + #define KFeatureId3DMenu 1511 #define KFeatureId3GpExtension 1592 @@ -508,4 +647,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 diff -r 96f7513ad2d7 -r eae91afea9e5 sf_config/config/inc/variant.cfg --- a/sf_config/config/inc/variant.cfg Fri Apr 16 16:15:22 2010 +0300 +++ b/sf_config/config/inc/variant.cfg Tue Apr 20 13:47:34 2010 +0100 @@ -1,1 +1,2 @@ \epoc32\include\bldvariant.hrh +ENABLE_ABIV2_MODE