diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e01f31291..43492dca1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ - + diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml index 6348fca37..914891d69 100644 --- a/res/values/non_localizable_custom.xml +++ b/res/values/non_localizable_custom.xml @@ -5,7 +5,7 @@ test.linphone.org true - + false false true true diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index e25417ff1..5498f78df 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -262,15 +262,21 @@ public class DialerActivity extends Activity implements LinphoneGuiListener { SlidingDrawer drawer = (SlidingDrawer) findViewById(R.id.drawer); if (drawer != null) { - drawer.setOnDrawerScrollListener(new OnDrawerScrollListener() { - public void onScrollEnded() { - - } - - public void onScrollStarted() { - displayRegisterStatus(); - } - }); + boolean disable_sliding_drawer = getResources().getBoolean(R.bool.disable_dialer_sliding_drawer); + + if (disable_sliding_drawer) { + drawer.lock(); + } else { + drawer.setOnDrawerScrollListener(new OnDrawerScrollListener() { + public void onScrollEnded() { + + } + + public void onScrollStarted() { + displayRegisterStatus(); + } + }); + } } AddressAware numpad = (AddressAware) findViewById(R.id.Dialer);