diff --git a/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java index c9ef4c3f..9a2c435b 100644 --- a/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java @@ -16,6 +16,7 @@ import android.hardware.SensorEventListener; import android.hardware.SensorManager; import android.media.MediaScannerConnection; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.provider.MediaStore; @@ -159,10 +160,10 @@ public class MainActivity extends SimpleActivity setContentView(R.layout.activity_main); ButterKnife.bind(this); - if (Utils.hasNavBar(getResources())) { + if (Utils.hasNavBar(getResources()) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { final View btnLayout = findViewById(R.id.btn_holder); - final int bottomMargin = (int) getResources().getDimension(R.dimen.preview_btn_margin); - ((RelativeLayout.LayoutParams) btnLayout.getLayoutParams()).setMargins(0, 0, 0, bottomMargin); + final RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) btnLayout.getLayoutParams(); + lp.setMargins(0, 0, 0, lp.bottomMargin + Utils.getNavBarHeight(getResources())); } mCurrCamera = mConfig.getLastUsedCamera(); diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml index 1b70fba3..fef0a1d0 100644 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -3,7 +3,6 @@ 12dp 12dp 50dp - 32dp 18sp diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml deleted file mode 100644 index f7fa1624..00000000 --- a/app/src/main/res/values-v21/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 64dp - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d6ac605c..ef09136e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,6 +1,5 @@ 16dp - 32dp 12dp 8dp 56dp