1277234 - Rename key name VolumeUp to AudioVolumeUp

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect)

Comment 1

[Gregor Wagner [:gwagner]]

Mulet builds are currently broken because of gecko/widget/NativeKeyToDOMKeyName.h:1015:25: error: 'KEY_NAME_INDEX_AudioVolumeDown' was not declared in this scope

Comment 2

[Gregor Wagner [:gwagner]]

Attachment: patch

Comment 3

[Gregor Wagner [:gwagner]]

Attachment: patch

Comment 4

[Gregor Wagner [:gwagner]]

Attachment: patch

Comment 5

[Gregor Wagner [:gwagner]]

Alberto, can you take care of the gaia pieces?

Comment 6

[Masayuki Nakano [:masayuki] (he/him)(JST, +0900)(PTO: 9/19-9/27)]

Comment on attachment 8758710 [details] [diff] [review]
patch

>diff --git a/widget/NativeKeyToDOMKeyName.h b/widget/NativeKeyToDOMKeyName.h
>--- a/widget/NativeKeyToDOMKeyName.h
>+++ b/widget/NativeKeyToDOMKeyName.h
>@@ -1010,35 +1010,35 @@ KEY_MAP_QT      (AudioBassBoostUp, Qt::K
> 
> // AudioVolumeDown
> KEY_MAP_WIN               (AudioVolumeDown, VK_VOLUME_DOWN)
> KEY_MAP_WIN_CMD           (AudioVolumeDown, APPCOMMAND_VOLUME_DOWN)
> KEY_MAP_COCOA             (AudioVolumeDown, kVK_VolumeDown)
> KEY_MAP_GTK               (AudioVolumeDown, GDK_AudioLowerVolume)
> KEY_MAP_QT                (AudioVolumeDown, Qt::Key_VolumeDown)
> KEY_MAP_ANDROID_EXCEPT_B2G(AudioVolumeDown, AKEYCODE_VOLUME_DOWN)
>-KEY_MAP_B2G               (VolumeDown,      AKEYCODE_VOLUME_DOWN)
>+KEY_MAP_B2G               (AudioVolumeDown, AKEYCODE_VOLUME_DOWN)

Instead of using KEY_MAP_B2G with KEY_MAP_ANDROID_EXCEPT_B2G, just use KEY_MAP_ANDROID which defines a map for both Firefox for Android and B2G.

> // AudioVolumeUp
> KEY_MAP_WIN               (AudioVolumeUp, VK_VOLUME_UP)
> KEY_MAP_WIN_CMD           (AudioVolumeUp, APPCOMMAND_VOLUME_UP)
> KEY_MAP_COCOA             (AudioVolumeUp, kVK_VolumeUp)
> KEY_MAP_GTK               (AudioVolumeUp, GDK_AudioRaiseVolume)
> KEY_MAP_QT                (AudioVolumeUp, Qt::Key_VolumeUp)
> KEY_MAP_ANDROID_EXCEPT_B2G(AudioVolumeUp, AKEYCODE_VOLUME_UP)
>-KEY_MAP_B2G               (VolumeUp,      AKEYCODE_VOLUME_UP)
>+KEY_MAP_B2G               (AudioVolumeUp, AKEYCODE_VOLUME_UP)

Same.

> // AudioVolumeMute
> KEY_MAP_WIN               (AudioVolumeMute, VK_VOLUME_MUTE)
> KEY_MAP_WIN_CMD           (AudioVolumeMute, APPCOMMAND_VOLUME_MUTE)
> KEY_MAP_COCOA             (AudioVolumeMute, kVK_Mute)
> KEY_MAP_GTK               (AudioVolumeMute, GDK_AudioMute)
> KEY_MAP_QT                (AudioVolumeMute, Qt::Key_VolumeMute)
> KEY_MAP_ANDROID_EXCEPT_B2G(AudioVolumeMute, AKEYCODE_VOLUME_MUTE)
>-KEY_MAP_B2G               (VolumeMute,      AKEYCODE_VOLUME_MUTE)
>+KEY_MAP_B2G               (AudioVolumeMute, AKEYCODE_VOLUME_MUTE)

Same.

With those changes, r=masayuki.

Thank you for your work!

Comment 7

[Gregor Wagner [:gwagner]]

Attachment: patch

Fix review comments.

Comment 8

[GitHub Autolander Bot]

Attachment: [gaia] albertopq:1277234-volumeUp-master > mozilla-b2g:master

Comment 9

[Alberto Pastor [:albertopq]]

That's the only change gaia needs, I think.
Is there any way you can verify if that's correct? Thanks!

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/17fd76ee110c
Rename key name VolumeUp to AudioVolumeUp. r=masayuki

Comment 11

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/17fd76ee110c