822585 - [FTU UX VD] Change final illustration of the hand

Status: VERIFIED FIXED

(Firefox OS Graveyard :: Gaia::First Time Experience, defect)

Description

[Victoria Gerchinhoren [:vicky]]

Attachment: this is the new image to replace the existing

In the final dark grey screen of FTU, before the tutorial, change the illustration of the hand that is touching a circle for the one attached of the hand pointing right (as an indicator of continuity)

Comment 1

[Victoria Gerchinhoren [:vicky]]

Attachment: This is the screen where it should be placed

Comment 2

[Fernando Campo (:fcampo)]

Attachment: https://github.com/mozilla-b2g/gaia/pull/7598

Asset change, no risk

Comment 3

[Maria Angeles Oteo (:oteo)]

This is not a blocker but nice to have to be either tracked or implemented though the UX branch

Comment 4

[Fernando Campo (:fcampo)]

Comment on attachment 701847 [details]
https://github.com/mozilla-b2g/gaia/pull/7598

asset change, safe land

Comment 5

[Francisco Jordano [:arcturus] [:francisco]]

No problem to accept this, is just an asset and the PR is already done.

For future changes like this (just an asset or changes in the markup or css), please use the UX branch.

Comment 6

[Fernando Campo (:fcampo)]

Attachment: https://github.com/gordonbrander/gaia/pull/93

Updating the PR to the UX-branch

Comment 7

[Sam Joch [:samjoch]]

Landed in uxbranch: https://github.com/gordonbrander/gaia/commit/b2ffeabdee278a996c197f1bf0443dc92cd74cb6

Comment 8

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

My understanding is that a bug isn't RESOLVED->FIXED until it lands on gaia master branch.

Comment 9

[Maria Angeles Oteo (:oteo)]

Hi Fernando or Sam, can you land the patch in master? 

As there is no clear answers about the UX branch purpose right now, it'd be better to land it in master so after that, we can ask for uplifting the patch to v1-train. Otherwise I am afraid the work done will be lost and it will not land in time or never in the commercial release v1.1.

Comment 10

[Sam Joch [:samjoch]]

https://github.com/mozilla-b2g/gaia/commit/25d9e53380db967d76223c5f1e1940ed907ed447

Comment 11

[Naoki Hirata :nhirata (please use needinfo instead of cc)]

On Master

Master build : 2013-03-26-07-02-04
"mozilla-central" revision="28b048ffb7a7"
"integration/gaia-central" revision="44f6a17f24d4"
"gecko.git"revision="a800f14ea7022a78966f7fe14a9b0d11c569b151"
"gaia.git" revision="ace1eb32a313da1232bbdf9cff2581a4b036356d"

Not on v1 train.

Comment 12

[Fernando Campo (:fcampo)]

Comment on attachment 702971 [details]
https://github.com/gordonbrander/gaia/pull/93

NOTE: Please see https://wiki.mozilla.org/Release_Management/B2G_Landing to better understand the B2G approval process and landings.

[Approval Request Comment]
Bug caused by (feature/regressing bug #): 
User impact if declined: image consistency on tutorial will be affected, as the current image is different than the others
Testing completed: 
Risk to taking this patch (and alternatives if risky): low, assets change only
String or UUID changes made by this patch:

Comment 13

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

I was not able to uplift this bug to v1-train.  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-train, 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-train
  git cherry-pick -x -m1 25d9e53380db967d76223c5f1e1940ed907ed447
  <RESOLVE MERGE CONFLICTS>
  git commit

Comment 14

[Fernando Campo (:fcampo)]

I checked it and saw that the conflicts are on the settings and browser app code, which are not touched on this bug. Probably because the used commit combines different UX fixes for different bugs.
I could try to solve the conflicts, but I'm not familiar with the code from those apps, nor the bugs they are trying to fix.

Or maybe it's easier to uplift the commit related to the bug (https://github.com/mozilla-b2g/gaia/commit/23aa5cd)

Comment 15

[Sam Joch [:samjoch]]

Yes the master commit hash is 23aa5cd.

Comment 16

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

v1-train: d90de846f846898c9a1ecf591367b970fee6cac4

Wow, that's confusing!  is the rest of what was approved here actually approved?