diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/PublicStaticFeatures.hrh --- a/epoc32/include/PublicStaticFeatures.hrh Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/PublicStaticFeatures.hrh Wed Mar 31 12:33:34 2010 +0100 @@ -2,9 +2,9 @@ * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available -* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html". +* at the URL "http://www.eclipse.org/legal/epl-v10.html". * * Initial Contributors: * Nokia Corporation - initial contribution. @@ -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