From f6c6bb25d241649e50d60c80e4349aca0cce0d41 Mon Sep 17 00:00:00 2001
From: Patryk Michalik <contact@patrykmichalik.com>
Date: Wed, 28 Apr 2021 11:37:18 +0200
Subject: [PATCH] Optimise code, indicate changes in copyright headers

---
 gradle/wrapper/gradle-wrapper.properties               |  4 ++--
 .../app/lawnchair/ui/preferences/SwitchPreference.kt   |  1 -
 .../touchcontrollers/StatusBarTouchController.java     | 10 +++++-----
 .../launcher3/folder/FolderAnimationManager.java       |  2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4b6c0f34f9..04871b1073 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 10 11:13:33 CEST 2021
+#Wed Apr 28 11:22:03 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt
index d141b1afec..68775d116a 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt
@@ -24,7 +24,6 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 
 @Composable
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
index d91cad0525..867243a5af 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
@@ -12,6 +12,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * Modifications copyright 2021, Lawnchair
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
@@ -93,11 +95,9 @@ public class StatusBarTouchController implements TouchController {
         if (mSystemUiProxy.isActive()) {
             mLastAction = ev.getActionMasked();
             mSystemUiProxy.onStatusBarMotionEvent(ev);
-        } else {
-            if (!mExpanded) {
-                mExpanded = true;
-                expand();
-            }
+        } else if (!mExpanded) {
+            mExpanded = true;
+            expand();
         }
     }
 
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 256bb2b7c5..9de90f10d7 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -12,6 +12,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * Modifications copyright 2021, Lawnchair
  */
 
 package com.android.launcher3.folder;