cmparts: Move the CMSettings preferences to CMSDK
Change-Id: Ia8395cbb31a1ef8e6a39caee15c3f3d0e646e43d
diff --git a/res/xml/privacy_guard_prefs.xml b/res/xml/privacy_guard_prefs.xml
index d5f961d..817310d 100644
--- a/res/xml/privacy_guard_prefs.xml
+++ b/res/xml/privacy_guard_prefs.xml
@@ -23,7 +23,7 @@
android:summary="@string/privacy_guard_default_summary"
android:persistent="false" />
- <org.cyanogenmod.cmparts.CMSecureSettingSwitchPreference
+ <cyanogenmod.platform.CMSecureSettingSwitchPreference
android:key="privacy_guard_notification"
android:title="@string/privacy_guard_notification_title"
android:defaultValue="true" />
diff --git a/src/org/cyanogenmod/cmparts/CMGlobalSettingSwitchPreference.java b/src/org/cyanogenmod/cmparts/CMGlobalSettingSwitchPreference.java
deleted file mode 100644
index 4190bf8..0000000
--- a/src/org/cyanogenmod/cmparts/CMGlobalSettingSwitchPreference.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2016 The CyanogenMod project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package org.cyanogenmod.cmparts;
-
-import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
-import android.util.AttributeSet;
-
-import cyanogenmod.providers.CMSettings;
-
-public class CMGlobalSettingSwitchPreference extends SwitchPreference {
- public CMGlobalSettingSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- public CMGlobalSettingSwitchPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public CMGlobalSettingSwitchPreference(Context context) {
- super(context, null);
- }
-
- @Override
- protected boolean persistBoolean(boolean value) {
- if (shouldPersist()) {
- if (value == getPersistedBoolean(!value)) {
- // It's already there, so the same as persisting
- return true;
- }
- CMSettings.Global.putInt(getContext().getContentResolver(), getKey(), value ? 1 : 0);
- return true;
- }
- return false;
- }
-
- @Override
- protected boolean getPersistedBoolean(boolean defaultReturnValue) {
- if (!shouldPersist()) {
- return defaultReturnValue;
- }
- return CMSettings.Global.getInt(getContext().getContentResolver(),
- getKey(), defaultReturnValue ? 1 : 0) != 0;
- }
-}
diff --git a/src/org/cyanogenmod/cmparts/CMSecureSettingSwitchPreference.java b/src/org/cyanogenmod/cmparts/CMSecureSettingSwitchPreference.java
deleted file mode 100644
index 2226e79..0000000
--- a/src/org/cyanogenmod/cmparts/CMSecureSettingSwitchPreference.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package org.cyanogenmod.cmparts;
-
-import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
-import android.util.AttributeSet;
-
-import cyanogenmod.providers.CMSettings;
-
-public class CMSecureSettingSwitchPreference extends SwitchPreference {
- public CMSecureSettingSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- public CMSecureSettingSwitchPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public CMSecureSettingSwitchPreference(Context context) {
- super(context, null);
- }
-
- @Override
- protected boolean persistBoolean(boolean value) {
- if (shouldPersist()) {
- if (value == getPersistedBoolean(!value)) {
- // It's already there, so the same as persisting
- return true;
- }
- CMSettings.Secure.putInt(getContext().getContentResolver(), getKey(), value ? 1 : 0);
- return true;
- }
- return false;
- }
-
- @Override
- protected boolean getPersistedBoolean(boolean defaultReturnValue) {
- if (!shouldPersist()) {
- return defaultReturnValue;
- }
- return CMSettings.Secure.getInt(getContext().getContentResolver(),
- getKey(), defaultReturnValue ? 1 : 0) != 0;
- }
-}
diff --git a/src/org/cyanogenmod/cmparts/CMSystemSettingSwitchPreference.java b/src/org/cyanogenmod/cmparts/CMSystemSettingSwitchPreference.java
deleted file mode 100644
index fa0acce..0000000
--- a/src/org/cyanogenmod/cmparts/CMSystemSettingSwitchPreference.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package org.cyanogenmod.cmparts;
-
-import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
-import android.util.AttributeSet;
-
-import cyanogenmod.providers.CMSettings;
-
-public class CMSystemSettingSwitchPreference extends SwitchPreference {
- public CMSystemSettingSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- public CMSystemSettingSwitchPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public CMSystemSettingSwitchPreference(Context context) {
- super(context, null);
- }
-
- @Override
- protected boolean persistBoolean(boolean value) {
- if (shouldPersist()) {
- if (value == getPersistedBoolean(!value)) {
- // It's already there, so the same as persisting
- return true;
- }
- CMSettings.System.putInt(getContext().getContentResolver(), getKey(), value ? 1 : 0);
- return true;
- }
- return false;
- }
-
- @Override
- protected boolean getPersistedBoolean(boolean defaultReturnValue) {
- if (!shouldPersist()) {
- return defaultReturnValue;
- }
- return CMSettings.System.getInt(getContext().getContentResolver(),
- getKey(), defaultReturnValue ? 1 : 0) != 0;
- }
-}
diff --git a/src/org/cyanogenmod/cmparts/SystemSettingSwitchPreference.java b/src/org/cyanogenmod/cmparts/SystemSettingSwitchPreference.java
deleted file mode 100644
index f2111df..0000000
--- a/src/org/cyanogenmod/cmparts/SystemSettingSwitchPreference.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2013 The CyanogenMod project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package org.cyanogenmod.cmparts;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.util.AttributeSet;
-
-public class SystemSettingSwitchPreference extends SwitchPreference {
- public SystemSettingSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- public SystemSettingSwitchPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public SystemSettingSwitchPreference(Context context) {
- super(context, null);
- }
-
- @Override
- protected boolean persistBoolean(boolean value) {
- if (shouldPersist()) {
- if (value == getPersistedBoolean(!value)) {
- // It's already there, so the same as persisting
- return true;
- }
- Settings.System.putInt(getContext().getContentResolver(), getKey(), value ? 1 : 0);
- return true;
- }
- return false;
- }
-
- @Override
- protected boolean getPersistedBoolean(boolean defaultReturnValue) {
- if (!shouldPersist()) {
- return defaultReturnValue;
- }
- return Settings.System.getInt(getContext().getContentResolver(),
- getKey(), defaultReturnValue ? 1 : 0) != 0;
- }
-}