Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions app/src/main/res/xml/pref_alerts.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<!-- The "Alerts" screen (#112): WHAT to be notified about. One category per alert event, in
battery-lifecycle order (levels → warning → critical → full → temperature → drain → charging).
Cross-cutting delivery options (sound in silent mode, vibration, quiet hours, stickiness)
live on the "Notification behaviour" screen (pref_behaviour.xml). -->
and the charge-announcement style live on the "Notification behaviour" screen
(pref_behaviour.xml). -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

Expand Down Expand Up @@ -181,7 +182,9 @@

</PreferenceCategory>

<!-- Charging announcements (#122/#127) and the slow-charge warning (#123). -->
<!-- Charging alerts: the #123 slow-charge warning. The charge-announcement style picker moved to
Notification behaviour › Appearance (#112 follow-up) — "style" reads as appearance, and that's
where users look for it. -->
<PreferenceCategory
android:title="@string/pref_cat_title_charging"
app:iconSpaceReserved="false">
Expand All @@ -196,15 +199,6 @@
android:title="@string/notify_slow_charge"
app:iconSpaceReserved="false" />

<ListPreference
android:defaultValue="@string/_pref_value_charge_notification_style_toast"
android:entries="@array/charge_notification_style_entries"
android:entryValues="@array/charge_notification_style_values"
android:key="@string/_pref_key_charge_notification_style"
android:title="@string/charge_notification_style_title"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />

</PreferenceCategory>

</PreferenceScreen>
12 changes: 12 additions & 0 deletions app/src/main/res/xml/pref_behaviour.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,18 @@
android:title="@string/sticky_notification"
app:iconSpaceReserved="false" />

<!-- How the charge-connected announcement surfaces (toast / notification / none).
Moved here from the Alerts screen: "style" reads as appearance, so this is where
users look for it (#112 follow-up, maintainer decision). -->
<ListPreference
android:defaultValue="@string/_pref_value_charge_notification_style_toast"
android:entries="@array/charge_notification_style_entries"
android:entryValues="@array/charge_notification_style_values"
android:key="@string/_pref_key_charge_notification_style"
android:title="@string/charge_notification_style_title"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />

</PreferenceCategory>

</PreferenceScreen>