New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 913012 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Dec 12
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: Android
Pri: 1
Type: Bug



Sign in to add a comment

Navigating "back" to the Explore Sites page doesn't scroll correctly.

Project Member Reported by dewittj@chromium.org, Dec 7

Issue description

Implementation review identified this as a bug worth fixing before 100% stable launch.
 
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/2a94ae3b82c0e840d2eff0a21edb3cc591700f3c

commit	2a94ae3b82c0e840d2eff0a21edb3cc591700f3c
Author: Justin DeWitt <dewittj@chromium.org>
Date: Fri Dec 07 04:45:24 2018

[EoS] Enable re-scrolling on back button.

This utilizes LinearLayoutManager#onSaveInstanceState to provide a
parcelable.  This is stashed on the NavigationEntry (which is OK since it
is not persisted in any way.)

Bug:  913012 
Change-Id: I903ef6440d1ef8e3d65d2e3764c2da35201b8b18
Reviewed-on: https://chromium-review.googlesource.com/c/1362198
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Reviewed-by: Cathy Li <chili@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614608}
Labels: -OS-Chrome OS-Android
Labels: Merge-Request-72
Project Member

Comment 4 by sheriffbot@chromium.org, Dec 8

Labels: -Merge-Request-72 Hotlist-Merge-Approved Merge-Approved-72
Your change meets the bar and is auto-approved for M72. Please go ahead and merge the CL to branch 3626 manually. Please contact milestone owner if you have questions.
Owners: govind@(Android), kariahda@(iOS), djmm@(ChromeOS), abdulsyed@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Pls merge you change to M72 branch 3626 ASAP so we can pick it up for next  Dev/Beta release, RC cut on Monday, 12/10 @ 1:00 PM PT. Thank you.
Project Member

Comment 6 by bugdroid1@chromium.org, Dec 10

Labels: -merge-approved-72 merge-merged-3626
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/bcdbfd512e036c7627a7a01b2085d4e65c9ba506

commit bcdbfd512e036c7627a7a01b2085d4e65c9ba506
Author: Justin DeWitt <dewittj@chromium.org>
Date: Mon Dec 10 17:44:04 2018

[EoS] Enable re-scrolling on back button.

This utilizes LinearLayoutManager#onSaveInstanceState to provide a
parcelable.  This is stashed on the NavigationEntry (which is OK since it
is not persisted in any way.)

Bug:  913012 
Change-Id: I903ef6440d1ef8e3d65d2e3764c2da35201b8b18
Reviewed-on: https://chromium-review.googlesource.com/c/1362198
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Reviewed-by: Cathy Li <chili@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#614608}(cherry picked from commit 2a94ae3b82c0e840d2eff0a21edb3cc591700f3c)
Reviewed-on: https://chromium-review.googlesource.com/c/1369639
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#204}
Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}
[modify] https://crrev.com/bcdbfd512e036c7627a7a01b2085d4e65c9ba506/chrome/android/java/src/org/chromium/chrome/browser/UrlConstants.java
[modify] https://crrev.com/bcdbfd512e036c7627a7a01b2085d4e65c9ba506/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java
[modify] https://crrev.com/bcdbfd512e036c7627a7a01b2085d4e65c9ba506/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPage.java
[modify] https://crrev.com/bcdbfd512e036c7627a7a01b2085d4e65c9ba506/chrome/android/java_sources.gni
[add] https://crrev.com/bcdbfd512e036c7627a7a01b2085d4e65c9ba506/chrome/android/javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java
[add] https://crrev.com/bcdbfd512e036c7627a7a01b2085d4e65c9ba506/chrome/test/data/android/render_tests/ExploreSitesPageTest.initial_layout.Nexus_5-19.png
[add] https://crrev.com/bcdbfd512e036c7627a7a01b2085d4e65c9ba506/chrome/test/data/android/render_tests/ExploreSitesPageTest.recycler_layout.Nexus_5-19.png
[add] https://crrev.com/bcdbfd512e036c7627a7a01b2085d4e65c9ba506/chrome/test/data/android/render_tests/ExploreSitesPageTest.recycler_layout_back.Nexus_5-19.png

