diff --git a/HISTORY.md b/HISTORY.md
index 2e40d22546..2191bb7a5f 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
# Keyman Version History
+## 15.0.104 alpha 2021-08-26
+
+* chore(linux): Update changelog files (#5637)
+* fix(web): Check keyboard before marking layout calibrated (#5630)
+
## 15.0.103 alpha 2021-08-25
* chore(linux): Improve debian package script (#5626)
diff --git a/VERSION.md b/VERSION.md
index b2bf812a1a..013d21645a 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-15.0.104
\ No newline at end of file
+15.0.105
\ No newline at end of file
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
index 18b2b118a8..25af3f9f77 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
@@ -14,6 +14,7 @@ import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
+import android.widget.ImageButton;
import android.widget.TextView;
import android.annotation.SuppressLint;
@@ -32,6 +33,33 @@ public class InfoActivity extends BaseActivity {
setContentView(R.layout.activity_info);
+ // Navigation buttons
+ final ImageButton backButton = (ImageButton) findViewById(R.id.back_button);
+ backButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ onBackPressed();
+ }
+ });
+
+ final ImageButton forwardButton = (ImageButton) findViewById(R.id.forward_button);
+ forwardButton.setEnabled(false);
+ forwardButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (webView != null && webView.canGoForward()) {
+ webView.goForward();
+ }
+ }
+ });
+
+ final ImageButton closeButton = (ImageButton) findViewById(R.id.close_button);
+ closeButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ finish();
+ }
+ });
+
TextView version = findViewById(R.id.infoVersion);
// Parse app version string to create a version title (Not using KMManager.getVersion() because that's for KMEA)
@@ -72,6 +100,9 @@ public class InfoActivity extends BaseActivity {
@Override
public void onPageFinished(WebView view, String url) {
+ if (webView != null) {
+ forwardButton.setEnabled(webView.canGoForward());
+ }
}
});
@@ -81,7 +112,12 @@ public class InfoActivity extends BaseActivity {
@Override
public void onBackPressed() {
- finish();
- overridePendingTransition(0, android.R.anim.fade_out);
+ if (webView != null && webView.canGoBack()) {
+ webView.goBack();
+ } else {
+ super.onBackPressed();
+ finish();
+ overridePendingTransition(0, android.R.anim.fade_out);
+ }
}
}
\ No newline at end of file
diff --git a/android/KMAPro/kMAPro/src/main/res/color/image_button_color.xml b/android/KMAPro/kMAPro/src/main/res/color/image_button_color.xml
new file mode 100644
index 0000000000..b0ff1e7b9d
--- /dev/null
+++ b/android/KMAPro/kMAPro/src/main/res/color/image_button_color.xml
@@ -0,0 +1,5 @@
+
+
+