From 245eb8de9b8ed87980a20f8c8a2f0be3bc621a8e Mon Sep 17 00:00:00 2001 From: Andrzej Hunt Date: Thu, 27 Apr 2017 15:54:06 +0800 Subject: [PATCH] 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 --- .../ActivityStreamTelemetry.java | 2 +- .../ActivityStreamHomeFragment.java | 2 +- .../homepanel}/ActivityStreamHomeScreen.java | 2 +- .../homepanel}/ActivityStreamPanel.java | 6 +-- .../homepanel}/HighlightsLoader.java | 4 +- .../homepanel}/StreamItemAnimator.java | 4 +- .../homepanel}/StreamRecyclerAdapter.java | 16 +++---- .../menu/ActivityStreamContextMenu.java | 4 +- .../menu/BottomSheetContextMenu.java | 6 +-- .../homepanel}/menu/PopupContextMenu.java | 4 +- .../homepanel}/model/Highlight.java | 2 +- .../homepanel}/model/Item.java | 2 +- .../homepanel}/model/Metadata.java | 2 +- .../homepanel}/model/TopSite.java | 2 +- .../homepanel}/stream/HighlightItem.java | 6 +-- .../homepanel}/stream/HighlightsTitle.java | 2 +- .../homepanel}/stream/StreamItem.java | 2 +- .../homepanel}/stream/TopPanel.java | 6 +-- .../homepanel}/stream/WelcomePanel.java | 2 +- .../topsites/CirclePageIndicator.java | 2 +- .../homepanel}/topsites/TopSitesCard.java | 7 ++- .../homepanel}/topsites/TopSitesPage.java | 6 +-- .../topsites/TopSitesPageAdapter.java | 4 +- .../topsites/TopSitesPagerAdapter.java | 2 +- .../ranking/HighlightCandidate.java | 4 +- .../ranking/HighlightsRanking.java | 3 +- .../org/mozilla/gecko/home/HomeAdapter.java | 2 +- mobile/android/base/moz.build | 46 +++++++++---------- .../base/resources/layout/activity_stream.xml | 10 ++-- .../layout/activity_stream_main_toppanel.xml | 2 +- .../layout/activity_stream_topsites_page.xml | 10 ++-- .../tests/testActivityStreamContextMenu.java | 8 ++-- 32 files changed, 85 insertions(+), 97 deletions(-) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/ActivityStreamHomeFragment.java (98%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/ActivityStreamHomeScreen.java (97%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/ActivityStreamPanel.java (96%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/HighlightsLoader.java (96%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/StreamItemAnimator.java (91%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/StreamRecyclerAdapter.java (92%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/menu/ActivityStreamContextMenu.java (99%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/menu/BottomSheetContextMenu.java (96%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/menu/PopupContextMenu.java (96%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/model/Highlight.java (98%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/model/Item.java (92%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/model/Metadata.java (97%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/model/TopSite.java (98%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/stream/HighlightItem.java (96%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/stream/HighlightsTitle.java (90%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/stream/StreamItem.java (89%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/stream/TopPanel.java (93%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/stream/WelcomePanel.java (97%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/topsites/CirclePageIndicator.java (99%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/topsites/TopSitesCard.java (95%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/topsites/TopSitesPage.java (87%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/topsites/TopSitesPageAdapter.java (97%) rename mobile/android/base/java/org/mozilla/gecko/{home/activitystream => activitystream/homepanel}/topsites/TopSitesPagerAdapter.java (98%) diff --git a/mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStreamTelemetry.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStreamTelemetry.java index 949ce7b15d3f..b95cf65679de 100644 --- a/mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStreamTelemetry.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStreamTelemetry.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamHomeFragment.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamHomeFragment.java similarity index 98% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamHomeFragment.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamHomeFragment.java index 1f07c0511a40..e0a44cd7a3f2 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamHomeFragment.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamHomeFragment.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamHomeScreen.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamHomeScreen.java similarity index 97% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamHomeScreen.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamHomeScreen.java index 0c1040e1ed1f..df3a12e6bfad 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamHomeScreen.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamHomeScreen.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamPanel.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamPanel.java similarity index 96% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamPanel.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamPanel.java index 877ba0a1915a..9a7d3de4ab1f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStreamPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/ActivityStreamPanel.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/HighlightsLoader.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/HighlightsLoader.java similarity index 96% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/HighlightsLoader.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/HighlightsLoader.java index bc7cf4b17e81..64a7c2f85aa4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/HighlightsLoader.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/HighlightsLoader.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/StreamItemAnimator.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamItemAnimator.java similarity index 91% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/StreamItemAnimator.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamItemAnimator.java index b17563cd8be9..adb7fc55b833 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/StreamItemAnimator.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamItemAnimator.java @@ -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. diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/StreamRecyclerAdapter.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamRecyclerAdapter.java similarity index 92% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/StreamRecyclerAdapter.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamRecyclerAdapter.java index 7de6b9c82b74..d4844c6c523d 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/StreamRecyclerAdapter.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamRecyclerAdapter.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/ActivityStreamContextMenu.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/ActivityStreamContextMenu.java similarity index 99% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/ActivityStreamContextMenu.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/ActivityStreamContextMenu.java index 7d34c89abba8..4cb877d49a35 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/ActivityStreamContextMenu.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/ActivityStreamContextMenu.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/BottomSheetContextMenu.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/BottomSheetContextMenu.java similarity index 96% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/BottomSheetContextMenu.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/BottomSheetContextMenu.java index 38dfe8941978..03fe9f71688e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/BottomSheetContextMenu.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/BottomSheetContextMenu.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/PopupContextMenu.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/PopupContextMenu.java similarity index 96% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/PopupContextMenu.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/PopupContextMenu.java index a76aa2a86de3..df1443230da8 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/menu/PopupContextMenu.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/menu/PopupContextMenu.java @@ -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 { diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Highlight.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Highlight.java similarity index 98% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Highlight.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Highlight.java index 3ce8c90e2768..788e9854d0ba 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Highlight.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Highlight.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Item.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Item.java similarity index 92% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Item.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Item.java index a11c0fdcf88d..6a58417e1405 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Item.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Item.java @@ -1,4 +1,4 @@ -package org.mozilla.gecko.home.activitystream.model; +package org.mozilla.gecko.activitystream.homepanel.model; import android.support.annotation.Nullable; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Metadata.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Metadata.java similarity index 97% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Metadata.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Metadata.java index 52982c88edeb..ef7ad7770b0c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/Metadata.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/Metadata.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/TopSite.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/TopSite.java similarity index 98% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/TopSite.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/TopSite.java index 5ca2ca52ad62..352545ab802e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/model/TopSite.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/model/TopSite.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/HighlightItem.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/HighlightItem.java similarity index 96% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/HighlightItem.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/HighlightItem.java index c88cca79a6b8..bd02d72a1d89 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/HighlightItem.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/HighlightItem.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/HighlightsTitle.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/HighlightsTitle.java similarity index 90% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/HighlightsTitle.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/HighlightsTitle.java index 65c031f35130..b8001c5f7f2f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/HighlightsTitle.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/HighlightsTitle.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/StreamItem.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/StreamItem.java similarity index 89% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/StreamItem.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/StreamItem.java index e83c8e3368dc..a68e2657fcb1 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/StreamItem.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/StreamItem.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/TopPanel.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/TopPanel.java similarity index 93% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/TopPanel.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/TopPanel.java index 6577a1984651..cef674a03f26 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/TopPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/TopPanel.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/WelcomePanel.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WelcomePanel.java similarity index 97% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/WelcomePanel.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WelcomePanel.java index 6aaeb0f7353c..74acddb42af2 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/stream/WelcomePanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WelcomePanel.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/CirclePageIndicator.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/CirclePageIndicator.java similarity index 99% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/CirclePageIndicator.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/CirclePageIndicator.java index 50300ff02a68..ad1141d5aecc 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/CirclePageIndicator.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/CirclePageIndicator.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesCard.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesCard.java similarity index 95% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesCard.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesCard.java index 83c4f4ddb9ec..39041fb52655 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesCard.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesCard.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPage.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPage.java similarity index 87% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPage.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPage.java index 45fdc0d1a2e8..4f53f9d2f351 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPage.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPage.java @@ -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 { diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPageAdapter.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPageAdapter.java similarity index 97% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPageAdapter.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPageAdapter.java index 96a099ff9c08..91931cc100a0 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPageAdapter.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPageAdapter.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPagerAdapter.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPagerAdapter.java similarity index 98% rename from mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPagerAdapter.java rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPagerAdapter.java index 5f7022ff452d..9245e11e3a23 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/TopSitesPagerAdapter.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPagerAdapter.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/activitystream/ranking/HighlightCandidate.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/ranking/HighlightCandidate.java index a2c98895b4ae..4d740a418eed 100644 --- a/mobile/android/base/java/org/mozilla/gecko/activitystream/ranking/HighlightCandidate.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/ranking/HighlightCandidate.java @@ -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. diff --git a/mobile/android/base/java/org/mozilla/gecko/activitystream/ranking/HighlightsRanking.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/ranking/HighlightsRanking.java index f9d3c78f5178..52fc78e962ec 100644 --- a/mobile/android/base/java/org/mozilla/gecko/activitystream/ranking/HighlightsRanking.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/ranking/HighlightsRanking.java @@ -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; diff --git a/mobile/android/base/java/org/mozilla/gecko/home/HomeAdapter.java b/mobile/android/base/java/org/mozilla/gecko/home/HomeAdapter.java index a76d30510f48..cc5ec12096ad 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/HomeAdapter.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/HomeAdapter.java @@ -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; diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index 8331dd317aa4..004b13ff06b0 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -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', diff --git a/mobile/android/base/resources/layout/activity_stream.xml b/mobile/android/base/resources/layout/activity_stream.xml index b40c01cdeefa..60b415a85b64 100644 --- a/mobile/android/base/resources/layout/activity_stream.xml +++ b/mobile/android/base/resources/layout/activity_stream.xml @@ -1,6 +1,6 @@ - + diff --git a/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml b/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml index bb2e1870a72e..3e17fe06d331 100644 --- a/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml +++ b/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml @@ -13,7 +13,7 @@ android:id="@+id/topsites_pager" android:contentDescription="@string/activity_stream_topsites" /> - - + diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testActivityStreamContextMenu.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testActivityStreamContextMenu.java index 373cb7c932d8..63fdcf5fc7fa 100644 --- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testActivityStreamContextMenu.java +++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testActivityStreamContextMenu.java @@ -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