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

The big code style cleanup

Browse Source 
* Format using AOSP code style in Android Studio,
  excluding `Rearrange entries` option.
* Rename static variables to use proper naming scheme
* Remove empty lines

Change-Id: I0d193e35f071bc288050e587b1693844d68865e1
This commit is contained in:
Michael Bestas
2021-08-25 19:13:30 +03:00
committed by Timi Rautamäki
parent ade1361e3b
commit b7b34b96a9
32 changed files with 376 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,36 +34,34 @@ import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.content.SharedPreferences;
import android.content.pm.ComponentInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.content.res.Resources;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.net.ConnectivityManager;
import android.os.Binder;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.net.ConnectivityManager;
import android.provider.Settings;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.Log;
import org.lineageos.internal.util.PackageManagerUtils;
import org.lineageos.setupwizard.BiometricActivity;
import org.lineageos.setupwizard.BluetoothSetupActivity;
import org.lineageos.setupwizard.ChooseDataSimActivity;
import org.lineageos.setupwizard.BiometricActivity;
import org.lineageos.setupwizard.MobileDataActivity;
import org.lineageos.setupwizard.SetupWizardApp;
import org.lineageos.setupwizard.SimMissingActivity;
import org.lineageos.setupwizard.UpdateRecoveryActivity;
import org.lineageos.setupwizard.WifiSetupActivity;
import org.lineageos.setupwizard.wizardmanager.WizardManager;
import org.lineageos.internal.util.PackageManagerUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -81,7 +79,8 @@ public class SetupWizardUtils {
private static final String CONFIG_HIDE_RECOVERY_UPDATE = "config_hideRecoveryUpdate";
private static final String PROP_BUILD_DATE = "ro.build.date.utc";
private SetupWizardUtils(){}
private SetupWizardUtils() {
}
public static SharedPreferences getPrefs(Context context) {
return context.getSharedPreferences("SetupWizardPrefs", MODE_PRIVATE);
@@ -134,12 +133,13 @@ public class SetupWizardUtils {
int res = updaterResources.getIdentifier(
CONFIG_HIDE_RECOVERY_UPDATE, "bool", UPDATER_PACKAGE);
featureHidden = updaterResources.getBoolean(res);
} catch (PackageManager.NameNotFoundException | Resources.NotFoundException ignored) { }
} catch (PackageManager.NameNotFoundException | Resources.NotFoundException ignored) {
}
return !featureHidden;
}
public static boolean isRadioReady(Context context, ServiceState state) {
final SetupWizardApp setupWizardApp = (SetupWizardApp)context.getApplicationContext();
final SetupWizardApp setupWizardApp = (SetupWizardApp) context.getApplicationContext();
if (setupWizardApp.isRadioReady()) {
return true;
} else {
@@ -148,7 +148,6 @@ public class SetupWizardUtils {
setupWizardApp.setRadioReady(ready);
return ready;
}
}
public static boolean isOwner() {
@@ -241,7 +240,7 @@ public class SetupWizardUtils {
public static boolean isEthernetConnected(Context context) {
ConnectivityManager cm = (ConnectivityManager) context.
getSystemService(Context.CONNECTIVITY_SERVICE);
getSystemService(Context.CONNECTIVITY_SERVICE);
return (cm.getActiveNetworkInfo() != null &&
cm.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_ETHERNET);
@@ -307,8 +306,7 @@ public class SetupWizardUtils {
if (!isMultiSimDevice() || singleSimInserted()) {
disableComponent(context, ChooseDataSimActivity.class);
}
if (!SetupWizardUtils.hasWifi(context) ||
isEthernetConnected(context)) {
if (!hasWifi(context) || isEthernetConnected(context)) {
disableComponent(context, WifiSetupActivity.class);
}
}
@@ -327,7 +325,7 @@ public class SetupWizardUtils {
intent.addCategory("android.intent.category.HOME");
intent.setPackage(context.getPackageName());
ComponentName comp = intent.resolveActivity(context.getPackageManager());
if (SetupWizardApp.LOGV) {
if (LOGV) {
Log.v(TAG, "resolveActivity for intent=" + intent + " returns " + comp);
}
return comp;
@@ -358,7 +356,6 @@ public class SetupWizardUtils {
COMPONENT_ENABLED_STATE_DEFAULT);
}
public static void setComponentEnabledState(Context context, ComponentName componentName,
int enabledState) {
context.getPackageManager().setComponentEnabledSetting(componentName,
@@ -403,12 +400,11 @@ public class SetupWizardUtils {
return componentNames;
}
public static final ComponentName mTvwifisettingsActivity =
public static final ComponentName sTvWifiSetupSettingsActivity =
new ComponentName("com.android.tv.settings",
"com.android.tv.settings.connectivity.setup.WifiSetupActivity");
public static final ComponentName mTvAddAccessorySettingsActivity =
public static final ComponentName sTvAddAccessorySettingsActivity =
new ComponentName("com.android.tv.settings",
"com.android.tv.settings.accessories.AddAccessoryActivity");