Android/lineage-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix settings pref switch for multi-user

Browse Source 
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
Pranav Vashi
2022-11-26 22:25:49 +05:30
committed by Joey
parent 981cdd2b8e
commit bb57322336
8 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingMainSwitchPreference.java
View File

@@ -6,6 +6,7 @@
package lineageos.preference;
import android.content.Context;
import android.os.UserHandle;
import android.util.AttributeSet;
import androidx.preference.PreferenceDataStore;
@@ -35,13 +36,13 @@ public class LineageSecureSettingMainSwitchPreference extends MainSwitchPreferen
private class DataStore extends PreferenceDataStore {
@Override
public void putBoolean(String key, boolean value) {
LineageSettings.Secure.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
LineageSettings.Secure.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
}
@Override
public boolean getBoolean(String key, boolean defaultValue) {
return LineageSettings.Secure.getInt(getContext().getContentResolver(), key,
defaultValue ? 1 : 0) != 0;
return LineageSettings.Secure.getIntForUser(getContext().getContentResolver(), key,
defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
}
}
}

7
packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingSwitchPreference.java
View File

@@ -7,6 +7,7 @@
package lineageos.preference;
import android.content.Context;
import android.os.UserHandle;
import android.util.AttributeSet;
import lineageos.providers.LineageSettings;
@@ -32,12 +33,12 @@ public class LineageSecureSettingSwitchPreference extends SelfRemovingSwitchPref
@Override
protected void putBoolean(String key, boolean value) {
LineageSettings.Secure.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
LineageSettings.Secure.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
}
@Override
protected boolean getBoolean(String key, boolean defaultValue) {
return LineageSettings.Secure.getInt(getContext().getContentResolver(),
key, defaultValue ? 1 : 0) != 0;
return LineageSettings.Secure.getIntForUser(getContext().getContentResolver(),
key, defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
}
}

7
packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingMainSwitchPreference.java
View File

@@ -6,6 +6,7 @@
package lineageos.preference;
import android.content.Context;
import android.os.UserHandle;
import android.util.AttributeSet;
import androidx.preference.PreferenceDataStore;
@@ -35,13 +36,13 @@ public class LineageSystemSettingMainSwitchPreference extends MainSwitchPreferen
private class DataStore extends PreferenceDataStore {
@Override
public void putBoolean(String key, boolean value) {
LineageSettings.System.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
LineageSettings.System.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
}
@Override
public boolean getBoolean(String key, boolean defaultValue) {
return LineageSettings.System.getInt(getContext().getContentResolver(), key,
defaultValue ? 1 : 0) != 0;
return LineageSettings.System.getIntForUser(getContext().getContentResolver(), key,
defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
}
}
}

7
packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingSwitchPreference.java
View File

@@ -7,6 +7,7 @@
package lineageos.preference;
import android.content.Context;
import android.os.UserHandle;
import android.util.AttributeSet;
import lineageos.providers.LineageSettings;
@@ -32,12 +33,12 @@ public class LineageSystemSettingSwitchPreference extends SelfRemovingSwitchPref
@Override
protected void putBoolean(String key, boolean value) {
LineageSettings.System.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
LineageSettings.System.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
}
@Override
protected boolean getBoolean(String key, boolean defaultValue) {
return LineageSettings.System.getInt(getContext().getContentResolver(),
key, defaultValue ? 1 : 0) != 0;
return LineageSettings.System.getIntForUser(getContext().getContentResolver(),
key, defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
}
}

7
packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingMainSwitchPreference.java
View File

@@ -6,6 +6,7 @@
package lineageos.preference;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.AttributeSet;
@@ -33,13 +34,13 @@ public class SecureSettingMainSwitchPreference extends MainSwitchPreference {
private class DataStore extends PreferenceDataStore {
@Override
public void putBoolean(String key, boolean value) {
Settings.Secure.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
Settings.Secure.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
}
@Override
public boolean getBoolean(String key, boolean defaultValue) {
return Settings.Secure.getInt(getContext().getContentResolver(), key,
defaultValue ? 1 : 0) != 0;
return Settings.Secure.getIntForUser(getContext().getContentResolver(), key,
defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
}
}
}

7
packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingSwitchPreference.java
View File

@@ -7,6 +7,7 @@
package lineageos.preference;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.AttributeSet;
@@ -31,12 +32,12 @@ public class SecureSettingSwitchPreference extends SelfRemovingSwitchPreference
@Override
protected void putBoolean(String key, boolean value) {
Settings.Secure.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
Settings.Secure.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
}
@Override
protected boolean getBoolean(String key, boolean defaultValue) {
return Settings.Secure.getInt(getContext().getContentResolver(),
key, defaultValue ? 1 : 0) != 0;
return Settings.Secure.getIntForUser(getContext().getContentResolver(),
key, defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
}
}

7
packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingMainSwitchPreference.java
View File

@@ -6,6 +6,7 @@
package lineageos.preference;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.AttributeSet;
@@ -33,13 +34,13 @@ public class SystemSettingMainSwitchPreference extends MainSwitchPreference {
private class DataStore extends PreferenceDataStore {
@Override
public void putBoolean(String key, boolean value) {
Settings.System.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
Settings.System.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
}
@Override
public boolean getBoolean(String key, boolean defaultValue) {
return Settings.System.getInt(getContext().getContentResolver(), key,
defaultValue ? 1 : 0) != 0;
return Settings.System.getIntForUser(getContext().getContentResolver(), key,
defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
}
}
}

7
packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingSwitchPreference.java
View File

@@ -7,6 +7,7 @@
package lineageos.preference;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.AttributeSet;
@@ -31,12 +32,12 @@ public class SystemSettingSwitchPreference extends SelfRemovingSwitchPreference
@Override
protected void putBoolean(String key, boolean value) {
Settings.System.putInt(getContext().getContentResolver(), key, value ? 1 : 0);
Settings.System.putIntForUser(getContext().getContentResolver(), key, value ? 1 : 0, UserHandle.USER_CURRENT);
}
@Override
protected boolean getBoolean(String key, boolean defaultValue) {
return Settings.System.getInt(getContext().getContentResolver(),
key, defaultValue ? 1 : 0) != 0;
return Settings.System.getIntForUser(getContext().getContentResolver(),
key, defaultValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
}
}