Project Member

Comment 7 by bugdroid1@chromium.org, Dec 11

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/da8d238f9b6243168adf7f4bf52809084100de80

commit da8d238f9b6243168adf7f4bf52809084100de80
Author: Justin DeWitt <dewittj@chromium.org>
Date: Tue Dec 11 01:07:07 2018

Revert "[EoS] Enable re-scrolling on back button."

This reverts commit bcdbfd512e036c7627a7a01b2085d4e65c9ba506.

Reason for revert: Broke beta build:

FAILED: gen/chrome/android/chrome_test_java.javac.jar gen/chrome/android/chrome_test_java.javac.jar.info 
python ../../build/android/gyp/javac.py --depfile=gen/chrome/android/chrome_test_java__compile_java.d --generated-dir=gen/chrome/android/chrome_test_java/generated_java --jar-path=gen/chrome/android/chrome_test_java.javac.jar --java-srcjars=\[\] --java-version=1.8 --full-classpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:javac_full_classpath\) --interface-classpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:javac_full_interface_classpath\) --processorpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:javac:processor_classpath\) --processors=@FileArg\(gen/chrome/android/chrome_test_java.build_config:javac:processor_classes\) --java-srcjars=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:owned_resource_srcjars\) --bootclasspath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:android:sdk_interface_jars\) --chromium-code=1 @gen/chrome/android/chrome_test_java.sources
Traceback (most recent call last):
  File "../../build/android/gyp/javac.py", line 638, in <module>
    sys.exit(main(sys.argv[1:]))
  File "../../build/android/gyp/javac.py", line 634, in main
    add_pydeps=False)
  File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/build_utils.py", line 642, in CallAndWriteDepfileIfStale
    pass_changes=True)
  File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/md5_check.py", line 87, in CallAndRecordIfStale
    function(*args)
  File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/build_utils.py", line 627, in on_stale_md5
    function(*args)
  File "../../build/android/gyp/javac.py", line 626, in <lambda>
    classpath_inputs, classpath),
  File "../../build/android/gyp/javac.py", line 398, in _OnStaleMd5
    javac_generated_sources)
  File "../../build/android/gyp/javac.py", line 249, in _CreateInfoFile
    'Chromium java files must only have one class: {}'.format(source))
AssertionError: Chromium java files must only have one class: ../../chrome/android/javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java

https://uberchromegw.corp.google.com/i/official.android.continuous/builders/beta-arm_64/builds/15631
https://uberchromegw.corp.google.com/i/official.android.continuous/builders/beta-arm_64/builds/15631/steps/Build%20Non-Channel%20Targets/logs/stdio

Original change's description:
> [EoS] Enable re-scrolling on back button.
> 
> This utilizes LinearLayoutManager#onSaveInstanceState to provide a
> parcelable.  This is stashed on the NavigationEntry (which is OK since it
> is not persisted in any way.)
> 
> Bug:  913012 
> Change-Id: I903ef6440d1ef8e3d65d2e3764c2da35201b8b18
> Reviewed-on: https://chromium-review.googlesource.com/c/1362198
> Commit-Queue: Justin DeWitt <dewittj@chromium.org>
> Reviewed-by: Cathy Li <chili@chromium.org>
> Reviewed-by: Theresa <twellington@chromium.org>
> Cr-Original-Commit-Position: refs/heads/master@{#614608}(cherry picked from commit 2a94ae3b82c0e840d2eff0a21edb3cc591700f3c)
> Reviewed-on: https://chromium-review.googlesource.com/c/1369639
> Reviewed-by: Justin DeWitt <dewittj@chromium.org>
> Cr-Commit-Position: refs/branch-heads/3626@{#204}
> Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}

TBR=dewittj@chromium.org

Change-Id: I354bc0e42d3724154a69732218c9f1b98c418130
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  913012 
Reviewed-on: https://chromium-review.googlesource.com/c/1371205
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#247}
Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}
[modify] https://crrev.com/da8d238f9b6243168adf7f4bf52809084100de80/chrome/android/java/src/org/chromium/chrome/browser/UrlConstants.java
[modify] https://crrev.com/da8d238f9b6243168adf7f4bf52809084100de80/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java
[modify] https://crrev.com/da8d238f9b6243168adf7f4bf52809084100de80/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPage.java
[modify] https://crrev.com/da8d238f9b6243168adf7f4bf52809084100de80/chrome/android/java_sources.gni
[delete] https://crrev.com/61f88387abe8623ccd5c164c519a82e451741c24/chrome/android/javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java
[delete] https://crrev.com/61f88387abe8623ccd5c164c519a82e451741c24/chrome/test/data/android/render_tests/ExploreSitesPageTest.initial_layout.Nexus_5-19.png
[delete] https://crrev.com/61f88387abe8623ccd5c164c519a82e451741c24/chrome/test/data/android/render_tests/ExploreSitesPageTest.recycler_layout.Nexus_5-19.png
[delete] https://crrev.com/61f88387abe8623ccd5c164c519a82e451741c24/chrome/test/data/android/render_tests/ExploreSitesPageTest.recycler_layout_back.Nexus_5-19.png

