Commit 71cefa10 authored by Patrick Noland's avatar Patrick Noland Committed by Commit Bot

[Feed] Import feed@a4e91c7238e329ad11e48b068fe3b1e935c0de9b

Change-Id: I20cd1fe7eeb2eac30d7913599a8dc1285ae9023e

******************************Resource Sizes Diff******************************
Monochrome.apk_Dex
    +1,728 entries fields
    +2,366 entries methods
      +581 entries types
    +1,193 entries strings
Monochrome.apk_Breakdown (+169,703 bytes)
    +3,241 bytes Zip Overhead
    +1,510 bytes Non-compiled Android resources size
   +12,528 bytes Native code size
      +129 bytes Package metadata size
  +148,695 bytes Java code size
    +3,600 bytes Compiled Android resources size
Monochrome.apk_Specifics
  +523,907 bytes normalized apk size
        +3 zip entries file count
   +12,528 bytes main lib size
  +354,204 bytes main dex size

Change-Id: I20cd1fe7eeb2eac30d7913599a8dc1285ae9023e
Reviewed-on: https://chromium-review.googlesource.com/1175218Reviewed-by: default avatarTheresa <twellington@chromium.org>
Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Commit-Queue: Patrick Noland <pnoland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583291}
parent 7156d47f
......@@ -181,7 +181,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'feed_revision': '75614b922b359cc739614fb53b34817cabd69d82',
'feed_revision': 'a4e91c7238e329ad11e48b068fe3b1e935c0de9b',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_build-tools_version
# and whatever else without interference from each other.
......
......@@ -15,6 +15,7 @@ import android.widget.FrameLayout;
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.stream.NonDismissibleHeader;
import com.google.android.libraries.feed.api.stream.Stream;
import com.google.android.libraries.feed.common.functional.Consumer;
import com.google.android.libraries.feed.host.action.ActionApi;
......@@ -213,7 +214,8 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
mStream.getView().setBackgroundColor(Color.WHITE);
mRootView.addView(mStream.getView());
mStream.setHeaderViews(Arrays.asList(mNewTabPageLayout, mSectionHeaderView));
mStream.setHeaderViews(Arrays.asList(new NonDismissibleHeader(mNewTabPageLayout),
new NonDismissibleHeader(mSectionHeaderView)));
}
@Override
......
......@@ -13,6 +13,7 @@ import com.google.android.libraries.feed.host.config.DebugBehavior;
import com.google.android.libraries.feed.host.network.NetworkClient;
import com.google.android.libraries.feed.hostimpl.logging.LoggingApiImpl;
import org.chromium.base.ContextUtils;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.profiles.Profile;
......@@ -58,7 +59,8 @@ public class FeedProcessScopeFactory {
new FeedProcessScope
.Builder(configHostApi, Executors.newSingleThreadExecutor(),
new LoggingApiImpl(), new FeedNetworkBridge(profile),
schedulerBridge, lifecycleListener, DebugBehavior.SILENT)
schedulerBridge, lifecycleListener, DebugBehavior.SILENT,
ContextUtils.getApplicationContext())
.build();
schedulerBridge.initializeFeedDependencies(
sFeedProcessScope.getRequestManager(), sFeedProcessScope.getSessionManager());
......@@ -91,7 +93,8 @@ public class FeedProcessScopeFactory {
sFeedProcessScope = new FeedProcessScope
.Builder(configHostApi, Executors.newSingleThreadExecutor(),
new LoggingApiImpl(), networkClient, sFeedScheduler,
lifecycleListener, DebugBehavior.SILENT)
lifecycleListener, DebugBehavior.SILENT,
ContextUtils.getApplicationContext())
.build();
}
......
......@@ -2,7 +2,7 @@ Name: Feed
Short name: feed
URL: https://chromium.googlesource.com/feed
Version: 0
Revision: 75614b922b359cc739614fb53b34817cabd69d82
Revision: a4e91c7238e329ad11e48b068fe3b1e935c0de9b
License: Apache 2.0
License File: LICENSE
Security Critical: yes
......
......@@ -42,6 +42,8 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/api/store/Store.java",
"src/src/main/java/com/google/android/libraries/feed/api/store/StoreListener.java",
"src/src/main/java/com/google/android/libraries/feed/api/stream/ContentChangedListener.java",
"src/src/main/java/com/google/android/libraries/feed/api/stream/Header.java",
"src/src/main/java/com/google/android/libraries/feed/api/stream/NonDismissibleHeader.java",
"src/src/main/java/com/google/android/libraries/feed/api/stream/ScrollListener.java",
"src/src/main/java/com/google/android/libraries/feed/api/stream/Stream.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/BasicStream.java",
......@@ -57,6 +59,7 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriver.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContinuationDriver.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/FeatureDriver.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/HeaderDriver.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/LeafFeatureDriver.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/NoContentDriver.java",
"src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriver.java",
......@@ -214,6 +217,7 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerColorDrawable.java",
"src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerImageView.java",
"src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerViewHelper.java",
"src/src/main/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/StreamOfflineMonitor.java",
"src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietAssetProvider.java",
"src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietCustomElementProvider.java",
"src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietHostBindingProvider.java",
......
......@@ -15,6 +15,7 @@ feed_lib_proto_sources = [
"src/src/main/proto/search/now/ui/piet/form_fields.proto",
"src/src/main/proto/search/now/ui/piet/gradients.proto",
"src/src/main/proto/search/now/ui/piet/images.proto",
"src/src/main/proto/search/now/ui/piet/media_queries.proto",
"src/src/main/proto/search/now/ui/piet/piet.proto",
"src/src/main/proto/search/now/ui/piet/piet_android_support.proto",
"src/src/main/proto/search/now/ui/piet/rounded_corners.proto",
......
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