diff options
| author | kboskin <kboskin> | 2021-02-18 12:14:54 +0200 |
|---|---|---|
| committer | kboskin <kboskin> | 2021-02-18 12:14:54 +0200 |
| commit | 68c28a1d4d25e9c88a4634f8bc3daa3e83a45a36 (patch) | |
| tree | 00a028d0a7619cb0efc6c983545586c09a90bc1c | |
| parent | 43e14f52a7eca4570ff558745e4794ad8528fa89 (diff) | |
| parent | 65ffa59c0de5b4739f909aacab899f12a9f87288 (diff) | |
| download | sdl_android-68c28a1d4d25e9c88a4634f8bc3daa3e83a45a36.tar.gz | |
Merge remote-tracking branch 'origin/feature/0298_keyboard_enchancements' into feature/0298_keyboard_enchancements
# Conflicts:
# base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java index 8b5d70847..a59623720 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java @@ -105,23 +105,22 @@ import java.util.List; * <tr>
* <td>maskInputCharacters</td>
* <td>KeyboardInputMask</td>
- * <td>false</td>
- * <td>Allows an app to mask entered characters on HMI</td>
- * <td>N</td>
- * <td></td>
+ * <td>false</td>
* <td>
- * @since SmartDeviceLink 7.1.0
+ * @since SmartDeviceLink 7.1.0
* </td>
+ * <td>Allows an app to mask entered characters on HMI</td>
* </tr>
* <tr>
* <td>customKeys</td>
* <td>List<String></td>
- * <td>false</td>
- * <td>Array of special characters to show in customizable keys. If omitted, keyboard will showdefault special characters</td>
- * <td>N</td>
- * <td>{"string_max_length": 1, "string_min_length": 1, "array_max_size": 10, "array_min_size": 1}</td>
+ * <td>false</td>
+ * <td>
+ * @since SmartDeviceLink 7.1.0
+ * </td>
* <td>
- * @since SmartDeviceLink 7.1.0
+ * Array of special characters to show in customizable keys. If omitted, keyboard will show default special characters
+ * {"string_max_length": 1, "string_min_length": 1, "array_max_size": 10, "array_min_size": 1}
* </td>
* </tr>
* </table>
|