Commit Graph

1661 Commits

Author SHA1 Message Date
Julia Reynolds
445aa53ddc Merge "Update notification settings OWNERS" am: 49b9583ea1 am: e2d790725c am: 809c15fd53
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665

Change-Id: I4f8ce83fea5cde2ddf4517c78e5f66bae461a1ea
2022-02-10 14:38:05 +00:00
Edgar Wang
b1a48df4f7 Remove restricted icon
Bug: 195401182
Test: robotest
Change-Id: I6b22b3b9b62812eb08f10492bd2d7908cce89d39
2022-02-08 03:09:50 +00:00
Jonathan Scott
269f97d960 Allow overriding of strings referenced in XML files.
Test: manual
Bug: 188414370
Change-Id: Ice45b1808530c14c4efff16795cac7b2cb81516e
2022-02-07 21:00:05 +00:00
Jonathan Scott
c3dbc3ffbd Merge "Allow Device Management Role Holder to update Settings strings." 2022-01-31 19:10:30 +00:00
Yuri Lin
0a7554acfa Cosmetic changes to zen mode people & sound/vibration screens
On the people screen, have the footer show up all the time and provide a more relevant message (indicating that the chosen people override any app/etc settings) than the current setting.

On the sound/vibration screen, remove the sub-title since it's a bit confusing what exactly is being turned on or off.

Bug: 190180868
Bug: 215564123
Test: manual
Change-Id: I78d407af350a9f99d26d1e5082b752881bd3f186
2022-01-26 13:01:26 -05:00
Yuri Lin
a91e2daea7 Change zen schedules page to use switches.
Also add clearer summaries for schedule and calendar events (rather than just "Off" and "On"): for schedules, list the days & times for which the schedule is active, and for events, the calendar whose events it triggers on.

Bug: 190180868
Bug: 215564123
Test: manual for switches, ZenRuleScheduleHelperTest for descriptions

Change-Id: I3ad579503adae0a66dfa3093b4e3df77db0ede31
2022-01-26 11:21:53 -05:00
Julia Reynolds
87d1db904e Update notification settings OWNERS
Change-Id: Ic69ea984ab439f1d2795daf82c516878aed420ce
2022-01-25 21:38:29 +00:00
Jonathan Scott
e0d439472f Allow Device Management Role Holder to update Settings strings.
Test: manual
Bug: 188414370
Change-Id: I6e1a06619799a9e99382d791e72e2e4518f93cac
2022-01-25 19:03:24 +00:00
Mady Mellor
28f18c4b0a Merge "Use hasSentValidBubble in settings" 2022-01-14 17:58:50 +00:00
Lais Andrade
54ed73ae6c Merge "Update Settings to use intensity settings as main preference keys" 2022-01-13 02:45:41 +00:00
Lais Andrade
141b5bb3bc Update Settings to use intensity settings as main preference keys
Updating the Settings app to allow setting the value off for key
HAPTIC_FEEDBACK_INTENSITY. This setting state is also copied onto
HAPTIC_FEEDBACK_ENABLED setting, so both should be in sync after this
change.

Similar logic is applied between RING_VIBRATION_INTENSITY and
VIBRATE_WHEN_RINGING.

This will not disable the hardware feedback since that one is controlled
by a separate setting key now.

The "vibrate for calls" was also removed and the single toggle for
"vibrate first then ring gradually" was moved into the "Vibration &
haptics" page.

Bug: 185351540
Test: [HapticFeedback|NotificationVibration|RingVibration][Intensity|Toggle]PreferenceControllerTest
      and manual testing of the AOSP settings app
Change-Id: I9c94cef331a1500a1272a601ba32667ca995ddab
2022-01-12 22:59:29 +00:00
Mady Mellor
f9fc2e0d1e Use hasSentValidBubble in settings
This change makes it such that bubble settings will only be available once
the app has sent a bubble notification.

Test: atest BubbleSummaryPreferenceControllerTest
Bug: 178387292
Change-Id: I459ffcedc4194d953e8b7170937e2eb5334d1422
2022-01-12 14:10:34 -08:00
Julia Reynolds
6689b81b82 Always check roles for non-blockability
Test: NotificationBackendTest
Fixes: 194833441
Change-Id: I72af524c56178077caef8fedfac592f8b5df3371
2022-01-10 13:40:45 -05:00
TreeHugger Robot
d0f1724cbb Merge "Move vibrate for calls setting to "Vibration & haptics" screen" 2021-12-20 11:26:34 +00:00
TreeHugger Robot
38fa2c195d Merge "Fix the onCreate crash happened among zen mode rule pages" into sc-v2-dev am: 56c49091a0 am: 5302093d5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16432138

