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

Migrate all MetricsProto enums to SettingsEnums

Browse Source 
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
This commit is contained in:
Fan Zhang
2019-01-16 13:49:47 -08:00
parent dbaa5459b8
commit 31b210017b
502 changed files with 1184 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/AddNetworkFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -27,7 +28,6 @@ import android.widget.ImageButton;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.wifi.dpp.WifiDppUtils;
@@ -52,7 +52,7 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
@Override
public int getMetricsCategory() {
return MetricsEvent.SETTINGS_WIFI_ADD_NETWORK;
return SettingsEnums.SETTINGS_WIFI_ADD_NETWORK;
}
@Override

6
src/com/android/settings/wifi/ButtonPreference.java
View File

@@ -24,13 +24,13 @@ import android.util.Log;
import android.view.View;
import android.widget.ImageButton;
import com.android.settings.R;
import androidx.annotation.VisibleForTesting;
import androidx.annotation.DrawableRes;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
/**
* This preference provides one button layout with Settings style.
* It looks like below

8
src/com/android/settings/wifi/ChangeWifiStateDetails.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import android.app.AppOpsManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
@@ -25,7 +26,6 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
@@ -69,7 +69,7 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader
@Override
public int getMetricsCategory() {
return MetricsEvent.CONFIGURE_WIFI;
return SettingsEnums.CONFIGURE_WIFI;
}
@Override
@@ -93,8 +93,8 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader
}
protected void logSpecialPermissionChange(boolean newState, String packageName) {
int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW
: MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY;
int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW
: SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY;
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
logCategory, packageName);
}

4
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.wifi;
import static android.content.Context.WIFI_SERVICE;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
@@ -24,7 +25,6 @@ import android.net.NetworkInfo;
import android.net.wifi.WifiManager;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -50,7 +50,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.CONFIGURE_WIFI;
return SettingsEnums.CONFIGURE_WIFI;
}
@Override

21
src/com/android/settings/wifi/NetworkRequestDialogFragment.java
View File

@@ -17,32 +17,31 @@
package com.android.settings.wifi;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.BaseAdapter;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.internal.PreferenceImageView;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
@@ -255,7 +254,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.WIFI_SCANNING_NEEDED_DIALOG;
return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG;
}
private class AccessPointAdapter extends ArrayAdapter<AccessPoint> {

4
src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java
View File

@@ -17,13 +17,13 @@
package com.android.settings.wifi;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -75,7 +75,7 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.WIFI_SCANNING_NEEDED_DIALOG;
return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG;
}
protected void startScanningDialog() {

4
src/com/android/settings/wifi/WifiAPITest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi;
import static android.content.Context.WIFI_SERVICE;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.net.wifi.WifiManager;
import android.os.Bundle;
@@ -28,7 +29,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -87,7 +87,7 @@ public class WifiAPITest extends SettingsPreferenceFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.TESTING;
return SettingsEnums.TESTING;
}
//============================

6
src/com/android/settings/wifi/WifiConnectionPreferenceController.java
View File

@@ -19,6 +19,9 @@ package com.android.settings.wifi;
import android.content.Context;
import android.os.Bundle;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
@@ -29,9 +32,6 @@ import com.android.settingslib.wifi.AccessPointPreference;
import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
/**
* This places a preference into a PreferenceGroup owned by some parent
* controller class when there is a wifi connection present.

1
src/com/android/settings/wifi/WifiDialog.java
View File

@@ -27,7 +27,6 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.wifi.AccessPoint;

6
src/com/android/settings/wifi/WifiEnabler.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.wifi;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -32,7 +33,6 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -209,10 +209,10 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene
}
if (isChecked) {
mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_WIFI_ON);
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_WIFI_ON);
} else {
// Log if user was connected at the time of switching off.
mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_WIFI_OFF,
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_WIFI_OFF,
mConnected.get());
}
if (!mWifiManager.setWifiEnabled(isChecked)) {

4
src/com/android/settings/wifi/WifiInfo.java
View File

@@ -16,9 +16,9 @@
package com.android.settings.wifi;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -36,6 +36,6 @@ public class WifiInfo extends SettingsPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.TESTING;
return SettingsEnums.TESTING;
}
}

4
src/com/android/settings/wifi/WifiScanModeActivity.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -29,7 +30,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentActivity;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -126,7 +126,7 @@ public class WifiScanModeActivity extends FragmentActivity {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_WIFI_SCAN_MODE;
return SettingsEnums.DIALOG_WIFI_SCAN_MODE;
}
@Override

4
src/com/android/settings/wifi/WifiScanningRequiredFragment.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.wifi;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
import android.content.Context;
@@ -31,7 +32,6 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.HelpUtils;
@@ -60,7 +60,7 @@ public class WifiScanningRequiredFragment extends InstrumentedDialogFragment imp
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.WIFI_SCANNING_NEEDED_DIALOG;
return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG;
}
@Override

14
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -22,6 +22,7 @@ import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
import android.annotation.NonNull;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
@@ -52,7 +53,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.LinkifyUtils;
import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
@@ -446,7 +446,7 @@ public class WifiSettings extends RestrictedSettingsFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.WIFI;
return SettingsEnums.WIFI;
}
@Override
@@ -657,9 +657,9 @@ public class WifiSettings extends RestrictedSettingsFragment
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case WIFI_DIALOG_ID:
return MetricsEvent.DIALOG_WIFI_AP_EDIT;
return SettingsEnums.DIALOG_WIFI_AP_EDIT;
case WRITE_NFC_DIALOG_ID:
return MetricsEvent.DIALOG_WIFI_WRITE_NFC;
return SettingsEnums.DIALOG_WIFI_WRITE_NFC;
default:
return 0;
}
@@ -1089,7 +1089,7 @@ public class WifiSettings extends RestrictedSettingsFragment
}
/* package */ void forget() {
mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_FORGET);
mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
if (!mSelectedAccessPoint.isSaved()) {
if (mSelectedAccessPoint.getNetworkInfo() != null &&
mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
@@ -1115,7 +1115,7 @@ public class WifiSettings extends RestrictedSettingsFragment
protected void connect(final WifiConfiguration config, boolean isSavedNetwork) {
// Log subtype if configuration is a saved network.
mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_WIFI_CONNECT,
mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_WIFI_CONNECT,
isSavedNetwork);
mWifiManager.connect(config, mConnectListener);
mClickedConnect = true;
@@ -1123,7 +1123,7 @@ public class WifiSettings extends RestrictedSettingsFragment
protected void connect(final int networkId, boolean isSavedNetwork) {
// Log subtype if configuration is a saved network.
mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT,
mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_CONNECT,
isSavedNetwork);
mWifiManager.connect(networkId, mConnectListener);
}

4
src/com/android/settings/wifi/calling/WifiCallingSettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.wifi.calling;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -29,7 +30,6 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import com.android.ims.ImsManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.search.actionbar.SearchMenuController;
@@ -55,7 +55,7 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
@Override
public int getMetricsCategory() {
return MetricsEvent.WIFI_CALLING;
return SettingsEnums.WIFI_CALLING;
}
@Override

4
src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.wifi.calling;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -44,7 +45,6 @@ import androidx.preference.PreferenceScreen;
import com.android.ims.ImsConfig;
import com.android.ims.ImsManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.Phone;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -212,7 +212,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.WIFI_CALLING_FOR_SUB;
return SettingsEnums.WIFI_CALLING_FOR_SUB;
}
@Override

