From fa094d0cb0f79693ad04ecba3b766611757fa651 Mon Sep 17 00:00:00 2001
From: Nyra <nyra@utumno>
Date: Mon, 28 Sep 2026 02:44:13 +0000
Subject: [PATCH 1/3] Roku page: volume keys, and the arrows in the keyboard's
 blue

The remote page's playback row becomes the volume row: Rewind/Play/Forward
are gone from res/xml/roku.xml and its three slots hold Volume Up, Volume
Down and Volume Mute. The page keeps six rows and the same heights, and the
full-width 'Keyboard' return key still ends it.

Volume is three new events (ROKU_VOLUP/ROKU_VOLDOWN/ROKU_VOLMUTE) appended to
KeyValue.Event, wired through the same RokuRemote.press() path the rest of the
page uses - one case group in Keyboard2.handle_event_key, three cases in
RokuRemote.ecpKey() - and mapped to the ECP names Harley's own web remote
posts: VolumeUp, VolumeDown, VolumeMute. No new endpoint, no second code path,
and the threading, timeouts, fail-soft and lit-state behaviour are untouched.

roku_rewind / roku_play / roku_forward keep their handling in KeyValue.java,
RokuRemote.java and Keyboard2.java, deliberately: nothing references them now,
so putting the playback row back is a one-line XML change and not a rebuild.

The four D-pad arrows are drawn in the theme's new colorRokuArrow (#00E5FF,
the same cyan the space bar's io-stall line and the DeepSeek off-peak
indicator already use). They are event keys and every event key carries
FLAG_SECONDARY, which dimmed them to secondaryLabelColor - a muted pink on the
Orchid theme that reads as 'disabled' on the one page where they are the main
controls. Keyboard2View.labelColor() matches them by EVENT
(ROKU_UP/DOWN/LEFT/RIGHT, guarded by getKind()), never by glyph: 0xE005-0xE008
are ordinary arrow glyphs that other pages and the default layouts also use and
they must not change. A press still takes the pressed colour, and
RokuRemote.isLit() still overrides for the sent acknowledgement. The volume
keys are not direction keys and keep their normal colour.

No auxiliary keys, no corner labels, no badge or badge-brightness change.
---
 res/values/themes.xml                   |  7 +++++++
 res/xml/roku.xml                        |  6 +++---
 srcs/juloo.keyboard2/KeyValue.java      |  8 ++++++++
 srcs/juloo.keyboard2/Keyboard2.java     |  1 +
 srcs/juloo.keyboard2/Keyboard2View.java | 25 +++++++++++++++++++++++++
 srcs/juloo.keyboard2/RokuRemote.java    |  5 +++++
 srcs/juloo.keyboard2/Theme.java         |  3 +++
 7 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/res/values/themes.xml b/res/values/themes.xml
index b336ffb..49928d7 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -15,6 +15,12 @@
     <attr name="colorLabelPressed" format="color"/> <!-- defaults to colorLabel -->
     <attr name="colorLabelActivated" format="color"/>
     <attr name="colorLabelLocked" format="color"/>
+    <!-- The Roku page's four direction keys. They carry FLAG_SECONDARY like every
+         other event key, so without a colour of their own they come out dimmed to
+         secondaryLabelColor. This is the same cyan the keyboard already uses for
+         "the blue" (the space bar's io-stall line, the DeepSeek off-peak indicator),
+         and it is deliberately the same value in every theme. -->
+    <attr name="colorRokuArrow" format="color"/>
     <attr name="secondaryDimming" format="float"/>
     <attr name="greyedDimming" format="float"/>
     <!-- Corner labels -->
@@ -61,6 +67,7 @@
     <item name="clipboard_divider_height">1px</item>
     <item name="suggestions_background">?attr/colorKeyboard</item>
     <item name="suggestions_border_radius">?attr/keyBorderRadius</item>
+    <item name="colorRokuArrow">#00E5FF</item>
   </style>
   <style name="Dark" parent="BaseTheme">
     <item name="android:isLightTheme">false</item>
diff --git a/res/xml/roku.xml b/res/xml/roku.xml
index 2cfa4a7..10753d8 100644
--- a/res/xml/roku.xml
+++ b/res/xml/roku.xml
@@ -28,9 +28,9 @@
     <key shift="3.3" width="3.3" role="action" key0="roku_down"/>
   </row>
   <row height="0.8">
-    <key width="3.3" role="action" key0="roku_rewind"/>
-    <key width="3.3" role="action" key0="roku_play"/>
-    <key width="3.3" role="action" key0="roku_forward"/>
+    <key width="3.3" role="action" key0="roku_volup"/>
+    <key width="3.3" role="action" key0="roku_voldown"/>
+    <key width="3.3" role="action" key0="roku_volmute"/>
   </row>
   <row height="1.0">
     <key width="9.9" role="action" key0="roku_close"/>
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index 38967e9..b015c28 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -40,6 +40,9 @@ public final class KeyValue implements Comparable<KeyValue>
     ROKU_REWIND,
     ROKU_FORWARD,
     ROKU_POWER,
+    ROKU_VOLUP,
+    ROKU_VOLDOWN,
+    ROKU_VOLMUTE,
   }
 
   // Must be evaluated in the reverse order of their values.
