Remove unnecesary ApiCompatibilityUtils calls.

Since we only support API 16 now, we can drop all the workarounds for pre 16 devices. BUG=473837 [email protected] Review URL: https://codereview.chromium.org/1078273002 Cr-Commit-Position: refs/heads/master@{#324700}
crosswalk-project · Apr 10, 2015 · 82aef33 · 82aef33
1 parent 0e37ea0
commit 82aef33
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 166 deletions.
diff --git a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
@@ -4,11 +4,9 @@
 
 package org.chromium.base;
 
-import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
-import android.app.ActivityOptions;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -20,16 +18,12 @@
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
-import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.RemoteViews;
 import android.widget.TextView;
 
 /**
@@ -241,121 +235,8 @@ public static void setCompoundDrawablesRelativeWithIntrinsicBounds(TextView text
         }
     }
 
-    /**
-     * @see android.view.View#postInvalidateOnAnimation()
-     */
-    public static void postInvalidateOnAnimation(View view) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            view.postInvalidateOnAnimation();
-        } else {
-            view.postInvalidate();
-        }
-    }
-
-    /**
-     * @see android.view.View#postOnAnimation()
-     */
-    public static void postOnAnimation(View view, Runnable action) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            view.postOnAnimation(action);
-        } else {
-            view.postDelayed(action, getFrameTime());
-        }
-    }
-
-    /**
-     * @see android.view.View#postOnAnimationDelayed()
-     */
-    public static void postOnAnimationDelayed(View view, Runnable action, long delayMillis) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            view.postOnAnimationDelayed(action, delayMillis);
-        } else {
-            view.postDelayed(action, getFrameTime() + delayMillis);
-        }
-    }
-
-    private static long getFrameTime() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            return ValueAnimator.getFrameDelay();
-        } else {
-            // Any reasonable fake frame delay will have to do.
-            return 10;
-        }
-    }
-
-    /**
-     * @see android.widget.RemoteViews#setContentDescription(int, CharSequence)
-     */
-    public static void setContentDescriptionForRemoteView(RemoteViews remoteViews, int viewId,
-            CharSequence contentDescription) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
-            remoteViews.setContentDescription(viewId, contentDescription);
-        } else {
-            // setContentDescription() is unavailable in earlier versions.
-        }
-    }
-
-    /**
-     * @see android.app.Activity#startActivity(Intent, Bundle)
-     */
-    public static void startActivity(Context context, Intent intent, Bundle options) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            context.startActivity(intent, options);
-        } else {
-            context.startActivity(intent);
-        }
-    }
-
-    /**
-     * @see android.app.ActivityOptions#toBundle()
-     */
-    public static Bundle toBundle(ActivityOptions options) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            return options.toBundle();
-        } else {
-            return null;
-        }
-    }
-
     // These methods have a new name, and the old name is deprecated.
 
-    /**
-     * @see android.view.View#setBackground(Drawable)
-     */
-    @SuppressWarnings("deprecation")
-    public static void setBackgroundForView(View view, Drawable drawable) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            view.setBackground(drawable);
-        } else {
-            view.setBackgroundDrawable(drawable);
-        }
-    }
-
-    /**
-     * @see android.view.ViewTreeObserver#removeOnGlobalLayoutListener()
-     */
-    @SuppressWarnings("deprecation")
-    public static void removeOnGlobalLayoutListener(
-            View view, ViewTreeObserver.OnGlobalLayoutListener listener) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            view.getViewTreeObserver().removeOnGlobalLayoutListener(listener);
-        } else {
-            view.getViewTreeObserver().removeGlobalOnLayoutListener(listener);
-        }
-    }
-
-    /**
-     * @see android.widget.ImageView#setImageAlpha(int)
-     */
-    @SuppressWarnings("deprecation")
-    public static void setImageAlpha(ImageView iv, int alpha) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            iv.setImageAlpha(alpha);
-        } else {
-            iv.setAlpha(alpha);
-        }
-    }
-
     /**
      * @see android.app.PendingIntent#getCreatorPackage()
      */
@@ -494,13 +375,4 @@ public static Drawable getDrawable(Resources res, int id) throws NotFoundExcepti
             return res.getDrawable(id);
         }
     }
-
-    /**
-     * @see android.view.View#announceForAccessibility(CharSequence text)
-     */
-    public static void announceForAccessibility(View view, CharSequence text) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            view.announceForAccessibility(text);
-        }
-    }
 }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java
@@ -172,8 +172,7 @@ public void disableAndWaitForVerification() {
         setOverlayVisibility(View.VISIBLE);
         mVerificationProgressBar.setVisibility(View.VISIBLE);
         mVerificationView.setText(R.string.autofill_card_unmask_verification_in_progress);
-        ApiCompatibilityUtils.announceForAccessibility(
-                mVerificationView, mVerificationView.getText());
+        mVerificationView.announceForAccessibility(mVerificationView.getText());
         setInputError(null);
     }
 
