From 4652f142731bae59cd9f23c3292a98ed7084a455 Mon Sep 17 00:00:00 2001
From: Braden Farmer <farmerbb@gmail.com>
Date: Mon, 13 Dec 2021 22:20:16 -0700
Subject: [PATCH] Taskbar 6.2 (release 1)

* Bump version code + update changelog for 6.2 release
---
 CHANGELOG.md                                       | 25 ++++++++++++++++++++--
 app/src/androidx86/AndroidManifest.xml             |  4 ++--
 .../farmerbb/taskbar/activity/MainActivity.java    |  2 +-
 dependencies.gradle                                |  4 ++--
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb3224d7..18f46239 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,25 @@
-## New features in Taskbar 6.1
+<!-- Don't forget to bump the latestChangelogVersion inside MainActivity -->
+
+## Changelog for Taskbar 6.2
+
+This is mostly a behind-the-scenes update, containing the following changes and fixes:
+
+* Many stability fixes for Android 11 and Android 12 devices, as well as Chrome OS devices running ARCVM
+
+* Hide freeform mode settings on most devices running Android 12, where launching freeform apps via Taskbar is non-functional
+
+* Fixed a crash that occurred when using Taskbar's Tasker plugin and a state condition is met
+
+* Hide divider when centering app icons
+
+* Support for enabling additional desktop mode settings via Shizuku
+
+* Themed start button support for Project Sakura PC builds
+
+## Older Changelogs
+
+<details>
+<summary>New features in Taskbar 6.1</summary>
 
 ### Desktop mode fixes for Android 11
 
@@ -20,7 +41,7 @@ On lower resolution devices, the start menu dimensions and font size have been t
 
 As usual, bugs have been fixed and top crashes have been dealt with.  Also, German and Chinese translations have been updated, and a Spanish translation has now been added.  Thank you very much to all who have contributed!
 
-## Older Changelogs
+</details>
 
 <details>
 <summary>New features in Taskbar 6.0</summary>
diff --git a/app/src/androidx86/AndroidManifest.xml b/app/src/androidx86/AndroidManifest.xml
index eca178a2..f64ca527 100644
--- a/app/src/androidx86/AndroidManifest.xml
+++ b/app/src/androidx86/AndroidManifest.xml
@@ -19,8 +19,8 @@
      * HomeActivity is enabled by default
      * Certain activities and receivers are not exposed
 -->
-<manifest android:versionCode="203"
-          android:versionName="6.1.1"
+<manifest android:versionCode="204"
+          android:versionName="6.2"
           xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.farmerbb.taskbar">
diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
index 48477a7e..630363fe 100644
--- a/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
@@ -81,7 +81,7 @@ public class MainActivity extends AppCompatActivity {
 
     private boolean hasCaption = false;
 
-    private final int latestChangelogVersion = 2;
+    private final int latestChangelogVersion = 3;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/dependencies.gradle b/dependencies.gradle
index 3d4f589a..759298c1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,8 +1,8 @@
 allprojects {
     ext {
         // TODO keep version name and version code in sync with Android-x86 manifest
-        VERSION_CODE = 203
-        VERSION_NAME = "6.1.1"
+        VERSION_CODE = 204
+        VERSION_NAME = "6.2"
 
         MIN_SDK_VERSION = 21
         COMPILE_SDK_VERSION = 31
-- 
2.11.0