Commit Graph

1717 Commits

Author SHA1 Message Date
Matías Hernández
005a382091 Prevent guest users from toggling "hide silent notifications"
This is a global setting, not per user, and shouldn't be modifiable by a guest. It can still be toggled by other, "normal" users, for the same global effect.

Fixes: 260570341
Test: atest
Change-Id: Id6e1803b5364f3b50bdbc14af0468979c96b5638
2023-03-24 12:15:58 +01:00
Julia Reynolds
2494fd0187 Merge "Add missing conversation field" into udc-dev 2023-03-20 14:28:41 +00:00
Julia Reynolds
5164149efc Add missing conversation field
NotificationChannel#EDIT_CONVERSATION should show
both 'demote conversation' and 'promote conversation'
fields.

Test: View Partial and Full Settings for promoted and
demoted channels
Fixes: 273508155

Change-Id: I4a17a73d695d7c79837fc647b79968f535fa4393
2023-03-20 13:04:11 +00:00
Kweku Adams
9a087d6c19 Merge "Revert "Remove duplicate strings."" into udc-dev 2023-03-16 20:14:16 +00:00
Julia Reynolds
fe310a86de Merge "Remove explicit number from string" into udc-dev 2023-03-16 18:52:25 +00:00
Julia Reynolds
8126e93ff2 Remove explicit number from string
So it can be translated properly
Test: View notification history screen
Fixes: 222128037

Change-Id: I2d11dd4e427c19ef0c003b1fa2b6882267e2026e
2023-03-16 12:27:37 -04:00
Matías Hernández
08893ed0b3 Merge "Refresh the app's "Conversations" list when there are none" into udc-dev 2023-03-16 15:57:11 +00:00
Matías Hernández
a5eea1c034 Refresh the app's "Conversations" list when there are none
Also hide the header in that case (simiarly to bubbles).

Test: atest (new) + manual
Fixes: 273748214
Change-Id: I4f758a0bf5bb8cfa91701185f1568b358d8903a0
2023-03-16 15:07:13 +01:00
Lifu Tang
caa1b51ef2 Revert "Remove duplicate strings."
Revert submission 19748582-settings_yesno

Reason for revert: Common strings in English could be translated into different strings in other languages.

Reverted changes: /q/submissionid:19748582-settings_yesno

Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
2023-03-15 22:39:24 +00:00
Julia Reynolds
068a55384b Merge "Reduce jank when revoking notification permission" into udc-dev 2023-03-15 14:50:07 +00:00
Julia Reynolds
a331c50b53 Reduce jank when revoking notification permission
-Reorder fields so the appear/disappear more cleanly
-Remove some divider lines- they don't animate with the content, for
some reason
-Remove an unused field
-Hide the badge field (remaining field with divider) if there are no
channels
-Change style of 'Notifications are blocked' field to better match
the other fields

Test: revoke notification permission for apps with and without channels
Test: BadgePreferenceControllerTest
Fixes: 233962859
Change-Id: Ife894172bf91d838edf3b0546c5ee00e206a855f
2023-03-15 09:08:10 -04:00
TreeHugger Robot
df5bbc630d Merge "Hide Dock speaker plays from sound pages" into udc-dev 2023-03-15 11:52:38 +00:00
Mill Chen
a860bf3220 Hide Dock speaker plays from sound pages
In order to ensure the setting only works on the analog docks, adding
the docking state checks.

Bug: 270492232
Test: manual test
1) Connect to digital dock
2) Check the sound page and the dock speaker plays shouldn't be
   displayed

Change-Id: I1dc1e0aac8b9067ec8f5f1defc721294caf2949e
2023-03-15 10:25:32 +00:00
Matías Hernández
2cabe8786e Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev 2023-03-15 10:12:23 +00:00
Matías Hernández
0882b04ed5 Delete stuff related to removed "Conversations that can interrupt" settings
Bug: 226486181
Test: N/A, dead code removal only
Change-Id: I100db518880a7eee402af37f49e416ec61ff8486
2023-03-14 16:53:53 +01:00
Julia Reynolds
4726d0de52 Merge "Don't show NLSes with excessively long component names" into udc-dev 2023-03-14 14:47:55 +00:00
Matías Hernández
89f93a9bb1 Close ZenModeScheduleRuleSettingsActivity when rule is deleted
This fixes an issue where the ZenRuleButtonsPreferenceController was redirecting to the rule list, but the container fragment was still trying to refresh the rule, leading to a "rule not found" toast. This also makes the transition look nicer, as it's a "back" instead of a "forward" animation now.

