869811 - [Clock] The alarm goes off page is broken and overlapping after attention screen switched between full/status bar mode.

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::Clock, defect)

Description

[[e-mail], [e-mail]]

STR:
0. Set an alarm and wait it to goes off(or make an incoming phone call)
1. Attention screen is shown
2. Click home button to display mini attention screen
3. Click on mini attention screen to display original style
4. Check the layout normally or not

Expected result:
- The layout should not be overlapping.(Alarm goes off page)
- The button should be displayed normally.(Phone call page)

Actual result:
- The layout is overlapping.(Alarm goes off page)
- Accept phone call button is disappeared.(Phone call page)

Comment 1

[Leo]

Attachment: Attention screen for alarm & incoming call[v1-train]

Source used: gaia/v1-train
Gaia Revision: 90c3cdc4e0fbab5960ae5ea80ab32ddf3993f42a
Build Identifier: 20130508105603

Comment 2

[Leo]

Attachment: Attention screen for alarm & incoming call[gaia-master]

Source code: gaia/master
Gaia version: 0d2b50d1c7083e5c19d7f0d0eebc019b7a7e8374
Build Identifier: 20130503130302

Comment 3

[(inactive after 6/18) Alive Kuo [:alive]]

Is this broken in system app?

Comment 4

[[e-mail], [e-mail]]

I'm looking on it. The oncall page will be broken after go back to full attention screen.(Accept call button disappeared.)

Comment 5

[[e-mail], [e-mail]]

For Comment2:
There is a regression from Bug 830644. It will let media query fail to parse 'rem' unit. So, the style of attention screen is not updated in status bar mode. 

For Comment1:
And Bug 830644 is not landed in v1-train. Media query works normally. It's string overlapping only.

This is layout issue belong to Clock app. Change summary..

Comment 6

[[e-mail], [e-mail]]

Attachment: Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/9670

Pointer to Github pull-request

Comment 7

[[e-mail], [e-mail]]

Comment on attachment 747849 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/9670

* Because of Bug 725879 - Broken support for rem unit in Media Queries, refine the unit from rem to em in media query.
* Reset the margin for alarm label when attention screen in status bar mode.

Alive,
Could you please help to review my pr? Thanks.

Comment 8

[(inactive after 6/18) Alive Kuo [:alive]]

Comment on attachment 747849 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/9670

CSS only change, r=alive.

Comment 9

[[e-mail], [e-mail]]

Thanks for Alive's reviewing effort. We can close the issue now since the pr is landed. https://github.com/mozilla-b2g/gaia/pull/9670

Comment 11

[Leo]

Attachment: label still overlapping with time when line of label.

Comment 12

[[e-mail], [e-mail]]

Miss to handle two lines case..

Comment 13

[[e-mail], [e-mail]]

Attachment: Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/9709

Pointer to Github pull-request

Comment 14

[[e-mail], [e-mail]]

Comment on attachment 748667 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/9709

Revise the height/line-height of alarm label in mini attention screen.

Alive,
Could you please help to review the pr for the CSS changing? Thank you.

Comment 15

[[e-mail], [e-mail]]

Thanks for Alive's reviewing effort. Since the pr is merged, we can close the issue now. https://github.com/mozilla-b2g/gaia/pull/9709

Comment 16

[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 393b3f57822ae0f34055c6a6060f1433136bafa0
  <RESOLVE MERGE CONFLICTS>
  git commit

Comment 17

[[e-mail], [e-mail]]

John,

Could you please help to uplift ff3b6e1f3e2fa945903d94dd2ee99ec3a84f46cf first? 
(The patch is landed first in comment 9. 
https://github.com/mozilla-b2g/gaia/commit/ff3b6e1f3e2fa945903d94dd2ee99ec3a84f46cf) 

Then. Uplifting 393b3f57822ae0f34055c6a6060f1433136bafa0 should work fine, because I don't see ff3b6e1f3e2fa945903d94dd2ee99ec3a84f46cf in v1-train. Thanks.

Comment 18

[Gareth Aye [:gaye] (back from PTO)]

Hi Ian,

So we tried merging ff3b6e1f3e2fa945903d94dd2ee99ec3a84f46cf first but there was still a merge conflict. Please go ahead and try doing the merge onto v1-train locally.

Comment 19

[[e-mail], [e-mail]]

Uplift the two patches to v1-train via following comment:
* ff3b6e1f3e2fa945903d94dd2ee99ec3a84f46cf via 828411bd93fc7e6005f7294cd4808ea23415a3b9
* 393b3f57822ae0f34055c6a6060f1433136bafa0 via f247f211a1bdc2055919e02e031b9bbb013b45a3

I have a test for v1-train. It looks fine for me.