From 3c6cf129f38bc2369becb115db017b1be33e8aa7 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Mon, 15 Mar 2021 11:45:20 +0800
Subject: [PATCH] 1/ Set Swipe bottom for notification OFF by default

Note:
1) The "Swipe bottom for notification" will still available
   in Settings
2) If user had ever turn ON this settings, then we will NOT help
user change() any setting for this purpose.

Test: facory reset and observe the default function if OFF
Test: atest WMShellUnitTests
Bug: 182711813
Change-Id: Iaea9c31e263d4b86096aeecf5287c7c738a5c69e
---
 .../com/android/wm/shell/onehanded/OneHandedSettingsUtil.java   | 2 +-
 packages/SettingsProvider/res/values/defaults.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedSettingsUtil.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedSettingsUtil.java
index 4768cf58152be..fa94ec5578830 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedSettingsUtil.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedSettingsUtil.java
@@ -126,7 +126,7 @@ public final class OneHandedSettingsUtil {
      */
     public boolean getSettingsSwipeToNotificationEnabled(ContentResolver resolver) {
         return Settings.Secure.getInt(resolver,
-                Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1) == 1;
+                Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 0 /* Default OFF */) == 1;
     }
 
     void dump(PrintWriter pw, String prefix, ContentResolver resolver) {
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index d10ff402aa3ae..47075390de5d5 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -242,7 +242,7 @@
     <bool name="def_hdmiControlAutoDeviceOff">true</bool>
 
     <!-- Default for Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED -->
-    <bool name="def_swipe_bottom_to_notification_enabled">true</bool>
+    <bool name="def_swipe_bottom_to_notification_enabled">false</bool>
 
     <!-- Default for Settings.Secure.ONE_HANDED_MODE_ENABLED -->
     <bool name="def_one_handed_mode_enabled">false</bool>