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

Commit 0e8c8837 authored by Salvador Martinez's avatar Salvador Martinez
Browse files

Move BatteryInfo to settings from settingslib 

This CL simply moves BatteryInfo from settingslib to settings and
makes sure the tests still pass. No other changes are made other than
imports or minor changes needed to make sure existing code does not
break.

Test: Robotests still pass
Bug: 38399275
Bug: 38398949
Bug: 38399654
Change-Id: I59803348e2780b7676ccc6c43234a586c184d71f
parent 51333ec2

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

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import android.telephony.ServiceState; 
import android.util.SparseIntArray;

import com.android.settings.Utils;

import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;

import com.android.settingslib.BatteryInfo;



public class BatteryCellParser implements BatteryInfo.BatteryDataParser, BatteryActiveProvider {

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

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ import android.os.BatteryStats.HistoryItem; 
import android.util.SparseBooleanArray;

import android.util.SparseIntArray;

import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;

import com.android.settingslib.BatteryInfo;



public class BatteryFlagParser implements BatteryInfo.BatteryDataParser, BatteryActiveProvider {

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

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.widget.TextView; 
import com.android.settings.R;

import com.android.settings.applications.LayoutPreference;

import com.android.settings.core.PreferenceController;

import com.android.settingslib.BatteryInfo;

import com.android.settingslib.Utils;



/**

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

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import android.util.TypedValue; 
import android.view.View;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settingslib.BatteryInfo;

import libcore.icu.LocaleData;



import java.util.ArrayList;

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

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import com.android.internal.os.BatteryStatsHelper; 
import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;

import com.android.settingslib.BatteryInfo;

import com.android.settingslib.graph.UsageView;



public class BatteryHistoryDetail extends SettingsPreferenceFragment {