chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java - Issue 1103293003: Remove ICS support code in chrome/ and components/precache/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java

Issue 1103293003: Remove ICS support code in chrome/ and components/precache/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove unused constant Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControl.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java

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

index af325f866cab0f0ed3660b243defb8fa9ecd660e..24cc0c9a7479533dd92a1f4cc83f78b375b35634 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java

@@ -9,8 +9,6 @@ import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.animation.PropertyValuesHolder;

-import android.annotation.TargetApi;

-import android.os.Build;

import android.view.View;

import android.view.ViewTreeObserver;

import android.view.animation.AccelerateDecelerateInterpolator;

@@ -217,15 +215,13 @@ public class AnimationHelper implements ViewTreeObserver.OnGlobalLayoutListener

mTargetWrapperView.startTransition();

}

- @TargetApi(Build.VERSION_CODES.JELLY_BEAN)

@Override

public void onAnimationEnd(Animator animation) {

mTargetWrapperView.finishTransition();

mContainer.finishTransition();

- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && mToShow != null

- && (mAnimationType == ANIMATION_TYPE_SHOW

- || mAnimationType == ANIMATION_TYPE_SWAP)) {

+ if (mToShow != null && (mAnimationType == ANIMATION_TYPE_SHOW

+ || mAnimationType == ANIMATION_TYPE_SWAP)) {

TextView messageView = (TextView) mToShow.findViewById(R.id.infobar_message);

if (messageView != null) {

mToShow.announceForAccessibility(messageView.getText());