Commit 9cc97234 authored by Gang Wu's avatar Gang Wu Committed by Commit Bot

[Feed] Import feed@23d32902a8bd6f4d55dea6a46fff43325c61b532

Specifics:
       +62,440 bytes main lib size
      +467,552 bytes main dex size
      +745,805 bytes normalized apk size
InstallSize:
      +280,953 bytes APK size
      +827,989 bytes Estimated installed size (Android Go)
    +2,169,863 bytes Estimated installed size
InstallBreakdown (+2,168,374 bytes):
        +2,700 bytes unwind_cfi (dev and canary only) size
        +2,146 bytes Non-compiled Android resources size
       +62,440 bytes Native code size
          +353 bytes Package metadata size
    +2,086,323 bytes Java code size
       +14,412 bytes Compiled Android resources size
Dex:
        +2,396 entries fields
        +3,284 entries methods
          +772 entries types
        +1,681 entries strings

Change-Id: I173abfb7ba5c75d10ade40de047b7f0bba257763
Reviewed-on: https://chromium-review.googlesource.com/c/1344292Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Commit-Queue: Gang Wu <gangwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610235}
parent b71903b6
...@@ -188,7 +188,7 @@ vars = { ...@@ -188,7 +188,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': '107851225e86b1ab6a222ce8ca7ac3729652273a', 'feed_revision': '23d32902a8bd6f4d55dea6a46fff43325c61b532',
# 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.
......
...@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.feed; ...@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.feed;
import com.google.android.libraries.feed.host.logging.ActionType; import com.google.android.libraries.feed.host.logging.ActionType;
import com.google.android.libraries.feed.host.logging.BasicLoggingApi; 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.logging.ContentLoggingData;
import com.google.android.libraries.feed.host.logging.SpinnerType;
import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.JNINamespace;
import org.chromium.chrome.browser.ntp.NewTabPageUma; import org.chromium.chrome.browser.ntp.NewTabPageUma;
...@@ -55,6 +56,9 @@ public class FeedLoggingBridge implements BasicLoggingApi { ...@@ -55,6 +56,9 @@ public class FeedLoggingBridge implements BasicLoggingApi {
mNativeFeedLoggingBridge, data.getPositionInStream(), data.getRepresentationUri()); mNativeFeedLoggingBridge, data.getPositionInStream(), data.getRepresentationUri());
} }
@Override
public void onContentSwiped(ContentLoggingData data) {}
@Override @Override
public void onContentClicked(ContentLoggingData data) { public void onContentClicked(ContentLoggingData data) {
assert mNativeFeedLoggingBridge != 0; assert mNativeFeedLoggingBridge != 0;
...@@ -107,6 +111,9 @@ public class FeedLoggingBridge implements BasicLoggingApi { ...@@ -107,6 +111,9 @@ public class FeedLoggingBridge implements BasicLoggingApi {
nativeOnOpenedWithNoContent(mNativeFeedLoggingBridge); nativeOnOpenedWithNoContent(mNativeFeedLoggingBridge);
} }
@Override
public void onSpinnerShown(int timeShownMs, @SpinnerType int spinnerType) {}
/** /**
* Reports how long a user spends on the page. * Reports how long a user spends on the page.
* *
......
...@@ -8,6 +8,12 @@ import("//third_party/feed/java_sources.gni") ...@@ -8,6 +8,12 @@ import("//third_party/feed/java_sources.gni")
import("//third_party/feed/proto_sources.gni") import("//third_party/feed/proto_sources.gni")
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
android_resources("sharedstream_resources") {
resource_dirs =
[ "src/src/main/java/com/google/android/libraries/feed/sharedstream/res" ]
custom_package = "com.google.android.libraries.feed.sharedstream"
}
android_resources("piet_resources") { android_resources("piet_resources") {
resource_dirs = resource_dirs =
[ "src/src/main/java/com/google/android/libraries/feed/piet/res" ] [ "src/src/main/java/com/google/android/libraries/feed/piet/res" ]
...@@ -16,6 +22,9 @@ android_resources("piet_resources") { ...@@ -16,6 +22,9 @@ android_resources("piet_resources") {
android_resources("basicstream_internal_viewholders_resources") { android_resources("basicstream_internal_viewholders_resources") {
resource_dirs = [ "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/res" ] resource_dirs = [ "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/res" ]
deps = [
":sharedstream_resources",
]
custom_package = custom_package =
"com.google.android.libraries.feed.basicstream.internal.viewholders" "com.google.android.libraries.feed.basicstream.internal.viewholders"
} }
......
...@@ -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: 107851225e86b1ab6a222ce8ca7ac3729652273a Revision: 23d32902a8bd6f4d55dea6a46fff43325c61b532
License: Apache 2.0 License: Apache 2.0
License File: LICENSE License File: LICENSE
Security Critical: yes Security Critical: yes
......
...@@ -67,6 +67,7 @@ feed_lib_java_sources = [ ...@@ -67,6 +67,7 @@ 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/SpinnerLogger.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",
...@@ -156,6 +157,8 @@ feed_lib_java_sources = [ ...@@ -156,6 +157,8 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedStoreHelper.java", "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedStoreHelper.java",
"src/src/main/java/com/google/android/libraries/feed/feedstore/internal/PersistentFeedStore.java", "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/PersistentFeedStore.java",
"src/src/main/java/com/google/android/libraries/feed/host/action/ActionApi.java", "src/src/main/java/com/google/android/libraries/feed/host/action/ActionApi.java",
"src/src/main/java/com/google/android/libraries/feed/host/action/ActionEnabledApi.java",
"src/src/main/java/com/google/android/libraries/feed/host/action/ActionPeformerApi.java",
"src/src/main/java/com/google/android/libraries/feed/host/action/StreamActionApi.java", "src/src/main/java/com/google/android/libraries/feed/host/action/StreamActionApi.java",
"src/src/main/java/com/google/android/libraries/feed/host/config/ApplicationInfo.java", "src/src/main/java/com/google/android/libraries/feed/host/config/ApplicationInfo.java",
"src/src/main/java/com/google/android/libraries/feed/host/config/Configuration.java", "src/src/main/java/com/google/android/libraries/feed/host/config/Configuration.java",
...@@ -166,6 +169,7 @@ feed_lib_java_sources = [ ...@@ -166,6 +169,7 @@ feed_lib_java_sources = [
"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/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/logging/SpinnerType.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",
"src/src/main/java/com/google/android/libraries/feed/host/network/HttpResponse.java", "src/src/main/java/com/google/android/libraries/feed/host/network/HttpResponse.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