Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 20:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backout 793ffe6ed42e (bug 960359)

Browse Source
This commit is contained in:
Margaret Leibovic 2014-02-03 10:02:42 -08:00
parent 166a7f0fbe
commit 4522f6d3db
8 changed files with 148 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/BrowserApp.java
View File

@ -1649,7 +1649,7 @@ abstract public class BrowserApp extends GeckoApp
if (mHomePager == null) {
final ViewStub homePagerStub = (ViewStub) findViewById(R.id.home_pager_stub);
mHomePager = (HomePager) homePagerStub.inflate().findViewById(R.id.home_pager);
mHomePager = (HomePager) homePagerStub.inflate();
}
mHomePager.show(getSupportLoaderManager(),

212
mobile/android/base/home/HomeBanner.java
View File

@ -5,10 +5,6 @@
package org.mozilla.gecko.home;
import org.mozilla.gecko.animation.PropertyAnimator;
import org.mozilla.gecko.animation.PropertyAnimator.Property;
import org.mozilla.gecko.animation.PropertyAnimator.PropertyAnimationListener;
import org.mozilla.gecko.animation.ViewHelper;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.R;
@ -27,7 +23,6 @@ import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.widget.ImageButton;
import android.widget.ImageView;
@ -38,22 +33,6 @@ public class HomeBanner extends LinearLayout
implements GeckoEventListener {
private static final String LOGTAG = "GeckoHomeBanner";
final TextView mTextView;
final ImageView mIconView;
final ImageButton mCloseButton;
// Used for tracking scroll length
private float mTouchY = -1;
// Used to detect for upwards scroll to push banner all the way up
private boolean mSnapBannerToTop;
// Used so that we don't move the banner when scrolling between pages
private boolean mScrollingPages = false;
// User has dismissed the banner using the close button
private boolean mDismissed = false;
public HomeBanner(Context context) {
this(context, null);
}
@ -62,18 +41,23 @@ public class HomeBanner extends LinearLayout
super(context, attrs);
LayoutInflater.from(context).inflate(R.layout.home_banner, this);
mTextView = (TextView) findViewById(R.id.text);
mIconView = (ImageView) findViewById(R.id.icon);
mCloseButton = (ImageButton) findViewById(R.id.close);
}
@Override
public void onAttachedToWindow() {
super.onAttachedToWindow();
mCloseButton.getDrawable().setAlpha(127);
// Tapping on the close button will ensure that the banner is never
// showed again on this session.
mCloseButton.setOnClickListener(new View.OnClickListener() {
final ImageButton closeButton = (ImageButton) findViewById(R.id.close);
// The drawable should have 50% opacity.
closeButton.getDrawable().setAlpha(127);
closeButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
animateDown();
mDismissed = true;
HomeBanner.this.setVisibility(View.GONE);
}
});
@ -81,66 +65,54 @@ public class HomeBanner extends LinearLayout
@Override
public void onClick(View v) {
// Send the current message id back to JS.
GeckoAppShell.sendEventToGecko(
GeckoEvent.createBroadcastEvent("HomeBanner:Click",(String) getTag()));
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("HomeBanner:Click", (String) getTag()));
}
});
}
@Override
public void onAttachedToWindow() {
GeckoAppShell.getEventDispatcher().registerEventListener("HomeBanner:Data", this);
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("HomeBanner:Get", null));
}
@Override
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
GeckoAppShell.getEventDispatcher().unregisterEventListener("HomeBanner:Data", this);
}
}
public void showBanner() {
if (!mDismissed) {
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("HomeBanner:Get", null));
}
}
public void hideBanner() {
animateDown();
}
public void setScrollingPages(boolean scrollingPages) {
mScrollingPages = scrollingPages;
public boolean isDismissed() {
return (getVisibility() == View.GONE);
}
@Override
public void handleMessage(final String event, final JSONObject message) {
ThreadUtils.postToUiThread(new Runnable() {
@Override
public void run() {
try {
// Store the current message id to pass back to JS in the view's OnClickListener.
setTag(message.getString("id"));
setText(message.getString("text"));
setIcon(message.optString("iconURI"));
animateUp();
} catch (JSONException e) {
Log.e(LOGTAG, "Exception handling " + event + " message", e);
public void handleMessage(String event, JSONObject message) {
try {
// Store the current message id to pass back to JS in the view's OnClickListener.
setTag(message.getString("id"));
// Display styled text from an HTML string.
final Spanned text = Html.fromHtml(message.getString("text"));
final TextView textView = (TextView) findViewById(R.id.text);
// Update the banner message on the UI thread.
ThreadUtils.postToUiThread(new Runnable() {
@Override
public void run() {
textView.setText(text);
setVisibility(View.VISIBLE);
}
}
});
}
});
} catch (JSONException e) {
Log.e(LOGTAG, "Exception handling " + event + " message", e);
return;
}
private void setText(String text) {
// Display styled text from an HTML string.
final Spanned html = Html.fromHtml(text);
final String iconURI = message.optString("iconURI");
final ImageView iconView = (ImageView) findViewById(R.id.icon);
// Update the banner message on the UI thread.
mTextView.setText(html);
}
private void setIcon(String iconURI) {
if (TextUtils.isEmpty(iconURI)) {
// Hide the image view if we don't have an icon to show.
mIconView.setVisibility(View.GONE);
iconView.setVisibility(View.GONE);
return;
}
@ -149,102 +121,18 @@ public class HomeBanner extends LinearLayout
public void onBitmapFound(final Drawable d) {
// Bail if getDrawable doesn't find anything.
if (d == null) {
mIconView.setVisibility(View.GONE);
iconView.setVisibility(View.GONE);
return;
}
// Update the banner icon
mIconView.setImageDrawable(d);
}
});
}
private void animateDown() {
// No need to animate if already translated.
if (getVisibility() == GONE && ViewHelper.getTranslationY(this) == getHeight()) {
return;
}
final PropertyAnimator animator = new PropertyAnimator(100);
animator.attach(this, Property.TRANSLATION_Y, getHeight());
animator.start();
animator.addPropertyAnimationListener(new PropertyAnimationListener() {
@Override
public void onPropertyAnimationStart() {}
public void onPropertyAnimationEnd() {
HomeBanner.this.setVisibility(GONE);
}
});
}
private void animateUp() {
// No need to animate if already translated.
if (getVisibility() == VISIBLE && ViewHelper.getTranslationY(this) == 0) {
return;
}
setVisibility(View.VISIBLE);
final PropertyAnimator animator = new PropertyAnimator(100);
animator.attach(this, Property.TRANSLATION_Y, 0);
animator.start();
}
/**
* Touches to the HomePager are forwarded here to handle the hiding / showing of the banner
* on scroll.
*/
public void handleHomeTouch(MotionEvent event) {
if (mDismissed || mScrollingPages) {
return;
}
switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN: {
mTouchY = event.getRawY();
break;
}
case MotionEvent.ACTION_MOVE: {
// There is a chance that we won't receive ACTION_DOWN, if the touch event
// actually started on the Grid instead of the List. Treat this as first event.
if (mTouchY == -1) {
mTouchY = event.getRawY();
return;
}
final float curY = event.getRawY();
final float delta = mTouchY - curY;
mSnapBannerToTop = delta <= 0.0f;
final float height = getHeight();
float newTranslationY = ViewHelper.getTranslationY(this) + delta;
// Clamp the values to be between 0 and height.
if (newTranslationY < 0.0f) {
newTranslationY = 0.0f;
} else if (newTranslationY > height) {
newTranslationY = height;
}
ViewHelper.setTranslationY(this, newTranslationY);
mTouchY = curY;
break;
}
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL: {
mTouchY = -1;
final float y = ViewHelper.getTranslationY(this);
final float height = getHeight();
if (y > 0.0f && y < height) {
if (mSnapBannerToTop) {
animateUp();
} else {
animateDown();
// Update the banner icon on the UI thread.
ThreadUtils.postToUiThread(new Runnable() {
@Override
public void run() {
iconView.setImageDrawable(d);
}
}
break;
});
}
}
});
}
}

