TreeHugger Robot
e99fe9b60c
Merge "Add NEW_TASK flag for intents that leave Settings" into sc-v2-dev am: 5a7966884b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16018030
Change-Id: I670e7a9cc69ef1805e5450a6054d4616624583d6
2021-10-11 15:51:19 +00:00
TreeHugger Robot
5a7966884b
Merge "Add NEW_TASK flag for intents that leave Settings" into sc-v2-dev
2021-10-11 15:38:16 +00:00
TreeHugger Robot
da19c80eb2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours am: d3f9214763
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019021
Change-Id: I3cc599a18511c1fddc63c8c247d691b723693dbb
2021-10-10 06:10:54 +00:00
Bill Yi
62b29dc3f9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours am: cde6bf9031
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I45c7f6b3b4fdafbdadf9e2551b282e895145832d
2021-10-10 06:10:08 +00:00
Bill Yi
39e7e33489
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: fcdcf5a0a1
-s ours am: f445e1018d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I6f7fbd7cda6172b280a1f28183ab56eec9796f94
2021-10-10 06:09:00 +00:00
TreeHugger Robot
ccb2ded802
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours am: 1b8322a812
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019021
Change-Id: I368c1287c2c271b5e70db30e68c230862d233fcf
2021-10-10 05:57:37 +00:00
Bill Yi
16e17ee6c9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours am: 4f311bebde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: Ibeda7ba6e8538ca5f23907b4849ca42ec32b19af
2021-10-10 05:56:43 +00:00
TreeHugger Robot
d3f9214763
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019021
Change-Id: I9ac05f5da437030e1b5db082ddaf7959f82acccd
2021-10-10 05:56:12 +00:00
TreeHugger Robot
1b8322a812
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019021
Change-Id: Ic4a369673e7cab2927c9c6f51dbf30674c9fc55b
2021-10-10 05:55:47 +00:00
TreeHugger Robot
7439f9dcfc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6cf476bd44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019023
Change-Id: I35909efac7d6a21c025f87b5c36cd8a1adb41e4a
2021-10-10 05:55:12 +00:00
Bill Yi
cde6bf9031
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I1a4ce422c864b46a3400ed3b8e53109a4bf0c957
2021-10-10 05:55:05 +00:00
Bill Yi
4f311bebde
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I8cf88d7a8d77131af720823b7be7b2c0af0d50b1
2021-10-10 05:54:56 +00:00
Bill Yi
f445e1018d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: fcdcf5a0a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: If3a3af0cabe768f1309479d54c0d99612940eb98
2021-10-10 05:53:33 +00:00
TreeHugger Robot
c57387dee7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-10 05:34:09 +00:00
TreeHugger Robot
6cf476bd44
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-10 05:34:04 +00:00
Bill Yi
4eedb7fa41
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5c26e1d4bd75816dbda40b0f818dac5729e04b4
2021-10-08 20:10:53 +00:00
Bill Yi
9b8ef1b7ae
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If65120e7b71d5ea69ec91f72077de3c4b45b287b
2021-10-08 20:07:13 +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
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
2c4e278709
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icbd3c3d47b1f4d87866e79697db179d113e14d32
2021-10-08 20:03:23 +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
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
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
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
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
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
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
Jason Chiu
de33f1224b
Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev am: 9b1f593773
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785736
Change-Id: I541605e02d5afdc340faf28c69ecc4b66207ed86
2021-10-08 08:04:48 +00:00
Xin Li
f6ff784305
[automerger skipped] Merge "Merge Android 12" am: 433825250d
-s ours am: 7062f8326d
-s ours am: b2fadd3b8a
-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: I2034dc23c36bb8565dc8a0e4775da3851631004e
2021-10-08 07:56:49 +00:00
TreeHugger Robot
1ac47f4115
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000255
Change-Id: I94be767dcfccf94b0a7782b49b11376c0080e107
2021-10-08 07:53:34 +00:00
TreeHugger Robot
68c6cbf627
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: Ibf00199077331a0df64a77fee1f0213e0cf2733b
2021-10-08 07:53:29 +00:00
TreeHugger Robot
8978184833
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I2480e9be5972b7cd656688ef0a841e5630aad27d
2021-10-08 07:53:21 +00:00
TreeHugger Robot
8d7347dc25
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605
am: 4f63f0c9e1
am: 75fe45f4b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304
Change-Id: Ib4880d69333e47fbd16715ec01fcf9ce4463adf1
2021-10-08 07:53:12 +00:00
Chen Chen
0ecee0e720
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c
am: 3449eccd85
am: d67647327d
am: b8e5201104
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587
Change-Id: I08388d47bba977d13dfe7d4695609716b8e7ec6d
2021-10-08 07:53:06 +00:00
Chen Chen
68ab2e4180
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: d9eca4893d
am: ca21133410
am: 9a218322e1
am: 62d0525a24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I68491efad5310af07c5ae7de36b93574c7b303fc
2021-10-08 07:53:00 +00:00
Chen Chen
dded8a5a16
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: 44deff97de
am: b51bfd47db
am: 9e03b75bfa
am: 32d9500f39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I98970c28a6c1d9972e7b80d7f7ed61d01f8abfd3
2021-10-08 07:52:51 +00:00
Jason Chiu
9b1f593773
Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev
2021-10-08 07:52:45 +00:00
TreeHugger Robot
9314bb316b
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
am: 074f18fd8b
am: 9f388f2a66
am: 7a98b491e9
am: d91faea117
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I26d79032a2c11465656f2b5d265e7a00e44a9e4d
2021-10-08 07:52:42 +00:00
TreeHugger Robot
b49ea1f6d1
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
am: 818a481294
am: 050872ecf0
am: c58143a2a9
am: 4f9cdf9df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: Ie0e7ebe2dcf329dc5e0135afc0fa3f2c20a3c68c
2021-10-08 07:52:34 +00:00
Weng Su
e14c913dcb
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I64dc76a05bc3a5e39047fe2367fe78253ea13794
2021-10-08 07:52:26 +00:00
Weng Su
fb2b0f5e4b
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I91255de0d89d269289b030b6f0e18e7561a5dc56
2021-10-08 07:52:25 +00:00
Weng Su
a10c40867c
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: I61a0fbd752efacd5fdaa2a5c9631e516ea055f9c
2021-10-08 07:52:24 +00:00
Weng Su
2242a139b7
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I93207071b6773a1ccb9dc820929ddec85e5d6286
2021-10-08 07:52:24 +00:00
Weng Su
2f81acda9b
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I1875732fd2e668275743e2292e27327e18ca4edc
2021-10-08 07:52:09 +00:00