@@ -682,6 +685,11 @@ public final class KeyValue implements Comparable<KeyValue>
       case "roku_rewind": return eventKey("Rewind", Event.ROKU_REWIND, FLAG_SMALLER_FONT);
       case "roku_forward": return eventKey("Forward", Event.ROKU_FORWARD, FLAG_SMALLER_FONT);
       case "roku_power": return eventKey("Power", Event.ROKU_POWER, FLAG_SMALLER_FONT);
+      /* The TV's volume, same ECP path as the rest of the page (RokuRemote sends the
+         VolumeUp/VolumeDown/VolumeMute keypresses Harley's own web remote uses). */
+      case "roku_volup": return eventKey("Vol+", Event.ROKU_VOLUP, FLAG_SMALLER_FONT);
+      case "roku_voldown": return eventKey("Vol-", Event.ROKU_VOLDOWN, FLAG_SMALLER_FONT);
+      case "roku_volmute": return eventKey("Mute", Event.ROKU_VOLMUTE, FLAG_SMALLER_FONT);
       /* The way back from the Roku page. The same event as "switch_text", which is
          unchanged, but labelled: the page has no config key, so this is the only exit
          and "ABC" does not read as one on a page full of remote keys. */
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 5a7e131..4d5df89 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -494,6 +494,7 @@ public class Keyboard2 extends InputMethodService
         case ROKU_HOME: case ROKU_BACK:
         case ROKU_UP: case ROKU_DOWN: case ROKU_LEFT: case ROKU_RIGHT:
         case ROKU_SELECT: case ROKU_PLAY: case ROKU_REWIND: case ROKU_FORWARD:
+        case ROKU_VOLUP: case ROKU_VOLDOWN: case ROKU_VOLMUTE:
         case ROKU_POWER:
           RokuRemote.press(ev);
           break;
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 70110b1..6365c71 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -743,6 +743,22 @@ public class Keyboard2View extends View
     canvas.restore();
   }
 
+  /** True for the four direction keys of the Roku page (res/xml/roku.xml), matched by
+      EVENT and never by glyph: 0xE005-0xE008 are ordinary arrow glyphs that the default
+      layouts and other pages also use, and those must keep their own colours.
+      [KeyValue.getEvent()] is only valid for its own kind, so the kind is checked first,
+      the same guard [RokuRemote.isLit] uses. */
+  private static boolean isRokuDirection(KeyValue k)
+  {
+    if (k.getKind() != KeyValue.Kind.Event)
+      return false;
+    switch (k.getEvent())
+    {
+      case ROKU_UP: case ROKU_DOWN: case ROKU_LEFT: case ROKU_RIGHT: return true;
+      default: return false;
+    }
+  }
+
   private int labelColor(KeyValue k, boolean isKeyDown, boolean sublabel)
   {
     if (isKeyDown)
@@ -756,6 +772,15 @@ public class Keyboard2View extends View
       }
       return _theme.pressedColor;
     }
+    /* The Roku page's four direction keys are event keys, and every event key carries
+       FLAG_SECONDARY, which dims them to secondaryLabelColor - a muted pink on the
+       Orchid theme, which reads as "disabled" on the one page where they are the main
+       controls. They get the theme's blue accent instead. Only these four events are
+       affected: no other key on any page or layout changes colour. A press is answered
+       above, and [drawLabel]'s RokuRemote.isLit() still overrides this, so neither the
+       pressed look nor the sent acknowledgement changes. */
+    if (isRokuDirection(k))
+      return _theme.rokuArrowColor;
     if (k.hasFlagsAny(KeyValue.FLAG_SECONDARY | KeyValue.FLAG_GREYED))
     {
       if (k.hasFlagsAny(KeyValue.FLAG_GREYED))
diff --git a/srcs/juloo.keyboard2/RokuRemote.java b/srcs/juloo.keyboard2/RokuRemote.java
index b9864aa..31cbff6 100644
--- a/srcs/juloo.keyboard2/RokuRemote.java
+++ b/srcs/juloo.keyboard2/RokuRemote.java
@@ -119,6 +119,11 @@ public final class RokuRemote
       case ROKU_REWIND: return "Rev";   // the ECP's name for rewind
       case ROKU_FORWARD: return "Fwd";  // ... and for fast forward
       case ROKU_POWER: return "Power";  // the ECP's power toggle
+      /* Volume: the same names Harley's own web remote posts to /keypress/. They only
+         do something on a Roku TV (the TV's volume keys), which is what this is. */
+      case ROKU_VOLUP: return "VolumeUp";
+      case ROKU_VOLDOWN: return "VolumeDown";
+      case ROKU_VOLMUTE: return "VolumeMute";
       default: return null;
     }
   }
