Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,092 Commits 1 Branch 0 Tags
dc6877f2efab28dfae5f1d767f52a36617ec1d57
Commit Graph

549 Commits

Author SHA1 Message Date
Steve Elliott
66284b5528 Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623 am: 81fc1b0b4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303

Change-Id: I510fcf15b561e4f89df2b1b69ad74ca0350c1426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 23:40:10 +00:00
Steve Elliott
81fc1b0b4d Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303

Change-Id: I9cd33ea6d02cf1243034a399162dfffcd0fd8f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 23:05:49 +00:00
Steve Elliott
30ccc43ae1 Revert^2 "Add configuration for defaulting notification behavior" 
Test: go through SUW on affected device, view notification screen
Bug: 240472040
Change-Id: I34dbe28226d830bc5ba633e72cd529d97021de85
 2022-11-21 15:16:40 +00:00
Sam Dubey
c536eb4dc4 Revert "Add configuration for defaulting notification behavior" am: a2d06273c1 am: 48eae58586 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171

Change-Id: I0e2693f89594f6c473c5c2e9dbb6a34ea6bf5864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 14:29:58 +00:00
Sam Dubey
48eae58586 Revert "Add configuration for defaulting notification behavior" am: a2d06273c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171

Change-Id: Ic9b89ba7d709e09be8217252485adcfc49575d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 14:01:32 +00:00
Sam Dubey
a2d06273c1 Revert "Add configuration for defaulting notification behavior" 
Likely causing b/259499400

This reverts commit a92688d642.

Change-Id: I781a7ecf9139eca11e1db895f86268b893258543
 2022-11-17 07:33:18 +00:00
TreeHugger Robot
7765c7129b Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c am: 54170343cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246

Change-Id: Ic5021313463c2fb955d2e5066a5b8f9dec4603fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 23:40:08 +00:00
TreeHugger Robot
54170343cf Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246

Change-Id: I3f6ad58e5f8292642d7eb958402d172537536d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 23:00:52 +00:00
Steve Elliott
a92688d642 Add configuration for defaulting notification behavior 
Test: RedactionInterstitialTest
Test: go through SUW on a phone
Bug: 240472040
Change-Id: I7bcd9f1a128c757881693e0251d305d2e26e4fd8
 2022-11-11 14:08:09 -05:00
Behnam Heydarshahi
bff773b41b Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae am: 6b156be280 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104

Change-Id: If6e7bd4facd8a3bea6528b25767aed45e7175f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 18:33:40 +00:00
Behnam Heydarshahi
6b156be280 Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104

Change-Id: I7321b1bfe1e7d89924b38cd6adf2853d336740d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 16:15:00 +00:00
Behnam Heydarshahi
2ac6fc5709 Read flag to show/hide notification slider 
Replace the build-time boolean resource with a run time device config flag that
signals whether the ring notification slider should be displayed or not

Bug: b/38477228
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932
 2022-11-01 20:31:38 +00:00
Yining Liu
923cdcae41 Fix text in notification settings for apps that do not send notifications am: e899b4c96c am: 7f6b3cc7ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20283152

Change-Id: I3b63362fab7d5c532d231b7db82553fc9a7bde4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 00:23:19 +00:00
Yining Liu
7f6b3cc7ca Fix text in notification settings for apps that do not send notifications am: e899b4c96c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20283152

Change-Id: Ic748f560f9a4767b6c75349506ae569cde1473af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-27 23:29:27 +00:00
Yining Liu
e899b4c96c Fix text in notification settings for apps that do not send notifications 
Added a new string to show for apps apps that target T, but do not declare the POST_NOTIFICATIONS permission in notification settings.

Bug: 229108007
Test: `croot` `make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification.app.NotificationsOffPreferenceControllerTest"` and manual: open Settings-Notifications-App Settings, check the text for apps that does not post notifications with toggle disabled. Text should be: "This app does not send notifications" when system language is English.
Change-Id: I9822b6f983e00c5982522099e339d86fae45aefe
 2022-10-27 20:19:44 +00:00
Betty Chang
50b3bdf7ea Merge "[LE Audio] Remove the broadcast icon when the device does not support broadcast feature" into tm-qpr-dev am: a7b9107027 am: 6d2a0cdf0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271146

