PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace hardcoded references to Settings intents

Browse Source 
Where required, move hardcoded strings into the files which use them

Change-Id: I411d18739459b46095667f85cf5e0a82fd52b0d2
This commit is contained in:
Oliver Scott
2024-04-11 19:15:50 -04:00
committed by Michael Bestas
parent 12c7da294f
commit 3616338149
7 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/lineageos/setupwizard/BiometricActivity.java
View File

@@ -6,15 +6,14 @@
package org.lineageos.setupwizard;
import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_BIOMETRIC;
import android.content.Intent;
import android.provider.Settings;
public class BiometricActivity extends SubBaseActivity {
@Override
protected void onStartSubactivity() {
Intent intent = new Intent(ACTION_SETUP_BIOMETRIC);
Intent intent = new Intent(Settings.ACTION_BIOMETRIC_ENROLL);
startSubactivity(intent);
}
}

4
src/org/lineageos/setupwizard/BluetoothSetupActivity.java
View File

@@ -27,9 +27,7 @@ public class BluetoothSetupActivity extends SubBaseActivity {
@Override
protected void onStartSubactivity() {
try {
Intent intent = new Intent();
intent.setComponent(SetupWizardUtils.sTvAddAccessorySettingsActivity);
intent.setAction(ACTION_CONNECT_INPUT);
Intent intent = new Intent(ACTION_CONNECT_INPUT);
intent.putExtra(INTENT_EXTRA_NO_INPUT_MODE, true);
startSubactivity(intent);
} catch (Exception e) {

7
src/org/lineageos/setupwizard/NetworkSetupActivity.java
View File

@@ -6,7 +6,6 @@
package org.lineageos.setupwizard;
import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_NETWORK;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ENABLE_NEXT_ON_CONNECT;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SET_BACK_TEXT;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_BUTTON_BAR;
@@ -14,20 +13,20 @@ import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_SKIP;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_SKIP_TV;
import android.content.Intent;
import android.os.Bundle;
import org.lineageos.setupwizard.util.SetupWizardUtils;
public class NetworkSetupActivity extends SubBaseActivity {
private static final String ACTION_SETUP_NETWORK = "android.settings.NETWORK_PROVIDER_SETUP";
@Override
protected void onStartSubactivity() {
if (SetupWizardUtils.isOwner()) {
tryEnablingWifi();
}
Intent intent = new Intent(ACTION_SETUP_NETWORK);
if (SetupWizardUtils.hasLeanback(this)) {
intent.setComponent(SetupWizardUtils.sTvWifiSetupSettingsActivity);
}
intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, true);
intent.putExtra(EXTRA_PREFS_SHOW_SKIP, true);
intent.putExtra(EXTRA_PREFS_SHOW_SKIP_TV, true);

4
src/org/lineageos/setupwizard/ScreenLockActivity.java
View File

@@ -6,12 +6,12 @@
package org.lineageos.setupwizard;
import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_LOCKSCREEN;
import android.content.Intent;
public class ScreenLockActivity extends SubBaseActivity {
private static final String ACTION_SETUP_LOCKSCREEN = "com.android.settings.SETUP_LOCK_SCREEN";
@Override
protected void onStartSubactivity() {
Intent intent = new Intent(ACTION_SETUP_LOCKSCREEN);

5
src/org/lineageos/setupwizard/SetupWizardApp.java
View File

@@ -22,14 +22,9 @@ public class SetupWizardApp extends Application {
// Verbose logging
public static final boolean LOGV = Log.isLoggable(TAG, Log.VERBOSE);
public static final String ACTION_ACCESSIBILITY_SETTINGS =
"android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW";
public static final String ACTION_FINISHED = "org.lineageos.setupwizard.SETUP_FINISHED";
public static final String ACTION_SETUP_COMPLETE =
"org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE";
public static final String ACTION_SETUP_NETWORK = "android.settings.NETWORK_PROVIDER_SETUP";
public static final String ACTION_SETUP_BIOMETRIC = "android.settings.BIOMETRIC_ENROLL";
public static final String ACTION_SETUP_LOCKSCREEN = "com.android.settings.SETUP_LOCK_SCREEN";
public static final String ACTION_RESTORE_FROM_BACKUP =
"com.stevesoltys.seedvault.RESTORE_BACKUP";
public static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";

4
src/org/lineageos/setupwizard/WelcomeActivity.java
View File

@@ -6,7 +6,6 @@
package org.lineageos.setupwizard;
import static org.lineageos.setupwizard.SetupWizardApp.ACTION_ACCESSIBILITY_SETTINGS;
import static org.lineageos.setupwizard.SetupWizardApp.ACTION_EMERGENCY_DIAL;
import android.content.Intent;
@@ -22,6 +21,9 @@ import org.lineageos.setupwizard.util.SetupWizardUtils;
public class WelcomeActivity extends SubBaseActivity {
private static final String ACTION_ACCESSIBILITY_SETTINGS =
"android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW";
@Override
protected void onStartSubactivity() {
}

8
src/org/lineageos/setupwizard/util/SetupWizardUtils.java
View File

@@ -352,14 +352,6 @@ public class SetupWizardUtils {
return componentNames;
}
public static final ComponentName sTvWifiSetupSettingsActivity =
new ComponentName("com.android.tv.settings",
"com.android.tv.settings.connectivity.setup.WifiSetupActivity");
public static final ComponentName sTvAddAccessorySettingsActivity =
new ComponentName("com.android.tv.settings",
"com.android.tv.settings.accessories.AddAccessoryActivity");
public static long getBuildDateTimestamp() {
return SystemProperties.getLong(PROP_BUILD_DATE, 0);
}