Commit Graph

98552 Commits

Author SHA1 Message Date
TreeHugger Robot
9c5b980cbf Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I910c297d00b16fbe214b91d3c6bf4a5f68134fd6
2021-11-09 07:02:43 +00:00
Hugh Chen
f589c5825a RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I8ac8df9c58b7011a08d98c0d1184944ecebc0893
2021-11-09 07:02:42 +00:00
TreeHugger Robot
f91da36d0a [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004

Change-Id: I8cb3818015166cae1304315c880728e146d787f6
2021-11-09 07:02:34 +00:00
TreeHugger Robot
7aa03c4821 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev 2021-11-09 06:59:11 +00:00
TreeHugger Robot
b63f20f7dc Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev 2021-11-09 06:59:05 +00:00
TreeHugger Robot
ad30e0abb6 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev 2021-11-09 06:59:03 +00:00
TreeHugger Robot
effa446a15 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev 2021-11-09 06:59:01 +00:00
TreeHugger Robot
d89fa348ed Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev 2021-11-09 06:58:49 +00:00
TreeHugger Robot
8072964193 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev 2021-11-09 06:58:39 +00:00
TreeHugger Robot
62e555932c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004

Change-Id: I40232a1c9484299932210e03068257f38250bb9d
2021-11-09 06:42:01 +00:00
TreeHugger Robot
7134e1ac35 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004

Change-Id: I9987e661cfb85b5c9aa105105d2cc37fd7240903
2021-11-09 06:15:20 +00:00
TreeHugger Robot
0e8d3e3c35 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004

Change-Id: I4363a8652c623e915daf6439e477385710a30726
2021-11-09 06:01:40 +00:00
TreeHugger Robot
5006367685 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev 2021-11-09 05:46:16 +00:00
Adam Bookatz
c2efde5fb0 Multiuser perfetto metric: Settings tracepoints
Add tracepoints in Settings for user switches and creation, for the
primary purpose of performance metrics in trace_processor.

Bug: 192001071
Test: manual
Change-Id: I1ecaccdaba3b14c42a45fefeb9b5568f7c7d6bf6
2021-11-08 18:00:48 -08:00
Julia Reynolds
358fe8e508 Update styling of NLS dialog
To make the content easier to parse

Test: manual
Fixes: 191331361
Change-Id: I1a86b761a09fd29a9581abfd9c4b313feb19394a
2021-11-08 20:54:40 +00:00
Julia Reynolds
b106377155 Add ability to force rebuild list
So that you can change between filters that
have the same sort order.

Test: robotests, manually switch between notifications (off) to
notifications (all)
Fixes: 169943424

Change-Id: I62bbe90f30abada2ec342487a1fa420e451b3caf
2021-11-08 15:47:51 -05:00
Jacob Hobbie
928254beec Adding RECEIVER_EXPORTED flag.
ACTION_CLOSE_SySTEM_DIALOG has been deprecated and will be dropped by the system in non-debug builds S+, so we want to preserve the old behavior and should mark this receiver as exported for T+.

Bug:161145287
Change-Id: I27fa0cbd971d17cb2bf7852e464c1b37d41350a8
Test: no-op
2021-11-08 17:21:04 +00:00
TreeHugger Robot
bf6c779caa Merge "Fix broken tests" 2021-11-08 17:16:46 +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
TreeHugger Robot
87b3974dfd Merge "Check if pref is disabled by admin" into sc-v2-dev 2021-11-08 16:16:53 +00:00
Julia Reynolds
dc18e85e41 Fix broken tests
Remove group conditions - we don't have a group page
and so don't need to test what its header would be

Test: this
Fixes: 201021319
Change-Id: I22049bc7ea2153a574ed5aa5428a5dfb295447a5
2021-11-08 16:16:48 +00:00
TreeHugger Robot
3b7e256d37 Merge "Some updates for better localization" 2021-11-08 16:03:15 +00:00
TreeHugger Robot
3870e6a880 Merge "AF passwords settings: Start activity as new task." into sc-v2-dev am: 309426bbea am: 23848cfc80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16212117

Change-Id: I23294246adb49905ef8dc6c5704d3bae2437056d
2021-11-08 08:44:13 +00:00
TreeHugger Robot
23848cfc80 Merge "AF passwords settings: Start activity as new task." into sc-v2-dev am: 309426bbea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16212117

Change-Id: I59f2c97b65b593857ef4d311ef2f3bd91949e401
2021-11-08 08:32:21 +00:00
TreeHugger Robot
309426bbea Merge "AF passwords settings: Start activity as new task." into sc-v2-dev 2021-11-08 08:18:22 +00:00
TreeHugger Robot
ae85aded35 Merge "Fix phone shows incorrect pairing code in pairing dialog" into sc-v2-dev am: 3f5d3cc0f3 am: 0d252521dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183665

Change-Id: I66aa7fbc7a99be29c59b89733aa1650f22129e12
2021-11-08 08:07:37 +00:00
TreeHugger Robot
0d252521dd Merge "Fix phone shows incorrect pairing code in pairing dialog" into sc-v2-dev am: 3f5d3cc0f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183665

Change-Id: If4876e9ebcfc670202d73a03d96a4632850546f4
2021-11-08 07:49:39 +00:00
TreeHugger Robot
3f5d3cc0f3 Merge "Fix phone shows incorrect pairing code in pairing dialog" into sc-v2-dev 2021-11-08 07:34:32 +00:00
Ahaan Ugale
dc816116c5 AF passwords settings: Start activity as new task.
Settings app has a new 2-pane layout for larger screens. Activities that
belong to other apps must now be started as a new task.

Fix: 197702325
Test: manual
Change-Id: Iaf800b7f9e6bf5d925047fed49d848f4d3973df7
2021-11-07 23:10:53 -08: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
Bill Yi
9f66f6677a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours am: 96aeb06191 -s ours am: c169c169d5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: Ie9298d36742fe1e3885475517ced95b316a1cebd
2021-11-05 18:36:51 +00:00
Bill Yi
9ee155dc02 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours am: 771e4c0903 -s ours am: 41c72cd2f8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I9bbbd3c16a068f4d232e4023ab9cc9495fd0a1b3
2021-11-05 18:36:41 +00:00
Automerger Merge Worker
de117cf5c3 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours am: 9ae7fa254e -s ours" into sc-v2-dev-plus-aosp am: 90db636af4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: Iafea20601486ee38499e16fa7ff8fcb855275e81
2021-11-05 18:36:34 +00:00
Bill Yi
5b91420a4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: 96ccdeda48 -s ours am: c3a99ee089 -s ours am: b15291fafb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I7beb5da1b4ab10a2a471d59529446bc088ee54b9
2021-11-05 18:36:25 +00:00
Bill Yi
2a6357ef08 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours am: eed2435b4b -s ours am: 200bb229ab -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I1a23b545a0fa81adb4b41ef539942c20016fe62b
2021-11-05 18:36:15 +00:00
Bill Yi
87e3d35a26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: 4da7274a20 -s ours am: 0d068e2a70 -s ours am: 5b0e23049d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I8e0b6cbe2d4f5948b49f7bebd018171b75a2a3ec
2021-11-05 18:35:24 +00:00
Bill Yi
c169c169d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours am: 96aeb06191 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: Ie4b166f0474a01ed880c643eee6e8b0eed47948e
2021-11-05 18:23:25 +00:00
Bill Yi
41c72cd2f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours am: 771e4c0903 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I33d4257b7c2bcb7b882711063f2920c4d9b1ec2f
2021-11-05 18:23:18 +00:00
Automerger Merge Worker
90db636af4 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours am: 9ae7fa254e -s ours" into sc-v2-dev-plus-aosp 2021-11-05 18:23:15 +00:00
Bill Yi
aacf8502a6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours am: 9ae7fa254e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I7960d7a93f39d88c581ba399e5434d3f678510aa
2021-11-05 18:23:12 +00:00
Bill Yi
b15291fafb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: 96ccdeda48 -s ours am: c3a99ee089 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: Ib16d3bafdaa077159f810e42c38df588fe5ed7a9
2021-11-05 18:23:11 +00:00
Bill Yi
200bb229ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours am: eed2435b4b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I6010c319c3f9113a4cf2dabbd313d4b8d17cbd87
2021-11-05 18:23:05 +00:00
Bill Yi
5b0e23049d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: 4da7274a20 -s ours am: 0d068e2a70 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I0ad09933a8bfe19021c77cf9b805c27d43f0d65e
2021-11-05 18:22:35 +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
Bill Yi
96aeb06191 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: If0aae46844a04d8842a8d3f003e8e23aafd898f6
2021-11-05 18:06:01 +00:00
Bill Yi
9ae7fa254e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I81a8c72d07bafb4c8b3a4c0147e44bd684d55207
2021-11-05 18:05:56 +00:00
Bill Yi
771e4c0903 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: Ib77b336cb7ea5a01e38f6ace71de8de1a1cf381f
2021-11-05 18:05:52 +00:00
Bill Yi
eed2435b4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I34fe73c102d8051cc04561709e5e67f2a8a5f231
2021-11-05 18:05:52 +00:00
Bill Yi
e7abed7eff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: b8f409afb4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421

Change-Id: I926ed23efdd93d043a235087e3f57699d6c33891
2021-11-05 18:05:03 +00:00