Closed Bug 1391177 Opened 4 years ago Closed 4 years ago

(photon) Visual refinements on mobile photon

Categories

(Firefox for Android Graveyard :: Theme and Visual Design, defect)

Unspecified
Android
defect
Not set
normal

Tracking

(firefox57 verified)

VERIFIED FIXED
Firefox 57
Tracking Status
firefox57 --- verified

People

(Reporter: jwu, Assigned: jwu)

References

Details

(Whiteboard: [FNC][SPT57.2][INT])

Attachments

(9 files)

59 bytes, text/x-review-board-request
cnevinchen
: review+
walkingice
: review+
Details
59 bytes, text/x-review-board-request
cnevinchen
: review+
walkingice
: review+
Details
59 bytes, text/x-review-board-request
cnevinchen
: review+
walkingice
: review+
Details
59 bytes, text/x-review-board-request
cnevinchen
: review+
walkingice
: review+
Details
59 bytes, text/x-review-board-request
cnevinchen
: review+
walkingice
: review+
Details
59 bytes, text/x-review-board-request
cnevinchen
: review+
walkingice
: review+
Details
59 bytes, text/x-review-board-request
cnevinchen
: review+
walkingice
: review+
Details
59 bytes, text/x-review-board-request
cnevinchen
: review+
walkingice
: review+
Details
59 bytes, text/x-review-board-request
cnevinchen
: review+
walkingice
: review+
Details
Designer has given us some feedback about current Photon build on Nightly. Some visual modifications are described below:

1. Change URL text(except domain) color in toolbar from #B2B2B2 to #737373.
2. Change text yes/no in search suggestion prompt to capitals.
3. Use "reading_list_folder.png" for reading list icon in Bookmarks Panel.
4. Change text selection color from #E4E4E4 to #4D00A2FE in normal mode, and #737373 to #4DAC39FF in private mode
5. Remove vertical dividers in tabs tray page
6. Change the primary blue from #00A2FE to #0A84FF
Comment on attachment 8898183 [details]
Bug 1391177 - Part 1: Change URL text(except domain) color in toolbar from #B2B2B2 to #737373.

https://reviewboard.mozilla.org/r/169544/#review174808
Attachment #8898183 - Flags: review?(cnevinchen) → review+
Comment on attachment 8898184 [details]
Bug 1391177 - Part 2: Change text yes/no in search suggestion prompt to capitals.

https://reviewboard.mozilla.org/r/169546/#review174810
Attachment #8898184 - Flags: review?(cnevinchen) → review+
Comment on attachment 8898185 [details]
Bug 1391177 - Part 3: Update icons for mobile photon.

https://reviewboard.mozilla.org/r/169548/#review174812
Attachment #8898185 - Flags: review?(cnevinchen) → review+
Comment on attachment 8898186 [details]
Bug 1391177 - Part 4: Change text selection color to primary color + 30% alpha.

https://reviewboard.mozilla.org/r/169550/#review174816
Attachment #8898186 - Flags: review?(cnevinchen) → review+
Comment on attachment 8898187 [details]
Bug 1391177 - Part 5: Remove vertical dividers in tabs tray page.

https://reviewboard.mozilla.org/r/169552/#review174818
Attachment #8898187 - Flags: review?(cnevinchen) → review+
Comment on attachment 8898188 [details]
Bug 1391177 - Part 6: Change the primary blue from #00A2FE to #0A84FF.

https://reviewboard.mozilla.org/r/169554/#review174820
Attachment #8898188 - Flags: review?(cnevinchen) → review+
Three extra enhancements from designer:

7. Adjust tab counter layout: use bold text, and use 2.3dp for box border thickness.
8. Adjust the margin between each menu icons on Toolbar.
9. Change the indicator height in tabs tray page to 4dp.
Comment on attachment 8899708 [details]
Bug 1391177 - Part 9: Change indicator height in tabs tray page to 4dp.

https://reviewboard.mozilla.org/r/171026/#review176560