69
mobile/android/base/home/HomePager.java
View File

@ -24,10 +24,8 @@ import android.support.v4.content.Loader;
import android.support.v4.view.ViewPager;
import android.view.ViewGroup.LayoutParams;
import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.View;
import java.util.ArrayList;
@ -35,7 +33,6 @@ import java.util.EnumSet;
import java.util.List;
public class HomePager extends ViewPager {
private static final String LOGTAG = "GeckoHomePager";
private static final int LOADER_ID_CONFIG = 0;
@ -43,7 +40,6 @@ public class HomePager extends ViewPager {
private volatile boolean mLoaded;
private Decor mDecor;
private View mTabStrip;
private HomeBanner mHomeBanner;
private final OnAddPanelListener mAddPanelListener;
@ -51,7 +47,6 @@ public class HomePager extends ViewPager {
private ConfigLoaderCallbacks mConfigLoaderCallbacks;
private String mInitialPanelId;
private int mDefaultPanelIndex;
// Whether or not we need to restart the loader when we show the HomePager.
private boolean mRestartLoader;
@ -244,10 +239,6 @@ public class HomePager extends ViewPager {
PropertyAnimator.Property.ALPHA,
1.0f);
}
// Setup banner and decor listeners
mHomeBanner = (HomeBanner) ((ViewGroup) getParent()).findViewById(R.id.home_banner);
setOnPageChangeListener(new HomePagerOnPageChangeListener());
}
/**
@ -259,15 +250,6 @@ public class HomePager extends ViewPager {
setAdapter(null);
}
@Override
public void setVisibility(int visibility) {
// Ensure that no decorations are overlaying the mainlayout
if (mHomeBanner != null) {
mHomeBanner.setVisibility(visibility);
}
super.setVisibility(visibility);
}
/**
* Determines whether the pager is visible.
*
@ -287,13 +269,6 @@ public class HomePager extends ViewPager {
if (mDecor != null) {
mDecor.onPageSelected(item);
}
if (mHomeBanner != null) {
if (item == mDefaultPanelIndex) {
mHomeBanner.showBanner();
} else {
mHomeBanner.hideBanner();
}
}
}
@Override
@ -306,16 +281,6 @@ public class HomePager extends ViewPager {
return super.onInterceptTouchEvent(event);
}
@Override
public boolean dispatchTouchEvent(MotionEvent event) {
// Get touches to pages, pass to banner, and forward to pages.
if (mHomeBanner != null) {
mHomeBanner.handleHomeTouch(event);
}
return super.dispatchTouchEvent(event);
}
private void updateUiFromPanelConfigs(List<PanelConfig> panelConfigs) {
// We only care about the adapter if HomePager is currently
// loaded, which means it's visible in the activity.
@ -339,9 +304,6 @@ public class HomePager extends ViewPager {
for (PanelConfig panelConfig : panelConfigs) {
if (!panelConfig.isDisabled()) {
enabledPanels.add(panelConfig);
if (panelConfig.isDefault()) {
mDefaultPanelIndex = enabledPanels.size() - 1;
}
}
}
@ -387,35 +349,4 @@ public class HomePager extends ViewPager {
public void onLoaderReset(Loader<List<PanelConfig>> loader) {
}
}
private class HomePagerOnPageChangeListener implements ViewPager.OnPageChangeListener {
@Override
public void onPageSelected(int position) {
if (mDecor != null) {
mDecor.onPageSelected(position);
}
if (mHomeBanner != null) {
if (position == mDefaultPanelIndex) {
mHomeBanner.showBanner();
} else {
mHomeBanner.hideBanner();
}
}
}
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
if (mDecor != null) {
mDecor.onPageScrolled(position, positionOffset, positionOffsetPixels);
}
if (mHomeBanner != null) {
mHomeBanner.setScrollingPages(positionOffsetPixels > 0);
}
}
@Override
public void onPageScrollStateChanged(int state) { }
}
}

72
mobile/android/base/home/TopSitesPanel.java
View File

@ -86,6 +86,15 @@ public class TopSitesPanel extends HomeFragment {
// Grid of top sites
private TopSitesGridView mGrid;
// Banner to show snippets.
private HomeBanner mBanner;
// Raw Y value of the last event that happened on the list view.
private float mListTouchY = -1;
// Scrolling direction of the banner.
private boolean mSnapBannerToTop;
// Callbacks used for the search and favicon cursor loaders
private CursorLoaderCallbacks mCursorLoaderCallbacks;
@ -197,6 +206,15 @@ public class TopSitesPanel extends HomeFragment {
registerForContextMenu(mList);
registerForContextMenu(mGrid);
mBanner = (HomeBanner) view.findViewById(R.id.home_banner);
mList.setOnTouchListener(new OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
TopSitesPanel.this.handleListTouchEvent(event);
return false;
}
});
}
@Override
@ -435,6 +453,60 @@ public class TopSitesPanel extends HomeFragment {
}
}
private void handleListTouchEvent(MotionEvent event) {
// Ignore the event if the banner is hidden for this session.
if (mBanner.isDismissed()) {
return;
}
switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN: {
mListTouchY = event.getRawY();
break;
}
case MotionEvent.ACTION_MOVE: {
// There is a chance that we won't receive ACTION_DOWN, if the touch event
// actually started on the Grid instead of the List. Treat this as first event.
if (mListTouchY == -1) {
mListTouchY = event.getRawY();
return;
}
final float curY = event.getRawY();
final float delta = mListTouchY - curY;
mSnapBannerToTop = (delta > 0.0f) ? false : true;
final float height = mBanner.getHeight();
float newTranslationY = ViewHelper.getTranslationY(mBanner) + delta;
// Clamp the values to be between 0 and height.
if (newTranslationY < 0.0f) {
newTranslationY = 0.0f;
} else if (newTranslationY > height) {
newTranslationY = height;
}
ViewHelper.setTranslationY(mBanner, newTranslationY);
mListTouchY = curY;
break;
}
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL: {
mListTouchY = -1;
final float y = ViewHelper.getTranslationY(mBanner);
final float height = mBanner.getHeight();
if (y > 0.0f && y < height) {
final PropertyAnimator animator = new PropertyAnimator(100);
animator.attach(mBanner, Property.TRANSLATION_Y, mSnapBannerToTop ? 0 : height);
animator.start();
}
break;
}
}
}
private void updateUiFromCursor(Cursor c) {
mList.setHeaderDividersEnabled(c != null && c.getCount() > mMaxGridEntries);
}

3
mobile/android/base/resources/layout-large-v11/home_pager.xml
View File

@ -14,8 +14,7 @@
android:background="@android:color/white"
android:visibility="gone">
<org.mozilla.gecko.home.TabMenuStrip android:id="@+id/tablet_menu_strip"
android:layout_width="fill_parent"
<org.mozilla.gecko.home.TabMenuStrip android:layout_width="fill_parent"
android:layout_height="32dip"
android:background="@color/background_light"
android:layout_gravity="top"

10
mobile/android/base/resources/layout/gecko_app.xml
View File

@ -36,16 +36,6 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<org.mozilla.gecko.home.HomeBanner android:id="@+id/home_banner"
style="@style/Widget.HomeBanner"
android:layout_width="fill_parent"
android:layout_height="@dimen/home_banner_height"
android:background="@drawable/home_banner"
android:layout_gravity="bottom"
android:gravity="center_vertical"
android:visibility="gone"
android:clickable="true"
android:focusable="true"/>
</FrameLayout>

3
mobile/android/base/resources/layout/home_pager.xml
View File

@ -14,8 +14,7 @@
android:background="@android:color/white"
android:visibility="gone">
<org.mozilla.gecko.home.HomePagerTabStrip android:id="@+id/phone_menu_strip"
android:layout_width="fill_parent"
<org.mozilla.gecko.home.HomePagerTabStrip android:layout_width="fill_parent"
android:layout_height="32dip"
android:layout_gravity="top"
android:gravity="bottom"

28
mobile/android/base/resources/layout/home_top_sites_panel.xml
View File

@ -3,8 +3,26 @@
- 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/. -->
<org.mozilla.gecko.home.HomeListView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/list"
style="@style/Widget.TopSitesListView"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<org.mozilla.gecko.home.HomeListView
android:id="@+id/list"
style="@style/Widget.TopSitesListView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<org.mozilla.gecko.home.HomeBanner android:id="@+id/home_banner"
style="@style/Widget.HomeBanner"
android:layout_width="fill_parent"
android:layout_height="@dimen/home_banner_height"
android:background="@drawable/home_banner"
android:layout_gravity="bottom"
android:gravity="center_vertical"
android:visibility="gone"
android:clickable="true"
android:focusable="true"/>
</FrameLayout>