TreeHugger Robot
2f349df564
[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: f91da36d0a
-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: I0a4630d98fc9e270a52490ba5303e9e7d25c63d8
2021-11-09 07:24:52 +00:00
TreeHugger Robot
c96d9867c5
Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: Ic9f02f2c7b60b131194896fd841cc27aff23c686
2021-11-09 07:24:47 +00:00
TreeHugger Robot
86e798c998
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145001
Change-Id: I114793f7b2688fbde9f1f8fb27cef947f32d4c68
2021-11-09 07:24:47 +00:00
Hugh Chen
d1ee2f41e8
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: If228864e833e512870a9d60ef457e4aa2c7820a9
2021-11-09 07:24:45 +00:00
TreeHugger Robot
e831e29cfc
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: Icb21e0e55d7058723e1fe2d135f5451afe420605
2021-11-09 07:05:03 +00:00
Hugh Chen
56b95bd8c0
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: Iac9af50eb7a8af18f84820b0180301a8583ea496
2021-11-09 07:05:02 +00:00
TreeHugger Robot
9c1eb61f8e
[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: I7dcc4205517a623593162e841a9fc0d3ff2e2081
2021-11-09 07:04:54 +00:00
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
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
309426bbea
Merge "AF passwords settings: Start activity as new task." into sc-v2-dev
2021-11-08 08:18:22 +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
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
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
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
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
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
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
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
672185ffe7
Merge "[Large screen] SplitListener may not provide correct information" into sc-v2-dev
2021-11-05 04:39:50 +00:00
Arc Wang
488f79cab5
[Large screen] SplitListener may not provide correct information
...
SettingsActivity may send Settings 2-pane deep link Intent to
SettingsHomepageActivity if split callback tells that there is no
SplitInfo.
Wallpaper app sends deep link Intent to SettingsHomepageActivity,
and then SettingsHomepageActivity starts Wallpaper app page.
The flow should be 2-pane organized but the split callback tells
that splitInfos is empty.
This change checks if the Intent is from SettingsHomepageActivity
to prevent the Intent loop by the bug.
Bug: 205206004
Test: manual
Long click Launcher -> Wallpaper & style
Change-Id: I6b9d76c136238e556384e891ae1700ae7c1bb41f
2021-11-05 11:07:33 +08:00
Joe Bolinger
774c2181ea
Merge "Set a min height for pattern setup." into sc-v2-dev
2021-11-05 02:45:07 +00:00
TreeHugger Robot
6c24e5bc33
Merge "Register rule for wallpaper entry" into sc-v2-dev
2021-11-05 01:00:08 +00:00
Joe Bolinger
e55568a7ba
Set a min height for pattern setup.
...
Fix: 194022156
Test: manual (set pattern in SUW with largest font/display size)
Change-Id: I82a0bb5aec122e9d65e4b17ea45166091deea02a
2021-11-05 00:24:36 +00:00
TreeHugger Robot
ea216fd2f3
Merge "[Large screen] Check if it's in 2-pane before 2-pane deep link flow" into sc-v2-dev
2021-11-04 11:06:19 +00:00
Tsung-Mao Fang
b3db40a02b
Register rule for wallpaper entry
...
We should keep consistent split rule for wallpaper and other home menu
item. So, we create this cl to register the split rule for wallpaper.
Also, I do some minor refactoring in this cl for reusing existing
method and better code quality.
Test: Go to wallpaper, and click back key. App can close.
Fix: 204406425
Fix: 204364572
Change-Id: Ia7de9483b351d1121cc26c4af1cb8a89ad0a16bc
2021-11-04 18:48:59 +08:00
Arc Wang
e80b74de3a
[Large screen] Check if it's in 2-pane before 2-pane deep link flow
...
The callback of SplitStateObserver.SplitStateListener can have one
or more active splits when there is already 2-pane in Activity stack.
This change prevent unnecessary 2-pane deep link flow if the Activity
is already in 2-pane activity stack.
This solution does not work if the Activity was started in a new task.
(e.g., Intent.FLAG_ACTIVITY_NEW_TASK, launchMode singleTask).
Bug: 201379454
Bug: 201620626
Bug: 204398432
Bug: 204397936
Bug: 197609195
Bug: 197609197
Bug: 204501179
Bug: 204959335
Bug: 204845334
Test: manual
1. Settings -> Apps > Default apps > Opening links.
2. Click back button should back to Default apps page.
Change-Id: I04aaceed47a8f2754a4e17c53b49252f61e0a1d1
2021-11-04 17:20:17 +08:00
TreeHugger Robot
c425a4ae93
Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev
2021-11-04 09:11:04 +00:00
Bill Yi
9d554450b0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2
-s ours am: 8736277f07
-s ours am: 775e9c5605
-s ours am: b78ee724ae
-s ours am: 4933470166
-s ours am: 8f132e48f6
-s ours am: 7493a1c8f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185416
Change-Id: I071ad78e8a2f6bb415ec5af61f10bfe6fc5508b9
2021-11-04 07:55:58 +00:00
Bill Yi
84b11eefca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921
-s ours am: 5f68234c40
-s ours am: e99626cbca
-s ours am: 579555c158
-s ours am: 7a05400c26
-s ours am: d51e96b212
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185415
Change-Id: I0acefa0287b4ef07bf8ab307c9f1c970e8b5e123
2021-11-04 07:55:54 +00:00
Bill Yi
90d2c5ded2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2
-s ours am: 8736277f07
-s ours am: 775e9c5605
-s ours am: b78ee724ae
-s ours am: d18efb1358
-s ours am: c95b61f5f3
-s ours am: 7f0820ba09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185416
Change-Id: I9c5b92d64fa2b247d7b32fe9ef04bd088728ee8a
2021-11-04 07:55:51 +00:00