::: mobile/android/app/src/photon/res/values-large/dimens.xml
(Diff revision 1)
>  
>  <resources>
>  
>      <dimen name="doorhanger_offsetY">100dp</dimen>
>  
> -    <!-- This value is the height of the Tabs Panel header view

This remove here seems not related to the commit message?
Comment on attachment 8899707 [details]
Bug 1391177 - Part 8: Adjust layout for menu icons on toolbar.

https://reviewboard.mozilla.org/r/171024/#review176562
Attachment #8899707 - Flags: review?(cnevinchen) → review+
Comment on attachment 8899706 [details]
Bug 1391177 - Part 7: TabCounter refinements.

https://reviewboard.mozilla.org/r/171022/#review176564
Attachment #8899706 - Flags: review?(cnevinchen) → review+
Comment on attachment 8899708 [details]
Bug 1391177 - Part 9: Change indicator height in tabs tray page to 4dp.

https://reviewboard.mozilla.org/r/171026/#review176574

::: mobile/android/app/src/photon/res/values-large/dimens.xml
(Diff revision 1)
>  
>  <resources>
>  
>      <dimen name="doorhanger_offsetY">100dp</dimen>
>  
> -    <!-- This value is the height of the Tabs Panel header view

Because for now mobile and tablet share same toolbar height, which means we only need one `tabs_panel_indicator_selected_padding_top` defined in values/dimens.xml with value with 52dp.

That's the reason I remove this redundant value in values-large/dimens.xml
Comment on attachment 8899708 [details]
Bug 1391177 - Part 9: Change indicator height in tabs tray page to 4dp.

https://reviewboard.mozilla.org/r/171026/#review176644
Attachment #8899708 - Flags: review?(cnevinchen) → review+
Comment on attachment 8898183 [details]
Bug 1391177 - Part 1: Change URL text(except domain) color in toolbar from #B2B2B2 to #737373.

https://reviewboard.mozilla.org/r/169544/#review177178
Attachment #8898183 - Flags: review?(walkingice0204) → review+
Comment on attachment 8898184 [details]
Bug 1391177 - Part 2: Change text yes/no in search suggestion prompt to capitals.

https://reviewboard.mozilla.org/r/169546/#review177180
Attachment #8898184 - Flags: review?(walkingice0204) → review+
Comment on attachment 8898185 [details]
Bug 1391177 - Part 3: Update icons for mobile photon.

https://reviewboard.mozilla.org/r/169548/#review177182
Attachment #8898185 - Flags: review?(walkingice0204) → review+
Comment on attachment 8898186 [details]
Bug 1391177 - Part 4: Change text selection color to primary color + 30% alpha.

https://reviewboard.mozilla.org/r/169550/#review177184
Attachment #8898186 - Flags: review?(walkingice0204) → review+
Comment on attachment 8898187 [details]
Bug 1391177 - Part 5: Remove vertical dividers in tabs tray page.

https://reviewboard.mozilla.org/r/169552/#review177186
Attachment #8898187 - Flags: review?(walkingice0204) → review+
Comment on attachment 8898188 [details]
Bug 1391177 - Part 6: Change the primary blue from #00A2FE to #0A84FF.

https://reviewboard.mozilla.org/r/169554/#review177188
Attachment #8898188 - Flags: review?(walkingice0204) → review+
Comment on attachment 8899707 [details]
Bug 1391177 - Part 8: Adjust layout for menu icons on toolbar.

https://reviewboard.mozilla.org/r/171024/#review177192
Attachment #8899707 - Flags: review?(walkingice0204) → review+
Comment on attachment 8899708 [details]
Bug 1391177 - Part 9: Change indicator height in tabs tray page to 4dp.

https://reviewboard.mozilla.org/r/171026/#review177196
Attachment #8899708 - Flags: review?(walkingice0204) → review+
Comment on attachment 8899706 [details]
Bug 1391177 - Part 7: TabCounter refinements.

https://reviewboard.mozilla.org/r/171022/#review177190

