FCL/sf/mw/usbservices: comparison usbengines/usbotgwatcher/src/cusbindicatornotifier.cpp

equal deleted inserted replaced

-:218231f2b3b3
+:f45583a69686
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Description:  Blink/show Usb indicator notifier implementation
 *
 */
-#include <AknSmallIndicator.h>
-#include <avkon.hrh>
 #include <usbuinotif.h>
+#include <hb/hbcore/hbindicatorsymbian.h>
 #include "cusbindicatornotifier.h"
 #include "cusbstate.h"
 #include "definitions.h"
 TRAP_IGNORE(iOtgWatcher.VBusObserver()->UnsubscribeL(*this));
 }
 // Unsubscribe from otg watcher states change notifications
 TRAP_IGNORE(iOtgWatcher.UnsubscribeL(*this));
+delete iUsbConnectingIndicator;
 }
 // ---------------------------------------------------------------------------
 // C++ constructor
 // ---------------------------------------------------------------------------
 CUsbOtgWatcher& aOtgWatcher) :
 CUsbNotifier(aNotifManager, KUsbUiNotifOtgIndicator, NULL), iOtgWatcher(
 aOtgWatcher)
 {
 LOG_FUNC
-//To be changed to EAknIndicatorStateAnimate and remove iIconBlinkingTimer
-//when AVKON implements animation form of usb indicator.
-iIndicatorState = EAknIndicatorStateOn;
 }
 // ---------------------------------------------------------------------------
 // Second-phase constructor
 // ---------------------------------------------------------------------------
 //
 void CUsbIndicatorNotifier::ConstructL()
 {
 LOG_FUNC
+iUsbConnectingIndicator = CHbIndicatorSymbian::NewL();
 // Subscribe for VBus change notifications
 iOtgWatcher.VBusObserver()->SubscribeL(*this);
 // Subscribe for otg watcher states change notifications
 iOtgWatcher.SubscribeL(*this);
 // check here for condition to set usb indicator
-SetIndicatorL();
+SetIndicator();
 }
 // ---------------------------------------------------------------------------
 // Show/hide static icon of the indicator.
 // If the indicator is blinking, stop blinking it and show/hide the static
 // form of the indicator.
 // ---------------------------------------------------------------------------
 //
-void CUsbIndicatorNotifier::ShowStaticL(TBool aVisible)
+void CUsbIndicatorNotifier::ShowStatic(TBool aVisible)
 {
 LOG_FUNC
 LOG1("aVisible = %d" , aVisible);
-SetIndicatorStateL(aVisible
+SetIndicatorState(aVisible
-? EAknIndicatorStateOn
+? EIndicatorStateOn
-: EAknIndicatorStateOff);
+: EIndicatorStateOff);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
-void CUsbIndicatorNotifier::BlinkL()
+void CUsbIndicatorNotifier::Blink()
 {
 LOG_FUNC
-SetIndicatorStateL( EAknIndicatorStateAnimate );
+SetIndicatorState( EIndicatorConnecting );
 }
 // ---------------------------------------------------------------------------
 // From base class CUsbNotifier
 // ---------------------------------------------------------------------------
 //
 void CUsbIndicatorNotifier::ShowL()
 {
 LOG_FUNC
-ShowStaticL(ETrue);
+ShowStatic(ETrue);
 }
 // ---------------------------------------------------------------------------
 // From CUsbNotifier
 // ---------------------------------------------------------------------------
 //
 void CUsbIndicatorNotifier::Close()
 {
 LOG_FUNC
-TRAP_IGNORE( ShowStaticL(EFalse) );
+ShowStatic(EFalse);
 }
 // ---------------------------------------------------------------------------
 // Set USB indicator On or Off
 // ---------------------------------------------------------------------------
 //
-void CUsbIndicatorNotifier::SetIndicatorStateL(const TInt aState)
+void CUsbIndicatorNotifier::SetIndicatorState(const TInt aState)
 {
 LOG1( "USB indicator State = %d" , aState);
-CAknSmallIndicator* indicator = CAknSmallIndicator::NewLC(TUid::Uid(
+TBool success = ETrue;
-EAknIndicatorUSBConnection));
-indicator->SetIndicatorStateL(aState);
+if ((aState == EIndicatorConnecting) && !iConnectingIndicatorOn)
-CleanupStack::PopAndDestroy(indicator); //indicator
+{
-}
+success = iUsbConnectingIndicator->Activate(KUsbConnectingIndicator);
+LOG1( "calling CHbIndicatorSymbian::Activate(), returned %d", success);
+if (success)
+{
+iConnectingIndicatorOn = ETrue;
+}
+}
+if ((aState != EIndicatorConnecting) && iConnectingIndicatorOn)
+{
+success = iUsbConnectingIndicator->Deactivate(KUsbConnectingIndicator);
+if (success)
+{
+iConnectingIndicatorOn = EFalse;
+}
+LOG1( "calling CHbIndicatorSymbian::Deactivate(), returned %d", success);
+}
+// if success became false loading the indicator failed, log the error
+if (!success)
+{
+TInt error = iUsbConnectingIndicator->Error();
+LOG1( "indicator error is %d", error);
+}
+}
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbIndicatorNotifier::OtgWatcherStateChangedL(TUsbStateIds aState)
 {
-SetIndicatorL();
+SetIndicator();
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbIndicatorNotifier::VBusDownL()
 {
-SetIndicatorL();
+SetIndicator();
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbIndicatorNotifier::VBusUpL()
 {
-SetIndicatorL();
+SetIndicator();
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
-void CUsbIndicatorNotifier::SetIndicatorL()
+void CUsbIndicatorNotifier::SetIndicator()
 {
 if (!(iOtgWatcher.IsDeviceA()) || iOtgWatcher.CurrentHostState()->Id() == EUsbStateHostAPeripheral)
 {
 // if B or peripheral, than other party (usbwatcher) takes care of usb indicator
 // in combined usbwatcher (if role swap allowed) one class has to manage usb indicator
 // if VBus Up and we are host -> show indicator
 if ((iOtgWatcher.VBusObserver()->VBus() == CUsbVBusObserver::EVBusUp)
 && (iOtgWatcher.CurrentHostState()->Id() == EUsbStateHostAHost))
 {
-ShowStaticL(ETrue);
+ShowStatic(ETrue);
 }
 // if VBus up and we are not host -> Blink indicator
 else if ((iOtgWatcher.VBusObserver()->VBus() == CUsbVBusObserver::EVBusUp)
 && (iOtgWatcher.CurrentHostState()->Id() != EUsbStateHostAHost))
 {
-BlinkL();
+Blink();
 }
 else
 // Otherwise do not show indicator
 {
-ShowStaticL(EFalse);
+ShowStatic(EFalse);
 }
 }
 // End of file

changeset 56	f45583a69686
parent 35	9d8b04ca6939
child 63	ef2686f7597e
child 75	809df41c314e