Merge "Add non-app power consumers to the PowerStatsViewer" (92c2f231) · Commits · e / os / android_frameworks_base

core/tests/powertests/PowerStatsViewer/AndroidManifest.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -35,8 +35,7 @@
		</intent-filter>
		</activity>

		<activity android:name=".AppPickerActivity"
		android:label="Power Stats - Select an App"/>

		<activity android:name=".PowerConsumerPickerActivity"
		android:label="Select a power consumer"/>
		</application>
		</manifest>

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@
		android:textAppearance="?android:attr/textAppearanceListItem"/>

		<TextView
		android:id="@+id/uid"
		android:id="@+id/details"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="marquee"

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2020 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.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<com.google.android.material.tabs.TabLayout
		android:id="@+id/tab_layout"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<androidx.viewpager.widget.ViewPager
		android:id="@+id/pager"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1" />

		</LinearLayout>

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		android:layout_height="match_parent">

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/app_list_view"
		android:id="@+id/list_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone"/>

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		android:paddingStart="10dp"
		android:paddingEnd="10dp">

		<include layout="@layout/app_info_layout"/>
		<include layout="@layout/power_consumer_info_layout"/>

		</LinearLayout>
		</androidx.cardview.widget.CardView>