Merge "Suppress more keys that share the same meaning with the parent key's imeAction"

java/res/xml/key_styles_enter.xml

@@ -32,6 +32,13 @@
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
                 latin:moreKeys="@string/action_previous_as_more_key" />
         </case>
+        <case
+            latin:imeAction="actionNext"
+            latin:navigatePrevious="false"
+        >
+            <key-style
+                latin:styleName="navigateMoreKeysStyle" />
+        </case>
         <case
             latin:imeAction="actionPrevious"
             latin:navigateNext="true"
@@ -41,6 +48,13 @@
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
                 latin:moreKeys="@string/action_next_as_more_key" />
         </case>
+        <case
+            latin:imeAction="actionPrevious"
+            latin:navigateNext="false"
+        >
+            <key-style
+                latin:styleName="navigateMoreKeysStyle" />
+        </case>
         <!-- imeAction!="actionNext" and imeAction!="actionPrevious" -->
         <case
             latin:navigateNext="true"