commit 7667643ef6a53fca844f16af84a3100daa64c024
author Nate Myren <ntmyren@google.com> Tue Jan 03 16:58:22 2023 -0800
committer Nate Myren <ntmyren@google.com> Tue May 28 20:30:48 2024 +0000
tree d0f9c5ae5596d069f25c14bf7912c38cee89fef4
parent 1df39c3d5fdcd2c92dd361a33ebb62d6579c54e4

Convert clipboard access to use new APIs

Convert the preferences for the clipboard access
notifications to use the new API values

Bug: 263305143
Test: manual
Change-Id: I3b366ff43afabf5664847040b1fb096caed4ef8c

src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java

diff --git a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
index ad57073..bd829b5 100644
--- a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
+++ b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
@@ -19,7 +19,6 @@
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.provider.DeviceConfig;
-import android.provider.Settings;
 
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -38,26 +37,25 @@
 
     private static final String KEY_SHOW_CLIP_ACCESS_NOTIFICATION = "show_clip_access_notification";
 
-    private final DeviceConfig.OnPropertiesChangedListener mDeviceConfigListener =
-            properties -> updateConfig();
-    private boolean mDefault;
     private Preference mPreference;
+    private final ClipboardManager mClipboardManager;
+    private final DeviceConfig.OnPropertiesChangedListener mDeviceConfigListener =
+            properties -> updateState(mPreference);
 
     public ShowClipAccessNotificationPreferenceController(Context context) {
         super(context, KEY_SHOW_CLIP_ACCESS_NOTIFICATION);
-        updateConfig();
+        mClipboardManager = context.getSystemService(ClipboardManager.class);
+        updateState(mPreference);
     }
 
     @Override
     public boolean isChecked() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, (mDefault ? 1 : 0)) != 0;
+        return mClipboardManager.areClipboardAccessNotificationsEnabled();
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, (isChecked ? 1 : 0));
+        mClipboardManager.setClipboardAccessNotificationsEnabled(isChecked);
         return true;
     }
 
@@ -94,12 +92,4 @@
     public void onStop() {
         DeviceConfig.removeOnPropertiesChangedListener(mDeviceConfigListener);
     }
-
-    private void updateConfig() {
-        mDefault = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CLIPBOARD,
-                ClipboardManager.DEVICE_CONFIG_SHOW_ACCESS_NOTIFICATIONS,
-                ClipboardManager.DEVICE_CONFIG_DEFAULT_SHOW_ACCESS_NOTIFICATIONS);
-        updateState(mPreference);
-    }
-
 }