зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1299949 - Move omg.home.activitystream into omg.activitystream.homepanel r=sebastian
Parts of ActivityStream already live under omg.activitystream, lets move the UI code there too to make it easier to actually find AS code. MozReview-Commit-ID: 6Aa7AZ9cw5n --HG-- rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamHomeFragment.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamHomeFragment.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamHomeScreen.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamHomeScreen.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamPanel.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamPanel.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/HighlightsLoader.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/HighlightsLoader.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/StreamItemAnimator.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamItemAnimator.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/StreamRecyclerAdapter.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamRecyclerAdapter.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/ActivityStreamContextMenu.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/ActivityStreamContextMenu.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/BottomSheetContextMenu.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/BottomSheetContextMenu.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/PopupContextMenu.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/PopupContextMenu.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Highlight.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Highlight.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Item.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Item.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Metadata.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Metadata.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/TopSite.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/TopSite.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/HighlightItem.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/HighlightItem.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/HighlightsTitle.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/HighlightsTitle.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/StreamItem.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/StreamItem.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/TopPanel.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/TopPanel.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/WelcomePanel.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WelcomePanel.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/CirclePageIndicator.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/CirclePageIndicator.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesCard.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesCard.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPage.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPage.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPageAdapter.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPageAdapter.java rename : mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPagerAdapter.java => mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPagerAdapter.java extra : rebase_source : 517272e4feb41af8c0aec08be8d1e1bbfed93e01
This commit is contained in:
Andrzej Hunt
Родитель
9bb9ee4a8d
Коммит
245eb8de9b
|
|
@ -12,7 +12,7 @@ import org.json.JSONException;
|
|||
import org.json.JSONObject;
|
||||
import org.mozilla.gecko.R;
|
||||
import org.mozilla.gecko.db.BrowserContract;
|
||||
import org.mozilla.gecko.home.activitystream.model.TopSite;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.TopSite;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* 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.activitystream;
|
||||
package org.mozilla.gecko.activitystream.homepanel;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* 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.activitystream;
|
||||
package org.mozilla.gecko.activitystream.homepanel;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* 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.activitystream;
|
||||
package org.mozilla.gecko.activitystream.homepanel;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
|
|
@ -21,8 +21,8 @@ import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
|
|||
import org.mozilla.gecko.db.BrowserDB;
|
||||
import org.mozilla.gecko.fxa.FirefoxAccounts;
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.home.activitystream.model.Highlight;
|
||||
import org.mozilla.gecko.home.activitystream.topsites.TopSitesPagerAdapter;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Highlight;
|
||||
import org.mozilla.gecko.activitystream.homepanel.topsites.TopSitesPagerAdapter;
|
||||
import org.mozilla.gecko.widget.RecyclerViewClickSupport;
|
||||
|
||||
import java.util.Collections;
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream;
|
||||
package org.mozilla.gecko.activitystream.homepanel;
|
||||
|
||||
import android.content.Context;
|
||||
import android.database.ContentObserver;
|
||||
|
|
@ -15,7 +15,7 @@ import org.mozilla.gecko.Telemetry;
|
|||
import org.mozilla.gecko.activitystream.ranking.HighlightsRanking;
|
||||
import org.mozilla.gecko.db.BrowserContract;
|
||||
import org.mozilla.gecko.db.BrowserDB;
|
||||
import org.mozilla.gecko.home.activitystream.model.Highlight;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Highlight;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
* 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.activitystream;
|
||||
package org.mozilla.gecko.activitystream.homepanel;
|
||||
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v7.widget.DefaultItemAnimator;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
|
||||
import org.mozilla.gecko.home.activitystream.stream.TopPanel;
|
||||
import org.mozilla.gecko.activitystream.homepanel.stream.TopPanel;
|
||||
|
||||
/**
|
||||
* We need our own item animator override to avoid default RV-style animations for certain panels.
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream;
|
||||
package org.mozilla.gecko.activitystream.homepanel;
|
||||
|
||||
import android.database.Cursor;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
|
|
@ -14,15 +14,13 @@ import android.view.ViewGroup;
|
|||
import org.mozilla.gecko.Telemetry;
|
||||
import org.mozilla.gecko.TelemetryContract;
|
||||
import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
|
||||
import org.mozilla.gecko.activitystream.Utils;
|
||||
import org.mozilla.gecko.db.BrowserContract;
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.home.activitystream.model.Highlight;
|
||||
import org.mozilla.gecko.home.activitystream.stream.HighlightItem;
|
||||
import org.mozilla.gecko.home.activitystream.stream.HighlightsTitle;
|
||||
import org.mozilla.gecko.home.activitystream.stream.StreamItem;
|
||||
import org.mozilla.gecko.home.activitystream.stream.TopPanel;
|
||||
import org.mozilla.gecko.home.activitystream.stream.WelcomePanel;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Highlight;
|
||||
import org.mozilla.gecko.activitystream.homepanel.stream.HighlightItem;
|
||||
import org.mozilla.gecko.activitystream.homepanel.stream.HighlightsTitle;
|
||||
import org.mozilla.gecko.activitystream.homepanel.stream.StreamItem;
|
||||
import org.mozilla.gecko.activitystream.homepanel.stream.TopPanel;
|
||||
import org.mozilla.gecko.activitystream.homepanel.stream.WelcomePanel;
|
||||
import org.mozilla.gecko.widget.RecyclerViewClickSupport;
|
||||
|
||||
import java.util.Collections;
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* 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.activitystream.menu;
|
||||
package org.mozilla.gecko.activitystream.homepanel.menu;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
|
@ -20,7 +20,7 @@ import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
|
|||
import org.mozilla.gecko.annotation.RobocopTarget;
|
||||
import org.mozilla.gecko.db.BrowserDB;
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.home.activitystream.model.Item;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Item;
|
||||
import org.mozilla.gecko.reader.SavedReaderViewHelper;
|
||||
import org.mozilla.gecko.util.Clipboard;
|
||||
import org.mozilla.gecko.util.HardwareUtils;
|
||||
|
|
@ -2,12 +2,10 @@
|
|||
* 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.activitystream.menu;
|
||||
package org.mozilla.gecko.activitystream.homepanel.menu;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.design.widget.BottomSheetBehavior;
|
||||
import android.support.design.widget.BottomSheetDialog;
|
||||
import android.support.design.widget.NavigationView;
|
||||
|
|
@ -21,7 +19,7 @@ import org.mozilla.gecko.R;
|
|||
import org.mozilla.gecko.activitystream.ActivityStream;
|
||||
import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.home.activitystream.model.Item;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Item;
|
||||
import org.mozilla.gecko.icons.IconCallback;
|
||||
import org.mozilla.gecko.icons.IconResponse;
|
||||
import org.mozilla.gecko.icons.Icons;
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* 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.activitystream.menu;
|
||||
package org.mozilla.gecko.activitystream.homepanel.menu;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Color;
|
||||
|
|
@ -18,7 +18,7 @@ import org.mozilla.gecko.AppConstants;
|
|||
import org.mozilla.gecko.R;
|
||||
import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.home.activitystream.model.Item;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Item;
|
||||
|
||||
/* package-private */ class PopupContextMenu
|
||||
extends ActivityStreamContextMenu {
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream.model;
|
||||
package org.mozilla.gecko.activitystream.homepanel.model;
|
||||
|
||||
import android.database.Cursor;
|
||||
import android.support.annotation.Nullable;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.mozilla.gecko.home.activitystream.model;
|
||||
package org.mozilla.gecko.activitystream.homepanel.model;
|
||||
|
||||
import android.support.annotation.Nullable;
|
||||
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream.model;
|
||||
package org.mozilla.gecko.activitystream.homepanel.model;
|
||||
|
||||
import android.database.Cursor;
|
||||
import android.text.TextUtils;
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream.model;
|
||||
package org.mozilla.gecko.activitystream.homepanel.model;
|
||||
|
||||
import android.database.Cursor;
|
||||
import android.support.annotation.Nullable;
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream.stream;
|
||||
package org.mozilla.gecko.activitystream.homepanel.stream;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.text.TextUtils;
|
||||
|
|
@ -19,8 +19,8 @@ import org.mozilla.gecko.activitystream.ActivityStream;
|
|||
import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
|
||||
import org.mozilla.gecko.activitystream.Utils;
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu;
|
||||
import org.mozilla.gecko.home.activitystream.model.Highlight;
|
||||
import org.mozilla.gecko.activitystream.homepanel.menu.ActivityStreamContextMenu;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Highlight;
|
||||
import org.mozilla.gecko.icons.IconCallback;
|
||||
import org.mozilla.gecko.icons.IconResponse;
|
||||
import org.mozilla.gecko.icons.Icons;
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream.stream;
|
||||
package org.mozilla.gecko.activitystream.homepanel.stream;
|
||||
|
||||
import android.view.View;
|
||||
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream.stream;
|
||||
package org.mozilla.gecko.activitystream.homepanel.stream;
|
||||
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.view.View;
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream.stream;
|
||||
package org.mozilla.gecko.activitystream.homepanel.stream;
|
||||
|
||||
import android.content.res.Resources;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -15,8 +15,8 @@ import org.mozilla.gecko.R;
|
|||
import org.mozilla.gecko.Telemetry;
|
||||
import org.mozilla.gecko.TelemetryContract;
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.home.activitystream.topsites.CirclePageIndicator;
|
||||
import org.mozilla.gecko.home.activitystream.topsites.TopSitesPagerAdapter;
|
||||
import org.mozilla.gecko.activitystream.homepanel.topsites.CirclePageIndicator;
|
||||
import org.mozilla.gecko.activitystream.homepanel.topsites.TopSitesPagerAdapter;
|
||||
|
||||
public class TopPanel extends StreamItem {
|
||||
public static final int LAYOUT_ID = R.layout.activity_stream_main_toppanel;
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
* 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.activitystream.stream;
|
||||
package org.mozilla.gecko.activitystream.homepanel.stream;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.mozilla.gecko.home.activitystream.topsites;
|
||||
package org.mozilla.gecko.activitystream.homepanel.topsites;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
|
|
@ -2,10 +2,9 @@
|
|||
* 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.activitystream.topsites;
|
||||
package org.mozilla.gecko.activitystream.homepanel.topsites;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.support.v4.widget.TextViewCompat;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
|
|
@ -20,8 +19,8 @@ import org.mozilla.gecko.TelemetryContract;
|
|||
import org.mozilla.gecko.activitystream.ActivityStream;
|
||||
import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu;
|
||||
import org.mozilla.gecko.home.activitystream.model.TopSite;
|
||||
import org.mozilla.gecko.activitystream.homepanel.menu.ActivityStreamContextMenu;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.TopSite;
|
||||
import org.mozilla.gecko.icons.IconCallback;
|
||||
import org.mozilla.gecko.icons.IconResponse;
|
||||
import org.mozilla.gecko.icons.Icons;
|
||||
|
|
@ -2,19 +2,15 @@
|
|||
* 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.activitystream.topsites;
|
||||
package org.mozilla.gecko.activitystream.homepanel.topsites;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.widget.GridLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.widget.RecyclerViewClickSupport;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
public class TopSitesPage
|
||||
extends RecyclerView {
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* 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.activitystream.topsites;
|
||||
package org.mozilla.gecko.activitystream.homepanel.topsites;
|
||||
|
||||
import android.content.Context;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -18,7 +18,7 @@ import org.mozilla.gecko.Telemetry;
|
|||
import org.mozilla.gecko.TelemetryContract;
|
||||
import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
|
||||
import org.mozilla.gecko.home.HomePager;
|
||||
import org.mozilla.gecko.home.activitystream.model.TopSite;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.TopSite;
|
||||
import org.mozilla.gecko.widget.RecyclerViewClickSupport;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* 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.activitystream.topsites;
|
||||
package org.mozilla.gecko.activitystream.homepanel.topsites;
|
||||
|
||||
import android.content.Context;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -13,13 +13,11 @@ import android.support.annotation.VisibleForTesting;
|
|||
|
||||
import org.mozilla.gecko.activitystream.ranking.RankingUtils.Func1;
|
||||
import org.mozilla.gecko.db.BrowserContract;
|
||||
import org.mozilla.gecko.home.activitystream.model.Highlight;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Highlight;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.mozilla.gecko.activitystream.ranking.RankingUtils.normalize;
|
||||
|
||||
/**
|
||||
* A highlight candidate (Highlight object + features). Ranking will determine whether this is an
|
||||
* actual highlight.
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@ package org.mozilla.gecko.activitystream.ranking;
|
|||
|
||||
import android.database.Cursor;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.util.Log;
|
||||
|
||||
import org.mozilla.gecko.home.activitystream.model.Highlight;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Highlight;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ package org.mozilla.gecko.home;
|
|||
import org.mozilla.gecko.activitystream.ActivityStream;
|
||||
import org.mozilla.gecko.home.HomeConfig.PanelConfig;
|
||||
import org.mozilla.gecko.home.HomeConfig.PanelType;
|
||||
import org.mozilla.gecko.home.activitystream.ActivityStreamHomeFragment;
|
||||
import org.mozilla.gecko.activitystream.homepanel.ActivityStreamHomeFragment;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
|
|
|
|||
|
|
@ -466,6 +466,29 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
|
|||
'activitystream/ActivityStream.java',
|
||||
'activitystream/ActivityStreamPreference.java',
|
||||
'activitystream/ActivityStreamTelemetry.java',
|
||||
'activitystream/homepanel/ActivityStreamHomeFragment.java',
|
||||
'activitystream/homepanel/ActivityStreamHomeScreen.java',
|
||||
'activitystream/homepanel/ActivityStreamPanel.java',
|
||||
'activitystream/homepanel/HighlightsLoader.java',
|
||||
'activitystream/homepanel/menu/ActivityStreamContextMenu.java',
|
||||
'activitystream/homepanel/menu/BottomSheetContextMenu.java',
|
||||
'activitystream/homepanel/menu/PopupContextMenu.java',
|
||||
'activitystream/homepanel/model/Highlight.java',
|
||||
'activitystream/homepanel/model/Item.java',
|
||||
'activitystream/homepanel/model/Metadata.java',
|
||||
'activitystream/homepanel/model/TopSite.java',
|
||||
'activitystream/homepanel/stream/HighlightItem.java',
|
||||
'activitystream/homepanel/stream/HighlightsTitle.java',
|
||||
'activitystream/homepanel/stream/StreamItem.java',
|
||||
'activitystream/homepanel/stream/TopPanel.java',
|
||||
'activitystream/homepanel/stream/WelcomePanel.java',
|
||||
'activitystream/homepanel/StreamItemAnimator.java',
|
||||
'activitystream/homepanel/StreamRecyclerAdapter.java',
|
||||
'activitystream/homepanel/topsites/CirclePageIndicator.java',
|
||||
'activitystream/homepanel/topsites/TopSitesCard.java',
|
||||
'activitystream/homepanel/topsites/TopSitesPage.java',
|
||||
'activitystream/homepanel/topsites/TopSitesPageAdapter.java',
|
||||
'activitystream/homepanel/topsites/TopSitesPagerAdapter.java',
|
||||
'activitystream/ranking/HighlightCandidate.java',
|
||||
'activitystream/ranking/HighlightsRanking.java',
|
||||
'activitystream/ranking/RankingUtils.java',
|
||||
|
|
@ -600,29 +623,6 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
|
|||
'health/HealthRecorder.java',
|
||||
'health/SessionInformation.java',
|
||||
'health/StubbedHealthRecorder.java',
|
||||
'home/activitystream/ActivityStreamHomeFragment.java',
|
||||
'home/activitystream/ActivityStreamHomeScreen.java',
|
||||
'home/activitystream/ActivityStreamPanel.java',
|
||||
'home/activitystream/HighlightsLoader.java',
|
||||
'home/activitystream/menu/ActivityStreamContextMenu.java',
|
||||
'home/activitystream/menu/BottomSheetContextMenu.java',
|
||||
'home/activitystream/menu/PopupContextMenu.java',
|
||||
'home/activitystream/model/Highlight.java',
|
||||
'home/activitystream/model/Item.java',
|
||||
'home/activitystream/model/Metadata.java',
|
||||
'home/activitystream/model/TopSite.java',
|
||||
'home/activitystream/stream/HighlightItem.java',
|
||||
'home/activitystream/stream/HighlightsTitle.java',
|
||||
'home/activitystream/stream/StreamItem.java',
|
||||
'home/activitystream/stream/TopPanel.java',
|
||||
'home/activitystream/stream/WelcomePanel.java',
|
||||
'home/activitystream/StreamItemAnimator.java',
|
||||
'home/activitystream/StreamRecyclerAdapter.java',
|
||||
'home/activitystream/topsites/CirclePageIndicator.java',
|
||||
'home/activitystream/topsites/TopSitesCard.java',
|
||||
'home/activitystream/topsites/TopSitesPage.java',
|
||||
'home/activitystream/topsites/TopSitesPageAdapter.java',
|
||||
'home/activitystream/topsites/TopSitesPagerAdapter.java',
|
||||
'home/BookmarkFolderView.java',
|
||||
'home/BookmarkScreenshotRow.java',
|
||||
'home/BookmarksListAdapter.java',
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<org.mozilla.gecko.home.activitystream.ActivityStreamHomeScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#FAFAFA"/>
|
||||
<org.mozilla.gecko.activitystream.homepanel.ActivityStreamHomeScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#FAFAFA"/>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
android:id="@+id/topsites_pager"
|
||||
android:contentDescription="@string/activity_stream_topsites" />
|
||||
|
||||
<org.mozilla.gecko.home.activitystream.topsites.CirclePageIndicator
|
||||
<org.mozilla.gecko.activitystream.homepanel.topsites.CirclePageIndicator
|
||||
android:id="@+id/topsites_indicator"
|
||||
android:padding="10dip"
|
||||
app:fillColor="#ff9d9d9d"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<org.mozilla.gecko.home.activitystream.topsites.TopSitesPage xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingLeft="10dp"/>
|
||||
<org.mozilla.gecko.activitystream.homepanel.topsites.TopSitesPage xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingLeft="10dp"/>
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@ import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
|
|||
import org.mozilla.gecko.db.BrowserContract;
|
||||
import org.mozilla.gecko.db.BrowserDB;
|
||||
import org.mozilla.gecko.db.DBUtils;
|
||||
import org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu;
|
||||
import org.mozilla.gecko.home.activitystream.model.Highlight;
|
||||
import org.mozilla.gecko.home.activitystream.model.Item;
|
||||
import org.mozilla.gecko.home.activitystream.model.TopSite;
|
||||
import org.mozilla.gecko.activitystream.homepanel.menu.ActivityStreamContextMenu;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Highlight;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.Item;
|
||||
import org.mozilla.gecko.activitystream.homepanel.model.TopSite;
|
||||
|
||||
/**
|
||||
* This test is unfortunately closely coupled to the current implementation, however it is still
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче