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

Merge "In High usage, hide apps without screen time." into pi-dev

Browse Source
This commit is contained in:
Lei Yu
2018-04-03 17:37:46 +00:00
committed by Android (Google) Code Review
parent a112226db2 7b9682ce87
commit 6f61ae0adf
2 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.batterytip.detectors;
import android.content.Context; import android.content.Context;
import android.os.BatteryStats; import android.os.BatteryStats;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
import android.text.format.DateUtils;
import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper; import com.android.internal.os.BatteryStatsHelper;
@@ -72,18 +73,20 @@ public class HighUsageDetector implements BatteryTipDetector {
final long foregroundTimeMs = mBatteryUtils.getProcessTimeMs( final long foregroundTimeMs = mBatteryUtils.getProcessTimeMs(
BatteryUtils.StatusType.FOREGROUND, batterySipper.uidObj, BatteryUtils.StatusType.FOREGROUND, batterySipper.uidObj,
BatteryStats.STATS_SINCE_CHARGED); BatteryStats.STATS_SINCE_CHARGED);
mHighUsageAppList.add(new AppInfo.Builder() if (foregroundTimeMs >= DateUtils.MINUTE_IN_MILLIS) {
.setUid(batterySipper.getUid()) mHighUsageAppList.add(new AppInfo.Builder()
.setPackageName( .setUid(batterySipper.getUid())
mBatteryUtils.getPackageName(batterySipper.getUid())) .setPackageName(
.setScreenOnTimeMs(foregroundTimeMs) mBatteryUtils.getPackageName(batterySipper.getUid()))
.build()); .setScreenOnTimeMs(foregroundTimeMs)
.build());
}
} }
} }
Collections.sort(mHighUsageAppList, Collections.reverseOrder());
mHighUsageAppList = mHighUsageAppList.subList(0, mHighUsageAppList = mHighUsageAppList.subList(0,
Math.min(mPolicy.highUsageAppCount, mHighUsageAppList.size())); Math.min(mPolicy.highUsageAppCount, mHighUsageAppList.size()));
Collections.sort(mHighUsageAppList, Collections.reverseOrder());
} }
} }

40
tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
View File

@@ -17,8 +17,10 @@
package com.android.settings.fuelgauge.batterytip.detectors; package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -48,7 +50,8 @@ import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
public class HighUsageDetectorTest { public class HighUsageDetectorTest {
private static final int UID = 123; private static final int UID_HIGH = 123;
private static final int UID_ZERO = 345;
private static final long SCREEN_ON_TIME_MS = DateUtils.HOUR_IN_MILLIS; private static final long SCREEN_ON_TIME_MS = DateUtils.HOUR_IN_MILLIS;
private Context mContext; private Context mContext;
@Mock @Mock
@@ -56,7 +59,9 @@ public class HighUsageDetectorTest {
@Mock @Mock
private BatteryUtils mBatteryUtils; private BatteryUtils mBatteryUtils;
@Mock @Mock
private BatterySipper mBatterySipper; private BatterySipper mHighBatterySipper;
@Mock
private BatterySipper mZeroBatterySipper;
@Mock @Mock
private HighUsageDataParser mDataParser; private HighUsageDataParser mDataParser;
@@ -75,14 +80,25 @@ public class HighUsageDetectorTest {
mHighUsageDetector.mBatteryUtils = mBatteryUtils; mHighUsageDetector.mBatteryUtils = mBatteryUtils;
mHighUsageDetector.mDataParser = mDataParser; mHighUsageDetector.mDataParser = mDataParser;
doNothing().when(mHighUsageDetector).parseBatteryData(); doNothing().when(mHighUsageDetector).parseBatteryData();
doReturn(UID).when(mBatterySipper).getUid(); doReturn(UID_HIGH).when(mHighBatterySipper).getUid();
mHighBatterySipper.uidObj = mock(BatteryStats.Uid.class);
mZeroBatterySipper.uidObj = mock(BatteryStats.Uid.class);
doReturn(UID_ZERO).when(mZeroBatterySipper).getUid();
mAppInfo = new AppInfo.Builder() mAppInfo = new AppInfo.Builder()
.setUid(UID) .setUid(UID_HIGH)
.setScreenOnTimeMs(SCREEN_ON_TIME_MS) .setScreenOnTimeMs(SCREEN_ON_TIME_MS)
.build(); .build();
doReturn(SCREEN_ON_TIME_MS).when(mBatteryUtils).getProcessTimeMs(
BatteryUtils.StatusType.FOREGROUND, mHighBatterySipper.uidObj,
BatteryStats.STATS_SINCE_CHARGED);
doReturn(0L).when(mBatteryUtils).getProcessTimeMs(
BatteryUtils.StatusType.FOREGROUND, mZeroBatterySipper.uidObj,
BatteryStats.STATS_SINCE_CHARGED);
mUsageList = new ArrayList<>(); mUsageList = new ArrayList<>();
mUsageList.add(mBatterySipper); mUsageList.add(mHighBatterySipper);
when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
} }
@Test @Test
@@ -95,10 +111,16 @@ public class HighUsageDetectorTest {
@Test @Test
public void testDetect_containsHighUsageApp_tipVisible() { public void testDetect_containsHighUsageApp_tipVisible() {
doReturn(true).when(mDataParser).isDeviceHeavilyUsed(); doReturn(true).when(mDataParser).isDeviceHeavilyUsed();
when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
doReturn(SCREEN_ON_TIME_MS).when(mBatteryUtils).getProcessTimeMs( final HighUsageTip highUsageTip = (HighUsageTip) mHighUsageDetector.detect();
BatteryUtils.StatusType.FOREGROUND, mBatterySipper.uidObj, assertThat(highUsageTip.isVisible()).isTrue();
BatteryStats.STATS_SINCE_CHARGED); assertThat(highUsageTip.getHighUsageAppList()).containsExactly(mAppInfo);
}
@Test
public void testDetect_containsHighUsageApp_removeZeroOne() {
doReturn(true).when(mDataParser).isDeviceHeavilyUsed();
mUsageList.add(mZeroBatterySipper);
final HighUsageTip highUsageTip = (HighUsageTip) mHighUsageDetector.detect(); final HighUsageTip highUsageTip = (HighUsageTip) mHighUsageDetector.detect();
assertThat(highUsageTip.isVisible()).isTrue(); assertThat(highUsageTip.isVisible()).isTrue();