Commit 566474e0 authored by Gang Wu's avatar Gang Wu Committed by Commit Bot

[Feed] Import feed@f7661592882a7ea507576dab4b70237fdfbffa96

Specifics:
      +596,579 bytes normalized apk size
            +3 zip entries file count
       +29,136 bytes main lib size
      +386,948 bytes main dex size
InstallSize:
      +209,631 bytes APK size
 +1,772,900.92 bytes Estimated installed size
InstallBreakdown (+1,773,525.92 bytes):
        +1,570 bytes Non-compiled Android resources size
       +29,136 bytes Native code size
          +161 bytes Package metadata size
 +1,728,134.92 bytes Java code size
       +14,524 bytes Compiled Android resources size
Dex:
        +1,935 entries fields
        +2,676 entries methods
          +656 entries types
        +1,339 entries strings

Change-Id: I73032882a03bf9fa3000068ba5d80e55f0208f88
Reviewed-on: https://chromium-review.googlesource.com/1154206
Commit-Queue: Gang Wu <gangwu@chromium.org>
Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578985}
parent 85d4706d
...@@ -181,7 +181,7 @@ vars = { ...@@ -181,7 +181,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'feed_revision': '3da352fb7e6e3de358373f017dc6e23dfba60132', 'feed_revision': 'f7661592882a7ea507576dab4b70237fdfbffa96',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_build-tools_version # the commit queue can handle CLs rolling android_sdk_build-tools_version
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -16,6 +16,8 @@ import android.widget.FrameLayout; ...@@ -16,6 +16,8 @@ import android.widget.FrameLayout;
import com.google.android.libraries.feed.api.scope.FeedProcessScope; import com.google.android.libraries.feed.api.scope.FeedProcessScope;
import com.google.android.libraries.feed.api.scope.FeedStreamScope; import com.google.android.libraries.feed.api.scope.FeedStreamScope;
import com.google.android.libraries.feed.api.stream.Stream; import com.google.android.libraries.feed.api.stream.Stream;
import com.google.android.libraries.feed.host.logging.BasicLoggingApi;
import com.google.android.libraries.feed.host.logging.ContentLoggingData;
import com.google.android.libraries.feed.host.stream.CardConfiguration; import com.google.android.libraries.feed.host.stream.CardConfiguration;
import com.google.android.libraries.feed.host.stream.SnackbarApi; import com.google.android.libraries.feed.host.stream.SnackbarApi;
import com.google.android.libraries.feed.host.stream.StreamConfiguration; import com.google.android.libraries.feed.host.stream.StreamConfiguration;
...@@ -55,6 +57,28 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate { ...@@ -55,6 +57,28 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
private SectionHeaderView mSectionHeaderView; private SectionHeaderView mSectionHeaderView;
private FeedImageLoader mImageLoader; private FeedImageLoader mImageLoader;
private static class DummyBasicLoggingApi implements BasicLoggingApi {
// TODO(gangwu): implement implement BasicLoggingApi functionality.
@Override
public void onContentViewed(ContentLoggingData data) {}
@Override
public void onContentDismissed(ContentLoggingData data) {}
@Override
public void onContentClicked(ContentLoggingData data) {}
@Override
public void onContentContextMenuOpened(ContentLoggingData data) {}
@Override
public void onMoreButtonViewed(int position) {}
@Override
public void onMoreButtonClicked(int position) {}
@Override
public void onOpenedWithContent(int timeToPopulateMs, int contentCount) {}
@Override
public void onOpenedWithNoImmediateContent() {}
@Override
public void onOpenedWithNoContent() {}
}
private class BasicSnackbarApi implements SnackbarApi { private class BasicSnackbarApi implements SnackbarApi {
@Override @Override
public void show(String message) { public void show(String message) {
...@@ -122,6 +146,18 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate { ...@@ -122,6 +146,18 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
public int getCardBottomMargin() { public int getCardBottomMargin() {
return mCardMarginBottom; return mCardMarginBottom;
} }
@Override
public int getCardStartMargin() {
// TODO(twellington): implement this method.
return 0;
}
@Override
public int getCardEndMargin() {
// TODO(twellington): implement this method.
return 0;
}
} }
/** /**
...@@ -148,7 +184,7 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate { ...@@ -148,7 +184,7 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
new FeedActionHandler(navigationDelegate), new FeedActionHandler(navigationDelegate),
new BasicStreamConfiguration(activity.getResources()), new BasicStreamConfiguration(activity.getResources()),
new BasicCardConfiguration(activity.getResources()), new BasicCardConfiguration(activity.getResources()),
new BasicSnackbarApi()) new BasicSnackbarApi(), new DummyBasicLoggingApi())
.build(); .build();
mStream = streamScope.getStream(); mStream = streamScope.getStream();
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
package org.chromium.chrome.browser.feed; package org.chromium.chrome.browser.feed;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import com.google.android.libraries.feed.api.stream.Stream; import com.google.android.libraries.feed.api.stream.Stream;
...@@ -89,7 +90,7 @@ class StreamLifecycleManager implements ApplicationStatus.ActivityStateListener ...@@ -89,7 +90,7 @@ class StreamLifecycleManager implements ApplicationStatus.ActivityStateListener
mStreamState = CREATED; mStreamState = CREATED;
// TODO(huayinz): Handle saved instance state. // TODO(huayinz): Handle saved instance state.
mStream.onCreate(null); mStream.onCreate((Bundle) null);
show(); show();
activate(); activate();
......
...@@ -2,7 +2,7 @@ Name: Feed ...@@ -2,7 +2,7 @@ Name: Feed
Short name: feed Short name: feed
URL: https://chromium.googlesource.com/feed URL: https://chromium.googlesource.com/feed
Version: 0 Version: 0
Revision: 3da352fb7e6e3de358373f017dc6e23dfba60132 Revision: f7661592882a7ea507576dab4b70237fdfbffa96
License: Apache 2.0 License: Apache 2.0
License File: LICENSE License File: LICENSE
Security Critical: yes Security Critical: yes
......
...@@ -60,7 +60,6 @@ feed_lib_java_sources = [ ...@@ -60,7 +60,6 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ZeroStateDriver.java", "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ZeroStateDriver.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/LoggingListener.java", "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/LoggingListener.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/OneShotVisibilityLoggingListener.java", "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/OneShotVisibilityLoggingListener.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/StreamBasicLoggingApi.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/StreamContentLoggingData.java", "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/StreamContentLoggingData.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/VisibilityListener.java", "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/VisibilityListener.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/VisibilityMonitor.java", "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/VisibilityMonitor.java",
...@@ -80,6 +79,7 @@ feed_lib_java_sources = [ ...@@ -80,6 +79,7 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/common/concurrent/TaskQueue.java", "src/src/main/java/com/google/android/libraries/feed/common/concurrent/TaskQueue.java",
"src/src/main/java/com/google/android/libraries/feed/common/functional/Committer.java", "src/src/main/java/com/google/android/libraries/feed/common/functional/Committer.java",
"src/src/main/java/com/google/android/libraries/feed/common/functional/Consumer.java", "src/src/main/java/com/google/android/libraries/feed/common/functional/Consumer.java",
"src/src/main/java/com/google/android/libraries/feed/common/functional/Predicate.java",
"src/src/main/java/com/google/android/libraries/feed/common/functional/SettableSupplier.java", "src/src/main/java/com/google/android/libraries/feed/common/functional/SettableSupplier.java",
"src/src/main/java/com/google/android/libraries/feed/common/functional/Supplier.java", "src/src/main/java/com/google/android/libraries/feed/common/functional/Supplier.java",
"src/src/main/java/com/google/android/libraries/feed/common/logging/Dumpable.java", "src/src/main/java/com/google/android/libraries/feed/common/logging/Dumpable.java",
...@@ -90,6 +90,7 @@ feed_lib_java_sources = [ ...@@ -90,6 +90,7 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/common/time/Clock.java", "src/src/main/java/com/google/android/libraries/feed/common/time/Clock.java",
"src/src/main/java/com/google/android/libraries/feed/common/time/SystemClockImpl.java", "src/src/main/java/com/google/android/libraries/feed/common/time/SystemClockImpl.java",
"src/src/main/java/com/google/android/libraries/feed/common/time/TimingUtils.java", "src/src/main/java/com/google/android/libraries/feed/common/time/TimingUtils.java",
"src/src/main/java/com/google/android/libraries/feed/common/ui/LayoutUtils.java",
"src/src/main/java/com/google/android/libraries/feed/feedactionmanager/FeedActionManagerImpl.java", "src/src/main/java/com/google/android/libraries/feed/feedactionmanager/FeedActionManagerImpl.java",
"src/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParser.java", "src/src/main/java/com/google/android/libraries/feed/feedactionparser/FeedActionParser.java",
"src/src/main/java/com/google/android/libraries/feed/feedactionparser/internal/PietFeedActionPaylaodRetriever.java", "src/src/main/java/com/google/android/libraries/feed/feedactionparser/internal/PietFeedActionPaylaodRetriever.java",
...@@ -137,6 +138,7 @@ feed_lib_java_sources = [ ...@@ -137,6 +138,7 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/host/config/DebugBehavior.java", "src/src/main/java/com/google/android/libraries/feed/host/config/DebugBehavior.java",
"src/src/main/java/com/google/android/libraries/feed/host/imageloader/ImageLoaderApi.java", "src/src/main/java/com/google/android/libraries/feed/host/imageloader/ImageLoaderApi.java",
"src/src/main/java/com/google/android/libraries/feed/host/logging/BasicLoggingApi.java", "src/src/main/java/com/google/android/libraries/feed/host/logging/BasicLoggingApi.java",
"src/src/main/java/com/google/android/libraries/feed/host/logging/ContentLoggingData.java",
"src/src/main/java/com/google/android/libraries/feed/host/logging/LoggingApi.java", "src/src/main/java/com/google/android/libraries/feed/host/logging/LoggingApi.java",
"src/src/main/java/com/google/android/libraries/feed/host/network/HttpHeader.java", "src/src/main/java/com/google/android/libraries/feed/host/network/HttpHeader.java",
"src/src/main/java/com/google/android/libraries/feed/host/network/HttpRequest.java", "src/src/main/java/com/google/android/libraries/feed/host/network/HttpRequest.java",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment