From 5f571d5fa5512590d9e7f695a1ec7864d3e689b4 Mon Sep 17 00:00:00 2001
From: micky387 <mickaelsaibi@free.fr>
Date: Thu, 19 Oct 2023 19:29:30 +0200
Subject: [PATCH] Launcher3: Swith to our OmniSettings provider

Change-Id: I423b3beafe52c0bc2a1d37fb60398ba947f5eabb
---
 .../src/com/android/launcher3/taskbar/TaskbarManager.java    | 5 +++--
 src/com/android/launcher3/DeviceProfile.java                 | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index da7e85e742..8fdd562836 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -41,6 +41,7 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.SystemProperties;
+import android.provider.OmniSettings;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.Display;
@@ -87,7 +88,7 @@ public class TaskbarManager {
             Settings.Secure.NAV_BAR_KIDS_MODE);
 
     private static final Uri ENABLE_TASKBAR_URI = Settings.System.getUriFor(
-            Settings.System.OMNI_ENABLE_TASKBAR);
+            OmniSettings.OMNI_ENABLE_TASKBAR);
 
     private final Context mContext;
     private final DisplayController mDisplayController;
@@ -162,7 +163,7 @@ public TaskbarManager(TouchInteractionService service) {
             // Create the illusion of this taking effect immediately
             // Also needed because TaskbarManager inits before SystemUiProxy on start
             boolean enabled = Settings.System.getInt(mContext.getContentResolver(),
-                    Settings.System.OMNI_ENABLE_TASKBAR, 0) == 1;
+                    OmniSettings.OMNI_ENABLE_TASKBAR, 0) == 1;
             SystemUiProxy.INSTANCE.get(mContext).setTaskbarEnabled(enabled);
 
             // Restart launcher
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 43700418c9..b7a5731398 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -39,6 +39,7 @@
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
+import android.provider.OmniSettings;
 import android.provider.Settings;
 import android.util.DisplayMetrics;
 import android.util.SparseArray;
@@ -314,7 +315,7 @@ public class DeviceProfile {
         isPhone = !isTablet;
         isTwoPanels = isTablet && isMultiDisplay;
         boolean isTaskBarEnabled = Settings.System.getInt(context.getContentResolver(),
-                Settings.System.OMNI_ENABLE_TASKBAR, isTablet ? 1 : 0) == 1;
+                OmniSettings.OMNI_ENABLE_TASKBAR, isTablet ? 1 : 0) == 1;
         isTaskbarPresent = isTaskBarEnabled && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS;
 
         // Some more constants.