Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BatteryStatsViewer: Fix theme

Browse Source 
Change-Id: I9b97a7804cdd8d9646a05257387ff2c834336e18
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
Michael Bestas
2023-03-21 16:51:49 +02:00
committed by Ghosuto
parent 39654063ed
commit 40ee00b2db
8 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml
View File

@@ -24,7 +24,7 @@
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<application
android:theme="@style/Theme"
android:theme="@style/Theme.SubSettingsBase"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_name">

22
core/tests/batterystatstests/BatteryStatsViewer/res/color/card_color_state_list.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/>
<item android:color="?androidprv:attr/colorSurface"/>
</selector>

8
core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_picker_layout.xml
View File

@@ -20,14 +20,6 @@
android:orientation="vertical"
android:fitsSystemWindows="true">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh"
android:layout_width="match_parent"

9
core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml
View File

@@ -47,9 +47,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:minHeight="80dp"
android:paddingStart="10dp"
android:paddingEnd="10dp">
android:minHeight="80dp">
<include layout="@layout/battery_consumer_info_layout"/>
</LinearLayout>
@@ -79,11 +77,6 @@
android:paddingEnd="20dp"
android:text="Apps"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView

2
core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml
View File

@@ -16,7 +16,5 @@
-->
<resources>
<color name="battery_consumer_bg_power_profile">#ffffff</color>
<color name="battery_consumer_bg_energy_consumption">#fff5eb</color>
<color name="battery_consumer_slice_icon">#aaaaaa</color>
</resources>

14
core/tests/batterystatstests/BatteryStatsViewer/res/values/styles.xml
View File

@@ -17,19 +17,13 @@
-->
<resources>
<style name="Theme" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="colorPrimary">#34a853</item>
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
</style>
<style name="LoadTestCardView" parent="Widget.MaterialComponents.CardView">
<item name="cardBackgroundColor">#ceead6</item>
<item name="cardBackgroundColor">@color/card_color_state_list</item>
<item name="cardCornerRadius">28dp</item>
<item name="cardElevation">0dp</item>
</style>
<style name="TextAppearanceBody" parent="android:TextAppearance.DeviceDefault">
<item name="android:textColor">#000000</item>
<item name="android:textSize">18sp</item>
</style>
<style name="TextAppearanceBody" parent="android:TextAppearance.DeviceDefault"/>
<style name="TableCell">
<item name="android:layout_height">match_parent</item>

6
core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java
View File

@@ -31,13 +31,13 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
import com.android.settingslib.utils.AsyncLoaderCompat;
import java.util.ArrayList;
@@ -50,7 +50,7 @@ import java.util.Locale;
* Picker, showing a sorted lists of applications and other types of entities consuming power.
* Opens BatteryStatsViewerActivity upon item selection.
*/
public class BatteryConsumerPickerActivity extends AppCompatActivity {
public class BatteryConsumerPickerActivity extends CollapsingToolbarBaseActivity {
private static final String PREF_SELECTED_BATTERY_CONSUMER = "batteryConsumerId";
private static final int BATTERY_STATS_REFRESH_RATE_MILLIS = 60 * 1000;
private static final String FORCE_FRESH_STATS = "force_fresh_stats";
@@ -68,10 +68,8 @@ public class BatteryConsumerPickerActivity extends AppCompatActivity {
super.onCreate(icicle);
setContentView(R.layout.battery_consumer_picker_layout);
setSupportActionBar(findViewById(R.id.toolbar));
mSwipeRefreshLayout = findViewById(R.id.swipe_refresh);
mSwipeRefreshLayout.setColorSchemeResources(android.R.color.holo_green_light);
mSwipeRefreshLayout.setRefreshing(true);
mSwipeRefreshLayout.setOnRefreshListener(this::onRefresh);
mAppList = findViewById(R.id.list_view);

18
core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java
View File

@@ -32,7 +32,6 @@ import android.widget.TableRow;
import android.widget.TextView;
import android.widget.Toast;
import androidx.activity.ComponentActivity;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.loader.app.LoaderManager;
@@ -42,6 +41,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
import com.android.settingslib.utils.AsyncLoaderCompat;
import java.util.ArrayList;
@@ -49,7 +49,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Locale;
public class BatteryStatsViewerActivity extends ComponentActivity {
public class BatteryStatsViewerActivity extends CollapsingToolbarBaseActivity {
public static final String EXTRA_BATTERY_CONSUMER = "batteryConsumerId";
private static final int BATTERY_STATS_REFRESH_RATE_MILLIS = 60 * 1000;
@@ -88,7 +88,6 @@ public class BatteryStatsViewerActivity extends ComponentActivity {
setContentView(R.layout.battery_stats_viewer_layout);
mSwipeRefreshLayout = findViewById(R.id.swipe_refresh);
mSwipeRefreshLayout.setColorSchemeResources(android.R.color.holo_green_light);
mSwipeRefreshLayout.setRefreshing(true);
mSwipeRefreshLayout.setOnRefreshListener(this::onRefresh);
@@ -343,27 +342,26 @@ public class BatteryStatsViewerActivity extends ComponentActivity {
switch (entry.entryType) {
case UID:
setTitleIconAndBackground(viewHolder, entry.title,
R.drawable.gm_energy_24, 0);
R.drawable.gm_energy_24);
setPowerText(viewHolder.value1TextView, entry.value1);
setProportionText(viewHolder.value2TextView, entry);
bindSlices(viewHolder, entry);
break;
case DEVICE_TOTAL_POWER:
setTitleIconAndBackground(viewHolder, entry.title,
R.drawable.gm_sum_24, 0);
R.drawable.gm_sum_24);
setPowerText(viewHolder.value1TextView, entry.value1);
setPowerText(viewHolder.value2TextView, entry.value2);
break;
case DEVICE_POWER:
setTitleIconAndBackground(viewHolder, entry.title,
R.drawable.gm_calculate_24,
R.color.battery_consumer_bg_power_profile);
R.drawable.gm_calculate_24);
setPowerText(viewHolder.value1TextView, entry.value1);
setPowerText(viewHolder.value2TextView, entry.value2);
break;
case DEVICE_DURATION:
setTitleIconAndBackground(viewHolder, entry.title,
R.drawable.gm_timer_24, 0);
R.drawable.gm_timer_24);
setDurationText(viewHolder.value1TextView, (long) entry.value1);
viewHolder.value2TextView.setVisibility(View.GONE);
break;
@@ -429,11 +427,9 @@ public class BatteryStatsViewerActivity extends ComponentActivity {
}
}
private void setTitleIconAndBackground(ViewHolder viewHolder, String title, int icon,
int background) {
private void setTitleIconAndBackground(ViewHolder viewHolder, String title, int icon) {
viewHolder.titleTextView.setText(title);
viewHolder.iconImageView.setImageResource(icon);
viewHolder.itemView.setBackgroundResource(background);
}
private void setProportionText(TextView textView, BatteryConsumerData.Entry entry) {