MyActionBar, NavigationMenuAdapter: Remove obsolete SDK version checks.

This commit is contained in:
Andreas Schildbach 2021-01-11 14:50:15 +01:00
parent da612ba542
commit a606342298
2 changed files with 4 additions and 8 deletions

View file

@ -22,7 +22,6 @@ import de.schildbach.oeffi.util.ToggleImageButton;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.Gravity; import android.view.Gravity;
@ -85,11 +84,9 @@ public class MyActionBar extends LinearLayout {
progressImage = (ImageView) findViewById(R.id.action_bar_progress_image); progressImage = (ImageView) findViewById(R.id.action_bar_progress_image);
// Make sure action bar isn't stuck under a transparent status bar. // Make sure action bar isn't stuck under a transparent status bar.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { final int statusHeight = res
final int statusHeight = res .getDimensionPixelSize(res.getIdentifier("status_bar_height", "dimen", "android"));
.getDimensionPixelSize(res.getIdentifier("status_bar_height", "dimen", "android")); setPadding(getPaddingLeft(), getPaddingTop() + statusHeight, getPaddingRight(), getPaddingBottom());
setPadding(getPaddingLeft(), getPaddingTop() + statusHeight, getPaddingRight(), getPaddingBottom());
}
} }
public void setDrawer(final OnClickListener onClickListener) { public void setDrawer(final OnClickListener onClickListener) {

View file

@ -29,7 +29,6 @@ import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.ActionProvider; import android.view.ActionProvider;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
@ -87,7 +86,7 @@ public class NavigationMenuAdapter extends RecyclerView.Adapter<NavigationMenuAd
holder.bind(visibleItems.get(position)); holder.bind(visibleItems.get(position));
// Offset the first list item so that it isn't stuck under a transparent status bar. // Offset the first list item so that it isn't stuck under a transparent status bar.
if (position == 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (position == 0) {
final int statusHeight = res final int statusHeight = res
.getDimensionPixelSize(res.getIdentifier("status_bar_height", "dimen", "android")); .getDimensionPixelSize(res.getIdentifier("status_bar_height", "dimen", "android"));
holder.itemView.setPadding(0, statusHeight, 0, 0); holder.itemView.setPadding(0, statusHeight, 0, 0);