Commit Graph

89701 Commits

Author SHA1 Message Date
TreeHugger Robot
e6b8e84bcd [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: d3647e4668 -s ours am: 408ffe7fe9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7dfc4b4c72c6cb0039f8a7e47f4cfd4343c1a86c
2021-11-09 07:45:54 +00:00
Hugh Chen
ffa165cc85 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: 4d356edd17 -s ours am: 152b25d7da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4998b8f222ee551e634d94d581d6c82e9b8d9616
2021-11-09 07:45:53 +00:00
TreeHugger Robot
408ffe7fe9 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: d3647e4668 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d62bae2313edecb9cb9d272af4e06f78b0406a9
2021-11-09 07:38:11 +00:00
Hugh Chen
152b25d7da [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: 4d356edd17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2f8ad367d07ef138d0f26a917bc997cae757459
2021-11-09 07:38:10 +00:00
TreeHugger Robot
bd7e557db9 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc -s ours am: 598db440f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a68e9eaf07bc822abae5609a0b5c3f995126c52
2021-11-09 07:35:17 +00:00
TreeHugger Robot
d3647e4668 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000

Change-Id: I611c57ec36671b8865b86de4935cd6aad6fc3728
2021-11-09 07:27:20 +00:00
TreeHugger Robot
598db440f5 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id19bc022ea060cfe58d15ce08e375cd2d730aa55
2021-11-09 07:27:18 +00:00
Hugh Chen
4d356edd17 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000

Change-Id: Ic914d6a53970e9de56a8579ec5f5b6e47a8c55f9
2021-11-09 07:27:18 +00:00
TreeHugger Robot
d2ed4d204f Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev am: 8072964193
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956

Change-Id: I3ee25605c4736ac27fbd06b3702d81722fa6d3fc
2021-11-09 07:24:28 +00:00
Hugh Chen
be094163b8 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 58d81fbbb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956

Change-Id: I6572efe48fb0ad0159e0177459d1929aaa4f86ce
2021-11-09 07:24:27 +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
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
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
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
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
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
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
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
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
5f87b783af Merge "Fine tune the homepage scrolling behavior" into sc-v2-dev am: 244df10d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182700

Change-Id: Ic2903d78e94cdf49d655b51ce84be85be9a4d634
2021-11-05 11:37:13 +00:00
TreeHugger Robot
244df10d90 Merge "Fine tune the homepage scrolling behavior" into sc-v2-dev 2021-11-05 11:22:49 +00:00
Jason Chiu
ae5327d4bb Fine tune the homepage scrolling behavior
Scroll to the highlight position before showing homepage.

Bug: 199017944
Bug: 204946469
Test: visual
Change-Id: I11708f42180a3af22855ac7b5f53460f737ed208
2021-11-05 18:21:59 +08:00
Arc Wang
3a655fd1ec [Large screen] Set SplitPairRule for DeepLinkHomepageActivity am: 82eeacf275
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183661

Change-Id: I7369fb99dea1ecd7b00a5fb399441a1cde8b0e68
2021-11-05 09:34:51 +00:00
Hugh Chen
13375e5f44 Fix phone shows incorrect pairing code in pairing dialog
Add PendingIntent.FLAG_UPDATE_CURRENT to let peding intent can
be updated the intent extra.

Bug: 204133175
Test: make -j64 RunSettingsRoboTests
Change-Id: I42966432dacc3727d31231d10aa07b782bb1d92e
2021-11-05 09:22:13 +00:00
Arc Wang
82eeacf275 [Large screen] Set SplitPairRule for DeepLinkHomepageActivity
Setting app should set SplitPairRule for all the alias of
SettingsHomepageActivity to handle all the different
launch cases.

Bug: 204156913
Bug: 204399375
Test: manual
      1. Launch settings in unfold screen
      2. Fold screen
      3. Launch wallpaper app
      4. Unfold screen
Change-Id: I3ad33a750ef19390bc8dc3fb4dc6f1c80630d57f
2021-11-05 08:33:59 +00:00
TreeHugger Robot
54fec9c294 Merge "[Large screen] SplitListener may not provide correct information" into sc-v2-dev am: 672185ffe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183654

Change-Id: I0ec9b59130b9e5b5849cad1bd095823b45204ed3
2021-11-05 04:56:14 +00:00