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

Merge "Metrics for user choices in storage wizard." into pi-dev

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-04 02:32:09 +00:00
committed by Android (Google) Code Review
parent 9b29aeba5a f6e47386b1
commit 1786dcd4f8
3 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java
View File

@@ -23,7 +23,9 @@ import android.os.storage.VolumeInfo;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
public class StorageWizardFormatSlow extends StorageWizardBase { public class StorageWizardFormatSlow extends StorageWizardBase {
private boolean mFormatPrivate; private boolean mFormatPrivate;
@@ -55,6 +57,9 @@ public class StorageWizardFormatSlow extends StorageWizardBase {
@Override @Override
public void onNavigateBack(View view) { public void onNavigateBack(View view) {
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_BENCHMARK_SLOW_ABORT);
final Intent intent = new Intent(this, StorageWizardInit.class); final Intent intent = new Intent(this, StorageWizardInit.class);
startActivity(intent); startActivity(intent);
finishAffinity(); finishAffinity();
@@ -62,6 +67,16 @@ public class StorageWizardFormatSlow extends StorageWizardBase {
@Override @Override
public void onNavigateNext(View view) { public void onNavigateNext(View view) {
if (view != null) {
// User made an explicit choice to continue when slow
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_BENCHMARK_SLOW_CONTINUE);
} else {
// User made an implicit choice to continue when fast
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_BENCHMARK_FAST_CONTINUE);
}
final String forgetUuid = getIntent().getStringExtra(EXTRA_FORMAT_FORGET_UUID); final String forgetUuid = getIntent().getStringExtra(EXTRA_FORMAT_FORGET_UUID);
if (!TextUtils.isEmpty(forgetUuid)) { if (!TextUtils.isEmpty(forgetUuid)) {
mStorage.forgetVolume(forgetUuid); mStorage.forgetVolume(forgetUuid);

14
src/com/android/settings/deviceinfo/StorageWizardInit.java
View File

@@ -25,7 +25,9 @@ import android.os.storage.VolumeInfo;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
public class StorageWizardInit extends StorageWizardBase { public class StorageWizardInit extends StorageWizardBase {
private Button mExternal; private Button mExternal;
@@ -68,6 +70,12 @@ public class StorageWizardInit extends StorageWizardBase {
} }
public void onNavigateExternal(View view) { public void onNavigateExternal(View view) {
if (view != null) {
// User made an explicit choice for external
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_INIT_EXTERNAL);
}
if (mVolume != null && mVolume.getType() == VolumeInfo.TYPE_PUBLIC if (mVolume != null && mVolume.getType() == VolumeInfo.TYPE_PUBLIC
&& mVolume.getState() != VolumeInfo.STATE_UNMOUNTABLE) { && mVolume.getState() != VolumeInfo.STATE_UNMOUNTABLE) {
// Remember that user made decision // Remember that user made decision
@@ -85,6 +93,12 @@ public class StorageWizardInit extends StorageWizardBase {
} }
public void onNavigateInternal(View view) { public void onNavigateInternal(View view) {
if (view != null) {
// User made an explicit choice for internal
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_INIT_INTERNAL);
}
StorageWizardFormatConfirm.showPrivate(this, mDisk.getId()); StorageWizardFormatConfirm.showPrivate(this, mDisk.getId());
} }
} }

8
src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
View File

@@ -31,7 +31,9 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Toast; import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import java.util.Objects; import java.util.Objects;
@@ -80,6 +82,9 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase {
@Override @Override
public void onNavigateBack(View view) { public void onNavigateBack(View view) {
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_MIGRATE_LATER);
final Intent intent = new Intent(this, StorageWizardReady.class); final Intent intent = new Intent(this, StorageWizardReady.class);
intent.putExtra(EXTRA_MIGRATE_SKIP, true); intent.putExtra(EXTRA_MIGRATE_SKIP, true);
startActivity(intent); startActivity(intent);
@@ -127,6 +132,9 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase {
return; return;
} }
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_MIGRATE_NOW);
final Intent intent = new Intent(this, StorageWizardMigrateProgress.class); final Intent intent = new Intent(this, StorageWizardMigrateProgress.class);
intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId()); intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
intent.putExtra(PackageManager.EXTRA_MOVE_ID, moveId); intent.putExtra(PackageManager.EXTRA_MOVE_ID, moveId);