::: mobile/android/app/src/photon/res/layout/tabs_counter.xml:31
(Diff revision 2)
>              android:src="@drawable/tabs_counter_box"
>              gecko:drawableTintList="@color/tabs_counter_fg"/>
>  
>          <org.mozilla.gecko.widget.themed.ThemedTextView
>              android:id="@+id/counter_text"
> +            style="@style/UrlBar.TabCounter.Text"

If it is only used here, to inline is acceptable to me.
Attachment #8899706 - Flags: review?(walkingice0204) → review+
Keywords: checkin-needed
Pushed by ryanvm@gmail.com:
https://hg.mozilla.org/integration/autoland/rev/007265934857
Part 1: Change URL text(except domain) color in toolbar from #B2B2B2 to #737373. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/8cd707f86455
Part 2: Change text yes/no in search suggestion prompt to capitals. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/f1151c03aeb8
Part 3: Update icons for mobile photon. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/1f2d1bdf4b08
Part 4: Change text selection color to primary color + 30% alpha. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/df1d70886d09
Part 5: Remove vertical dividers in tabs tray page. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/054791914057
Part 6: Change the primary blue from #00A2FE to #0A84FF. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/dda991278dc4
Part 7: TabCounter refinements. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/483e66c92c6b
Part 8: Adjust layout for menu icons on toolbar. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/ed482ad5d31f
Part 9: Change indicator height in tabs tray page to 4dp. r=nechen,walkingice
Keywords: checkin-needed
Backed out for Android bustage at mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml:25: unbound prefix during XML parsing:

https://hg.mozilla.org/integration/autoland/rev/8221f2cb661c37ca16a79ba842eb7c5f25a44524
https://hg.mozilla.org/integration/autoland/rev/e4c5281e9b619ea6342eac4ae2d44c672ab9b7c4
https://hg.mozilla.org/integration/autoland/rev/8572e9bea8bd8c6323ace48ff17e30ed27860d95
https://hg.mozilla.org/integration/autoland/rev/bb50e1cd48621f6efb130fa9f0f756dc45933c9a
https://hg.mozilla.org/integration/autoland/rev/85e7c2b5bb24444e1ee960fea2a0ff14164f7e66
https://hg.mozilla.org/integration/autoland/rev/55424aaa719100117c3044d1c5444ebd8ab8ab99
https://hg.mozilla.org/integration/autoland/rev/16322585dadf41463992f33545e2f26b863e901f
https://hg.mozilla.org/integration/autoland/rev/42343ed33c67c222b40664cf03449fdbf38f7c0a
https://hg.mozilla.org/integration/autoland/rev/bb5a84874b979a104c38a6db0c616d8ff6bb3a7e

Push with bustage: https://treeherder.mozilla.org/#/jobs?repo=autoland&revision=ed482ad5d31f987fa1ac8bab5989a5a54b2d2378&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception&filter-resultStatus=retry&filter-resultStatus=usercancel&filter-resultStatus=runnable
Build log: https://treeherder.mozilla.org/logviewer.html#?job_id=125891883&repo=autoland