Change-Id: Ia8a43105afc093c28f3aa06877b72f7ef9d17ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 10:00:54 +00:00
Betty Chang
6d2a0cdf0d Merge "[LE Audio] Remove the broadcast icon when the device does not support broadcast feature" into tm-qpr-dev am: a7b9107027 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271146

Change-Id: I742b41599ca0d33c7f6c33bb607a8bf89406cb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 09:23:57 +00:00
changbetty
4f42ca1eac [LE Audio] Remove the broadcast icon when the device does not support 
broadcast feature

Bug: 254743785
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputIndicatorWorkerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I02e429b3a306e2f9b0e2342118649208617c4944
 2022-10-24 12:03:23 +00:00
Julia Tuttle
6f25e6afca Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb am: 8416222c25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426

Change-Id: If8d5df779d82d0064a5cdec5d59c119fb8b404a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 16:13:04 +00:00
Julia Tuttle
8416222c25 Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426

Change-Id: I6b4ac70d7ca1d7c4fd76b42c6d26f7361ff3420d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 16:07:43 +00:00
Julia Tuttle
e9108aecd8 Default to hiding silent notifications on lockscreen in Settings 
Also, fix an errorprone issue.

Bug: 252815574
Test: atest ShowOnLockscreenNotificationPreferenceControllerTest
Change-Id: I46e6d0f15c69abe60ef8505d300e5205b3c71e53
 2022-10-15 01:24:19 -04:00
Julia Tuttle
431d967b6d Fix some out-of-order imports am: 9f0efa68a1 am: 16b7c91e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193425

Change-Id: I7ac72e785fff82674f3bf47546044ab92a0acf74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-14 19:50:17 +00:00
Julia Tuttle
16b7c91e5e Fix some out-of-order imports am: 9f0efa68a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193425

Change-Id: I85de5768359802bd1800bc88b7ab490631c280e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-14 19:03:13 +00:00
Julia Tuttle
9f0efa68a1 Fix some out-of-order imports 
Bug: 20188695
Test: build
Change-Id: I47d463f82bee4e1b22300eb4260dd38dbeb13c88
 2022-10-13 21:55:46 -04:00
Chloris Kuo
6e64305274 Disable Enhanced notifications setting when default NAS is not available am: 236eaed326 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188999

Change-Id: I68d337b4d5b947a7e0af817cb0c76039df18dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-13 20:42:21 +00:00
Chloris Kuo
236eaed326 Disable Enhanced notifications setting when default NAS is not available 
Test: NotificationAssistantPreferenceControllerTest
Bug: 251400808
Change-Id: Idec520013bea32cfaea0285f33c525a6e37f0124
(cherry picked from commit 873b8544e1)
 2022-10-13 16:27:35 +00:00
Chloris Kuo
064b960554 Merge "Disable Enhanced notifications setting when default NAS is not available" 2022-10-13 16:27:05 +00:00
Behnam Heydarshahi
ee4d902410 Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89 am: 8b2496eb9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409

Change-Id: Ia1b13bf425da2ef90c287b3aaee6231891c67bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:38:18 +00:00
Behnam Heydarshahi
8b2496eb9e Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409

Change-Id: Iffd5dcd7eb9ad645807d9529f352582457dc3f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:07:05 +00:00
Chloris Kuo
873b8544e1 Disable Enhanced notifications setting when default NAS is not available 
Test: NotificationAssistantPreferenceControllerTest
Bug: 251400808
Change-Id: Idec520013bea32cfaea0285f33c525a6e37f0124
 2022-10-12 11:05:25 -07:00
Behnam Heydarshahi
3ac6aaf796 Add notification volume controller in settings 
Separate notification and ring controllers based on the ring/volume
stream alias boolean in config.xml.

For both ring and volume controller: Not show vibrate icon when vibration is not supported on device. Show
silent icon instead.

Known issue: Add the notification volume slider only in Settings, and
not in VolumePanelDialog. When the alias is set to false and the streams
separated, the ring volume slider in VolumePanelDialog keeps its title
of "Ring & notification volume" instead of changing to "Ring volume".

Bug: b/38477228

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=SoundSettingsTest RunSettingsRoboTests

