Merge branch 'master' of git.linphone.org:linphone-android into video

This commit is contained in:
Simon Morlat 2010-10-08 10:36:16 +02:00
commit 5c14cb08b4
4 changed files with 3 additions and 6 deletions

Binary file not shown.

Binary file not shown.

View file

@ -238,12 +238,9 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
if (LinphoneService.isready() == false) return; //nop nothing to do
if (LinphoneService.instance().getLinphoneCore().isIncall()
&& event.values[0] != event.sensor.getMaximumRange()
&& event.values[0] < 3) {
&& event.values[0] != event.sensor.getMaximumRange() ) {
hideScreen(true);
} else if (mMainFrame.getVisibility() != View.VISIBLE
&& (event.values[0] == event.sensor.getMaximumRange()
|| event.values[0] >=3)) {
} else {
hideScreen(false);
}
}

@ -1 +1 @@
Subproject commit 176616e0fb7f02dd27469b44510428e7140a0461
Subproject commit 804d489321b28ffa410c5f0eef8e74f0a6a5a30a