Merge "App anomaly tips on PowerUsage App list" into udc-qpr-dev (821ed070) · Commits · e / os / android_packages_apps_Settings

res/drawable/battery_hints_chip_bg.xml

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2023 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.
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle">
		<solid android:color="@color/settingslib_dialog_background" />
		<corners android:radius="@dimen/battery_hints_chip_corner_radius" />
		</shape>
		No newline at end of file

res/drawable/battery_hints_chip_bg_ripple.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2023 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.
		-->

		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="?android:attr/colorControlHighlight">
		<item android:drawable="@drawable/battery_hints_chip_bg"/>
		</ripple>
		No newline at end of file

res/layout/anomaly_app_item_preference.xml

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2023 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="wrap_content"
		android:orientation="vertical">

		<include layout="@layout/preference_app"/>

		<LinearLayout
		android:id="@+id/warning_chip"
		android:visibility="gone"
		android:clickable="false"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="?android:attr/selectableItemBackground"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<Space
		android:layout_width="@dimen/secondary_app_icon_size"
		android:layout_height="wrap_content" />

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:padding="8dp"
		android:layout_marginStart="16dp"
		android:background="@drawable/battery_hints_chip_bg_ripple">

		<ImageView
		android:layout_width="16dp"
		android:layout_height="16dp"
		android:layout_gravity="center_vertical\|start"
		android:contentDescription="@string/battery_hints_warning_icon_a11y"
		android:src="@drawable/ic_battery_tips_warning_icon" />

		<TextView
		android:id="@+id/warning_info"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingHorizontal="8dp"
		android:layout_gravity="center_vertical\|start"
		android:textAlignment="viewStart"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorPrimary"/>
		</LinearLayout>

		</LinearLayout>
		</LinearLayout>
		No newline at end of file

res/values/arrays.xml

+33 −4

Original line number	Diff line number	Diff line
		@@ -1420,20 +1420,49 @@
		<item>color_battery_anomaly_yellow_selector</item>
		</string-array>

		<!-- The following 3 arrays are for power anomaly tips card. Please keep them the same size. -->
		<string-array name="power_anomaly_titles">
		<item>Turn on adaptive brightness to extend battery life</item>
		<item>Reduce screen timeout to extend battery life</item>
		<!-- The following 4 arrays are for power anomaly tips card. Please keep them the same size. -->
		<string-array name="power_anomaly_title_ids" translatable="false">
		<item>battery_tips_settings_summary_brightness</item>
		<item>battery_tips_settings_summary_screen_timeout</item>
		<item>battery_tips_apps_summary_always_high</item>
		<item>battery_tips_apps_summary_higher_than_usual</item>
		<item>battery_tips_apps_summary_always_high_in_background</item>
		<item>battery_tips_apps_summary_higher_than_usual_in_background</item>
		<item>battery_tips_apps_summary_always_high_in_foreground</item>
		<item>battery_tips_apps_summary_higher_than_usual_in_foreground</item>
		</string-array>

		<string-array name="power_anomaly_main_btn_strings" translatable="false">
		<item>@string/battery_tips_card_action_button</item>
		<item>@string/battery_tips_card_action_button</item>
		<item>@string/battery_tips_card_action_button_check</item>
		<item>@string/battery_tips_card_action_button_check</item>
		<item>@string/battery_tips_card_action_button_check</item>
		<item>@string/battery_tips_card_action_button_check</item>
		<item>@string/battery_tips_card_action_button_check</item>
		<item>@string/battery_tips_card_action_button_check</item>
		</string-array>

		<string-array name="power_anomaly_dismiss_btn_strings" translatable="false">
		<item>@string/battery_tips_card_dismiss_button</item>
		<item>@string/battery_tips_card_dismiss_button</item>
		<item>@string/battery_tips_card_dismiss_button</item>
		<item>@string/battery_tips_card_dismiss_button</item>
		<item>@string/battery_tips_card_dismiss_button</item>
		<item>@string/battery_tips_card_dismiss_button</item>
		<item>@string/battery_tips_card_dismiss_button</item>
		<item>@string/battery_tips_card_dismiss_button</item>
		</string-array>

		<string-array name="power_anomaly_hint_messages" translatable="false">
		<item></item>
		<item></item>
		<item>@string/battery_app_item_hint</item>
		<item>@string/battery_app_item_hint</item>
		<item>@string/battery_app_item_hint_in_bg</item>
		<item>@string/battery_app_item_hint_in_bg</item>
		<item>@string/battery_app_item_hint_in_fg</item>
		<item>@string/battery_app_item_hint_in_fg</item>
		</string-array>

		</resources>

res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -382,6 +382,7 @@
		<!-- Battery tips card view component -->
		<dimen name="battery_tips_card_corner_radius_small">4dp</dimen>
		<dimen name="battery_tips_card_corner_radius_normal">24dp</dimen>
		<dimen name="battery_hints_chip_corner_radius">8dp</dimen>

		<!-- Dimensions for Dream settings cards -->
		<dimen name="dream_item_min_column_width">174dp</dimen>