Fixes: 244103559
Test: Manually on phone & tablet
Change-Id: Ie26511dcaec4c7976f488936cdc6d417110ca1b1
2023-03-13 12:03:27 +01:00
Julia Reynolds
4bb32ee56f Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-07 15:46:29 -05:00
Matías Hernández
bf1b95e0fe Don't allow setting channels to bypass DND if the app cannot show notifications
The fix makes the flow more consistent with preexisting behavior:
* Apps appear in the "Apps that can interrupt" section only if some channels are set to bypass DND *and* the app is able to show notifications.
* Channels cannot be set to bypass if those individual channels are blocked.

Fixes: 265064188
Test: atest AppChannelsBypassingDndPreferenceControllerTest
Change-Id: If10f086fd60f0f70f53adb8f5cd67f90936bc35f
2023-03-07 16:41:36 +01:00
Julia Reynolds
a0c9ce5b2f Merge "Remove jank on DND schedule page" into udc-dev 2023-03-01 18:43:11 +00:00
Julia Reynolds
cb6a88b862 Remove jank on DND schedule page
Only add/or remove preferences when absolutely needed.
Also fix a 'load data from backend' method that wasn't.

Fixes: 216747934
Test: ZenModeAutomaticRulesPreferenceControllerTest
Test: view schedules page
Test: add schedule
Test: remove schedule
Test: view schedule child page and return to schedules page
Change-Id: I237c2ca7ea89ee6e42354470a76712068a7f4dd7
2023-03-01 18:43:02 +00:00
Julia Reynolds
20c5853744 Merge "Fix settings crash" into udc-dev 2023-02-28 23:02:06 +00:00
Julia Reynolds
57a42d2a93 Fix settings crash
Test: post notification with an action with a null title, view
notification widget
Fixes: 250836823

Change-Id: I56707c628b3fcc7d6823e4b3736dd26e3d98dfa7
2023-02-27 16:24:21 -05:00
TreeHugger Robot
408a4045f1 Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d am: 2ecd05add8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350

Change-Id: I06dc22c948192703fdf717a735ef9abc3df58496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 21:32:14 +00:00
TreeHugger Robot
2ecd05add8 Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350

Change-Id: I3b215c7f5c824c04837cc84f2af1c81e0702aa6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 19:47:05 +00:00
Julia Reynolds
9f7af5946e Reduce jank on DND apps page
1) Remove call to redisplay the api when registering our app listener -
this meant all preferences were always removed/readded on page load
because the app list isn't ready at that time
2) Stop rebuilding the UI for events we don't care about
3) Keep existing preferences when possible and just do the diff of prefs
that need to be added/removed

Fixes: 234298144
Test: ZenModeAddBypassingAppsPreferenceControllerTest
Test: ZenModeAllBypassingAppsPreferenceControllerTest
Test: manually view page; add & remove apps that have dnd breakthrough
Change-Id: I57b36d36135dd25d1d2fd73073cf6b7a033659a6
2023-02-17 13:39:19 +00:00
Behnam Heydarshahi
dce497f72f Merge "Muting ring volume slider disables notification" into tm-qpr-dev am: 40a293fbdf am: d65e087b0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21164988

Change-Id: I560670cee8bd07312766d494c4a66ef770e121cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 15:47:36 +00:00
Behnam Heydarshahi
d65e087b0d Merge "Muting ring volume slider disables notification" into tm-qpr-dev am: 40a293fbdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21164988

Change-Id: I8043d9156b1602379a6580cffb29c5addf32d8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 15:01:11 +00:00
Behnam Heydarshahi
d9c3cf855f Muting ring volume slider disables notification
With volume_separate_notification flag enbaled, muting ring volume
slice will cause notification volume slice to gray out.

There used to be a bug in which notification slice would not get
updated in response to a change in ring volume mute/unmute broadcast.
The resulting erroneous behavior was notification slider would get to
zero but not get grayed out. To fix that bug, VolumeSliceHelper listens
to ring stream mute/unmute broadcasts and forwards them to notification
slice.

Bug: b/266072907
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="NotificationVolumePreferenceControllerTest|VolumeSliceHelperTest" RunSettingsRoboTests -j40

Change-Id: I2ab51f1272bf99a0c3d9ca285354052d00910c90
2023-02-15 15:43:08 +00:00
Ioana Alexandru
4c5231324e Remove method to change allowed NAS adjustments.
Bug: 268604587
Test: NotificationBackendTest

Change-Id: I5184c73c7ac9a49c5195021319065200f74c4ff4
2023-02-10 15:52:43 +00:00
Edgar Wang
0fd7e6e3e7 Merge "Update lottie illustration for tablet" into tm-qpr-dev am: b5215abde7 am: 366ed57197
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154459

Change-Id: I7ba454aa3a58ec6c8f848ac5d09ea2385fdb3a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 23:06:50 +00:00
Edgar Wang
366ed57197 Merge "Update lottie illustration for tablet" into tm-qpr-dev am: b5215abde7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154459