Project Member

Comment 8 by bugdroid1@chromium.org, Dec 11

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/cc91158a5505d55b66cd01b5da2d4ad973e9ffd9

commit cc91158a5505d55b66cd01b5da2d4ad973e9ffd9
Author: Justin DeWitt <dewittj@chromium.org>
Date: Tue Dec 11 15:25:48 2018

[EoS] Fix formatting of ExploreSitesPageTest

This causes a lint error on the official builders.

Bug: 894334,913755, 913012 
Change-Id: I9dbaa9932873755639d22618b3d758ef87c840cb
Reviewed-on: https://chromium-review.googlesource.com/c/1370587
Reviewed-by: Cathy Li <chili@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615526}
[modify] https://crrev.com/cc91158a5505d55b66cd01b5da2d4ad973e9ffd9/chrome/android/javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java

Labels: Merge-Request-72
Adding merge request for 72 - for both CLs in this bug:
* Reland the CL from comment #1 on the beta branch
* Merge the CL from comment #8 to fix the beta builder lint problem.

Thanks!
Labels: -Merge-Request-72 Merge-Approved-72
Approving merge for CL listed at #9 to M72 branch 3626 based on comment #9 and per offline chat with dewittj@. 
Project Member

Comment 11 by bugdroid1@chromium.org, Dec 11

Labels: -merge-approved-72
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b56d724193c0542eb86060765ecb8e12f3ea0b50

commit b56d724193c0542eb86060765ecb8e12f3ea0b50
Author: Justin DeWitt <dewittj@chromium.org>
Date: Tue Dec 11 22:04:39 2018

Reland "[EoS] Enable re-scrolling on back button."

This reverts commit da8d238f9b6243168adf7f4bf52809084100de80.

Reason for revert: Fix will be applied with subsequent merge from https://chromium-review.googlesource.com/c/chromium/src/+/1370587