[task 2017-08-25T12:52:53.854106Z] 12:52:53     INFO -  /home/worker/workspace/build/src/mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png: libpng warning: iCCP: Not recognizing known sRGB profile that has been edited
[task 2017-08-25T12:52:53.854485Z] 12:52:53     INFO -  /home/worker/workspace/build/src/mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png: libpng warning: iCCP: Not recognizing known sRGB profile that has been edited
[task 2017-08-25T12:52:53.854838Z] 12:52:53     INFO -  /home/worker/workspace/build/src/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml:25: error: Error parsing XML: unbound prefix
[task 2017-08-25T12:52:53.855154Z] 12:52:53     INFO -  tive.png, for flavor xxxhdpi-v4
[task 2017-08-25T12:52:53.855478Z] 12:52:53     INFO -  nothing matches overlay file url_bar_nav_button.xml, for flavor large-v11
[task 2017-08-25T12:52:53.855798Z] 12:52:53     INFO -  Makefile:487: recipe for target '.aapt.deps' failed
[task 2017-08-25T12:52:53.856110Z] 12:52:53     INFO -  gmake[5]: *** [.aapt.deps] Error 1
Flags: needinfo?(topwu.tw)
I missed 'xmlns:gecko' prefix in toolbar_edit_layout.xml. File new patches for fixing and the try result:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=8bf32953223dfccc154f5023bb104c71dc4bc39f
Flags: needinfo?(topwu.tw)
Keywords: checkin-needed
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 0278f4df8021 -d e796a86fc12f: rebasing 415874:0278f4df8021 "Bug 1391177 - Part 1: Change URL text(except domain) color in toolbar from #B2B2B2 to #737373. r=nechen,walkingice"
merging mobile/android/app/src/photon/res/values/colors.xml
rebasing 415875:41269a4981ce "Bug 1391177 - Part 2: Change text yes/no in search suggestion prompt to capitals. r=nechen,walkingice"
merging mobile/android/app/src/photon/res/layout/home_suggestion_prompt.xml
rebasing 415876:0326a7f7888a "Bug 1391177 - Part 3: Update icons for mobile photon. r=nechen,walkingice"
merging mobile/android/app/src/photon/res/drawable-hdpi/ic_globe_nm.png
merging mobile/android/app/src/photon/res/drawable-hdpi/reading_list_folder.png
merging mobile/android/app/src/photon/res/drawable-hdpi/status_icon_readercache.png
merging mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_background.9.png and mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_background.9.png to mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_background.9.png
merging mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_selected.9.png and mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png to mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png
merging mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_selected_focused.9.png and mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png to mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png
merging mobile/android/app/src/photon/res/drawable-xhdpi/ic_globe_nm.png
merging mobile/android/app/src/photon/res/drawable-xhdpi/reading_list_folder.png
merging mobile/android/app/src/photon/res/drawable-xhdpi/status_icon_readercache.png
merging mobile/android/app/src/photon/res/drawable-xxhdpi/ic_globe_nm.png
merging mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_globe_nm.png
merging mobile/android/app/src/photon/res/drawable-xxxhdpi/reading_list_folder.png
merging mobile/android/app/src/photon/res/drawable-xxxhdpi/status_icon_readercache.png
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/ic_globe_nm.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/ic_globe_nm.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/reading_list_folder.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/reading_list_folder.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/status_icon_readercache.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/status_icon_readercache.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_background.9.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_background.9.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xhdpi/ic_globe_nm.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xhdpi/ic_globe_nm.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xhdpi/reading_list_folder.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xhdpi/reading_list_folder.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xhdpi/status_icon_readercache.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xhdpi/status_icon_readercache.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_globe_nm.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xxhdpi/ic_globe_nm.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_globe_nm.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_globe_nm.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xxxhdpi/reading_list_folder.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xxxhdpi/reading_list_folder.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xxxhdpi/status_icon_readercache.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xxxhdpi/status_icon_readercache.png! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
Flags: needinfo?(topwu.tw)
Keywords: checkin-needed
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 06cf6184359a -d 5f06e9d7c0d3: rebasing 416142:06cf6184359a "Bug 1391177 - Part 1: Change URL text(except domain) color in toolbar from #B2B2B2 to #737373. r=nechen,walkingice"
merging mobile/android/app/src/photon/res/values/colors.xml
rebasing 416143:6e11da8e7a71 "Bug 1391177 - Part 2: Change text yes/no in search suggestion prompt to capitals. r=nechen,walkingice"
merging mobile/android/app/src/photon/res/layout/home_suggestion_prompt.xml
rebasing 416144:cba32d23e586 "Bug 1391177 - Part 3: Update icons for mobile photon. r=nechen,walkingice"
merging mobile/android/app/src/photon/res/drawable-hdpi/ic_globe_nm.png
merging mobile/android/app/src/photon/res/drawable-hdpi/reading_list_folder.png
merging mobile/android/app/src/photon/res/drawable-hdpi/status_icon_readercache.png
merging mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_background.9.png and mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_background.9.png to mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_background.9.png
merging mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_selected.9.png and mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png to mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png
merging mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_selected_focused.9.png and mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png to mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png
merging mobile/android/app/src/photon/res/drawable-xhdpi/ic_globe_nm.png
merging mobile/android/app/src/photon/res/drawable-xhdpi/reading_list_folder.png
merging mobile/android/app/src/photon/res/drawable-xhdpi/status_icon_readercache.png
merging mobile/android/app/src/photon/res/drawable-xxhdpi/ic_globe_nm.png
merging mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_globe_nm.png
merging mobile/android/app/src/photon/res/drawable-xxxhdpi/reading_list_folder.png
merging mobile/android/app/src/photon/res/drawable-xxxhdpi/status_icon_readercache.png
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/ic_globe_nm.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/ic_globe_nm.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/reading_list_folder.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/reading_list_folder.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/status_icon_readercache.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/status_icon_readercache.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_background.9.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_background.9.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xhdpi/ic_globe_nm.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xhdpi/ic_globe_nm.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xhdpi/reading_list_folder.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xhdpi/reading_list_folder.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xhdpi/status_icon_readercache.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xhdpi/status_icon_readercache.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_globe_nm.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xxhdpi/ic_globe_nm.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_globe_nm.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_globe_nm.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xxxhdpi/reading_list_folder.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xxxhdpi/reading_list_folder.png! (edit, then use 'hg resolve --mark')
warning: /repos/mozreview-gecko/mobile/android/app/src/photon/res/drawable-xxxhdpi/status_icon_readercache.png looks like a binary file.
warning: conflicts while merging mobile/android/app/src/photon/res/drawable-xxxhdpi/status_icon_readercache.png! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
Pushed by topwu.tw@gmail.com:
https://hg.mozilla.org/integration/autoland/rev/055640cd98f8
Part 1: Change URL text(except domain) color in toolbar from #B2B2B2 to #737373. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/5576730175d9
Part 2: Change text yes/no in search suggestion prompt to capitals. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/c59fd1a9956a
Part 3: Update icons for mobile photon. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/4e6ffe1c352c
Part 4: Change text selection color to primary color + 30% alpha. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/6d95e3c87844
Part 5: Remove vertical dividers in tabs tray page. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/5a72b05891df
Part 6: Change the primary blue from #00A2FE to #0A84FF. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/e67583f251b9
Part 7: TabCounter refinements. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/993fc12edaa7
Part 8: Adjust layout for menu icons on toolbar. r=nechen,walkingice
https://hg.mozilla.org/integration/autoland/rev/ff7354f8d72d
Part 9: Change indicator height in tabs tray page to 4dp. r=nechen,walkingice
Flags: needinfo?(topwu.tw)
Whiteboard: [FNC][SPT57.2][INT]
Verified as fixed on  Nightly 57.0a1 (2017-08-31). Checked the following changes:
1. Change URL text(except domain) color in toolbar from #B2B2B2 to #737373.
2. Change text yes/no in search suggestion prompt to capitals.
3. Use "reading_list_folder.png" for reading list icon in Bookmarks Panel.
4. Change text selection color from #E4E4E4 to #4D00A2FE in normal mode, and #737373 to #4DAC39FF in private mode
5. Remove vertical dividers in tabs tray page
6. Change the primary blue from #00A2FE to #0A84FF - pass
7. Adjust tab counter layout: use bold text, and use 2.3dp for box border thickness.
8. Adjust the margin between each menu icons on Toolbar. 
9. Change the indicator height in tabs tray page to 4dp.
Status: RESOLVED → VERIFIED
Logged related issues: Bug 1395917, Bug 1395920
Depends on: 1403596
Product: Firefox for Android → Firefox for Android Graveyard
You need to log in before you can comment on or make changes to this bug.