diff --git a/srcs/juloo.keyboard2/Theme.java b/srcs/juloo.keyboard2/Theme.java
index 8f4e8f6..885e9af 100644
--- a/srcs/juloo.keyboard2/Theme.java
+++ b/srcs/juloo.keyboard2/Theme.java
@@ -23,6 +23,8 @@ public class Theme
   public final int subLabelColor;
   public final int secondaryLabelColor;
   public final int greyedLabelColor;
+  /** Label colour for the Roku page's direction keys (res/values/themes.xml). */
+  public final int rokuArrowColor;
 
   // Key borders
   public final float keyBorderRadius;
@@ -58,6 +60,7 @@ public class Theme
         s.getFloat(R.styleable.keyboard_secondaryDimming, 0.25f));
     greyedLabelColor = adjustLight(labelColor,
         s.getFloat(R.styleable.keyboard_greyedDimming, 0.5f));
+    rokuArrowColor = s.getColor(R.styleable.keyboard_colorRokuArrow, labelColor);
     keyBorderRadius = s.getDimension(R.styleable.keyboard_keyBorderRadius, 0);
     keyBorderWidth = s.getDimension(R.styleable.keyboard_keyBorderWidth, 0);
     keyBorderWidthActivated = s.getDimension(R.styleable.keyboard_keyBorderWidthActivated, 0);

From 3ebeba0619e8b3a43530ebcdc0c482fa4842131b Mon Sep 17 00:00:00 2001
From: Nyra <nyra@utumno>
Date: Mon, 28 Sep 2026 02:45:01 +0000
Subject: [PATCH 2/3] Roku page: keep Play, and put volume either side of it

Harley wants Play kept. The row that held Rewind/Play/Forward is now
Vol- / Play / Vol+: Rewind and Forward are off the page, Play stays in the
middle slot unchanged, Volume Down takes the left slot and Volume Up the
right. Volume Mute does not fit three slots and is not on the page, but its
event, its 'roku_volmute' KeyValue case and its RokuRemote mapping stay in
place, wired exactly like the other two and simply not referenced by any
layout - so adding Mute later is a one-line XML change, not a rebuild.

The page still has six rows, the same heights, and the full-width 'Keyboard'
return key still ends it.
---
 res/xml/roku.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/roku.xml b/res/xml/roku.xml
index 10753d8..c1ed50b 100644
--- a/res/xml/roku.xml
+++ b/res/xml/roku.xml
@@ -28,9 +28,9 @@
     <key shift="3.3" width="3.3" role="action" key0="roku_down"/>
   </row>
   <row height="0.8">
-    <key width="3.3" role="action" key0="roku_volup"/>
     <key width="3.3" role="action" key0="roku_voldown"/>
-    <key width="3.3" role="action" key0="roku_volmute"/>
+    <key width="3.3" role="action" key0="roku_play"/>
+    <key width="3.3" role="action" key0="roku_volup"/>
   </row>
   <row height="1.0">
     <key width="9.9" role="action" key0="roku_close"/>

From 74319714c07cd00480a4a68de2f816ee464c9c6c Mon Sep 17 00:00:00 2001
From: Nyra <nyra@utumno>
Date: Mon, 28 Sep 2026 02:47:42 +0000
Subject: [PATCH 3/3] Roku page: holding Vol- sends mute

Mute has no slot on the page (Vol- / Play / Vol+ fills the row), so it lives
under the volume-down key: a short press on Vol- is still exactly one
VolumeDown, a hold is one VolumeMute.