Original change's description:
> Revert "[EoS] Enable re-scrolling on back button."
> 
> This reverts commit bcdbfd512e036c7627a7a01b2085d4e65c9ba506.
> 
> Reason for revert: Broke beta build:
> 
> FAILED: gen/chrome/android/chrome_test_java.javac.jar gen/chrome/android/chrome_test_java.javac.jar.info 
> python ../../build/android/gyp/javac.py --depfile=gen/chrome/android/chrome_test_java__compile_java.d --generated-dir=gen/chrome/android/chrome_test_java/generated_java --jar-path=gen/chrome/android/chrome_test_java.javac.jar --java-srcjars=\[\] --java-version=1.8 --full-classpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:javac_full_classpath\) --interface-classpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:javac_full_interface_classpath\) --processorpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:javac:processor_classpath\) --processors=@FileArg\(gen/chrome/android/chrome_test_java.build_config:javac:processor_classes\) --java-srcjars=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:owned_resource_srcjars\) --bootclasspath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:android:sdk_interface_jars\) --chromium-code=1 @gen/chrome/android/chrome_test_java.sources
> Traceback (most recent call last):
>   File "../../build/android/gyp/javac.py", line 638, in <module>
>     sys.exit(main(sys.argv[1:]))
>   File "../../build/android/gyp/javac.py", line 634, in main
>     add_pydeps=False)
>   File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/build_utils.py", line 642, in CallAndWriteDepfileIfStale
>     pass_changes=True)
>   File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/md5_check.py", line 87, in CallAndRecordIfStale
>     function(*args)
>   File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/build_utils.py", line 627, in on_stale_md5
>     function(*args)
>   File "../../build/android/gyp/javac.py", line 626, in <lambda>
>     classpath_inputs, classpath),
>   File "../../build/android/gyp/javac.py", line 398, in _OnStaleMd5
>     javac_generated_sources)
>   File "../../build/android/gyp/javac.py", line 249, in _CreateInfoFile
>     'Chromium java files must only have one class: {}'.format(source))
> AssertionError: Chromium java files must only have one class: ../../chrome/android/javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java
> 
> https://uberchromegw.corp.google.com/i/official.android.continuous/builders/beta-arm_64/builds/15631
> https://uberchromegw.corp.google.com/i/official.android.continuous/builders/beta-arm_64/builds/15631/steps/Build%20Non-Channel%20Targets/logs/stdio
> 
> Original change's description:
> > [EoS] Enable re-scrolling on back button.
> > 
> > This utilizes LinearLayoutManager#onSaveInstanceState to provide a
> > parcelable.  This is stashed on the NavigationEntry (which is OK since it
> > is not persisted in any way.)
> > 
> > Bug:  913012 
> > Change-Id: I903ef6440d1ef8e3d65d2e3764c2da35201b8b18
> > Reviewed-on: https://chromium-review.googlesource.com/c/1362198
> > Commit-Queue: Justin DeWitt <dewittj@chromium.org>
> > Reviewed-by: Cathy Li <chili@chromium.org>
> > Reviewed-by: Theresa <twellington@chromium.org>
> > Cr-Original-Commit-Position: refs/heads/master@{#614608}(cherry picked from commit 2a94ae3b82c0e840d2eff0a21edb3cc591700f3c)
> > Reviewed-on: https://chromium-review.googlesource.com/c/1369639
> > Reviewed-by: Justin DeWitt <dewittj@chromium.org>
> > Cr-Commit-Position: refs/branch-heads/3626@{#204}
> > Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}
> 
> TBR=dewittj@chromium.org
> 
> Change-Id: I354bc0e42d3724154a69732218c9f1b98c418130
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug:  913012 
> Reviewed-on: https://chromium-review.googlesource.com/c/1371205
> Reviewed-by: Justin DeWitt <dewittj@chromium.org>
> Cr-Commit-Position: refs/branch-heads/3626@{#247}
> Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}

TBR=dewittj@chromium.org

Change-Id: Id903d2436c77aa41f2605d0a12c033d00325be2e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  913012 
Reviewed-on: https://chromium-review.googlesource.com/c/1372474
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#263}
Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}
[modify] https://crrev.com/b56d724193c0542eb86060765ecb8e12f3ea0b50/chrome/android/java/src/org/chromium/chrome/browser/UrlConstants.java
[modify] https://crrev.com/b56d724193c0542eb86060765ecb8e12f3ea0b50/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java
[modify] https://crrev.com/b56d724193c0542eb86060765ecb8e12f3ea0b50/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPage.java
[modify] https://crrev.com/b56d724193c0542eb86060765ecb8e12f3ea0b50/chrome/android/java_sources.gni
[add] https://crrev.com/b56d724193c0542eb86060765ecb8e12f3ea0b50/chrome/android/javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java
[add] https://crrev.com/b56d724193c0542eb86060765ecb8e12f3ea0b50/chrome/test/data/android/render_tests/ExploreSitesPageTest.initial_layout.Nexus_5-19.png
[add] https://crrev.com/b56d724193c0542eb86060765ecb8e12f3ea0b50/chrome/test/data/android/render_tests/ExploreSitesPageTest.recycler_layout.Nexus_5-19.png
[add] https://crrev.com/b56d724193c0542eb86060765ecb8e12f3ea0b50/chrome/test/data/android/render_tests/ExploreSitesPageTest.recycler_layout_back.Nexus_5-19.png

