Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07bd51e9 authored by Alex Kulesza's avatar Alex Kulesza Committed by android-build-merger
Browse files

Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev 

am: f21bc100

Change-Id: I145fa85f2a0ba2b6ff3d7fc6a586b823c959a768
parents f4712347 f21bc100

src/com/android/settings/fuelgauge/PowerUsageSummary.java

+9 −7
Original line number Diff line number Diff line
@@ -231,13 +231,7 @@ public class PowerUsageSummary extends PowerUsageBase implements 


        initFeatureProvider();

        mBatteryLayoutPref = (LayoutPreference) findPreference(KEY_BATTERY_HEADER);

        View header = mBatteryLayoutPref.findViewById(R.id.summary1);

        // Unfortunately setting a long click listener on a means it will no longer pass the regular

        // click event to the parent, so we have to register a regular click listener as well.

        if (mPowerFeatureProvider.isEstimateDebugEnabled()) {

            header.setOnLongClickListener(this);

            header.setOnClickListener(this);

        }



        mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);

        mScreenUsagePref = (PowerGaugePreference) findPreference(KEY_SCREEN_USAGE);

        mLastFullChargePref = (PowerGaugePreference) findPreference(
@@ -772,6 +766,14 @@ public class PowerUsageSummary extends PowerUsageBase implements 
    void restartBatteryInfoLoader() {

        getLoaderManager().restartLoader(BATTERY_INFO_LOADER, Bundle.EMPTY,

                mBatteryInfoLoaderCallbacks);

        if (mPowerFeatureProvider.isEstimateDebugEnabled()) {

            // Unfortunately setting a long click listener on a view means it will no

            // longer pass the regular click event to the parent, so we have to register

            // a regular click listener as well.

            View header = mBatteryLayoutPref.findViewById(R.id.summary1);

            header.setOnLongClickListener(this);

            header.setOnClickListener(this);

        }

    }



    private static List<BatterySipper> getFakeStats() {

tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java

+44 −23
Original line number Diff line number Diff line
@@ -15,13 +15,30 @@ 
 */

package com.android.settings.fuelgauge;



import java.util.List;

import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;

import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;

import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_TOGGLE_APPS;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.LoaderManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.content.ContentResolver;

import android.os.PowerManager;

import android.support.v7.preference.PreferenceGroup;

import android.support.v7.preference.PreferenceScreen;
@@ -40,46 +57,31 @@ import com.android.internal.os.BatteryStatsHelper; 
import com.android.internal.os.BatteryStatsImpl;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.Utils;

import com.android.settings.applications.LayoutPreference;

import com.android.settings.core.PreferenceController;

import com.android.settings.fuelgauge.anomaly.Anomaly;

import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.XmlTestUtils;

import com.android.settings.testutils.shadow.SettingsShadowResources;

import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;

import com.android.settings.testutils.XmlTestUtils;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;

import org.robolectric.Robolectric;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import java.util.ArrayList;



import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;

import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;

import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_TOGGLE_APPS;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import java.util.List;



/**

 * Unit tests for {@link PowerUsageSummary}.
@@ -183,6 +185,7 @@ public class PowerUsageSummaryTest { 
        mBatteryMeterView = new BatteryMeterView(mRealContext);

        mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);

        doNothing().when(mFragment).restartBatteryStatsLoader();

        doReturn(mock(LoaderManager.class)).when(mFragment).getLoaderManager();



        when(mFragment.getActivity()).thenReturn(mSettingsActivity);

        when(mAdditionalBatteryInfoMenu.getItemId())
@@ -545,6 +548,24 @@ public class PowerUsageSummaryTest { 
        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isFalse();

    }



    @Test

    public void testDebugMode() {

        doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isEstimateDebugEnabled();



        mFragment.restartBatteryInfoLoader();

        ArgumentCaptor<View.OnLongClickListener> listener = ArgumentCaptor.forClass(

                View.OnLongClickListener.class);

        verify(mSummary1).setOnLongClickListener(listener.capture());



        // Calling the listener should disable it.

        listener.getValue().onLongClick(mSummary1);

        verify(mSummary1).setOnLongClickListener(null);



        // Restarting the loader should reset the listener.

        mFragment.restartBatteryInfoLoader();

        verify(mSummary1, times(2)).setOnLongClickListener(any(View.OnLongClickListener.class));

    }



    public static class TestFragment extends PowerUsageSummary {



        private Context mContext;