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

Merge "Add extra log for battery tip." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-10 01:43:04 +00:00
committed by Android (Google) Code Review
parent a63d41da21 513ddb14a6
commit 9fc80c5064
16 changed files with 231 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
View File

@@ -104,9 +104,7 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
final Preference preference = batteryTip.buildPreference(mPrefContext);
mBatteryTipMap.put(preference.getKey(), batteryTip);
mPreferenceGroup.addPreference(preference);
mMetricsFeatureProvider.action(mContext,
MetricsProto.MetricsEvent.ACTION_BATTERY_TIP_SHOWN,
batteryTip.getType());
batteryTip.log(mContext, mMetricsFeatureProvider);
break;
}
}

7
src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
View File

@@ -25,6 +25,8 @@ import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.util.SparseIntArray;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -123,6 +125,11 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
*/
public abstract void updateState(BatteryTip tip);
/**
* Log the battery tip
*/
public abstract void log(Context context, MetricsFeatureProvider metricsFeatureProvider);
public Preference buildPreference(Context context) {
Preference preference = new Preference(context);

8
src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java
View File

@@ -19,7 +19,9 @@ package com.android.settings.fuelgauge.batterytip.tips;
import android.content.Context;
import android.os.Parcel;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Tip to show early warning if battery couldn't make to usual charging time
@@ -75,6 +77,12 @@ public class EarlyWarningTip extends BatteryTip {
mPowerSaveModeOn = earlyWarningTip.mPowerSaveModeOn;
}
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_EARLY_WARNING_TIP,
mState);
}
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);

14
src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
View File

@@ -21,9 +21,11 @@ import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.StringUtil;
import java.util.List;
@@ -78,6 +80,18 @@ public class HighUsageTip extends BatteryTip {
mState = tip.mState;
}
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP,
mState);
for (int i = 0, size = mHighUsageAppList.size(); i < size; i++) {
final AppInfo appInfo = mHighUsageAppList.get(i);
metricsFeatureProvider.action(context,
MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP_LIST,
appInfo.packageName);
}
}
public long getScreenTimeMs() {
return mScreenTimeMs;
}

8
src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
View File

@@ -20,7 +20,9 @@ import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Tip to show current battery life is short
@@ -55,6 +57,12 @@ public class LowBatteryTip extends BatteryTip {
mState = tip.mState;
}
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_LOW_BATTERY_TIP,
mState);
}
public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
public BatteryTip createFromParcel(Parcel in) {
return new LowBatteryTip(in);

21
src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
View File

@@ -19,11 +19,14 @@ package com.android.settings.fuelgauge.batterytip.tips;
import android.content.Context;
import android.content.res.Resources;
import android.os.Parcel;
import android.util.Pair;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.ArrayList;
import java.util.List;
@@ -93,6 +96,24 @@ public class RestrictAppTip extends BatteryTip {
}
}
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP,
mState);
if (mState == StateType.NEW) {
for (int i = 0, size = mRestrictAppList.size(); i < size; i++) {
final AppInfo appInfo = mRestrictAppList.get(i);
for (Integer anomalyType : appInfo.anomalyTypes) {
metricsFeatureProvider.action(context,
MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP_LIST,
appInfo.packageName,
Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, anomalyType));
}
}
}
}
public List<AppInfo> getRestrictAppList() {
return mRestrictAppList;
}

8
src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java
View File

@@ -20,7 +20,9 @@ import android.content.Context;
import android.os.Parcel;
import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Tip to suggest turn on smart battery if it is not on
@@ -55,6 +57,12 @@ public class SmartBatteryTip extends BatteryTip {
mState = tip.mState;
}
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_SMART_BATTERY_TIP,
mState);
}
public static final Creator CREATOR = new Creator() {
public BatteryTip createFromParcel(Parcel in) {
return new SmartBatteryTip(in);

8
src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java
View File

@@ -20,7 +20,9 @@ import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Tip to show general summary about battery life
@@ -55,6 +57,12 @@ public class SummaryTip extends BatteryTip {
mState = tip.mState;
}
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_SUMMARY_TIP,
mState);
}
public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
public BatteryTip createFromParcel(Parcel in) {
return new SummaryTip(in);

6
src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
View File

@@ -21,6 +21,7 @@ import android.os.Parcel;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Tip to suggest user to remove app restriction. This is the empty tip and it is only used in
@@ -66,6 +67,11 @@ public class UnrestrictAppTip extends BatteryTip {
mState = tip.mState;
}
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
// Do nothing
}
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);