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/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo.storage;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.SystemProperties;
import android.provider.Settings;
@@ -25,7 +26,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentManager;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.deletionhelper.ActivationWarningFragment;
import com.android.settings.overlay.FeatureFactory;
@@ -86,7 +86,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
@Override
public boolean onSwitchToggled(boolean isChecked) {
mMetricsFeatureProvider.action(mContext,
MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER, isChecked);
SettingsEnums.ACTION_TOGGLE_STORAGE_MANAGER, isChecked);
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
isChecked ? 1 : 0);

4
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo.storage;
import android.app.settings.SettingsEnums;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
@@ -33,7 +34,6 @@ import androidx.fragment.app.Fragment;
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.Settings;
import com.android.settings.applications.manageapplications.ManageApplications;
@@ -155,7 +155,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
case FILES_KEY:
intent = getFilesIntent();
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(
mContext, MetricsEvent.STORAGE_FILES);
mContext, SettingsEnums.STORAGE_FILES);
break;
case SYSTEM_KEY:
final SystemInfoFragment dialog = new SystemInfoFragment();

4
src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo.storage;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
@@ -29,7 +30,6 @@ import android.widget.Button;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.DonutView;
@@ -81,7 +81,7 @@ public class StorageSummaryDonutPreference extends Preference implements View.On
if (v != null && R.id.deletion_helper_button == v.getId()) {
Context context = getContext();
FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(
context, MetricsEvent.STORAGE_FREE_UP_SPACE_NOW);
context, SettingsEnums.STORAGE_FREE_UP_SPACE_NOW);
Intent intent = new Intent(StorageManager.ACTION_MANAGE_STORAGE);
getContext().startActivity(intent);
}

4
src/com/android/settings/deviceinfo/storage/UserProfileController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo.storage;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
@@ -26,7 +27,6 @@ import android.util.SparseArray;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.util.Preconditions;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
@@ -84,7 +84,7 @@ public class UserProfileController extends AbstractPreferenceController implemen
.setDestination(StorageProfileFragment.class.getName())
.setArguments(args)
.setTitleText(mUser.name)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.DEVICEINFO_STORAGE)
.setSourceMetricsCategory(SettingsEnums.DEVICEINFO_STORAGE)
.launch();
return true;
}