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

Merge "Revert "Add animation for battery asyncLoader."" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-23 01:49:22 +00:00
committed by Android (Google) Code Review
parent 32ad1c0db4 78684dc049
commit 161571617b
3 changed files with 6 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -17,7 +17,6 @@ package com.android.settings.fuelgauge;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.PowerManager;
import android.os.Process;
import android.text.TextUtils;
@@ -130,6 +129,8 @@ public class PowerUsageSummaryTest {
@Mock
private LayoutPreference mBatteryLayoutPref;
@Mock
private TextView mBatteryPercentText;
@Mock
private TextView mSummary1;
@Mock
private BatteryInfo mBatteryInfo;
@@ -140,7 +141,6 @@ public class PowerUsageSummaryTest {
@Mock
private SettingsActivity mSettingsActivity;
private TextView mBatteryPercentText;
private List<BatterySipper> mUsageList;
private Context mRealContext;
private TestFragment mFragment;
@@ -164,7 +164,7 @@ public class PowerUsageSummaryTest {
mLastFullChargePref = new PowerGaugePreference(mRealContext);
mFragment = spy(new TestFragment(mContext));
mFragment.initFeatureProvider();
mBatteryMeterView = spy(new BatteryMeterView(mRealContext));
mBatteryMeterView = new BatteryMeterView(mRealContext);
mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);
doNothing().when(mFragment).restartBatteryStatsLoader();
@@ -187,7 +187,6 @@ public class PowerUsageSummaryTest {
mCellBatterySipper.drainType = BatterySipper.DrainType.CELL;
mCellBatterySipper.totalPowerMah = POWER_MAH;
mBatteryPercentText = new TextView(mRealContext);
when(mBatteryLayoutPref.findViewById(R.id.summary1)).thenReturn(mSummary1);
when(mBatteryLayoutPref.findViewById(R.id.battery_percent)).thenReturn(mBatteryPercentText);
when(mBatteryLayoutPref.findViewById(R.id.battery_header_icon))
@@ -280,50 +279,6 @@ public class PowerUsageSummaryTest {
testToggleAllApps(false);
}
@Test
public void testInitHeaderPreference_initCorrectly() {
mFragment.mBatteryLevel = 100;
mFragment.initHeaderPreference();
assertThat(mBatteryMeterView.getBatteryLevel()).isEqualTo(100);
assertThat(mBatteryPercentText.getText().toString()).isEqualTo("100%");
}
@Test
public void testStartBatteryHeaderAnimationIfNecessary_batteryLevelChanged_animationStarted() {
final int prevLevel = 100;
final int curLevel = 80;
mFragment.startBatteryHeaderAnimationIfNecessary(mBatteryMeterView, mBatteryPercentText,
prevLevel, curLevel);
assertThat(mBatteryMeterView.getBatteryLevel()).isEqualTo(curLevel);
assertThat(mBatteryPercentText.getText().toString()).isEqualTo("80%");
}
@Test
public void testOnSaveInstanceState_saveBatteryLevel() {
Bundle bundle = new Bundle();
mFragment.mBatteryLevel = BATTERY_LEVEL;
// mock it to stop crash in getPreferenceScreen
doReturn(null).when(mFragment).getPreferenceScreen();
mFragment.onSaveInstanceState(bundle);
assertThat(bundle.getInt(PowerUsageSummary.ARG_BATTERY_LEVEL)).isEqualTo(BATTERY_LEVEL);
}
@Test
public void testOnActivityCreated_setBatteryLevel() {
Bundle bundle = new Bundle();
bundle.putInt(PowerUsageSummary.ARG_BATTERY_LEVEL, BATTERY_LEVEL);
mFragment.onActivityCreated(bundle);
assertThat(mFragment.mBatteryLevel).isEqualTo(BATTERY_LEVEL);
}
@Test
public void testExtractKeyFromSipper_typeAPPUidObjectNull_returnPackageNames() {
mNormalBatterySipper.uidObj = null;