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

Commit 22a39c2b authored by James Lemieux's avatar James Lemieux
Browse files

Use external/robolectric-shadows/run_robotests.mk 

This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
parent 229a6a2b

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -4747,6 +4747,10 @@ 
    <string name="power_usage_list_summary">App usage since full charge (<xliff:g id="relative_time">^1</xliff:g>)</string>

    <!-- Label for device components using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->

    <string name="power_usage_list_summary_device">Device usage since full charge (<xliff:g id="relative_time">^1</xliff:g>)</string>

    <!-- Temp string used to debug new battery estimates [DO NOT TRANSLATE] -->

    <string name="power_usage_enhanced_debug" translatable="false"><xliff:g id="time">%1$s</xliff:g> left (New ML est)</string>

    <!-- Temp string used to debug old battery estimates [DO NOT TRANSLATE] -->

    <string name="power_usage_old_debug" translatable="false"><xliff:g id="time">%1$s</xliff:g> left (Old est)</string>

    <!-- Description for the screen usage item [CHAR_LIMIT=120] -->

    <string name="screen_usage_summary">Amount of time screen has been on since full charge</string>

    <!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->

src/com/android/settings/ResetNetworkConfirm.java

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.internal.telephony.PhoneConstants; 
import com.android.settings.wrapper.RecoverySystemWrapper;

import com.android.settings.core.InstrumentedFragment;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.utils.ThreadUtils;



import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -158,7 +159,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment { 
    void esimFactoryReset(Context context, String packageName) {

        if (mEraseEsim) {

            mEraseEsimTask = new EraseEsimAsyncTask(context, packageName);

            mEraseEsimTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);

            mEraseEsimTask.execute();

        } else {

            Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)

                    .show();

src/com/android/settings/accounts/AccountPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
        for (int i = 0, size = mProfiles.size(); i < size; i++) {

            mProfiles.valueAt(i).pendingRemoval = true;

        }

        if (mUm.isLinkedUser()) {

        if (mUm.isRestrictedProfile()) {

            // Restricted user or similar

            UserInfo userInfo = mUm.getUserInfo(UserHandle.myUserId());

            updateProfileUi(userInfo);

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

+31 −31
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.os.BatteryStats; 
import android.os.Bundle;

import android.provider.SearchIndexableResource;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.PreferenceGroup;

import android.text.format.Formatter;

import android.util.SparseArray;

import android.view.Menu;
@@ -56,7 +55,7 @@ import com.android.settingslib.utils.PowerUtil; 
import com.android.settingslib.utils.StringUtil;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;



/**
@@ -101,8 +100,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
    @VisibleForTesting

    SparseArray<List<Anomaly>> mAnomalySparseArray;

    @VisibleForTesting

    PreferenceGroup mAppListGroup;

    @VisibleForTesting

    BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;

    private BatteryAppListPreferenceController mBatteryAppListPreferenceController;

    private BatteryTipPreferenceController mBatteryTipPreferenceController;
@@ -138,7 +135,16 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
                @Override

                public void onLoadFinished(Loader<List<BatteryInfo>> loader,

                        List<BatteryInfo> batteryInfos) {

                    final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref

                    updateViews(batteryInfos);

                }



                @Override

                public void onLoaderReset(Loader<List<BatteryInfo>> loader) {

                }

            };



    protected void updateViews(List<BatteryInfo> batteryInfos) {

        final BatteryMeterView batteryView = mBatteryLayoutPref

            .findViewById(R.id.battery_header_icon);

        final TextView percentRemaining =

            mBatteryLayoutPref.findViewById(R.id.battery_percent);
@@ -164,11 +170,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
        batteryView.setCharging(!oldInfo.discharging);

    }



                @Override

                public void onLoaderReset(Loader<List<BatteryInfo>> loader) {

                }

            };



    private LoaderManager.LoaderCallbacks<List<BatteryTip>> mBatteryTipsCallbacks =

            new LoaderManager.LoaderCallbacks<List<BatteryTip>>() {
@@ -343,8 +344,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
    @VisibleForTesting

    void updateAnomalySparseArray(List<Anomaly> anomalies) {

        mAnomalySparseArray.clear();

        for (int i = 0, size = anomalies.size(); i < size; i++) {

            final Anomaly anomaly = anomalies.get(i);

        for (final Anomaly anomaly : anomalies) {

            if (mAnomalySparseArray.get(anomaly.uid) == null) {

                mAnomalySparseArray.append(anomaly.uid, new ArrayList<>());

            }
@@ -423,7 +423,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
                        Context context, boolean enabled) {

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = R.xml.power_usage_summary;

                    return Arrays.asList(sir);

                    return Collections.singletonList(sir);

                }



                @Override

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

+43 −38
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.fuelgauge;



import android.app.Activity;

import android.app.LoaderManager;

import android.app.LoaderManager.LoaderCallbacks;

import android.content.Context;

import android.content.Loader;
@@ -188,7 +189,7 @@ public class PowerUsageSummaryLegacy extends PowerUsageBase implements 
                }

            };



    LoaderCallbacks<List<BatteryInfo>> mBatteryInfoDebugLoaderCallbacks =

    LoaderManager.LoaderCallbacks<List<BatteryInfo>> mBatteryInfoDebugLoaderCallbacks =

        new LoaderCallbacks<List<BatteryInfo>>() {

            @Override

            public Loader<List<BatteryInfo>> onCreateLoader(int i, Bundle bundle) {
@@ -198,7 +199,16 @@ public class PowerUsageSummaryLegacy extends PowerUsageBase implements 
            @Override

            public void onLoadFinished(Loader<List<BatteryInfo>> loader,

                List<BatteryInfo> batteryInfos) {

                    final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref

                updateViews(batteryInfos);

            }



            @Override

            public void onLoaderReset(Loader<List<BatteryInfo>> loader) {

            }

        };



    protected void updateViews(List<BatteryInfo> batteryInfos) {

        final BatteryMeterView batteryView = mBatteryLayoutPref

            .findViewById(R.id.battery_header_icon);

        final TextView percentRemaining =

            mBatteryLayoutPref.findViewById(R.id.battery_percent);
@@ -224,11 +234,6 @@ public class PowerUsageSummaryLegacy extends PowerUsageBase implements 
        batteryView.setCharging(!oldInfo.discharging);

    }



                @Override

                public void onLoaderReset(Loader<List<BatteryInfo>> loader) {

                }

            };



    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);