Move ActionParser package to feed/internalapi
PiperOrigin-RevId: 243070089
Change-Id: I223353b43499e788f78e1d72f83aae08f3569a18
diff --git a/src/main/java/com/google/android/libraries/feed/api/scope/BUILD b/src/main/java/com/google/android/libraries/feed/api/scope/BUILD
index 08e015e..9860456 100644
--- a/src/main/java/com/google/android/libraries/feed/api/scope/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/api/scope/BUILD
@@ -6,7 +6,6 @@
name = "scope",
srcs = glob(["*.java"]),
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/lifecycle",
@@ -46,6 +45,7 @@
"//src/main/java/com/google/android/libraries/feed/hostimpl/scheduler",
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
diff --git a/src/main/java/com/google/android/libraries/feed/api/scope/FeedStreamScope.java b/src/main/java/com/google/android/libraries/feed/api/scope/FeedStreamScope.java
index abdd40a..a30e239 100644
--- a/src/main/java/com/google/android/libraries/feed/api/scope/FeedStreamScope.java
+++ b/src/main/java/com/google/android/libraries/feed/api/scope/FeedStreamScope.java
@@ -15,7 +15,6 @@
package com.google.android.libraries.feed.api.scope;
import android.content.Context;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.api.knowncontent.KnownContentApi;
import com.google.android.libraries.feed.api.modelprovider.ModelProviderFactory;
@@ -42,6 +41,7 @@
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.host.stream.TooltipSupportedApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.piet.host.CustomElementProvider;
import com.google.android.libraries.feed.piet.host.HostBindingProvider;
import java.util.ArrayList;
@@ -104,11 +104,6 @@
this.tooltipApi = tooltipApi;
}
- public Builder setActionParserFactory(ActionParserFactory actionParserFactory) {
- this.actionParserFactory = actionParserFactory;
- return this;
- }
-
public Builder setIsBackgroundDark(boolean isBackgroundDark) {
this.isBackgroundDark = isBackgroundDark;
return this;
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/BUILD b/src/main/java/com/google/android/libraries/feed/basicstream/BUILD
index 00115d1..df74bba 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/BUILD
@@ -8,7 +8,6 @@
manifest = "AndroidManifest.xml",
resource_files = glob(["res/**"]),
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
@@ -29,6 +28,7 @@
"//src/main/java/com/google/android/libraries/feed/host/offlineindicator",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contentchanged",
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/BasicStream.java b/src/main/java/com/google/android/libraries/feed/basicstream/BasicStream.java
index e426a8f..0eced72 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/BasicStream.java
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/BasicStream.java
@@ -30,7 +30,6 @@
import android.view.ContextThemeWrapper;
import android.view.View;
import android.view.View.OnLayoutChangeListener;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.api.knowncontent.KnownContentApi;
import com.google.android.libraries.feed.api.modelprovider.ModelError;
@@ -69,6 +68,7 @@
import com.google.android.libraries.feed.host.stream.StreamConfiguration;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.piet.PietManager;
import com.google.android.libraries.feed.piet.host.CustomElementProvider;
import com.google.android.libraries.feed.piet.host.HostBindingProvider;
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD b/src/main/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
index 83bcb18..ffd5aaa 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
@@ -6,13 +6,13 @@
name = "actions",
srcs = glob(["*.java"]),
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/pendingdismiss",
"//src/main/java/com/google/android/libraries/feed/host/action",
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
"//src/main/java/com/google/android/libraries/feed/sharedstream/pendingdismiss",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/internal/actions/StreamActionApiImpl.java b/src/main/java/com/google/android/libraries/feed/basicstream/internal/actions/StreamActionApiImpl.java
index 9afa1a3..5494271 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/internal/actions/StreamActionApiImpl.java
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/internal/actions/StreamActionApiImpl.java
@@ -15,8 +15,6 @@
package com.google.android.libraries.feed.basicstream.internal.actions;
import android.view.View;
-import com.google.android.libraries.feed.api.actionparser.ActionParser;
-import com.google.android.libraries.feed.api.actionparser.ActionSource;
import com.google.android.libraries.feed.api.knowncontent.ContentMetadata;
import com.google.android.libraries.feed.basicstream.internal.pendingdismiss.ClusterPendingDismissHelper;
import com.google.android.libraries.feed.host.action.ActionApi;
@@ -28,6 +26,8 @@
import com.google.android.libraries.feed.host.stream.TooltipCallbackApi;
import com.google.android.libraries.feed.host.stream.TooltipInfo;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParser;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionSource;
import com.google.android.libraries.feed.sharedstream.contextmenumanager.ContextMenuManager;
import com.google.android.libraries.feed.sharedstream.pendingdismiss.PendingDismissCallback;
import com.google.search.now.feed.client.StreamDataProto.StreamDataOperation;
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
index c2819ee..c28e7d4 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
@@ -7,7 +7,6 @@
srcs = glob(["*.java"]),
manifest = "AndroidManifest.xml",
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
@@ -27,6 +26,7 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/sharedstream/constants",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriver.java b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriver.java
index 1fc3845..c66ea84 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriver.java
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriver.java
@@ -17,7 +17,6 @@
import static com.google.android.libraries.feed.common.Validators.checkState;
import android.support.annotation.VisibleForTesting;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.modelprovider.ModelChild;
import com.google.android.libraries.feed.api.modelprovider.ModelChild.Type;
import com.google.android.libraries.feed.api.modelprovider.ModelCursor;
@@ -34,6 +33,7 @@
import com.google.android.libraries.feed.host.logging.InternalFeedError;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.sharedstream.contextmenumanager.ContextMenuManager;
import com.google.android.libraries.feed.sharedstream.offlinemonitor.StreamOfflineMonitor;
import com.google.search.now.ui.action.FeedActionPayloadProto.FeedActionPayload;
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriver.java b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriver.java
index d97e0ef..69a5c8d 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriver.java
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriver.java
@@ -15,7 +15,6 @@
package com.google.android.libraries.feed.basicstream.internal.drivers;
import android.support.annotation.VisibleForTesting;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.modelprovider.ModelChild;
import com.google.android.libraries.feed.api.modelprovider.ModelChild.Type;
import com.google.android.libraries.feed.api.modelprovider.ModelCursor;
@@ -33,6 +32,7 @@
import com.google.android.libraries.feed.host.logging.InternalFeedError;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.sharedstream.contextmenumanager.ContextMenuManager;
import com.google.android.libraries.feed.sharedstream.offlinemonitor.StreamOfflineMonitor;
import com.google.android.libraries.feed.sharedstream.pendingdismiss.PendingDismissCallback;
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriver.java b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriver.java
index e8a08af..5b61833 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriver.java
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriver.java
@@ -18,8 +18,6 @@
import android.support.annotation.VisibleForTesting;
import android.support.v7.widget.RecyclerView;
-import com.google.android.libraries.feed.api.actionparser.ActionParser;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.knowncontent.ContentMetadata;
import com.google.android.libraries.feed.api.modelprovider.ModelFeature;
import com.google.android.libraries.feed.api.modelprovider.ModelProvider;
@@ -45,6 +43,8 @@
import com.google.android.libraries.feed.host.logging.InternalFeedError;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParser;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.sharedstream.constants.Constants;
import com.google.android.libraries.feed.sharedstream.contextmenumanager.ContextMenuManager;
import com.google.android.libraries.feed.sharedstream.logging.LoggingListener;
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriver.java b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriver.java
index 98a1bd2..8c59227 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriver.java
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriver.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.support.annotation.VisibleForTesting;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.api.knowncontent.KnownContentApi;
import com.google.android.libraries.feed.api.modelprovider.FeatureChange;
@@ -47,6 +46,7 @@
import com.google.android.libraries.feed.host.stream.SnackbarCallbackApi;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.sharedstream.contextmenumanager.ContextMenuManager;
import com.google.android.libraries.feed.sharedstream.offlinemonitor.StreamOfflineMonitor;
import com.google.android.libraries.feed.sharedstream.pendingdismiss.PendingDismissCallback;
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD b/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
index d1cac63..7fddbd8 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
@@ -8,7 +8,6 @@
manifest = "AndroidManifest.xml",
resource_files = glob(["res/**"]),
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/stream",
"//src/main/java/com/google/android/libraries/feed/common",
"//src/main/java/com/google/android/libraries/feed/common/logging",
@@ -16,6 +15,7 @@
"//src/main/java/com/google/android/libraries/feed/host/action",
"//src/main/java/com/google/android/libraries/feed/host/config",
"//src/main/java/com/google/android/libraries/feed/host/stream",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
diff --git a/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolder.java b/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolder.java
index aadb860..ab0ce8f 100644
--- a/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolder.java
+++ b/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolder.java
@@ -23,15 +23,15 @@
import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams;
import android.widget.FrameLayout;
-import com.google.android.libraries.feed.api.actionparser.ActionParser;
-import com.google.android.libraries.feed.api.actionparser.ActionSource;
-import com.google.android.libraries.feed.api.actionparser.ActionSourceConverter;
import com.google.android.libraries.feed.api.stream.ScrollListener;
import com.google.android.libraries.feed.common.logging.Logger;
import com.google.android.libraries.feed.common.ui.LayoutUtils;
import com.google.android.libraries.feed.host.action.StreamActionApi;
import com.google.android.libraries.feed.host.config.Configuration;
import com.google.android.libraries.feed.host.stream.CardConfiguration;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParser;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionSource;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionSourceConverter;
import com.google.android.libraries.feed.piet.FrameAdapter;
import com.google.android.libraries.feed.piet.PietManager;
import com.google.android.libraries.feed.piet.host.ActionHandler.ActionType;
diff --git a/src/main/java/com/google/android/libraries/feed/feedactionparser/BUILD b/src/main/java/com/google/android/libraries/feed/feedactionparser/BUILD
index 63d3f78..02e2c79 100644
--- a/src/main/java/com/google/android/libraries/feed/feedactionparser/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/feedactionparser/BUILD
@@ -6,7 +6,6 @@
name = "feedactionparser",
srcs = glob(["*.java"]),
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/protocoladapter",
"//src/main/java/com/google/android/libraries/feed/common",
@@ -15,6 +14,7 @@
"//src/main/java/com/google/android/libraries/feed/feedactionparser/internal",
"//src/main/java/com/google/android/libraries/feed/host/action",
"//src/main/java/com/google/android/libraries/feed/host/logging",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/ui/action:feed_action_java_proto_lite",
"//src/main/proto/search/now/ui/action:feed_action_payload_java_proto_lite",
diff --git a/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParser.java b/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParser.java
index e7bbea9..29f98c2 100644
--- a/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParser.java
+++ b/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParser.java
@@ -23,8 +23,6 @@
import static com.google.search.now.ui.action.FeedActionProto.FeedActionMetadata.Type.OPEN_URL_NEW_WINDOW;
import android.view.View;
-import com.google.android.libraries.feed.api.actionparser.ActionParser;
-import com.google.android.libraries.feed.api.actionparser.ActionSource;
import com.google.android.libraries.feed.api.knowncontent.ContentMetadata;
import com.google.android.libraries.feed.api.protocoladapter.ProtocolAdapter;
import com.google.android.libraries.feed.common.Result;
@@ -36,6 +34,8 @@
import com.google.android.libraries.feed.host.action.StreamActionApi;
import com.google.android.libraries.feed.host.logging.BasicLoggingApi;
import com.google.android.libraries.feed.host.logging.InternalFeedError;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParser;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionSource;
import com.google.search.now.feed.client.StreamDataProto.StreamDataOperation;
import com.google.search.now.ui.action.FeedActionPayloadProto.FeedActionPayload;
import com.google.search.now.ui.action.FeedActionProto.FeedAction;
diff --git a/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserFactory.java b/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserFactory.java
index bcfffe4..a02645e 100644
--- a/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserFactory.java
+++ b/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserFactory.java
@@ -14,13 +14,13 @@
package com.google.android.libraries.feed.feedactionparser;
-import com.google.android.libraries.feed.api.actionparser.ActionParser;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.knowncontent.ContentMetadata;
import com.google.android.libraries.feed.api.protocoladapter.ProtocolAdapter;
import com.google.android.libraries.feed.common.functional.Supplier;
import com.google.android.libraries.feed.feedactionparser.internal.PietFeedActionPayloadRetriever;
import com.google.android.libraries.feed.host.logging.BasicLoggingApi;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParser;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
/** Default factory for the default {@link ActionParser} implementation. */
public final class FeedActionParserFactory implements ActionParserFactory {
diff --git a/src/main/java/com/google/android/libraries/feed/host/action/StreamActionApi.java b/src/main/java/com/google/android/libraries/feed/host/action/StreamActionApi.java
index b25674f..7bb6fc9 100644
--- a/src/main/java/com/google/android/libraries/feed/host/action/StreamActionApi.java
+++ b/src/main/java/com/google/android/libraries/feed/host/action/StreamActionApi.java
@@ -24,8 +24,8 @@
import java.util.List;
/**
- * Allows the {@link com.google.android.libraries.feed.api.actionparser.ActionParser} to communicate
- * actions back to the Stream after parsing.
+ * Allows the {@link com.google.android.libraries.feed.internalapi.actionparser.ActionParser} to
+ * communicate actions back to the Stream after parsing.
*/
public interface StreamActionApi extends ActionApi {
diff --git a/src/main/java/com/google/android/libraries/feed/api/actionparser/ActionParser.java b/src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionParser.java
similarity index 95%
rename from src/main/java/com/google/android/libraries/feed/api/actionparser/ActionParser.java
rename to src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionParser.java
index 19e5006..d5170c7 100644
--- a/src/main/java/com/google/android/libraries/feed/api/actionparser/ActionParser.java
+++ b/src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionParser.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.android.libraries.feed.api.actionparser;
+package com.google.android.libraries.feed.internalapi.actionparser;
import android.view.View;
import com.google.android.libraries.feed.host.action.StreamActionApi;
diff --git a/src/main/java/com/google/android/libraries/feed/api/actionparser/ActionParserFactory.java b/src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionParserFactory.java
similarity index 95%
rename from src/main/java/com/google/android/libraries/feed/api/actionparser/ActionParserFactory.java
rename to src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionParserFactory.java
index d00bcec..b4c7141 100644
--- a/src/main/java/com/google/android/libraries/feed/api/actionparser/ActionParserFactory.java
+++ b/src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionParserFactory.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.android.libraries.feed.api.actionparser;
+package com.google.android.libraries.feed.internalapi.actionparser;
import com.google.android.libraries.feed.api.knowncontent.ContentMetadata;
import com.google.android.libraries.feed.common.functional.Supplier;
diff --git a/src/main/java/com/google/android/libraries/feed/api/actionparser/ActionSource.java b/src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionSource.java
similarity index 94%
rename from src/main/java/com/google/android/libraries/feed/api/actionparser/ActionSource.java
rename to src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionSource.java
index ff05ff0..ae535e5 100644
--- a/src/main/java/com/google/android/libraries/feed/api/actionparser/ActionSource.java
+++ b/src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionSource.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.android.libraries.feed.api.actionparser;
+package com.google.android.libraries.feed.internalapi.actionparser;
import android.support.annotation.IntDef;
diff --git a/src/main/java/com/google/android/libraries/feed/api/actionparser/ActionSourceConverter.java b/src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionSourceConverter.java
similarity index 94%
rename from src/main/java/com/google/android/libraries/feed/api/actionparser/ActionSourceConverter.java
rename to src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionSourceConverter.java
index 51e9d40..487841c 100644
--- a/src/main/java/com/google/android/libraries/feed/api/actionparser/ActionSourceConverter.java
+++ b/src/main/java/com/google/android/libraries/feed/internalapi/actionparser/ActionSourceConverter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.android.libraries.feed.api.actionparser;
+package com.google.android.libraries.feed.internalapi.actionparser;
import com.google.android.libraries.feed.piet.host.ActionHandler.ActionType;
diff --git a/src/main/java/com/google/android/libraries/feed/api/actionparser/BUILD b/src/main/java/com/google/android/libraries/feed/internalapi/actionparser/BUILD
similarity index 100%
rename from src/main/java/com/google/android/libraries/feed/api/actionparser/BUILD
rename to src/main/java/com/google/android/libraries/feed/internalapi/actionparser/BUILD
diff --git a/src/test/java/com/google/android/libraries/feed/api/scope/BUILD b/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
index dc5b9c3..3dc6bed 100644
--- a/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
@@ -65,7 +65,6 @@
aapt_version = "aapt2",
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
@@ -83,6 +82,7 @@
"//src/main/java/com/google/android/libraries/feed/host/offlineindicator",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
diff --git a/src/test/java/com/google/android/libraries/feed/api/scope/FeedStreamScopeTest.java b/src/test/java/com/google/android/libraries/feed/api/scope/FeedStreamScopeTest.java
index b91277f..77f0915 100644
--- a/src/test/java/com/google/android/libraries/feed/api/scope/FeedStreamScopeTest.java
+++ b/src/test/java/com/google/android/libraries/feed/api/scope/FeedStreamScopeTest.java
@@ -23,7 +23,6 @@
import android.app.Activity;
import android.content.Context;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.api.knowncontent.KnownContentApi;
import com.google.android.libraries.feed.api.modelprovider.ModelProviderFactory;
@@ -70,7 +69,6 @@
// Mocks for optional fields
@Mock private ProtocolAdapter protocolAdapter;
@Mock private SessionManager sessionManager;
- @Mock private ActionParserFactory actionParserFactory;
@Mock private Stream stream;
@Mock private StreamConfiguration streamConfiguration;
@Mock private CardConfiguration cardConfiguration;
@@ -160,7 +158,6 @@
knownContentApi,
tooltipApi,
tooltipSupportedApi)
- .setActionParserFactory(actionParserFactory)
.setStream(stream)
.setModelProviderFactory(modelProviderFactory)
.setCustomElementProvider(customElementProvider)
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/BUILD
index f842c08..e9ebe2e 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/BUILD
@@ -10,7 +10,6 @@
aapt_version = "aapt2",
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
@@ -33,6 +32,7 @@
"//src/main/java/com/google/android/libraries/feed/host/offlineindicator",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contentchanged",
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/BasicStreamTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/BasicStreamTest.java
index d49b1e3..25ebc97 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/BasicStreamTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/BasicStreamTest.java
@@ -41,7 +41,6 @@
import android.util.Base64;
import android.view.View;
import android.widget.FrameLayout;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.api.knowncontent.ContentMetadata;
import com.google.android.libraries.feed.api.knowncontent.KnownContentApi;
@@ -80,6 +79,7 @@
import com.google.android.libraries.feed.host.stream.StreamConfiguration;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.piet.PietManager;
import com.google.android.libraries.feed.piet.host.CustomElementProvider;
import com.google.android.libraries.feed.piet.host.HostBindingProvider;
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
index 3a87fa1..6e10218 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
@@ -10,7 +10,6 @@
aapt_version = "aapt2",
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/actions",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/pendingdismiss",
@@ -19,6 +18,7 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
"//src/main/java/com/google/android/libraries/feed/sharedstream/pendingdismiss",
"//src/main/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer",
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/StreamActionApiImplTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/StreamActionApiImplTest.java
index 412dd1b..c012411 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/StreamActionApiImplTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/StreamActionApiImplTest.java
@@ -28,8 +28,6 @@
import android.app.Activity;
import android.content.Context;
import android.view.View;
-import com.google.android.libraries.feed.api.actionparser.ActionParser;
-import com.google.android.libraries.feed.api.actionparser.ActionSource;
import com.google.android.libraries.feed.api.knowncontent.ContentMetadata;
import com.google.android.libraries.feed.basicstream.internal.pendingdismiss.ClusterPendingDismissHelper;
import com.google.android.libraries.feed.common.functional.Consumer;
@@ -42,6 +40,8 @@
import com.google.android.libraries.feed.host.stream.TooltipCallbackApi.TooltipDismissType;
import com.google.android.libraries.feed.host.stream.TooltipInfo;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParser;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionSource;
import com.google.android.libraries.feed.sharedstream.pendingdismiss.PendingDismissCallback;
import com.google.android.libraries.feed.testing.sharedstream.contextmenumanager.FakeContextMenuManager;
import com.google.common.collect.ImmutableList;
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
index 84fe7c5..6bd16dd 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
@@ -10,7 +10,6 @@
aapt_version = "aapt2",
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
"//src/main/java/com/google/android/libraries/feed/api/stream",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers",
@@ -22,6 +21,7 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
"//src/main/java/com/google/android/libraries/feed/sharedstream/offlinemonitor",
"//src/main/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer",
@@ -48,7 +48,6 @@
aapt_version = "aapt2",
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
"//src/main/java/com/google/android/libraries/feed/api/stream",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers",
@@ -60,6 +59,7 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
"//src/main/java/com/google/android/libraries/feed/sharedstream/offlinemonitor",
"//src/main/java/com/google/android/libraries/feed/sharedstream/pendingdismiss",
@@ -85,7 +85,6 @@
aapt_version = "aapt2",
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
"//src/main/java/com/google/android/libraries/feed/api/stream",
@@ -102,6 +101,7 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
"//src/main/java/com/google/android/libraries/feed/sharedstream/offlinemonitor",
@@ -197,7 +197,6 @@
aapt_version = "aapt2",
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
@@ -216,6 +215,7 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
"//src/main/java/com/google/android/libraries/feed/sharedstream/offlinemonitor",
"//src/main/java/com/google/android/libraries/feed/sharedstream/pendingdismiss",
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriverTest.java
index f211239..5215ce9 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriverTest.java
@@ -22,7 +22,6 @@
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.modelprovider.ModelChild;
import com.google.android.libraries.feed.api.modelprovider.ModelChild.Type;
import com.google.android.libraries.feed.api.modelprovider.ModelFeature;
@@ -37,6 +36,7 @@
import com.google.android.libraries.feed.host.logging.InternalFeedError;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.sharedstream.contextmenumanager.ContextMenuManager;
import com.google.android.libraries.feed.sharedstream.offlinemonitor.StreamOfflineMonitor;
import com.google.android.libraries.feed.testing.modelprovider.FakeModelCursor;
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriverTest.java
index 8bb0172..e874977 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriverTest.java
@@ -21,7 +21,6 @@
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.modelprovider.ModelChild;
import com.google.android.libraries.feed.api.modelprovider.ModelChild.Type;
import com.google.android.libraries.feed.api.modelprovider.ModelFeature;
@@ -36,6 +35,7 @@
import com.google.android.libraries.feed.host.logging.InternalFeedError;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.sharedstream.contextmenumanager.ContextMenuManager;
import com.google.android.libraries.feed.sharedstream.offlinemonitor.StreamOfflineMonitor;
import com.google.android.libraries.feed.sharedstream.pendingdismiss.PendingDismissCallback;
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java
index f3443b6..dc546f6 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java
@@ -27,8 +27,6 @@
import static org.mockito.MockitoAnnotations.initMocks;
import android.support.v7.widget.RecyclerView;
-import com.google.android.libraries.feed.api.actionparser.ActionParser;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.knowncontent.ContentMetadata;
import com.google.android.libraries.feed.api.modelprovider.ModelFeature;
import com.google.android.libraries.feed.api.modelprovider.ModelProvider;
@@ -51,6 +49,8 @@
import com.google.android.libraries.feed.host.logging.InternalFeedError;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParser;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.sharedstream.contextmenumanager.ContextMenuManager;
import com.google.android.libraries.feed.sharedstream.logging.LoggingListener;
import com.google.android.libraries.feed.sharedstream.logging.StreamContentLoggingData;
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriverTest.java
index f00dc01..fd4afa4 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriverTest.java
@@ -30,7 +30,6 @@
import android.app.Activity;
import android.content.Context;
-import com.google.android.libraries.feed.api.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.api.knowncontent.KnownContentApi;
import com.google.android.libraries.feed.api.modelprovider.ModelChild;
@@ -57,6 +56,7 @@
import com.google.android.libraries.feed.host.stream.SnackbarCallbackApi;
import com.google.android.libraries.feed.host.stream.TooltipApi;
import com.google.android.libraries.feed.internalapi.actionmanager.ActionManager;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParserFactory;
import com.google.android.libraries.feed.sharedstream.contextmenumanager.ContextMenuManager;
import com.google.android.libraries.feed.sharedstream.offlinemonitor.StreamOfflineMonitor;
import com.google.android.libraries.feed.sharedstream.pendingdismiss.PendingDismissCallback;
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
index 2d4bc59..b6743ed 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
@@ -67,7 +67,6 @@
aapt_version = "aapt2",
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/stream",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/actions",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders",
@@ -76,6 +75,7 @@
"//src/main/java/com/google/android/libraries/feed/host/config",
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/host/stream",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/piet/testing",
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java
index 1f04183..c73bae3 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java
@@ -33,9 +33,6 @@
import android.view.ViewGroup.MarginLayoutParams;
import android.widget.FrameLayout;
import android.widget.TextView;
-import com.google.android.libraries.feed.api.actionparser.ActionParser;
-import com.google.android.libraries.feed.api.actionparser.ActionSource;
-import com.google.android.libraries.feed.api.actionparser.ActionSourceConverter;
import com.google.android.libraries.feed.api.stream.ContentChangedListener;
import com.google.android.libraries.feed.basicstream.internal.actions.StreamActionApiImpl;
import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
@@ -43,6 +40,9 @@
import com.google.android.libraries.feed.host.config.Configuration;
import com.google.android.libraries.feed.host.logging.BasicLoggingApi;
import com.google.android.libraries.feed.host.stream.CardConfiguration;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionParser;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionSource;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionSourceConverter;
import com.google.android.libraries.feed.piet.PietManager;
import com.google.android.libraries.feed.piet.host.ActionHandler;
import com.google.android.libraries.feed.piet.host.ActionHandler.ActionType;
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD b/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD
index 3a7f4a3..de92154 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD
@@ -10,7 +10,6 @@
aapt_version = "aapt2",
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/actionparser",
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/protocoladapter",
"//src/main/java/com/google/android/libraries/feed/common",
@@ -19,6 +18,7 @@
"//src/main/java/com/google/android/libraries/feed/host/action",
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/host/stream",
+ "//src/main/java/com/google/android/libraries/feed/internalapi/actionparser",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/ui/action:feed_action_java_proto_lite",
"//src/main/proto/search/now/ui/action:feed_action_payload_java_proto_lite",
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserTest.java b/src/test/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserTest.java
index 4915ed0..eb94a96 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserTest.java
@@ -29,7 +29,6 @@
import android.app.Activity;
import android.content.Context;
import android.view.View;
-import com.google.android.libraries.feed.api.actionparser.ActionSource;
import com.google.android.libraries.feed.api.knowncontent.ContentMetadata;
import com.google.android.libraries.feed.api.protocoladapter.ProtocolAdapter;
import com.google.android.libraries.feed.common.Result;
@@ -39,6 +38,7 @@
import com.google.android.libraries.feed.host.logging.BasicLoggingApi;
import com.google.android.libraries.feed.host.logging.InternalFeedError;
import com.google.android.libraries.feed.host.stream.TooltipInfo;
+import com.google.android.libraries.feed.internalapi.actionparser.ActionSource;
import com.google.common.collect.Lists;
import com.google.search.now.feed.client.StreamDataProto.StreamDataOperation;
import com.google.search.now.feed.client.StreamDataProto.StreamStructure;