This rides the keyboard's own long-press path rather than a timer of its own.
KeyModifier.modify_long_press() maps ROKU_VOLDOWN to KeyValue.ROKU_VOLUME_MUTE -
the same route CHANGE_METHOD_PREV/NEXT and SWITCH_VOICE_TYPING already take - so
Pointers.handleLongPress() replaces the pointer's value at longpress_timeout and
the single key_up on release carries the mute. VolumeDown is never sent on a hold
because events are dispatched only from key_up (KeyEventHandler), which reads the
pointer's value after the replacement; and if the finger lifts first,
onTouchUp stops the pending long-press before reading the value, so the swap
never happens.

KeyValue.ROKU_VOLUME_MUTE is one shared key: the 'roku_volmute' name and the
long press both return it, so the two cannot drift apart. The Roku page needs no
XML change for this.

The long-press delay is _config.longPressTimeout, the fork's longpress_timeout
setting, the same as every other long-pressable key.
---
 res/xml/roku.xml                      | 5 ++++-
 srcs/juloo.keyboard2/KeyModifier.java | 7 +++++++
 srcs/juloo.keyboard2/KeyValue.java    | 6 +++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/res/xml/roku.xml b/res/xml/roku.xml
index c1ed50b..2ef7c06 100644
--- a/res/xml/roku.xml
+++ b/res/xml/roku.xml
@@ -9,7 +9,10 @@
      fill the empty corner slots of these keys. That is why the last row is a
      full-width "Keyboard" key instead of the config gear: it fires the same
      Event.SWITCH_TEXT as the switch_text key on other pages and is the way back
-     to the letter keyboard. -->
+     to the letter keyboard.
+
+     Vol- is also the page's mute: holding it sends mute instead of volume-down
+     (KeyModifier.modify_long_press), so mute is on the page without a slot. -->
 <keyboard bottom_row="false">
   <row height="0.8">
     <key width="3.3" role="action" key0="roku_home"/>
diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 0cb7254..d7eab96 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -112,6 +112,13 @@ public final class KeyModifier
             return KeyValue.CHANGE_METHOD;
           case SWITCH_VOICE_TYPING:
             return KeyValue.VOICE_TYPING_CHOOSER;
+          /* The Roku page's volume-down key: held, it is the TV's mute instead of
+             volume-down. This is the same path the two keys above take, so [Pointers]
+             replaces the pointer's value while the finger is still down and the single
+             [key_up] on release carries the mute - the short press is not sent as well.
+             Mute therefore lives on the page without taking a slot of its own. */
+          case ROKU_VOLDOWN:
+            return KeyValue.ROKU_VOLUME_MUTE;
         }
         break;
     }
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index b015c28..5b692f3 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -561,6 +561,10 @@ public final class KeyValue implements Comparable<KeyValue>
   public static final KeyValue CHANGE_METHOD_PREV = eventKey(0xE009, Event.CHANGE_METHOD_PREV, FLAG_SMALLER_FONT);
   public static final KeyValue CHANGE_METHOD_NEXT = eventKey(0xE009, Event.CHANGE_METHOD_NEXT, FLAG_SMALLER_FONT);
   public static final KeyValue VOICE_TYPING_CHOOSER = eventKey(0xE015, Event.SWITCH_VOICE_TYPING_CHOOSER, FLAG_SMALLER_FONT);
+  /** The Roku page's mute key. It is also what a long press on the page's volume-down key
+      sends (see [KeyModifier.modify_long_press]), so mute lives on the page without
+      spending a slot on it; both uses share this one key. */
+  public static final KeyValue ROKU_VOLUME_MUTE = eventKey("Mute", Event.ROKU_VOLMUTE, FLAG_SMALLER_FONT);
   public static final KeyValue COMPOSE_CANCEL = placeholderKey(0xE01A, Placeholder.COMPOSE_CANCEL, FLAG_SECONDARY);
 
   public static KeyValue getSpecialKeyByName(String name)
@@ -689,7 +693,7 @@ public final class KeyValue implements Comparable<KeyValue>
          VolumeUp/VolumeDown/VolumeMute keypresses Harley's own web remote uses). */
       case "roku_volup": return eventKey("Vol+", Event.ROKU_VOLUP, FLAG_SMALLER_FONT);
       case "roku_voldown": return eventKey("Vol-", Event.ROKU_VOLDOWN, FLAG_SMALLER_FONT);
-      case "roku_volmute": return eventKey("Mute", Event.ROKU_VOLMUTE, FLAG_SMALLER_FONT);
+      case "roku_volmute": return ROKU_VOLUME_MUTE;
       /* The way back from the Roku page. The same event as "switch_text", which is
          unchanged, but labelled: the page has no config key, so this is the only exit
          and "ABC" does not read as one on a page full of remote keys. */