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

Clean up obsolete battery settings files

Browse Source 
Fixes: 112440820
Test: robotest still pass
Change-Id: I91e8a4094bb2077c7998ef663d5545e9a3e18d03
This commit is contained in:
jackqdyulei
2018-08-09 17:13:01 -07:00
parent b9b4a68862
commit e39e8d7f93
7 changed files with 0 additions and 1568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
res/layout/battery_history_chart.xml
View File

@@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<com.android.settings.fuelgauge.BatteryHistoryChart
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.android.settings"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:id="@+id/battery_history_chart"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
app:headerAppearance="?android:attr/textAppearanceMedium"
android:shadowRadius="4"
android:shadowColor="?android:attr/colorBackground"
android:shadowDx="2"
android:shadowDy="2"
app:barPrimaryColor="?android:attr/colorControlActivated"
app:barPredictionColor="@color/material_empty_color_light"
app:chartMinHeight="@dimen/battery_history_chart_height">
</com.android.settings.fuelgauge.BatteryHistoryChart>
</FrameLayout>

29
res/values/attrs.xml
View File

@@ -15,35 +15,6 @@
-->
<resources>
<declare-styleable name="BatteryHistoryChart">
<!-- Base text color, typeface, size, and style. -->
<attr name="android:textAppearance" />
<!-- Text color. -->
<attr name="android:textColor" />
<!-- Size of the text. Recommended dimension type for text is "sp" for scaled-pixels (example: 15sp). -->
<attr name="android:textSize" />
<!-- Typeface (normal, sans, serif, monospace) for the text. -->
<attr name="android:typeface" />
<!-- Style (bold, italic, bolditalic) for the text. -->
<attr name="android:textStyle" />
<!-- Place a shadow of the specified color behind the text. -->
<attr name="android:shadowColor" />
<!-- Horizontal offset of the shadow. -->
<attr name="android:shadowDx" />
<!-- Vertical offset of the shadow. -->
<attr name="android:shadowDy" />
<!-- Radius of the shadow. -->
<attr name="android:shadowRadius" />
<!-- Text color, typeface, size, and style of header. -->
<attr name="headerAppearance" format="reference" />
<!-- Primary color of chart. -->
<attr name="barPrimaryColor" format="color|reference" />
<!-- Color of predicted future use part of chart. -->
<attr name="barPredictionColor" format="color|reference" />
<!-- Minimum height of the chart itself. -->
<attr name="chartMinHeight" format="dimension|reference" />
</declare-styleable>
<declare-styleable name="PercentageBarChart">
<!-- Background color -->
<attr name="emptyColor" format="color" />

2
res/values/dimens.xml
View File

@@ -33,8 +33,6 @@
<dimen name="bind_app_widget_dialog_checkbox_bottom_padding">16dip</dimen>
<dimen name="installed_app_details_bullet_offset">8dip</dimen>
<dimen name="battery_history_chart_height">120dp</dimen>
<dimen name="data_usage_chart_height">228dip</dimen>
<dimen name="data_usage_chart_optimalWidth">440dip</dimen>
<dimen name="usage_number_text_size">36sp</dimen>

1366
src/com/android/settings/fuelgauge/BatteryHistoryChart.java
View File

File diff suppressed because it is too large Load Diff

126
src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
View File

