gasolin@mozilla.com Assignee
	Description • 11 years ago

followup bug 920445

hide `add collection` menu option when searchbar is hidden

	gasolin@mozilla.com Assignee
	Comment 1 • 11 years ago

When long press homescreen, there will be 2 items ['change wallpaper','add collection']

expect:

only show ['change wallpaper'] when searchbar is disabled

	Cristian Rodriguez (:crdlc)
	Comment 3 • 11 years ago

Comment on attachment 818265 [details]
pull request redirect to github

This is not the correct path sorry. The code is ready to show different UIs with or without ev.me

https://github.com/mozilla-b2g/gaia/blob/master/apps/homescreen/js/homescreen.js#L89

Please review this line, thanks a lot

	Francis Lee [:frlee]
	Comment 4 • 11 years ago

this is a must for flatfish since e.me should be removed from flatfish. according to triage result, its koi+

	gasolin@mozilla.com Assignee
	Comment 5 • 11 years ago

Thanks for point out that, send another patch to fix it

	Cristian Rodriguez (:crdlc)
	Comment 6 • 11 years ago

Comment on attachment 818389 [details]
2nd pull request

Perfect! Great work. Please review a minor comment in github, thanks a lot

	gasolin@mozilla.com Assignee
	Comment 7 • 11 years ago

fixed and merged to gaia-master https://github.com/mozilla-b2g/gaia/commit/5c85c92618b0e78110dff9a83c88bf2ad52535b5

thanks!

	John Ford [:jhford] CET/CEST Berlin Time
	Comment 8 • 11 years ago

I was not able to uplift this bug to v1.2.  If this bug has dependencies which are not marked in this bug, please comment on this bug.  If this bug depends on patches that aren't approved for v1.2, we need to re-evaluate the approval.  Otherwise, if this is just a merge conflict, you might be able to resolve it with:

  git checkout v1.2
  git cherry-pick -x -m1 5c85c92618b0e78110dff9a83c88bf2ad52535b5
  <RESOLVE MERGE CONFLICTS>
  git commit

	gasolin@mozilla.com Assignee
	Comment 9 • 11 years ago

Hi john, this uplift is blocked by bug 920445, which depends on a huge e.me patch...

	Jason Smith [:jsmith]
	Comment 10 • 11 years ago

Collections aren't targeted to be part of the 1.2 release - so moving to 1.3?