Change-Id: Ieba60e9cebdc683fbaa8e382a80d9e4efe666c8f
2021-12-10 17:01:15 +00:00
TreeHugger Robot
5302093d5c Merge "Fix the onCreate crash happened among zen mode rule pages" into sc-v2-dev am: 56c49091a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16432138

Change-Id: Id8a2517aadca439e98c6ba978652689898b442fd
2021-12-10 16:43:42 +00:00
Jason Chiu
bd8f45b9d4 Fix the onCreate crash happened among zen mode rule pages
Fix: 199229588
Test: manual
Change-Id: I7b0116de8d9760f420c026a8d65b019e6d2d00df
2021-12-10 11:36:55 +08:00
Lais Andrade
fe2ed12d26 Move vibrate for calls setting to "Vibration & haptics" screen
Move setting to configure "Vibrate for calls" into "Vibraiton & haptics"
screen. Also make this page accessible via both Accessibility and
"Sound & vibration" settings pages.

Bug: 185351540
Test: SoundSettingsTest
      manually using the settings app and checking updates
Change-Id: I7e40af3f332fdff8afd1a31d54a676f7e13a6678
2021-12-06 17:23:56 +00:00
Sergey Nikolaienkov
7fea5bd54f Fix usage of the updated CDM APIs
Bug: 194301022
Test: make
Change-Id: I70633f43d37fdeec8329e0c58f7cffa402dba689
2021-11-23 13:36:34 +00:00
TreeHugger Robot
5cee04e16e Merge "Set SYNC_PARENT_SOUNDS settings directly" 2021-11-14 18:13:20 +00:00
Xin Li
bf45599d43 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I9ac05f5da437030e1b5db082ddaf7959f82acccd
Change-Id: Iaf8ebc4877a8276672354b45db0dd502c0f71bd3
2021-11-11 16:54:23 +00:00
Julia Reynolds
a1c0dc75cd Properly show conversation settings
... when the backing shortcut is missing, so users can change
notification settings when the shortcut hasn't yet been recreated by the
app when setting up a new device

Test: Robotests (confirmed that the 2 controllers that used
mConversationInfo already tested for null), manual
Fixes: 203991823

Change-Id: I477c6b0aef0d978767788cbfc1bfadea4d36cda8
2021-11-10 14:16:42 -05:00
Robin Lee
afe89cee44 Set SYNC_PARENT_SOUNDS settings directly
The RingtoneManager.xyzSyncFromParent methods have been removed.

Test: atest SettingsRoboTests
Bug: 204555055
Change-Id: I17ee0353b1c76c810a57640c11f560feb1c52d8c
2021-11-10 15:46:03 +00:00
TreeHugger Robot
7e94a9ff62 Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd am: cd467e99d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: Ib57d1de7591e1429440f746839078594fd97dfef
2021-11-08 16:50:47 +00:00
TreeHugger Robot
cd467e99d8 Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: I670cde971b45484e54b951a90e507acc7ef0c1dc
2021-11-08 16:34:32 +00:00
Julia Reynolds
98cc4f1302 Some updates for better localization
Test: manual
Fixes: 190021494
Fixes: 185203196
Fixes: 190088372
Change-Id: Ia2871814870a1f0e5c5f2deed06dcbef7b2bd967
2021-11-05 20:05:41 +00:00
Julia Reynolds
42896d7fe1 Check if pref is disabled by admin
Test: robotests
Fixes: 137638270
Change-Id: I39953d5b7466281cff7a9a7ffaeb5ba99ab12934
2021-11-05 18:07:58 +00:00
Jason Chiu
d13834de52 Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600 am: 56dde819dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: Ife6c9bbe5433a818d42bf91509160fea8ae924f8
2021-11-03 07:05:55 +00:00
Jason Chiu
56dde819dc Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: I6a3448e6e54666b45f6f67288593034a03d50d64
2021-11-03 06:54:55 +00:00
Jason Chiu
9fc0f18181 Define a constant Sliceable#NO_RES for no resource cases
Fix: 204733076
Test: build
Change-Id: Ifa3b9db0e915a3ec056ad68a9a1862811594d423
2021-11-03 12:23:49 +08:00
Julia Reynolds
66cffd469f Merge "Migrate to using fixed permissions" 2021-11-02 20:47:58 +00:00
Jason Chiu
7f6b9e26c9 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
2021-11-02 02:43:42 +00:00
Jason Chiu
026b1b5df6 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
2989c50a23 Add highlight menu keys for all toggle pref controllers and custom slices
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
2021-11-01 15:00:18 +08:00
Julia Reynolds
a024c10517 Migrate to using fixed permissions
When deciding which app/group/channel level fields are editable. If
an app has a fixed notification permission, no importance type fields
(including blocking, importance, minimizing, popping on screen, or
prioirty conversions) can be edited.

