921334 - [LockScreen] The arrows on the handle is incorrect

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::System::Lockscreen, defect)

Comment 1

[Greg Weng [:snowmantw][:gweng][:λ]]

It should be corrected with image files, rather than using Unicode characters.

Comment 2

[Greg Weng [:snowmantw][:gweng][:λ]]

Attachment: Patch

Solved it by adding the new image file and adjust style.
Also solved the problem, that the arrow will displays shortly every time when the handle crossing the origin.

Comment 3

[Greg Weng [:snowmantw][:gweng][:λ]]

master: https://github.com/mozilla-b2g/gaia/commit/01d274cd85a0eb0ae80af8bd212e576f59133d2d

Comment 4

[John Ford [:jhford] CET/CEST Berlin Time]

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 01d274cd85a0eb0ae80af8bd212e576f59133d2d
  <RESOLVE MERGE CONFLICTS>
  git commit

Comment 5

[Greg Weng [:snowmantw][:gweng][:λ]]

I've solved these dependencies on my local repo by first revert the second commit of LockScreen on v1.2 branch

    git revert 3d46b7c7ef49f6d66ea25a9383d924e759d15c75

This will let it begin from the first version of the LockScreen, namely the Bug 913377. Then, I cherry-picked all related commits on the master branch manually and by the order they had been merged. The order is Bug 903924, Bug 917689, Bug 919854, Bug 921360, Bug 919858, Bug 921335, Bug 921334, and the last one is Bug 921392. In this way the LockScreen will works fine as it in the master branch. I guess that I can set the dependencies as the same as the order, but I'm not sure. So I needinfo John Ford again to see what should I do now.

Comment 6

[John Ford [:jhford] CET/CEST Berlin Time]

(In reply to Greg Weng [:snowmantw] from comment #5)
> I've solved these dependencies on my local repo by first revert the second
> commit of LockScreen on v1.2 branch
> 
>     git revert 3d46b7c7ef49f6d66ea25a9383d924e759d15c75
> 
> This will let it begin from the first version of the LockScreen, namely the
> Bug 913377. Then, I cherry-picked all related commits on the master branch
> manually and by the order they had been merged. The order is Bug 903924, Bug
> 917689, Bug 919854, Bug 921360, Bug 919858, Bug 921335, Bug 921334, and the
> last one is Bug 921392. In this way the LockScreen will works fine as it in
> the master branch. I guess that I can set the dependencies as the same as
> the order, but I'm not sure. So I needinfo John Ford again to see what
> should I do now.

At least the first bug in that list is still koi?.  We can't do anything on those bugs on v1.2 (or this one, I guess) until all of them are koi+.

Comment 7

[Greg Weng [:snowmantw][:gweng][:λ]]

Tim suggested me to ask him for koi? and uplift these bugs in my own repo, then merge them back to the mozilla/v1.2. This works and those commits now are rearranged in the correct order, and the LockScreen now alive in mozilla/v1.2, too.

Comment 8

[Steve Chung [:steveck]]

Hi Greg, we might need arrow image with 1.5x and 2x for multi-resolution. Could you contact visual and update the image assets? Thanks.

Comment 9

[Greg Weng [:snowmantw][:gweng][:λ]]

Well I've asked Rob in one letter, he said that he will forward to UX, but there's no response yet...

Comment 10

[Steve Chung [:steveck]]

Attachment: [e-mail]

Hi Greg, it's the 1.5X arrow icon, you may need it for the system lockscreen.

Comment 11

[Greg Weng [:snowmantw][:gweng][:λ]]

(In reply to Steve Chung [:steveck] from comment #10)
> Created attachment 823140 [details]
> [e-mail]
> 
> Hi Greg, it's the 1.5X arrow icon, you may need it for the system lockscreen.

Oh, I've commit the arrow in another bug (for larger device). Thank you.

Comment 12

[John Ford [:jhford] CET/CEST Berlin Time]

Greg, please make sure that you set flags for branch landings when you do them

v1.2: https://github.com/snowmantw/gaia/commit/d7665bc3ffc85f933a0ad4a16cf73239299be39f