9
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -21,6 +21,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import android.app.Activity;
import android.app.KeyguardManager;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -53,17 +54,15 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.EntityHeaderController;
import com.android.settings.wifi.dpp.WifiDppConfiguratorActivity;
import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settings.wifi.WifiDialog;
import com.android.settings.wifi.WifiDialog.WifiDialogListener;
import com.android.settings.wifi.WifiUtils;
import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -551,7 +550,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
}
}
mMetricsFeatureProvider.action(
mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
mFragment.getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
mFragment.getActivity().finish();
}
@@ -593,7 +592,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
*/
private void signIntoNetwork() {
mMetricsFeatureProvider.action(
mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
mFragment.getActivity(), SettingsEnums.ACTION_WIFI_SIGNIN);
mConnectivityManager.startCaptivePortalApp(mNetwork);
}

7
src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
View File

@@ -19,6 +19,7 @@ import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
@@ -30,8 +31,6 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.wifi.WifiConfigUiBase;
@@ -67,7 +66,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.WIFI_NETWORK_DETAILS;
return SettingsEnums.WIFI_NETWORK_DETAILS;
}
@Override
@@ -83,7 +82,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment {
@Override
public int getDialogMetricsCategory(int dialogId) {
if (dialogId == WIFI_DIALOG_ID) {
return MetricsEvent.DIALOG_WIFI_AP_EDIT;
return SettingsEnums.DIALOG_WIFI_AP_EDIT;
}
return 0;
}

5
src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi.dpp;
import android.app.ActionBar;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.net.wifi.WifiManager;
import android.os.Bundle;
@@ -28,9 +29,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.ProgressBar;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
/**
@@ -82,7 +81,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
@Override

4
src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi.dpp;
import android.app.ActionBar;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -28,7 +29,6 @@ import android.widget.ListView;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
/**
@@ -44,7 +44,7 @@ public class WifiDppChooseSavedWifiNetworkFragment extends WifiDppQrCodeBaseFrag
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
@Override

6
src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi.dpp;
import android.app.ActionBar;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
@@ -27,9 +28,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.InstrumentedActivity;
import com.android.settings.R;
import com.android.settings.core.InstrumentedActivity;
/**
* To provision "other" device with specified Wi-Fi network.
@@ -83,7 +83,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
@Override

12
src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
View File

@@ -16,23 +16,23 @@
package com.android.settings.wifi.dpp;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
import android.provider.Settings;
import android.app.ActionBar;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.provider.Settings;
import android.util.Log;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.InstrumentedActivity;
import com.android.settings.R;
import com.android.settings.core.InstrumentedActivity;
import java.util.List;
@@ -89,7 +89,7 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_ENROLLEE;
return SettingsEnums.SETTINGS_WIFI_DPP_ENROLLEE;
}
@Override

1
src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java
View File

@@ -22,7 +22,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
/**
* There are below 4 fragments for Wi-Fi DPP UI flow, to reduce redundant code of UI components,

4
src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.wifi.dpp;
import android.app.ActionBar;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.graphics.Bitmap;
import android.os.Bundle;
@@ -29,7 +30,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.wifi.qrcode.QrCodeGenerator;
@@ -47,7 +47,7 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
// Container Activity must implement this interface

8
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

@@ -17,9 +17,8 @@
package com.android.settings.wifi.dpp;
import android.app.ActionBar;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
@@ -37,7 +36,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.wifi.qrcode.QrCamera;
import com.android.settings.wifi.qrcode.QrDecorateView;
@@ -92,9 +90,9 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
@Override
public int getMetricsCategory() {
if (mIsConfiguratorMode) {
return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
} else {
return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_ENROLLEE;
return SettingsEnums.SETTINGS_WIFI_DPP_ENROLLEE;
}
}

14
src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.wifi.dpp;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.net.NetworkInfo.DetailedState;
@@ -27,10 +28,13 @@ import android.util.Log;
import android.view.View;
import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.wifi.AddNetworkFragment;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPointPreference;
@@ -39,10 +43,6 @@ import com.android.settingslib.wifi.WifiTrackerFactory;
import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
public class WifiNetworkListFragment extends SettingsPreferenceFragment implements
WifiTracker.WifiListener, AccessPoint.AccessPointListener {
private static final String TAG = "WifiNetworkListFragment";
@@ -74,7 +74,7 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR;
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
@Override

1
src/com/android/settings/wifi/dpp/WifiQrCode.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.wifi.dpp;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
import android.text.TextUtils;

12
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi.p2p;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
@@ -50,7 +51,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -165,7 +165,7 @@ public class WifiP2pSettings extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.WIFI_P2P;
return SettingsEnums.WIFI_P2P;
}
@Override
@@ -507,13 +507,13 @@ public class WifiP2pSettings extends DashboardFragment
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case DIALOG_DISCONNECT:
return MetricsEvent.DIALOG_WIFI_P2P_DISCONNECT;
return SettingsEnums.DIALOG_WIFI_P2P_DISCONNECT;
case DIALOG_CANCEL_CONNECT:
return MetricsEvent.DIALOG_WIFI_P2P_CANCEL_CONNECT;
return SettingsEnums.DIALOG_WIFI_P2P_CANCEL_CONNECT;
case DIALOG_RENAME:
return MetricsEvent.DIALOG_WIFI_P2P_RENAME;
return SettingsEnums.DIALOG_WIFI_P2P_RENAME;
case DIALOG_DELETE_GROUP:
return MetricsEvent.DIALOG_WIFI_P2P_DELETE_GROUP;
return SettingsEnums.DIALOG_WIFI_P2P_DELETE_GROUP;
}
return 0;
}

7
src/com/android/settings/wifi/qrcode/QrCamera.java
View File

@@ -24,7 +24,6 @@ import android.graphics.SurfaceTexture;
import android.hardware.Camera;
import android.hardware.Camera.CameraInfo;
import android.hardware.Camera.Parameters;
import android.hardware.Camera.PreviewCallback;
import android.os.AsyncTask;
import android.os.Handler;
import android.os.Message;
@@ -33,6 +32,9 @@ import android.util.Log;
import android.util.Size;
import android.view.Surface;
import android.view.WindowManager;
import androidx.annotation.VisibleForTesting;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.BinaryBitmap;
import com.google.zxing.DecodeHintType;
@@ -40,6 +42,7 @@ import com.google.zxing.MultiFormatReader;
import com.google.zxing.ReaderException;
import com.google.zxing.Result;
import com.google.zxing.common.HybridBinarizer;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -48,8 +51,6 @@ import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
import androidx.annotation.VisibleForTesting;
/**
* Manage the camera for the QR scanner and help the decoder to get the image inside the scanning
* frame. Caller prepares a {@link SurfaceTexture} then call {@link #start(SurfaceTexture)} to

3
src/com/android/settings/wifi/qrcode/QrDecorateView.java
View File

@@ -19,12 +19,9 @@ package com.android.settings.wifi.qrcode;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Point;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.RectF;
import android.util.AttributeSet;
import android.util.TypedValue;

1
src/com/android/settings/wifi/qrcode/QrPreviewLayout.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.wifi.qrcode;
import android.content.Context;
import android.util.AttributeSet;
import android.util.Log;
import android.widget.FrameLayout;
/**

7
src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java
View File

@@ -18,14 +18,13 @@ package com.android.settings.wifi.savedaccesspoints;
import android.annotation.Nullable;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.wifi.WifiConfigUiBase;
@@ -51,7 +50,7 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.WIFI_SAVED_ACCESS_POINTS;
return SettingsEnums.WIFI_SAVED_ACCESS_POINTS;
}
@Override
@@ -123,7 +122,7 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case WifiSettings.WIFI_DIALOG_ID:
return MetricsProto.MetricsEvent.DIALOG_WIFI_SAVED_AP_EDIT;
return SettingsEnums.DIALOG_WIFI_SAVED_AP_EDIT;
default:
return 0;
}

6
src/com/android/settings/wifi/slice/WifiSlice.java
View File

@@ -23,6 +23,7 @@ import static com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI;
import android.annotation.ColorInt;
import android.app.PendingIntent;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@@ -38,7 +39,6 @@ import androidx.slice.Slice;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
@@ -174,7 +174,7 @@ public class WifiSlice implements CustomSliceable {
.setTitleRes(R.string.pref_title_network_details)
.setDestination(WifiNetworkDetailsFragment.class.getName())
.setArguments(extras)
.setSourceMetricsCategory(MetricsEvent.WIFI)
.setSourceMetricsCategory(SettingsEnums.WIFI)
.toIntent();
} else {
intent = new Intent(mContext, WifiDialogActivity.class);
@@ -204,7 +204,7 @@ public class WifiSlice implements CustomSliceable {
final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build();
final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
WifiSettings.class.getName(), KEY_WIFI, screenTitle,
MetricsEvent.DIALOG_WIFI_AP_EDIT)
SettingsEnums.DIALOG_WIFI_AP_EDIT)
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
.setData(contentUri);

1
src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.wifi.tether;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.EditTextPreference;

4
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.wifi.tether;
import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED;
import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -32,7 +33,6 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.RestrictedDashboardFragment;
@@ -87,7 +87,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.WIFI_TETHER_SETTINGS;
return SettingsEnums.WIFI_TETHER_SETTINGS;
}
@Override