zenfone9: Change DeviceParts for our New OmniLib changes
Change-Id: Id17814745d07fd0ebb173ddf9d81461915657fab
diff --git a/DeviceParts/Android.bp b/DeviceParts/Android.bp
index f27b7a3..a82699f 100644
--- a/DeviceParts/Android.bp
+++ b/DeviceParts/Android.bp
@@ -9,7 +9,6 @@
"androidx.core_core",
"androidx.preference_preference",
"OmniLib",
- "OmniLibCore",
],
srcs: [
diff --git a/DeviceParts/src/org/omnirom/device/DozeSettings.java b/DeviceParts/src/org/omnirom/device/DozeSettings.java
index 9e05709..b8be48a 100644
--- a/DeviceParts/src/org/omnirom/device/DozeSettings.java
+++ b/DeviceParts/src/org/omnirom/device/DozeSettings.java
@@ -37,6 +37,8 @@
import android.widget.ListView;
import android.util.Log;
+import org.omnirom.omnilib.utils.OmniSettings;
+
public class DozeSettings extends PreferenceFragment {
private static final String KEY_WAVE_CHECK = "wave_check";
@@ -92,7 +94,7 @@
private void getDozeSettings() {
String value = Settings.System.getString(getContext().getContentResolver(),
- Settings.System.OMNI_DEVICE_FEATURE_SETTINGS);
+ OmniSettings.OMNI_DEVICE_FEATURE_SETTINGS);
if (!TextUtils.isEmpty(value)) {
String[] parts = value.split(":");
mUseWaveCheck = Boolean.valueOf(parts[0]);
@@ -103,7 +105,7 @@
private void setDozeSettings() {
String newValue = String.valueOf(mUseWaveCheck) + ":" + String.valueOf(mUsePocketCheck) + ":" + String.valueOf(mUseTiltCheck);
- Settings.System.putString(getContext().getContentResolver(), Settings.System.OMNI_DEVICE_FEATURE_SETTINGS, newValue);
+ Settings.System.putString(getContext().getContentResolver(), OmniSettings.OMNI_DEVICE_FEATURE_SETTINGS, newValue);
}
private boolean isAmbientDisplayEnabled() {
diff --git a/DeviceParts/src/org/omnirom/device/GestureSettings.java b/DeviceParts/src/org/omnirom/device/GestureSettings.java
index 6c4b5eb..f63bbf1 100644
--- a/DeviceParts/src/org/omnirom/device/GestureSettings.java
+++ b/DeviceParts/src/org/omnirom/device/GestureSettings.java
@@ -46,6 +46,8 @@
import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
import android.os.UserHandle;
+import org.omnirom.omnilib.utils.OmniSettings;
+
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -112,7 +114,7 @@
mProxiSwitch = (TwoStatePreference) findPreference(KEY_PROXI_SWITCH);
mProxiSwitch.setChecked(Settings.System.getInt(getContext().getContentResolver(),
- Settings.System.OMNI_DEVICE_PROXI_CHECK_ENABLED, 1) != 0);
+ OmniSettings.OMNI_DEVICE_PROXI_CHECK_ENABLED, 1) != 0);
mLetterEGesture = (AppSelectListPreference) findPreference(KEY_E_APP);
mLetterEGesture.setEnabled(true);
@@ -166,7 +168,7 @@
public boolean onPreferenceTreeClick(Preference preference) {
if (preference == mProxiSwitch) {
Settings.System.putInt(getContext().getContentResolver(),
- Settings.System.OMNI_DEVICE_PROXI_CHECK_ENABLED, mProxiSwitch.isChecked() ? 1 : 0);
+ OmniSettings.OMNI_DEVICE_PROXI_CHECK_ENABLED, mProxiSwitch.isChecked() ? 1 : 0);
return true;
}
if (preference == mMusicSwitch) {
diff --git a/DeviceParts/src/org/omnirom/device/KeyHandler.java b/DeviceParts/src/org/omnirom/device/KeyHandler.java
index db06434..ff19353 100644
--- a/DeviceParts/src/org/omnirom/device/KeyHandler.java
+++ b/DeviceParts/src/org/omnirom/device/KeyHandler.java
@@ -65,10 +65,11 @@
import com.android.internal.util.ScreenshotHelper;
import com.android.internal.statusbar.IStatusBarService;
-import org.omnirom.omnilibcore.utils.DeviceKeyHandler;
-import org.omnirom.omnilibcore.utils.OmniUtils;
-import org.omnirom.omnilibcore.utils.OmniVibe;
-import org.omnirom.omnilibcore.utils.PackageUtils;
+import org.omnirom.omnilib.utils.DeviceKeyHandler;
+import org.omnirom.omnilib.utils.OmniSettings;
+import org.omnirom.omnilib.utils.OmniUtils;
+import org.omnirom.omnilib.utils.OmniVibe;
+import org.omnirom.omnilib.utils.PackageUtils;
public class KeyHandler implements DeviceKeyHandler {
@@ -214,10 +215,10 @@
void observe() {
mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
- Settings.System.OMNI_DEVICE_PROXI_CHECK_ENABLED),
+ OmniSettings.OMNI_DEVICE_PROXI_CHECK_ENABLED),
false, this);
mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
- Settings.System.OMNI_DEVICE_FEATURE_SETTINGS),
+ OmniSettings.OMNI_DEVICE_FEATURE_SETTINGS),
false, this);
mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.DOUBLE_TAP_TO_WAKE),
@@ -234,7 +235,7 @@
@Override
public void onChange(boolean selfChange, Uri uri) {
if (uri.equals(Settings.System.getUriFor(
- Settings.System.OMNI_DEVICE_FEATURE_SETTINGS))){
+ OmniSettings.OMNI_DEVICE_FEATURE_SETTINGS))){
updateDozeSettings();
return;
}
@@ -243,7 +244,7 @@
public void update() {
mUseProxiCheck = Settings.System.getIntForUser(
- mContext.getContentResolver(), Settings.System.OMNI_DEVICE_PROXI_CHECK_ENABLED, 1,
+ mContext.getContentResolver(), OmniSettings.OMNI_DEVICE_PROXI_CHECK_ENABLED, 1,
UserHandle.USER_CURRENT) == 1;
mDoubleTapToWake = Settings.Secure.getInt(
mContext.getContentResolver(), Settings.Secure.DOUBLE_TAP_TO_WAKE, 1) == 1;
@@ -626,7 +627,7 @@
private void updateDozeSettings() {
String value = Settings.System.getStringForUser(mContext.getContentResolver(),
- Settings.System.OMNI_DEVICE_FEATURE_SETTINGS,
+ OmniSettings.OMNI_DEVICE_FEATURE_SETTINGS,
UserHandle.USER_CURRENT);
if (DEBUG) Log.i(TAG, "Doze settings = " + value);
if (!TextUtils.isEmpty(value)) {