Project Member

Comment 12 by bugdroid1@chromium.org, Dec 11

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/927766a8531e6c7f08fccf93bc0903d004a08985

commit 927766a8531e6c7f08fccf93bc0903d004a08985
Author: Justin DeWitt <dewittj@chromium.org>
Date: Tue Dec 11 22:05:03 2018

[EoS] Fix formatting of ExploreSitesPageTest

This causes a lint error on the official builders.

Bug: 894334,913755, 913012 
Change-Id: I9dbaa9932873755639d22618b3d758ef87c840cb
Reviewed-on: https://chromium-review.googlesource.com/c/1370587
Reviewed-by: Cathy Li <chili@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#615526}(cherry picked from commit cc91158a5505d55b66cd01b5da2d4ad973e9ffd9)
Reviewed-on: https://chromium-review.googlesource.com/c/1372447
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#264}
Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}
[modify] https://crrev.com/927766a8531e6c7f08fccf93bc0903d004a08985/chrome/android/javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java

Status: Fixed (was: Started)
Labels: Merge-Merged-72-3626
The following revision refers to this bug: 
https://chromium.googlesource.com/chromium/src.git/+/927766a8531e6c7f08fccf93bc0903d004a08985

Commit: 927766a8531e6c7f08fccf93bc0903d004a08985
Author: dewittj@chromium.org
Commiter: dewittj@chromium.org
Date: 2018-12-11 22:05:03 +0000 UTC

[EoS] Fix formatting of ExploreSitesPageTest

This causes a lint error on the official builders.

Bug: 894334,913755, 913012 
Change-Id: I9dbaa9932873755639d22618b3d758ef87c840cb
Reviewed-on: https://chromium-review.googlesource.com/c/1370587
Reviewed-by: Cathy Li <chili@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#615526}(cherry picked from commit cc91158a5505d55b66cd01b5da2d4ad973e9ffd9)
Reviewed-on: https://chromium-review.googlesource.com/c/1372447
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#264}
Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}
The following revision refers to this bug: 
https://chromium.googlesource.com/chromium/src.git/+/b56d724193c0542eb86060765ecb8e12f3ea0b50

Commit: b56d724193c0542eb86060765ecb8e12f3ea0b50
Author: dewittj@chromium.org
Commiter: dewittj@chromium.org
Date: 2018-12-11 22:04:39 +0000 UTC

Reland "[EoS] Enable re-scrolling on back button."

This reverts commit da8d238f9b6243168adf7f4bf52809084100de80.

Reason for revert: Fix will be applied with subsequent merge from https://chromium-review.googlesource.com/c/chromium/src/+/1370587

