Bill Yi
fcdcf5a0a1
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: Iba6c62591668b487a0d31665e28d1ea37956fb44
2021-10-08 20:03:37 +00:00
Bill Yi
cac2809d5b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: If7e901e27836f4e297645947d45bac9f08088eff
2021-10-08 20:03:37 +00:00
Bill Yi
1b957d8449
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I183bffe85b9a64ed4a9f164d5c12436f5ccf1a08
2021-10-08 20:03:37 +00:00
Bill Yi
2c4e278709
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icbd3c3d47b1f4d87866e79697db179d113e14d32
2021-10-08 20:03:23 +00:00
Bill Yi
f1acf27fe7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8759dec7cfdf8f0efa71fc37040646a8b1565014
2021-10-08 19:59:14 +00:00
Bill Yi
42ecf9572e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 73ef6abb5d
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019010
Change-Id: I8d972ef45cb67ef7dac9b4af7a3c96e2962339fa
2021-10-08 19:48:31 +00:00
Bill Yi
73ef6abb5d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6c0ca1124fac42bec5db5395dea9b27231e74044
2021-10-08 19:48:18 +00:00
Antoan Angelov
e17b0850ee
Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev am: 3bc6b32b51
am: c32f18a7c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15853135
Change-Id: I340c4a735b6eda7409f67dab1bcd8252c04a41b1
2021-10-08 18:49:16 +00:00
Antoan Angelov
c32f18a7c5
Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev am: 3bc6b32b51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15853135
Change-Id: Iaf3272d30b5c54a89525989e9d91ea0c3429c879
2021-10-08 18:36:40 +00:00
Antoan Angelov
3bc6b32b51
Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev
2021-10-08 18:23:50 +00:00
Chienyuan
5be9255ddf
Remove connection preferences "Files received via Bluetooth"
...
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
2021-10-09 01:19:00 +08: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
Greg Kaiser
d659a5271b
Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40
am: 3f638ebad8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469
Change-Id: I8a3deba2be06113f781f399221a8463f5454ceee
2021-10-08 15:12:13 +00:00
Greg Kaiser
3f638ebad8
Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469
Change-Id: I01497de4d02a9a2868af8f2611eb20b24f61b20f
2021-10-08 14:56:25 +00:00
Greg Kaiser
1ab7ad3e40
Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev
2021-10-08 14:48:14 +00:00
Greg Kaiser
096c090b80
Revert "Support highlightable Settings homepage menu for 2-pane"
...
This reverts commit 9037ceabd3
.
Reason for revert: Presumed cause of b/202510128
Change-Id: I0daaab95d9bc57229c0c8c916cbe3ada7aafb6fa
2021-10-08 14:29:06 +00:00
TreeHugger Robot
03d79d517c
Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev am: bf6160280f
am: 815abaade4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15921663
Change-Id: I7a2da90a01e8b8a154f8ab3495a193abc3aa0657
2021-10-08 12:27:06 +00:00
TreeHugger Robot
815abaade4
Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev am: bf6160280f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15921663
Change-Id: I92af54854cc20dc8835a9a650d63b018c68692f0
2021-10-08 12:07:10 +00:00
TreeHugger Robot
bf6160280f
Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev
2021-10-08 11:58:29 +00:00
TreeHugger Robot
657f5465c2
Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev am: 1bc9997032
am: fdb46441a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013678
Change-Id: Ia11c47a85621497f49b8ffb0ffcfee3f078b6419
2021-10-08 11:51:12 +00:00
TreeHugger Robot
fdb46441a9
Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev am: 1bc9997032
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013678
Change-Id: I4882850212e0936f262f883ab82ee22c91f171ce
2021-10-08 11:31:18 +00:00
TreeHugger Robot
1bc9997032
Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev
2021-10-08 11:11:20 +00:00
Arc Wang
28cdf73cf7
[Large screen] Set alwaysExpand for SearchActivity.
...
Set alwaysExpand and SearchActivity will show in full screen.
Bug: 196923591
Test: manual
Settings -> Search settings
Change-Id: I4174753bce15232342fa69d0845225a95d757782
2021-10-08 18:14:18 +08:00
Xin Li
987825a49d
[automerger skipped] Merge "Merge Android 12" am: 433825250d
-s ours am: 7062f8326d
-s ours am: b2fadd3b8a
-s ours am: f6ff784305
-s ours am: 3f6535f1f0
-s ours
...
am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1847386
Change-Id: I575706371228b2628c1f3514817e23d57da18fa6
2021-10-08 08:59:57 +00:00
Xin Li
3f6535f1f0
[automerger skipped] Merge "Merge Android 12" am: 433825250d
-s ours am: 7062f8326d
-s ours am: b2fadd3b8a
-s ours am: f6ff784305
-s ours
...
am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1847386
Change-Id: I2fde09fc444eaf6e6dc503d5013ad12c5ffc2494
2021-10-08 08:29:47 +00:00
Jason Chiu
630cbdc519
Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev am: 9b1f593773
am: de33f1224b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785736
Change-Id: Ic375f9e19b1f6dbc6f70cedaa770c133fb96f652
2021-10-08 08:12:37 +00:00
TreeHugger Robot
8db122761b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469
-s ours am: 824f21616b
-s ours am: 34ab8e7060
-s ours am: 1ac47f4115
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000255
Change-Id: Ieda33fb166394e13b8db50a1d5257a1704edfc7f
2021-10-08 08:12:31 +00:00
TreeHugger Robot
ea57e3305d
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: 07fe34aa57
am: f5e2d0dcb3
am: 445ea21c1e
am: 5bf33443db
am: 68c6cbf627
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I82467877022e4972e3069dafa52d0dec93c5ce58
2021-10-08 08:12:26 +00:00
TreeHugger Robot
e4d6a8bb22
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: f40e2700d3
am: 6e2eefe2c5
am: b13e76c167
am: 618509667e
am: 8978184833
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I6680ca5b404de2341434c0c0e3769483c4f811a2
2021-10-08 08:12:16 +00:00
TreeHugger Robot
c35f2773c9
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605
am: 4f63f0c9e1
am: 75fe45f4b4
am: 8d7347dc25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304
Change-Id: If3a47daf5a49a1842854343df497547ae2be1b89
2021-10-08 08:12:05 +00:00
Chen Chen
5ecf99bf87
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c
am: 3449eccd85
am: d67647327d
am: b8e5201104
am: 0ecee0e720
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587
Change-Id: I99cb09d129ebed57ed3fb3c0100d0d38fe92c39c
2021-10-08 08:11:58 +00:00
Chen Chen
7c69ba56eb
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: d9eca4893d
am: ca21133410
am: 9a218322e1
am: 62d0525a24
am: 68ab2e4180
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I65506d6bb9a791c8bf724d158f428c1f9804f66e
2021-10-08 08:11:50 +00:00
Chen Chen
c60820ecca
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: 44deff97de
am: b51bfd47db
am: 9e03b75bfa
am: 32d9500f39
am: dded8a5a16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I01e22ac3dcc04f652c2185e2c9b864bea374584b
2021-10-08 08:11:39 +00:00
TreeHugger Robot
c0532e5cfe
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
am: 074f18fd8b
am: 9f388f2a66
am: 7a98b491e9
am: d91faea117
am: 9314bb316b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I58009ed7bf31b1c61ba7c956487e8d88207d9f93
2021-10-08 08:11:29 +00:00
TreeHugger Robot
3c0144821d
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
am: 818a481294
am: 050872ecf0
am: c58143a2a9
am: 4f9cdf9df7
am: b49ea1f6d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: Icbe5fdc2246efc23faf5ea27d121201ea7836162
2021-10-08 08:11:21 +00:00
Arc Wang
3648d67201
Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE
...
Each user has different components enable state,
should update enable state of DeepLinkHomepageActivity
for Intent#ACTION_USER_INITIALIZE.
Bug: 202364984
Test: manual
Switch user -> long click Launcher -> Wallpaper & style
See if it shows wallpaper app's Activity.
Change-Id: If50de0f017f5cd606ba0cbf88d41eeabf3f47506
2021-10-08 08:11:13 +00:00
Weng Su
9816b0692c
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90
am: 2fe0d45ab8
-s ours am: 86a02e1e8e
-s ours am: 0dc4560066
-s ours am: 68952164ad
-s ours am: 58c97c30ad
-s ours am: 9ae84a971a
-s ours am: e14c913dcb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: Iaf1797be9be1e41593b08e385ac206aef27259db
2021-10-08 08:11:12 +00:00
Weng Su
b4882dd66d
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5
am: 0fe85baf93
-s ours am: 9ccd76cbde
-s ours am: 7ab58102ff
-s ours am: 80d84e4053
-s ours am: 0be02f71e5
-s ours am: 007bb82857
-s ours am: fb2b0f5e4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I947833946ae4aef40b645c967db71d6251f47a86
2021-10-08 08:11:11 +00:00
Weng Su
9dfb9e5cc1
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
am: cbd0883356
-s ours am: 1f4b0eaa6f
-s ours am: bd3dcfc61a
-s ours am: 428d973b15
-s ours am: 26af79c34c
-s ours am: b4c30ce356
-s ours am: a10c40867c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: I3f4dbab933a6095c64599dbb1daf0bbf690ccfc0
2021-10-08 08:11:10 +00:00
Weng Su
fff5e38068
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours am: f41979632a
-s ours am: 2323109f93
-s ours am: 77e284042e
-s ours am: 17eb3f2447
-s ours am: 97ed0c524c
-s ours am: 2242a139b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I07b65ef792e9e2273867381ce95a99251998266f
2021-10-08 08:11:08 +00:00
Weng Su
b35817a048
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90
am: 2fe0d45ab8
-s ours am: 86a02e1e8e
-s ours am: 54abe21d12
-s ours am: c0dd58ee8c
-s ours am: b36fae96c5
-s ours am: 308210b3f6
-s ours am: 2f81acda9b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I2f14d373da7349ef08c5ff2a781affdc1c471589
2021-10-08 08:10:51 +00:00
Weng Su
cdf6ad5441
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5
am: 0fe85baf93
-s ours am: 9ccd76cbde
-s ours am: 9e73b1e4ed
-s ours am: 1dbd53eb70
-s ours am: dd8e5d9f86
-s ours am: 7811b58448
-s ours am: d66f679a1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I4a3b5f287bcea059c94966f1cf50126d2480c98f
2021-10-08 08:10:50 +00:00
Weng Su
32c7d9e3d7
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
am: cbd0883356
-s ours am: 1f4b0eaa6f
-s ours am: 70fce50634
-s ours am: ad77ce9784
-s ours am: f63feb106e
-s ours am: e9e47a8108
-s ours am: 3a3b3c27dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: I9ab418e3bbfaa400153ea552ce6925b192f2fff4
2021-10-08 08:10:49 +00:00
Weng Su
4eeedf99b1
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours am: f41979632a
-s ours am: 36a13c0cfe
-s ours am: 6b29f7110a
-s ours am: 6532190ccf
-s ours am: e9600f3336
-s ours am: 1b5a993750
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I09682a4ade578db169b538d6d8e6adf0c824a41d
2021-10-08 08:10:48 +00:00
Automerger Merge Worker
3a7771f6e4
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469
-s ours am: 9048523ba4
-s ours am: df1a21033f
-s ours" into sc-v2-dev-plus-aosp am: 9ae5da0ee5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000255
Change-Id: I17351bdca35d306ca370d9498be6d09a47b4d389
2021-10-08 08:10:34 +00:00
Weng Su
3d81729517
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: aed1ab9e45
-s ours am: 00e38c59cc
-s ours am: 26b65768ea
-s ours am: 5bfc65b1c0
-s ours am: d9ff2b5b3f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I92f2a6c9ab55a016873ee9f7c46b06f391e75b68
2021-10-08 08:10:28 +00:00
Weng Su
b839d45742
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: f05b8fbb79
-s ours am: 107ebcdc9e
-s ours am: bd89c97867
-s ours am: c64398a1b9
-s ours am: 7836d976d8
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Ic795c311747d2dd36bdb3a00a7fcc2a41f43f92f
2021-10-08 08:10:27 +00:00
TreeHugger Robot
df6c03f1ac
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: 07fe34aa57
am: f5e2d0dcb3
am: 59d01eec17
am: 2370d34040
am: 4210a7bcae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I19cc49e7b9677c55f16a34c9ebbf3ccd4e8a714b
2021-10-08 08:10:17 +00:00
Weng Su
24f52b11fa
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: 395ac6073c
-s ours am: 374ef0012a
-s ours am: 5922df7f44
-s ours am: 9923ea26ef
-s ours am: e4d6c530c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I3ed8121a193541e17cf477ba2f53a6d3a53a0dbd
2021-10-08 08:10:07 +00:00
Weng Su
b878401596
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: d5ff68889c
-s ours am: b885452051
-s ours am: e81a5b9a13
-s ours am: 9effff343f
-s ours am: 26ed60de74
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I09ad5a93b8bea1586a18bcc5af0602213d14fe7f
2021-10-08 08:10:06 +00:00