equal
deleted
inserted
replaced
45 bool updateOrientation) |
45 bool updateOrientation) |
46 : |
46 : |
47 mObserver(observer), |
47 mObserver(observer), |
48 mDefaultOrientation(defaultOrientation), |
48 mDefaultOrientation(defaultOrientation), |
49 mOrientation(mDefaultOrientation), |
49 mOrientation(mDefaultOrientation), |
50 mEnabled(false) |
50 mEnabled(false), |
|
51 mSettingsEnabled(false) |
51 #ifdef Q_OS_SYMBIAN |
52 #ifdef Q_OS_SYMBIAN |
52 , |
53 , |
53 mNotifyHandler(0), |
54 mNotifyHandler(0), |
54 mSensrvChannel(0) |
55 mSensrvChannel(0) |
55 #endif |
56 #endif |
112 } |
113 } |
113 } |
114 } |
114 #else |
115 #else |
115 QSettings mSettings("Nokia", "HbStartUpDeskTopSensors"); |
116 QSettings mSettings("Nokia", "HbStartUpDeskTopSensors"); |
116 bool enable = mSettings.value("SensorsEnabled").toBool(); |
117 bool enable = mSettings.value("SensorsEnabled").toBool(); |
|
118 mSettingsEnabled = enable; |
117 enableSensors(enable, false); |
119 enableSensors(enable, false); |
118 #endif |
120 #endif |
119 } |
121 } |
120 |
122 |
121 void HbSensorListener::enableSensors(bool enable, bool notify) |
123 void HbSensorListener::enableSensors(bool enable, bool notify) |
122 { |
124 { |
123 mEnabled = enable; |
125 mEnabled = enable; |
124 #ifdef Q_OS_SYMBIAN |
126 #ifdef Q_OS_SYMBIAN |
125 enableSensorListening(enable); |
127 enableSensorListening(enable); |
|
128 #else |
|
129 mSettingsEnabled = enable; |
126 #endif |
130 #endif |
127 if (notify) { |
131 if (notify) { |
128 mObserver.sensorStatusChanged(enable, true); |
132 mObserver.sensorStatusChanged(enable, true); |
129 } |
133 } |
130 } |
134 } |
131 |
135 |
132 bool HbSensorListener::isEnabled() const |
136 bool HbSensorListener::isEnabled() const |
133 { |
137 { |
134 return mEnabled; |
138 if (mSettingsEnabled) { |
|
139 return mEnabled; |
|
140 } |
|
141 return false; |
135 } |
142 } |
136 |
143 |
137 #ifdef Q_OS_SYMBIAN |
144 #ifdef Q_OS_SYMBIAN |
138 void HbSensorListener::enableSensorListening(bool enable) |
145 void HbSensorListener::enableSensorListening(bool enable) |
139 { |
146 { |
148 } |
155 } |
149 |
156 |
150 void HbSensorListener::cenrepValueChanged(TInt aValue, bool notify) |
157 void HbSensorListener::cenrepValueChanged(TInt aValue, bool notify) |
151 { |
158 { |
152 bool enable = (aValue == 0)? false : true; |
159 bool enable = (aValue == 0)? false : true; |
|
160 mSettingsEnabled = enable; |
153 enableSensors(enable, notify); |
161 enableSensors(enable, notify); |
154 } |
162 } |
155 #endif |
163 #endif |
156 |
164 |
157 void HbSensorListener::startSensorChannel() |
165 void HbSensorListener::startSensorChannel() |