Test: Robotests
Bug: 194833441
Change-Id: Idc198ea05cd2ab6e43387ae4e8290f446ccfa0c6
2021-10-29 11:27:01 -04:00
Julia Reynolds
ac8911fda8 Remove unused code
Test: make
Bug: 194833441
Change-Id: I99a91281fd8f8a347f80ebfa881eafb960d7f144
2021-10-20 13:20:33 -04:00
Chloris Kuo
25d6a106c8 Rename Ranking.visuallyInterruptive to isTextChanged am: d67e970290
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16077136

Change-Id: Ib09cb44ad4d5508025a4c655691a3d5faef7180f
2021-10-19 01:30:09 +00:00
Chloris Kuo
c8d09d6844 Merge "Rename Ranking.visuallyInterruptive to isTextChanged" 2021-10-18 23:29:01 +00:00
Chloris Kuo
d67e970290 Rename Ranking.visuallyInterruptive to isTextChanged
Bug: 201087764
Test: manually tested on device
Change-Id: I28b416a4ab9cc74f985c7c7c5c72ca6f7e1b6065
2021-10-18 20:13:00 +00:00
Chloris Kuo
66c41511cd Rename Ranking.visuallyInterruptive to isTextChanged
Bug: 201087764
Test: manually tested on device
Change-Id: I28b416a4ab9cc74f985c7c7c5c72ca6f7e1b6065
2021-10-18 12:40:01 -07:00
TreeHugger Robot
2933fa1efe Merge "Clear up unused code" 2021-10-18 18:13:07 +00:00
Yuri Lin
8cab46f57a Merge "Merge messages & conversations settings for DND priority senders." 2021-10-18 15:03:27 +00:00
Julia Reynolds
b60116fa55 Clear up unused code
Test: make
Bug: 194833441
Change-Id: Icff8fe689626a6e92a119f9ed1a58656d15fbb47
2021-10-15 14:27:17 -04:00
Steven Moreland
c723e3e939 Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37 am: 90181319da am: 0fbe8bd395 am: 0a412b4351 am: bc25c4e88a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673

Change-Id: I505bfd72bc9eddb86e921bb469cbbd492c52dd58
2021-10-14 18:47:50 +00:00
Steven Moreland
bc25c4e88a Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37 am: 90181319da am: 0fbe8bd395 am: 0a412b4351
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673

Change-Id: Id7089952ed2543ea7e447441b85d2b5ed1aac2bf
2021-10-14 18:33:08 +00:00
Steven Moreland
0a412b4351 Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37 am: 90181319da am: 0fbe8bd395
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673

Change-Id: I33d698f384f9a75f09486867a9034e638c5e143f
2021-10-14 18:17:56 +00:00
Steven Moreland
519546ce3e getBlobAshmemSize -> getOpenAshmemSize
This API returns the total size of all ashmem memory that is in FDs that
is owned by a Parcel object. It was renamed a while ago, but the name
was never updated in Java.

Bug: 202029388
Test: N/A
Change-Id: Icc428063083110952cf3951721d69cbb919429b1
2021-10-13 11:01:10 -07:00
TreeHugger Robot
99e05ea46c Merge "Add NEW_TASK flag for intents that leave Settings" into sc-v2-dev am: 5a7966884b am: e99fe9b60c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16018030

Change-Id: I740ef2294a340ad01366fd99df986f34563e28da
2021-10-11 16:05:50 +00:00
Julia Reynolds
f8cdea4b9d Add NEW_TASK flag for intents that leave Settings
Test: manual
Fixes: 202101382
Change-Id: Ie0cc7c10b19b49ad33227f3fdaad397e03e33858
2021-10-08 17:05:45 +00:00
TreeHugger Robot
58edb69d46 Merge "Add the Spatial audio toggle in SoundSettings" into sc-v2-dev am: a448a917eb am: edc5e940ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15884455

Change-Id: Iedbf25f530937ae35e7b772873df994036c1d237
2021-09-23 06:55:21 +00:00