@@ -1,126 +0,0 @@
/*
* Copyright (C) 2009 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.fuelgauge;
import android.content.Intent;
import android.os.BatteryStats;
import android.os.BatteryStats.HistoryItem;
import android.os.Bundle;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
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.settings.widget.UsageView;
public class BatteryHistoryDetail extends SettingsPreferenceFragment {
public static final String EXTRA_STATS = "stats";
public static final String EXTRA_BROADCAST = "broadcast";
public static final String BATTERY_HISTORY_FILE = "tmp_bat_history.bin";
private BatteryStats mStats;
private Intent mBatteryBroadcast;
private BatteryFlagParser mChargingParser;
private BatteryFlagParser mScreenOn;
private BatteryFlagParser mGpsParser;
private BatteryFlagParser mFlashlightParser;
private BatteryFlagParser mCameraParser;
private BatteryWifiParser mWifiParser;
private BatteryFlagParser mCpuParser;
private BatteryCellParser mPhoneParser;
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
String histFile = getArguments().getString(EXTRA_STATS);
mStats = BatteryStatsHelper.statsFromFile(getActivity(), histFile);
mBatteryBroadcast = getArguments().getParcelable(EXTRA_BROADCAST);
TypedValue value = new TypedValue();
getContext().getTheme().resolveAttribute(android.R.attr.colorAccent, value, true);
int accentColor = getContext().getColor(value.resourceId);
mChargingParser = new BatteryFlagParser(accentColor, false,
HistoryItem.STATE_BATTERY_PLUGGED_FLAG);
mScreenOn = new BatteryFlagParser(accentColor, false,
HistoryItem.STATE_SCREEN_ON_FLAG);
mGpsParser = new BatteryFlagParser(accentColor, false,
HistoryItem.STATE_GPS_ON_FLAG);
mFlashlightParser = new BatteryFlagParser(accentColor, true,
HistoryItem.STATE2_FLASHLIGHT_FLAG);
mCameraParser = new BatteryFlagParser(accentColor, true,
HistoryItem.STATE2_CAMERA_FLAG);
mWifiParser = new BatteryWifiParser(accentColor);
mCpuParser = new BatteryFlagParser(accentColor, false,
HistoryItem.STATE_CPU_RUNNING_FLAG);
mPhoneParser = new BatteryCellParser();
setHasOptionsMenu(true);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.battery_history_detail, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
updateEverything();
}
private void updateEverything() {
BatteryInfo.getBatteryInfo(getContext(), info -> {
final View view = getView();
info.bindHistory((UsageView) view.findViewById(R.id.battery_usage), mChargingParser,
mScreenOn, mGpsParser, mFlashlightParser, mCameraParser, mWifiParser,
mCpuParser, mPhoneParser);
((TextView) view.findViewById(R.id.charge)).setText(info.batteryPercentString);
((TextView) view.findViewById(R.id.estimation)).setText(info.remainingLabel);
bindData(mChargingParser, R.string.battery_stats_charging_label, R.id.charging_group);
bindData(mScreenOn, R.string.battery_stats_screen_on_label, R.id.screen_on_group);
bindData(mGpsParser, R.string.battery_stats_gps_on_label, R.id.gps_group);
bindData(mFlashlightParser, R.string.battery_stats_flashlight_on_label,
R.id.flashlight_group);
bindData(mCameraParser, R.string.battery_stats_camera_on_label, R.id.camera_group);
bindData(mWifiParser, R.string.battery_stats_wifi_running_label, R.id.wifi_group);
bindData(mCpuParser, R.string.battery_stats_wake_lock_label, R.id.cpu_group);
bindData(mPhoneParser, R.string.battery_stats_phone_signal_label,
R.id.cell_network_group);
}, mStats, false /* shortString */);
}
private void bindData(BatteryActiveProvider provider, int label, int groupId) {
View group = getView().findViewById(groupId);
group.setVisibility(provider.hasData() ? View.VISIBLE : View.GONE);
((TextView) group.findViewById(android.R.id.title)).setText(label);
((BatteryActiveView) group.findViewById(R.id.battery_active)).setProvider(provider);
}
@Override
public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_BATTERY_HISTORY_DETAIL;
}
}

2
src/com/android/settings/fuelgauge/PowerUsageBase.java
View File

@@ -72,8 +72,6 @@ public abstract class PowerUsageBase extends DashboardFragment {
@Override
public void onResume() {
super.onResume();
BatteryStatsHelper.dropFile(getActivity(), BatteryHistoryDetail.BATTERY_HISTORY_FILE);
mBatteryBroadcastReceiver.register();
}

1
tests/robotests/assets/grandfather_not_implementing_index_provider
View File

@@ -39,7 +39,6 @@ com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMi
com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
com.android.settings.fuelgauge.AdvancedPowerUsageDetail
com.android.settings.fuelgauge.BatteryHistoryDetail
com.android.settings.fuelgauge.InactiveApps
com.android.settings.fuelgauge.RestrictedAppDetails
com.android.settings.IccLockSettings