mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-07 18:04:46 +00:00
Bug 1185002 - Remove unused HomePagerTabStrip code. r=mcomella
--HG-- extra : commitid : 6GByz6o0Hn0
This commit is contained in:
Chenxia Liu
parent
efae7d4ebe
commit
7f1d2c0c8d
@ -1,146 +0,0 @@
|
||||
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package org.mozilla.gecko.home;
|
||||
|
||||
import org.mozilla.gecko.R;
|
||||
import org.mozilla.gecko.animation.BounceAnimatorBuilder;
|
||||
import org.mozilla.gecko.animation.BounceAnimatorBuilder.Attributes;
|
||||
import org.mozilla.gecko.animation.TransitionsTracker;
|
||||
import org.mozilla.gecko.util.ColorUtils;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.content.res.TypedArray;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Paint;
|
||||
import android.support.v4.view.PagerTabStrip;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.view.ViewTreeObserver;
|
||||
|
||||
import com.nineoldandroids.animation.AnimatorSet;
|
||||
import com.nineoldandroids.animation.ObjectAnimator;
|
||||
import com.nineoldandroids.animation.ValueAnimator;
|
||||
import com.nineoldandroids.view.ViewHelper;
|
||||
|
||||
/**
|
||||
* HomePagerTabStrip is a custom implementation of PagerTabStrip
|
||||
* that exposes XML attributes for the public methods.
|
||||
*/
|
||||
|
||||
class HomePagerTabStrip extends PagerTabStrip {
|
||||
|
||||
private static final String LOGTAG = "PagerTabStrip";
|
||||
private static final int ANIMATION_DELAY_MS = 50;
|
||||
private static final int ALPHA_MS = 10;
|
||||
private static final int BOUNCE1_MS = 350;
|
||||
private static final int BOUNCE2_MS = 200;
|
||||
private static final int BOUNCE3_MS = 100;
|
||||
private static final int INIT_OFFSET = 100;
|
||||
|
||||
private final Paint shadowPaint;
|
||||
private final int shadowSize;
|
||||
|
||||
public HomePagerTabStrip(Context context) {
|
||||
this(context, null);
|
||||
}
|
||||
|
||||
public HomePagerTabStrip(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
|
||||
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.HomePagerTabStrip);
|
||||
int color = a.getColor(R.styleable.HomePagerTabStrip_tabIndicatorColor, 0x00);
|
||||
a.recycle();
|
||||
|
||||
setTabIndicatorColor(color);
|
||||
|
||||
final Resources res = getResources();
|
||||
shadowSize = res.getDimensionPixelSize(R.dimen.tabs_strip_shadow_size);
|
||||
|
||||
shadowPaint = new Paint();
|
||||
shadowPaint.setColor(ColorUtils.getColor(context, R.color.url_bar_shadow));
|
||||
shadowPaint.setStrokeWidth(0.0f);
|
||||
|
||||
getViewTreeObserver().addOnPreDrawListener(new PreDrawListener());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPaddingBottom() {
|
||||
// PagerTabStrip enforces a minimum bottom padding of 6dp which causes
|
||||
// misalignments when using 'center_vertical' gravity. Force padding bottom
|
||||
// to 0dp so that children are properly centered.
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(Canvas canvas) {
|
||||
super.draw(canvas);
|
||||
|
||||
final int height = getHeight();
|
||||
canvas.drawRect(0, height - shadowSize, getWidth(), height, shadowPaint);
|
||||
}
|
||||
|
||||
private void animateTitles() {
|
||||
final View prevTextView = getChildAt(0);
|
||||
final View nextTextView = getChildAt(getChildCount() - 1);
|
||||
|
||||
if (prevTextView == null || nextTextView == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Set up initial values for the views that will be animated.
|
||||
ViewHelper.setTranslationX(prevTextView, -INIT_OFFSET);
|
||||
ViewHelper.setAlpha(prevTextView, 0);
|
||||
ViewHelper.setTranslationX(nextTextView, INIT_OFFSET);
|
||||
ViewHelper.setAlpha(nextTextView, 0);
|
||||
|
||||
// Alpha animations.
|
||||
final ValueAnimator alpha1 = ObjectAnimator.ofFloat(prevTextView, "alpha", 1);
|
||||
final ValueAnimator alpha2 = ObjectAnimator.ofFloat(nextTextView, "alpha", 1);
|
||||
|
||||
final AnimatorSet alphaAnimatorSet = new AnimatorSet();
|
||||
alphaAnimatorSet.playTogether(alpha1, alpha2);
|
||||
alphaAnimatorSet.setDuration(ALPHA_MS);
|
||||
alphaAnimatorSet.setStartDelay(ANIMATION_DELAY_MS);
|
||||
|
||||
// Bounce animation.
|
||||
final float bounceDistance = getWidth()/100f; // Hack: TextFields still have 0 width here.
|
||||
|
||||
final BounceAnimatorBuilder prevBounceAnimatorBuilder = new BounceAnimatorBuilder(prevTextView, "translationX");
|
||||
prevBounceAnimatorBuilder.queue(new Attributes(bounceDistance, BOUNCE1_MS));
|
||||
prevBounceAnimatorBuilder.queue(new Attributes(-bounceDistance/4, BOUNCE2_MS));
|
||||
prevBounceAnimatorBuilder.queue(new Attributes(0, BOUNCE3_MS));
|
||||
|
||||
final BounceAnimatorBuilder nextBounceAnimatorBuilder = new BounceAnimatorBuilder(nextTextView, "translationX");
|
||||
nextBounceAnimatorBuilder.queue(new Attributes(-bounceDistance, BOUNCE1_MS));
|
||||
nextBounceAnimatorBuilder.queue(new Attributes(bounceDistance/4, BOUNCE2_MS));
|
||||
nextBounceAnimatorBuilder.queue(new Attributes(0, BOUNCE3_MS));
|
||||
|
||||
final AnimatorSet bounceAnimatorSet = new AnimatorSet();
|
||||
bounceAnimatorSet.playTogether(prevBounceAnimatorBuilder.build(), nextBounceAnimatorBuilder.build());
|
||||
|
||||
TransitionsTracker.track(nextBounceAnimatorBuilder);
|
||||
|
||||
final AnimatorSet titlesAnimatorSet = new AnimatorSet();
|
||||
titlesAnimatorSet.playTogether(alphaAnimatorSet, bounceAnimatorSet);
|
||||
titlesAnimatorSet.setStartDelay(ANIMATION_DELAY_MS);
|
||||
|
||||
// Start animations.
|
||||
titlesAnimatorSet.start();
|
||||
}
|
||||
|
||||
private class PreDrawListener implements ViewTreeObserver.OnPreDrawListener {
|
||||
@Override
|
||||
public boolean onPreDraw() {
|
||||
if (!TransitionsTracker.areTransitionsRunning()) {
|
||||
// Don't show the title bounce animation if other animations are running.
|
||||
animateTitles();
|
||||
}
|
||||
getViewTreeObserver().removeOnPreDrawListener(this);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -340,7 +340,6 @@ gbjar.sources += [
|
||||
'home/HomeFragment.java',
|
||||
'home/HomeListView.java',
|
||||
'home/HomePager.java',
|
||||
'home/HomePagerTabStrip.java',
|
||||
'home/HomePanelsManager.java',
|
||||
'home/ImageLoader.java',
|
||||
'home/MultiTypeCursorAdapter.java',
|
||||
|
||||
@ -126,10 +126,6 @@
|
||||
<attr name="topDivider" format="boolean"/>
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="HomePagerTabStrip">
|
||||
<attr name="tabIndicatorColor" format="color"/>
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="FadedTextView">
|
||||
<attr name="fadeWidth" format="dimension"/>
|
||||
</declare-styleable>
|
||||
|
||||
@ -390,10 +390,6 @@
|
||||
<item name="android:textColor">@color/primary_text</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Widget.HomePagerTabStrip" parent="TextAppearance.Small">
|
||||
<item name="android:textColor">?android:attr/textColorHint</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Widget.HomePagerTabMenuStrip" parent="TextAppearance.Small">
|
||||
<item name="android:textColor">?android:attr/textColorHint</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user