Original change's description:
> Revert "[EoS] Enable re-scrolling on back button."
> 
> This reverts commit bcdbfd512e036c7627a7a01b2085d4e65c9ba506.
> 
> Reason for revert: Broke beta build:
> 
> FAILED: gen/chrome/android/chrome_test_java.javac.jar gen/chrome/android/chrome_test_java.javac.jar.info 
> python ../../build/android/gyp/javac.py --depfile=gen/chrome/android/chrome_test_java__compile_java.d --generated-dir=gen/chrome/android/chrome_test_java/generated_java --jar-path=gen/chrome/android/chrome_test_java.javac.jar --java-srcjars=\[\] --java-version=1.8 --full-classpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:javac_full_classpath\) --interface-classpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:javac_full_interface_classpath\) --processorpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:javac:processor_classpath\) --processors=@FileArg\(gen/chrome/android/chrome_test_java.build_config:javac:processor_classes\) --java-srcjars=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:owned_resource_srcjars\) --bootclasspath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:android:sdk_interface_jars\) --chromium-code=1 @gen/chrome/android/chrome_test_java.sources
> Traceback (most recent call last):
>   File "../../build/android/gyp/javac.py", line 638, in <module>
>     sys.exit(main(sys.argv[1:]))
>   File "../../build/android/gyp/javac.py", line 634, in main
>     add_pydeps=False)
>   File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/build_utils.py", line 642, in CallAndWriteDepfileIfStale
>     pass_changes=True)
>   File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/md5_check.py", line 87, in CallAndRecordIfStale
>     function(*args)
>   File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/build_utils.py", line 627, in on_stale_md5
>     function(*args)
>   File "../../build/android/gyp/javac.py", line 626, in <lambda>
>     classpath_inputs, classpath),
>   File "../../build/android/gyp/javac.py", line 398, in _OnStaleMd5
>     javac_generated_sources)
>   File "../../build/android/gyp/javac.py", line 249, in _CreateInfoFile
>     'Chromium java files must only have one class: {}'.format(source))
> AssertionError: Chromium java files must only have one class: ../../chrome/android/javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java
> 
> https://uberchromegw.corp.google.com/i/official.android.continuous/builders/beta-arm_64/builds/15631
> https://uberchromegw.corp.google.com/i/official.android.continuous/builders/beta-arm_64/builds/15631/steps/Build%20Non-Channel%20Targets/logs/stdio
> 
> Original change's description:
> > [EoS] Enable re-scrolling on back button.
> > 
> > This utilizes LinearLayoutManager#onSaveInstanceState to provide a
> > parcelable.  This is stashed on the NavigationEntry (which is OK since it
> > is not persisted in any way.)
> > 
> > Bug:  913012 
> > Change-Id: I903ef6440d1ef8e3d65d2e3764c2da35201b8b18
> > Reviewed-on: https://chromium-review.googlesource.com/c/1362198
> > Commit-Queue: Justin DeWitt <dewittj@chromium.org>
> > Reviewed-by: Cathy Li <chili@chromium.org>
> > Reviewed-by: Theresa <twellington@chromium.org>
> > Cr-Original-Commit-Position: refs/heads/master@{#614608}(cherry picked from commit 2a94ae3b82c0e840d2eff0a21edb3cc591700f3c)
> > Reviewed-on: https://chromium-review.googlesource.com/c/1369639
> > Reviewed-by: Justin DeWitt <dewittj@chromium.org>
> > Cr-Commit-Position: refs/branch-heads/3626@{#204}
> > Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}
> 
> TBR=dewittj@chromium.org
> 
> Change-Id: I354bc0e42d3724154a69732218c9f1b98c418130
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug:  913012 
> Reviewed-on: https://chromium-review.googlesource.com/c/1371205
> Reviewed-by: Justin DeWitt <dewittj@chromium.org>
> Cr-Commit-Position: refs/branch-heads/3626@{#247}
> Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}

TBR=dewittj@chromium.org

Change-Id: Id903d2436c77aa41f2605d0a12c033d00325be2e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  913012 
Reviewed-on: https://chromium-review.googlesource.com/c/1372474
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#263}
Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}
The following revision refers to this bug: 
https://chromium.googlesource.com/chromium/src.git/+/bcdbfd512e036c7627a7a01b2085d4e65c9ba506

Commit: bcdbfd512e036c7627a7a01b2085d4e65c9ba506
Author: dewittj@chromium.org
Commiter: dewittj@chromium.org
Date: 2018-12-10 17:44:04 +0000 UTC

[EoS] Enable re-scrolling on back button.

This utilizes LinearLayoutManager#onSaveInstanceState to provide a
parcelable.  This is stashed on the NavigationEntry (which is OK since it
is not persisted in any way.)

Bug:  913012 
Change-Id: I903ef6440d1ef8e3d65d2e3764c2da35201b8b18
Reviewed-on: https://chromium-review.googlesource.com/c/1362198
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Reviewed-by: Cathy Li <chili@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#614608}(cherry picked from commit 2a94ae3b82c0e840d2eff0a21edb3cc591700f3c)
Reviewed-on: https://chromium-review.googlesource.com/c/1369639
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#204}
Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}
The following revision refers to this bug: 
https://chromium.googlesource.com/chromium/src.git/+/da8d238f9b6243168adf7f4bf52809084100de80