Change-Id: Id17523f49b291a5cf612b90f93c3b2ab6486c62f
 2022-10-10 14:42:56 +00:00
Treehugger Robot
8552428dbc Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb am: 2d1b325cd0 am: 5d3e2d3f42 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I6faff06b6096420bd58b7e8de3bf77c691f67c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 16:38:50 +00:00
Treehugger Robot
5d3e2d3f42 Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb am: 2d1b325cd0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I8fc0d30dd8338152ce2e9c7dc7741b9543f6dcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 16:10:43 +00:00
Shen Lin
78fc8a21a4 Fix potential NPE crash in ConversationHeaderPreferenceController 
mChannel is nullable and we have to do a null-check before calling its method.

Bug: 245506600

Test: manual and atest
Change-Id: Ib739f0f66f1a2aee1b2741263e7c206341782892
 2022-09-09 10:16:29 +08:00
Chloris Kuo
fd947cb0b3 Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev am: 6f79ffd831 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19717110

Change-Id: If0ff5b45d3e38a1e5b08cb6a648ea64474b731d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:59:00 +00:00
Chloris Kuo
6f79ffd831 Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev 2022-08-24 22:37:58 +00:00
Chloris Kuo
54c677a83c Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications 
Show detail settings page from the default NAS app if it implements the new intent ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS.

Test: Robotest, manually test on device
Bug: 231492005
Change-Id: I6566cd9d615331a56728613583295637982bcd3f
Merged-In: I6566cd9d615331a56728613583295637982bcd3f
 2022-08-24 19:51:08 +00:00
Michael Wright
3b0cbefac1 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085 am: bbde399410 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797

Change-Id: Idcaa343d56921b2f2b4428a10fb5dffc99a0c698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 16:11:16 +00:00
Michael Wright
bbde399410 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797

Change-Id: Ifa352490aff4a215710aec57e6d42aab162d5cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 16:05:15 +00:00
Michael Wright
1218065085 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev 2022-08-24 15:24:15 +00:00
Michael Wright
475632c4fe Revert^3 "Improve App notification loading" 
33710fd9e2

Change-Id: Ifb45f949c28bff04f8abfe3e1a73628f2e407241
 2022-08-24 12:22:12 +00:00
Chloris Kuo
fe172874ed Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" 2022-08-23 18:35:22 +00:00
Chloris Kuo
5adf602ef7 Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications 
Show detail settings page from the default NAS app if it implements the new intent ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS.

Test: Robotest, manually test on device
Bug: 231492005
Change-Id: I6566cd9d615331a56728613583295637982bcd3f
 2022-08-22 16:27:38 -07:00
Julia Reynolds
4287420f87 Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev am: 635b3f065e am: e8409ecf10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19583473

Change-Id: I76aa8f4112832225dc2ca62e0be229d9c476146d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 14:48:41 +00:00
Julia Reynolds
e8409ecf10 Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev am: 635b3f065e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19583473

Change-Id: I85fd316de253f7d3879962e74aece04db0f3f0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 14:18:35 +00:00
Julia Reynolds
635b3f065e Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev 2022-08-22 13:56:41 +00:00
Betty Chang
b9abc156c8 Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde am: 0c2a3ead2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: I85e2d5a8589cf775ca2da2d79081eddbd9b59378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 02:24:02 +00:00
Betty Chang
0c2a3ead2b Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: Ia2f4ab79a90b7733d0ad23b3573b55a527da84df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 01:40:05 +00:00
changbetty
d55a7067aa [LE Audio] To fix the condition of the broadcast icon display 
- The broadcast icon will be displayed when the device is connected to
   the LE Audio device.

 - The broadcast option dialog will show the "Broadcast" option when the
   media is streaming. Otherwise, it will not show.

Bug: 235923182
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: Ib225d185b6f15463f4fae809e0cdaa25920d52af
 2022-08-11 02:01:55 +00:00
Julia Reynolds
33710fd9e2 Revert^2 "Improve App notification loading" 
c5f1cb11e0

Change-Id: I5a6d39e0a5f2b7bd30bcc12e207b8bb23857c6d8
 2022-08-10 13:41:22 -04:00