Merge branch 'master' of git.linphone.org:linphone-android into video
This commit is contained in:
commit
5c14cb08b4
4 changed files with 3 additions and 6 deletions
Binary file not shown.
Binary file not shown.
|
@ -238,12 +238,9 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
|
||||||
if (LinphoneService.isready() == false) return; //nop nothing to do
|
if (LinphoneService.isready() == false) return; //nop nothing to do
|
||||||
|
|
||||||
if (LinphoneService.instance().getLinphoneCore().isIncall()
|
if (LinphoneService.instance().getLinphoneCore().isIncall()
|
||||||
&& event.values[0] != event.sensor.getMaximumRange()
|
&& event.values[0] != event.sensor.getMaximumRange() ) {
|
||||||
&& event.values[0] < 3) {
|
|
||||||
hideScreen(true);
|
hideScreen(true);
|
||||||
} else if (mMainFrame.getVisibility() != View.VISIBLE
|
} else {
|
||||||
&& (event.values[0] == event.sensor.getMaximumRange()
|
|
||||||
|| event.values[0] >=3)) {
|
|
||||||
hideScreen(false);
|
hideScreen(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 176616e0fb7f02dd27469b44510428e7140a0461
|
Subproject commit 804d489321b28ffa410c5f0eef8e74f0a6a5a30a
|
Loading…
Reference in a new issue