Merge remote-tracking branch 'origin/master' into feat/android/enter-…

…mode
keymanapp · Aug 9, 2024 · 74011e2 · 74011e2
2 parents ea2b062 + e39ef3b
commit 74011e2
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 2 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,10 @@
 # Keyman Version History
 
+## 18.0.85 alpha 2024-08-08
+
+* fix(developer): update date for last git commit date fixture (#12122)
+* refactor(android/engine): Parse keyboards.json for FirstVoices app (#11943)
+
 ## 18.0.84 alpha 2024-08-07
 
 * refactor(common): move kpj-related files into developer-utils (#11531)

diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-18.0.85
+18.0.86
diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_blue_2017_1.9.png
diff --git a/.../KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_color_tai_heritage_pro.9.png b/.../KMAPro/kMAPro/src/main/res/drawable-hdpi/sil_logo_color_tai_heritage_pro.9.png
diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_blue_2017_1.9.png
diff --git a/.../KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_color_tai_heritage_pro.9.png b/.../KMAPro/kMAPro/src/main/res/drawable-mdpi/sil_logo_color_tai_heritage_pro.9.png
diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_blue_2017_1.9.png
diff --git a/...KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_color_tai_heritage_pro.9.png b/...KMAPro/kMAPro/src/main/res/drawable-xhdpi/sil_logo_color_tai_heritage_pro.9.png
diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_blue_2017_1.9.png
diff --git a/...MAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_color_tai_heritage_pro.9.png b/...MAPro/kMAPro/src/main/res/drawable-xxhdpi/sil_logo_color_tai_heritage_pro.9.png
diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_blue_2017_1.9.png b/android/KMAPro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_blue_2017_1.9.png
diff --git a/...APro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_color_tai_heritage_pro.9.png b/...APro/kMAPro/src/main/res/drawable-xxxhdpi/sil_logo_color_tai_heritage_pro.9.png
diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo.xml b/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo.xml
@@ -15,7 +15,7 @@
 
     <item>
         <bitmap
-            android:src="@drawable/sil_logo_blue_2017_1"
+            android:src="@drawable/sil_logo_color_tai_heritage_pro"
             android:gravity="center"/>
     </item>
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
         <item>
             <bitmap
-                android:src="@drawable/sil_logo_blue_2017_1"
+                android:src="@drawable/sil_logo_color_tai_heritage_pro"
                 android:gravity="center"/>
         </item>
@@ Expand Down @@