Change-Id: If11468af414a092695276e4040f735fc88245828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 10:45:19 +00:00
Edgar Wang
2f5f6d4ee6 Update lottie illustration for tablet
Bug: 243889662
Bug: 243889643
Test: visual
Change-Id: Icac10e4401da3d704350aef6ef2723ff92ca34f8
2023-02-01 07:27:18 +00:00
Steve Elliott
23049925a2 Merge "Setting to control seen notification filtering" into tm-qpr-dev am: c8a6db40ac am: 2891e33edb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21022067

Change-Id: I2ad7d426b9dbee84b440029a5d34124406ec78b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-21 00:17:17 +00:00
Steve Elliott
2891e33edb Merge "Setting to control seen notification filtering" into tm-qpr-dev am: c8a6db40ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21022067

Change-Id: Ibb65634f4c0f6b45dc8a769d4a45c363c4c63522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 23:35:41 +00:00
Steve Elliott
f127bc13b0 Setting to control seen notification filtering
Test: manual
  1. adb shell settings put secure \
     lock_screen_show_only_unseen_notifications <0|1>
  2. Settings > Notifications > General > Show only new notifications on
     lock screen
  3. Toggle setting
  Observe: if setting is enabled, seen notifications are filtered from
           the lockscreen, and vice versa
Bug: 254647461
Change-Id: I4f6e35a1d918095cea25a97f72ddd08869ad9b31
2023-01-19 22:22:30 +00:00
Mady Mellor
1ddb83a8cb Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev am: 912ace3032 am: 599d990913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20598039

Change-Id: I2065ec218f8fa9d4c83abad8a18f1d011e24d61d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 19:58:19 +00:00
Mady Mellor
599d990913 Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev am: 912ace3032
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20598039

Change-Id: Ie1a6ecdc7b6a896c5839bda765a3e2ad359dd874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 18:49:52 +00:00
Mady Mellor
912ace3032 Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev 2023-01-12 18:16:04 +00:00
Behnam Heydarshahi
74f725254e Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537 am: 93ae531273
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100

Change-Id: Ifc2e24c703199737d647f55f8615d83795630477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 17:18:05 +00:00
Behnam Heydarshahi
f1ad9691f2 Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev am: 9d63dc8b6e am: 811fb9fa8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806122

Change-Id: I9bcb0251705d7a6e39dca684d80842be67cf26da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 17:17:05 +00:00
Behnam Heydarshahi
93ae531273 Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100

Change-Id: Id45cee329be0245b513ad3ddd4a405fef2efb223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 16:37:26 +00:00
Behnam Heydarshahi
811fb9fa8d Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev am: 9d63dc8b6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806122

Change-Id: Ib2c89b96573a37e3856da1d8db240ec151eeb422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 16:37:14 +00:00
Behnam Heydarshahi
18469d2975 Ring & notif vol missing on a largescreen device
Before:
"Ring & notification volume" showed up in volume panel and in volume
settings.

Now (what prompted this bugreport):
A device config was changed to mark it not voice capable.
"Ring & notification volume" disappeared from both places;
"Notification volume" showed up only in volume settings, not panel.

Fix: the voice capable should not be a factor when determining
availability for ring/notification slices.

After this fix is applied:
"Ring & notification volume" to reappear at both settings and panel.

Bug: 256548882

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="VolumePanelTest|RingVolumePreferenceControllerTest|NotificationVolumePreferenceControllerTest|SeparateRingVolumePreferenceController" RunSettingsRoboTests -j40

Change-Id: Ie2b1913bde6a64303c4d9fde3724889f949c363b
2023-01-11 22:14:29 +00:00
Behnam Heydarshahi
acea45544e Fix Maps PIP issue: DeviceConfig permission denial
Problem:
Exception thrown when maps was in PIP mode.

Solution:
Use Binder to give permission to Settings reading device config
SEPARATE_VOLUME_NOTIFICATION.

Bug: 261809910
Test: Manual. (from bug report) Launch Maps and navigate to a place.
Minimize maps app. Open Settings. Should open normally and not crash.

Change-Id: I38735ebc7d555ead54e3aa77b50e4a7077fe452b
2023-01-11 22:10:23 +00:00
Behnam Heydarshahi
53c32d487a Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90 am: 4fc098dc1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598

Change-Id: I2ed97051fc0602324c12960e3696c4933911abcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 15:14:24 +00:00
Behnam Heydarshahi
4fc098dc1b Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598

Change-Id: I1dbbde115a9e92ecc1b602607827d51ec2078102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 14:34:49 +00:00
Behnam Heydarshahi
ee56e95f90 Merge "Implement a separate controller for ring volume" into tm-qpr-dev 2023-01-11 14:08:01 +00:00
Treehugger Robot
88e923f7ce Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746 am: 8601b70e1c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: I1e2cabff29c20c9a759743116ba9d57710c3d1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 12:17:05 +00:00
Treehugger Robot
8601b70e1c Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ibb2373d9410439be710b78c9e61c697f87bb28b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 11:53:43 +00:00