Commit bbc424dd authored by Newton Allen's avatar Newton Allen

Fix crashes on ICS.

We were using several APIs introduced after API level 14. Fix that.

BUG=462802
R=estade@chromium.org

Review URL: https://codereview.chromium.org/963993002

Cr-Commit-Position: refs/heads/master@{#318731}
parent 3176863a
...@@ -12,6 +12,7 @@ import android.graphics.PorterDuff; ...@@ -12,6 +12,7 @@ import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter; import android.graphics.PorterDuffColorFilter;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.support.v4.view.ViewCompat;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -101,8 +102,8 @@ public class CardUnmaskPrompt implements DialogInterface.OnDismissListener, Text ...@@ -101,8 +102,8 @@ public class CardUnmaskPrompt implements DialogInterface.OnDismissListener, Text
.setView(v) .setView(v)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.card_unmask_confirm_button, null) .setPositiveButton(R.string.card_unmask_confirm_button, null)
.setOnDismissListener(this)
.create(); .create();
mDialog.setOnDismissListener(this);
mShouldRequestExpirationDate = shouldRequestExpirationDate; mShouldRequestExpirationDate = shouldRequestExpirationDate;
mThisYear = Calendar.getInstance().get(Calendar.YEAR); mThisYear = Calendar.getInstance().get(Calendar.YEAR);
...@@ -168,6 +169,7 @@ public class CardUnmaskPrompt implements DialogInterface.OnDismissListener, Text ...@@ -168,6 +169,7 @@ public class CardUnmaskPrompt implements DialogInterface.OnDismissListener, Text
mVerificationView.setText("Your card is verified"); mVerificationView.setText("Your card is verified");
Handler h = new Handler(); Handler h = new Handler();
h.postDelayed(new Runnable() { h.postDelayed(new Runnable() {
@Override
public void run() { public void run() {
dismiss(); dismiss();
} }
...@@ -223,7 +225,7 @@ public class CardUnmaskPrompt implements DialogInterface.OnDismissListener, Text ...@@ -223,7 +225,7 @@ public class CardUnmaskPrompt implements DialogInterface.OnDismissListener, Text
mMonthInput.setEnabled(enabled); mMonthInput.setEnabled(enabled);
mYearInput.setEnabled(enabled); mYearInput.setEnabled(enabled);
mMainContents.setAlpha(enabled ? 1.0f : 0.15f); mMainContents.setAlpha(enabled ? 1.0f : 0.15f);
mMainContents.setImportantForAccessibility( ViewCompat.setImportantForAccessibility(mMainContents,
enabled ? View.IMPORTANT_FOR_ACCESSIBILITY_AUTO enabled ? View.IMPORTANT_FOR_ACCESSIBILITY_AUTO
: View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS); : View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
((ViewGroup) mMainContents).setDescendantFocusability( ((ViewGroup) mMainContents).setDescendantFocusability(
......
...@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.infobar; ...@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.infobar;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.support.v4.view.ViewCompat;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -107,9 +108,9 @@ public class AppBannerInfoBar extends ConfirmInfoBar implements View.OnClickList ...@@ -107,9 +108,9 @@ public class AppBannerInfoBar extends ConfirmInfoBar implements View.OnClickList
} }
// Hide uninteresting views from accessibility. // Hide uninteresting views from accessibility.
ratingView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); ViewCompat.setImportantForAccessibility(ratingView, View.IMPORTANT_FOR_ACCESSIBILITY_NO);
if (mIconView != null) { if (mIconView != null) {
mIconView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); ViewCompat.setImportantForAccessibility(mIconView, View.IMPORTANT_FOR_ACCESSIBILITY_NO);
} }
// Set up clicking on the controls to bring up the app details. // Set up clicking on the controls to bring up the app details.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment