diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f648f32..edef11a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -27,12 +27,9 @@ - - - { boolean checked = !mMetrics.isChecked(); mMetrics.setChecked(checked); @@ -73,19 +67,12 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { View navKeysRow = findViewById(R.id.nav_keys); navKeysRow.setOnClickListener(mNavKeysClickListener); mNavKeys = findViewById(R.id.nav_keys_checkbox); - mSupportsKeyDisabler = isKeyDisablerSupported(this); - if (mSupportsKeyDisabler) { - mNavKeys.setChecked(LineageSettings.System.getIntForUser(getContentResolver(), - LineageSettings.System.FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) != 0); - } else { - navKeysRow.setVisibility(View.GONE); - } + navKeysRow.setVisibility(View.GONE); } @Override public void onResume() { super.onResume(); - updateDisableNavkeysOption(); updateMetricsOption(); } @@ -112,22 +99,4 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { mMetrics.setChecked(metricsChecked); myPageBundle.putBoolean(KEY_SEND_METRICS, metricsChecked); } - - private void updateDisableNavkeysOption() { - if (mSupportsKeyDisabler) { - final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle(); - boolean enabled = LineageSettings.System.getIntForUser(getContentResolver(), - LineageSettings.System.FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) != 0; - boolean checked = myPageBundle.containsKey(DISABLE_NAV_KEYS) ? - myPageBundle.getBoolean(DISABLE_NAV_KEYS) : - enabled; - mNavKeys.setChecked(checked); - myPageBundle.putBoolean(DISABLE_NAV_KEYS, checked); - } - } - - private static boolean isKeyDisablerSupported(Context context) { - final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context); - return hardware.isSupported(LineageHardwareManager.FEATURE_KEY_DISABLE); - } } diff --git a/src/me/pawlet/setupwizard/NavigationSettingsActivity.java b/src/me/pawlet/setupwizard/NavigationSettingsActivity.java index 5018107..7aa886f 100644 --- a/src/me/pawlet/setupwizard/NavigationSettingsActivity.java +++ b/src/me/pawlet/setupwizard/NavigationSettingsActivity.java @@ -8,14 +8,12 @@ package me.pawlet.setupwizard; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY; -import static org.lineageos.internal.util.DeviceKeysConstants.KEY_MASK_APP_SWITCH; import static me.pawlet.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS; import static me.pawlet.setupwizard.SetupWizardApp.NAVIGATION_OPTION_KEY; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.os.Bundle; -import android.os.UserHandle; import android.view.View; import android.widget.CheckBox; import android.widget.RadioButton; @@ -23,8 +21,6 @@ import android.widget.RadioGroup; import com.airbnb.lottie.LottieAnimationView; -import lineageos.providers.LineageSettings; - import me.pawlet.setupwizard.util.SetupWizardUtils; public class NavigationSettingsActivity extends BaseSetupWizardActivity { @@ -45,9 +41,8 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity { navBarEnabled = mSetupWizardApp.getSettingsBundle().getBoolean(DISABLE_NAV_KEYS); } - int deviceKeys = getResources().getInteger( - org.lineageos.platform.internal.R.integer.config_deviceHardwareKeys); - boolean hasHomeKey = (deviceKeys & KEY_MASK_APP_SWITCH) != 0; + // RPi has no hardware keys; treat hasHomeKey as false + boolean hasHomeKey = false; getGlifLayout().setDescriptionText(getString(R.string.navigation_summary)); setNextText(R.string.next); @@ -128,10 +123,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity { @Override protected void onNextPressed() { mSetupWizardApp.getSettingsBundle().putString(NAVIGATION_OPTION_KEY, mSelection); - boolean hideHint = mHideGesturalHint.isChecked(); - LineageSettings.System.putIntForUser(getContentResolver(), - LineageSettings.System.NAVIGATION_BAR_HINT, hideHint ? 0 : 1, - UserHandle.USER_CURRENT); super.onNextPressed(); } diff --git a/src/me/pawlet/setupwizard/util/SetupWizardUtils.java b/src/me/pawlet/setupwizard/util/SetupWizardUtils.java index 4184a28..3baf6ac 100644 --- a/src/me/pawlet/setupwizard/util/SetupWizardUtils.java +++ b/src/me/pawlet/setupwizard/util/SetupWizardUtils.java @@ -46,9 +46,6 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; -import lineageos.hardware.LineageHardwareManager; -import lineageos.providers.LineageSettings; - import me.pawlet.setupwizard.BaseSetupWizardActivity; import me.pawlet.setupwizard.SetupWizardApp; @@ -62,7 +59,7 @@ public class SetupWizardUtils { private static final String GMS_PACKAGE = "com.google.android.gms"; private static final String GMS_SUW_PACKAGE = "com.google.android.setupwizard"; private static final String GMS_TV_SUW_PACKAGE = "com.google.android.tungsten.setupwraith"; - private static final String UPDATER_PACKAGE = "org.lineageos.updater"; + private static final String UPDATER_PACKAGE = "me.pawlet.updater"; private static final String UPDATE_RECOVERY_EXEC = "/vendor/bin/install-recovery.sh"; private static final String CONFIG_HIDE_RECOVERY_UPDATE = "config_hideRecoveryUpdate"; @@ -268,14 +265,7 @@ public class SetupWizardUtils { } private static void handleEnableMetrics(Context context) { - Bundle privacyData = SetupWizardApp.getSettingsBundle(); - if (privacyData != null - && privacyData.containsKey(KEY_SEND_METRICS)) { - LineageSettings.Secure.putInt(context.getContentResolver(), - LineageSettings.Secure.STATS_COLLECTION, - privacyData.getBoolean(KEY_SEND_METRICS) - ? 1 : 0); - } + // No telemetry provider in PawletOS; metrics preference stored in settingsBundle only. } private static void handleNavKeys(Context context) { @@ -310,17 +300,7 @@ public class SetupWizardUtils { } private static void writeDisableNavkeysOption(Context context, boolean enabled) { - final boolean virtualKeysEnabled = LineageSettings.System.getIntForUser( - context.getContentResolver(), LineageSettings.System.FORCE_SHOW_NAVBAR, 0, - UserHandle.USER_CURRENT) != 0; - if (enabled != virtualKeysEnabled) { - LineageSettings.System.putIntForUser(context.getContentResolver(), - LineageSettings.System.FORCE_SHOW_NAVBAR, enabled ? 1 : 0, - UserHandle.USER_CURRENT); - - final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context); - hardware.set(LineageHardwareManager.FEATURE_KEY_DISABLE, enabled); - } + // No hardware key disabler on this platform; nav key preference is a no-op. } public static long getBuildDateTimestamp() {