Commit: da8d238f9b6243168adf7f4bf52809084100de80
Author: dewittj@chromium.org
Commiter: dewittj@chromium.org
Date: 2018-12-11 01:07:07 +0000 UTC

Revert "[EoS] Enable re-scrolling on back button."

This reverts commit bcdbfd512e036c7627a7a01b2085d4e65c9ba506.

Reason for revert: Broke beta build:

FAILED: gen/chrome/android/chrome_test_java.javac.jar gen/chrome/android/chrome_test_java.javac.jar.info 
python ../../build/android/gyp/javac.py --depfile=gen/chrome/android/chrome_test_java__compile_java.d --generated-dir=gen/chrome/android/chrome_test_java/generated_java --jar-path=gen/chrome/android/chrome_test_java.javac.jar --java-srcjars=\[\] --java-version=1.8 --full-classpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:javac_full_classpath\) --interface-classpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:javac_full_interface_classpath\) --processorpath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:javac:processor_classpath\) --processors=@FileArg\(gen/chrome/android/chrome_test_java.build_config:javac:processor_classes\) --java-srcjars=@FileArg\(gen/chrome/android/chrome_test_java.build_config:deps_info:owned_resource_srcjars\) --bootclasspath=@FileArg\(gen/chrome/android/chrome_test_java.build_config:android:sdk_interface_jars\) --chromium-code=1 @gen/chrome/android/chrome_test_java.sources
Traceback (most recent call last):
  File "../../build/android/gyp/javac.py", line 638, in <module>
    sys.exit(main(sys.argv[1:]))
  File "../../build/android/gyp/javac.py", line 634, in main
    add_pydeps=False)
  File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/build_utils.py", line 642, in CallAndWriteDepfileIfStale
    pass_changes=True)
  File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/md5_check.py", line 87, in CallAndRecordIfStale
    function(*args)
  File "/b/build/slave/beta-arm_64/build/src/build/android/gyp/util/build_utils.py", line 627, in on_stale_md5
    function(*args)
  File "../../build/android/gyp/javac.py", line 626, in <lambda>
    classpath_inputs, classpath),
  File "../../build/android/gyp/javac.py", line 398, in _OnStaleMd5
    javac_generated_sources)
  File "../../build/android/gyp/javac.py", line 249, in _CreateInfoFile
    'Chromium java files must only have one class: {}'.format(source))
AssertionError: Chromium java files must only have one class: ../../chrome/android/javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java

https://uberchromegw.corp.google.com/i/official.android.continuous/builders/beta-arm_64/builds/15631
https://uberchromegw.corp.google.com/i/official.android.continuous/builders/beta-arm_64/builds/15631/steps/Build%20Non-Channel%20Targets/logs/stdio

Original change's description:
> [EoS] Enable re-scrolling on back button.
> 
> This utilizes LinearLayoutManager#onSaveInstanceState to provide a
> parcelable.  This is stashed on the NavigationEntry (which is OK since it
> is not persisted in any way.)
> 
> Bug:  913012 
> Change-Id: I903ef6440d1ef8e3d65d2e3764c2da35201b8b18
> Reviewed-on: https://chromium-review.googlesource.com/c/1362198
> Commit-Queue: Justin DeWitt <dewittj@chromium.org>
> Reviewed-by: Cathy Li <chili@chromium.org>
> Reviewed-by: Theresa <twellington@chromium.org>
> Cr-Original-Commit-Position: refs/heads/master@{#614608}(cherry picked from commit 2a94ae3b82c0e840d2eff0a21edb3cc591700f3c)
> Reviewed-on: https://chromium-review.googlesource.com/c/1369639
> Reviewed-by: Justin DeWitt <dewittj@chromium.org>
> Cr-Commit-Position: refs/branch-heads/3626@{#204}
> Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}

TBR=dewittj@chromium.org

Change-Id: I354bc0e42d3724154a69732218c9f1b98c418130
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  913012 
Reviewed-on: https://chromium-review.googlesource.com/c/1371205
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#247}
Cr-Branched-From: d897fb137fbaaa9355c0c93124cc048824eb1e65-refs/heads/master@{#612437}

Sign in to add a comment