@@ -266,7 +265,7 @@ public void run() {
         });
         mStoreLocallyTooltipPopup.showAsDropDown(mStoreLocallyCheckbox,
                 ViewCompat.getPaddingStart(mStoreLocallyCheckbox), 0);
-        ApiCompatibilityUtils.announceForAccessibility(text, text.getText());
+        text.announceForAccessibility(text.getText());
     }
 
     private void setInitialFocus() {
@@ -338,7 +337,7 @@ private void setInputError(String message) {
         // A null message is passed in during card verification, which also makes an announcement.
         // Announcing twice in a row may cancel the first announcement.
         if (message != null) {
-            ApiCompatibilityUtils.announceForAccessibility(mErrorMessage, message);
+            mErrorMessage.announceForAccessibility(message);
         }
 
         // The rest of this code makes L-specific assumptions about the background being used to
@@ -364,7 +363,7 @@ private void setInputError(String message) {
     private void setNoRetryError(String message) {
         mNoRetryErrorMessage.setText(message);
         mNoRetryErrorMessage.setVisibility(View.VISIBLE);
-        ApiCompatibilityUtils.announceForAccessibility(mNoRetryErrorMessage, message);
+        mNoRetryErrorMessage.announceForAccessibility(message);
     }
 
     /**

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunView.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunView.java
@@ -436,7 +436,7 @@ public void switchToSignedMode() {
         updateProfileName();
 
         mSpinner.setEnabled(false);
-        ApiCompatibilityUtils.setBackgroundForView(mSpinner, null);
+        mSpinner.setBackground(null);
         mPositiveButton.setText(getResources().getText(R.string.fre_done));
         mPositiveButton.setOnClickListener(new OnClickListener() {
             @Override

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java
@@ -23,7 +23,6 @@
 import android.widget.FrameLayout;
 
 import org.chromium.base.ActivityState;
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.base.BaseChromiumApplication;
@@ -492,7 +491,7 @@ private void scheduleVisibilityUpdate() {
         final int desiredVisibility = shouldShowAndroidControls() ? View.VISIBLE : View.INVISIBLE;
         if (mControlContainer.getVisibility() == desiredVisibility) return;
         mControlContainer.removeCallbacks(mUpdateVisibilityRunnable);
-        ApiCompatibilityUtils.postOnAnimation(mControlContainer, mUpdateVisibilityRunnable);
+        mControlContainer.postOnAnimation(mUpdateVisibilityRunnable);
     }
 
     private void updateVisuals() {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java
@@ -17,7 +17,6 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 
 import java.util.ArrayList;
@@ -122,7 +121,7 @@ public int getAnimationType() {
      */
     @Override
     public void onGlobalLayout() {
-        ApiCompatibilityUtils.removeOnGlobalLayoutListener(mTargetWrapperView, this);
+        mTargetWrapperView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
         continueAnimation();
     }
 

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
@@ -183,7 +183,7 @@ public InfoBarLayout(Context context, InfoBarView infoBarView, int iconResourceI
                 new int [] {R.attr.selectableItemBackground});
         Drawable closeButtonBackground = a.getDrawable(0);
         a.recycle();
-        ApiCompatibilityUtils.setBackgroundForView(mCloseButton, closeButtonBackground);
+        mCloseButton.setBackground(closeButtonBackground);
         mCloseButton.setPadding(mMargin, mMargin, mMargin, mMargin);
         mCloseButton.setOnClickListener(this);
         mCloseButton.setContentDescription(res.getString(R.string.infobar_close));

diff --git a/...android/java/src/org/chromium/chrome/browser/media/remote/ExpandedControllerActivity.java b/...android/java/src/org/chromium/chrome/browser/media/remote/ExpandedControllerActivity.java
@@ -24,7 +24,6 @@
 
 import com.google.android.gms.cast.CastMediaControlIntent;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.media.remote.RemoteVideoInfo.PlayerState;
 import org.chromium.third_party.android.media.MediaController;
@@ -181,7 +180,7 @@ protected void onResume() {
         if (iv == null) return;
         Bitmap posterBitmap = mMediaRouteController.getPoster();
         if (posterBitmap != null) iv.setImageBitmap(posterBitmap);
-        ApiCompatibilityUtils.setImageAlpha(iv, POSTER_IMAGE_ALPHA);
+        iv.setImageAlpha(POSTER_IMAGE_ALPHA);
     }
 
     @Override

diff --git a/...droid/java/src/org/chromium/chrome/browser/media/remote/NotificationTransportControl.java b/...droid/java/src/org/chromium/chrome/browser/media/remote/NotificationTransportControl.java
@@ -19,7 +19,6 @@
 import android.view.View;
 import android.widget.RemoteViews;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.media.remote.RemoteVideoInfo.PlayerState;
@@ -577,8 +576,7 @@ private void updateNotificationInternal() {
                             videoInfo.currentTimeMillis, false);
                     contentView.setImageViewResource(R.id.playpause,
                             R.drawable.ic_vidcontrol_pause);
-                    ApiCompatibilityUtils.setContentDescriptionForRemoteView(contentView,
-                            R.id.playpause, mPauseDescription);
+                    contentView.setContentDescription(R.id.playpause, mPauseDescription);
                     contentView.setOnClickPendingIntent(R.id.playpause,
                             getService().getPendingIntent(ListenerService.ACTION_ID_PAUSE));
                     break;
@@ -588,8 +586,7 @@ private void updateNotificationInternal() {
                     contentView.setProgressBar(R.id.progress, videoInfo.durationMillis,
                             videoInfo.currentTimeMillis, false);
                     contentView.setImageViewResource(R.id.playpause, R.drawable.ic_vidcontrol_play);
-                    ApiCompatibilityUtils.setContentDescriptionForRemoteView(contentView,
-                            R.id.playpause, mPlayDescription);
+                    contentView.setContentDescription(R.id.playpause, mPlayDescription);
                     contentView.setOnClickPendingIntent(R.id.playpause,
                             getService().getPendingIntent(ListenerService.ACTION_ID_PLAY));
                     break;

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromeSwitchPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromeSwitchPreference.java
@@ -15,7 +15,6 @@
 import android.view.View;
 import android.widget.TextView;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.widget.ChromeSwitchCompat;
 
@@ -72,7 +71,7 @@ protected void onBindView(View view) {
             int right = view.getPaddingRight();
             int top = view.getPaddingTop();
             int bottom = view.getPaddingBottom();
-            ApiCompatibilityUtils.setBackgroundForView(view, DividerDrawable.create(getContext()));
+            view.setBackground(DividerDrawable.create(getContext()));
             view.setPadding(left, top, right, bottom);
         }
 

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/SmoothProgressBar.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/SmoothProgressBar.java
@@ -8,7 +8,6 @@
 import android.util.AttributeSet;
 import android.widget.ProgressBar;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.ObserverList.RewindableIterator;
 
@@ -65,8 +64,7 @@ public void run() {
             // Every time, the progress bar get's at least 20% closer to mTargetProcess.
             // Add 3 to guarantee progressing even if they only differ by 1.
             setProgressInternal(getProgress() + (mTargetProgress - getProgress() + 3) / 4);
-            ApiCompatibilityUtils.postOnAnimationDelayed(
-                    SmoothProgressBar.this, this, PROGRESS_UPDATE_DELAY_MS);
+            postOnAnimationDelayed(this, PROGRESS_UPDATE_DELAY_MS);
         }
     };
 
@@ -118,7 +116,7 @@ public void setProgress(int progress) {
         if (mTargetProgress == targetProgress) return;
         mTargetProgress = targetProgress;
         removeCallbacks(mUpdateProgressRunnable);
-        ApiCompatibilityUtils.postOnAnimation(this, mUpdateProgressRunnable);
+        postOnAnimation(mUpdateProgressRunnable);
     }
 
     /**

diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
@@ -19,7 +19,6 @@
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.CommandLine;
 import org.chromium.chrome.browser.EmptyTabObserver;
 import org.chromium.chrome.browser.Tab;
@@ -53,8 +52,7 @@ public void run() {
                         R.drawable.btn_close);
             } else {
                 mStopReloadButton.setImageResource(R.drawable.btn_toolbar_reload);
-                ApiCompatibilityUtils.postOnAnimationDelayed(ChromeShellToolbar.this,
-                        mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
+                postOnAnimationDelayed(mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
             }
         }
     };
@@ -127,7 +125,7 @@ private void onLoadProgressChanged(int progress) {
         removeCallbacks(mUpdateProgressRunnable);
         mProgress = progress;
         mLoading = progress != 100;
-        ApiCompatibilityUtils.postOnAnimation(this, mUpdateProgressRunnable);
+        postOnAnimation(mUpdateProgressRunnable);
     }
 
     /**

diff --git a/.../public/android/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java b/.../public/android/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java
@@ -13,7 +13,6 @@
 import android.view.animation.AnimationUtils;
 import android.widget.PopupWindow;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.PositionObserver;
@@ -244,7 +243,7 @@ public void run() {
 
         if (mHasPendingInvalidate) return;
         mHasPendingInvalidate = true;
-        ApiCompatibilityUtils.postOnAnimation(this, mInvalidationRunnable);
+        postOnAnimation(mInvalidationRunnable);
     }
 
     private void rescheduleFadeIn() {
@@ -263,8 +262,7 @@ public void run() {
         }
 
         removeCallbacks(mDeferredHandleFadeInRunnable);
-        ApiCompatibilityUtils.postOnAnimationDelayed(
-                this, mDeferredHandleFadeInRunnable, FADE_IN_DELAY_MS);
+        postOnAnimationDelayed(mDeferredHandleFadeInRunnable, FADE_IN_DELAY_MS);
     }
 
     private void beginFadeIn() {