Messaging: Remove compatibility for old android versions
Change-Id: Id9065d60525a509271a0e64c0e349e857cb998e2
This commit is contained in:
@@ -34,7 +34,6 @@ import com.android.messaging.datamodel.data.MediaPickerData;
|
||||
import com.android.messaging.datamodel.data.DraftMessageData.DraftMessageSubscriptionDataProvider;
|
||||
import com.android.messaging.ui.BasePagerViewHolder;
|
||||
import com.android.messaging.util.Assert;
|
||||
import com.android.messaging.util.OsUtil;
|
||||
|
||||
abstract class MediaChooser extends BasePagerViewHolder
|
||||
implements DraftMessageSubscriptionDataProvider {
|
||||
@@ -107,8 +106,7 @@ abstract class MediaChooser extends BasePagerViewHolder
|
||||
}
|
||||
|
||||
protected FragmentManager getFragmentManager() {
|
||||
return OsUtil.isAtLeastJB_MR1() ? mMediaPicker.getChildFragmentManager() :
|
||||
mMediaPicker.getFragmentManager();
|
||||
return mMediaPicker.getChildFragmentManager();
|
||||
}
|
||||
protected LayoutInflater getLayoutInflater() {
|
||||
return LayoutInflater.from(getContext());
|
||||
|
||||
@@ -31,7 +31,6 @@ import android.widget.LinearLayout;
|
||||
import com.android.messaging.R;
|
||||
import com.android.messaging.ui.PagingAwareViewPager;
|
||||
import com.android.messaging.util.Assert;
|
||||
import com.android.messaging.util.OsUtil;
|
||||
import com.android.messaging.util.UiUtils;
|
||||
|
||||
/**
|
||||
@@ -202,7 +201,7 @@ public class MediaPickerPanel extends ViewGroup {
|
||||
private int getDesiredHeight() {
|
||||
if (mFullScreen) {
|
||||
int fullHeight = getContext().getResources().getDisplayMetrics().heightPixels;
|
||||
if (OsUtil.isAtLeastKLP() && isAttachedToWindow()) {
|
||||
if (isAttachedToWindow()) {
|
||||
// When we're attached to the window, we can get an accurate height, not necessary
|
||||
// on older API level devices because they don't include the action bar height
|
||||
View composeContainer =
|
||||
|
||||
Reference in New Issue
Block a user