Commit Graph

98282 Commits

Author SHA1 Message Date
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
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
Bill Yi
858aeed4b5 [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: 6a58b99ab0 -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: I947a07255f2a2c78407b832e9cd2b822646543ed
2021-11-05 18:04:56 +00:00
Bill Yi
c3a99ee089 [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 skip reason: subject contains skip directive

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

Change-Id: I7c7479679513b9e04b65f9531c1c226770841a06
2021-11-05 18:04:39 +00:00
Bill Yi
0d068e2a70 [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 skip reason: subject contains skip directive

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

Change-Id: Icb0946b07b316755b892845d78d777279befa4e0
2021-11-05 18:04:29 +00:00
Bill Yi
e527e727e7 [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 skip reason: subject contains skip directive

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

Change-Id: I051b458d8edad5597dde324e587b8454e7f4caca
2021-11-05 17:48:11 +00:00
Bill Yi
d73d791280 [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 skip reason: subject contains skip directive

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

Change-Id: I6be6e779400ae184c3a31409520f1996e35c413c
2021-11-05 17:48:07 +00:00
Bill Yi
b8f409afb4 [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 skip reason: subject contains skip directive

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

Change-Id: I1fc590df5e9e826c24e723e9d814457dfa86492b
2021-11-05 17:47:20 +00:00
Bill Yi
6a58b99ab0 [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 skip reason: subject contains skip directive

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

Change-Id: I5ea15447b8ca8d1f8797511b72e803c6710dcce4
2021-11-05 17:47:16 +00:00
Bill Yi
96ccdeda48 [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 skip reason: subject contains skip directive

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

Change-Id: I1064645e6393c4570b782effa92ac16a304425a0
2021-11-05 17:44:45 +00:00
Bill Yi
4da7274a20 [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 skip reason: subject contains skip directive

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

Change-Id: Icd422d156df1cb5792b9736d094244190aef682b
2021-11-05 17:44:39 +00:00
Jun Ono
89c2c5e9c0 Add entry point for adaptive brightness settings
Test: adb shell am start -a android.settings.ADAPTIVE_BRIGHTNESS_SETTINGS
Bug: 187332145
Change-Id: Ifd81bfb3b0abc3ea10a062cb49fab20f6ef3fdfc
2021-11-05 17:27:41 +00:00
Bill Yi
faac160573 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -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: I6c9bc3b81b410629117474f5085cdb823eb8c1ba
2021-11-05 17:27:34 +00:00
Bill Yi
55dab4109b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -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: I9eaaa367bdec53a1e5594952ffd80c0e5b78e82a
2021-11-05 17:19:35 +00:00
Bill Yi
cd228d9043 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -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: I4946af048a4c84747eb16f1e14b83abfedd1f84b
2021-11-05 17:08:48 +00:00
Bill Yi
db40442194 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -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: I663f52410d7d43346bad9fe62c66fa5245a6ccb2
2021-11-05 17:08:45 +00:00
Bill Yi
12eeadedcb Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2021-11-05 16:54:15 +00:00
TreeHugger Robot
a63e7c7141 Merge "Revert "[Settings] Ignore failed test case"" 2021-11-05 13:47:20 +00:00