Jason Chiu
29a09e55ba
Revert "Revert "Support highlightable Settings homepage menu for 2-pane""
...
This reverts commit 096c090b80
.
Reason for revert: crash is fixed in this change
Bug: 202510128
Test: manual, build
Change-Id: Ifff8d58cfdcf43e123b11dee308665b2617cb4b3
2021-10-12 09:32:07 +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
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
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
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
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
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
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
bf6160280f
Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev
2021-10-08 11:58:29 +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
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
9b1f593773
Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev
2021-10-08 07:52:45 +00:00
TreeHugger Robot
df1a21033f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469
-s ours am: 9048523ba4
-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: Ifed11914cd5dfa9bf3a227bd24a81970364b4700
2021-10-08 07:40:09 +00:00
TreeHugger Robot
2370d34040
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: 07fe34aa57
am: f5e2d0dcb3
am: 59d01eec17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I4ad2c1058cb4d6ea1bd367327c3b8fcaef09659b
2021-10-08 07:40:07 +00:00
TreeHugger Robot
3667dd4e0b
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: f40e2700d3
am: 6e2eefe2c5
am: 7e02378a43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I08e9cbe3380cc6dbdeba302d00e49f20827574cf
2021-10-08 07:40:01 +00:00
TreeHugger Robot
08aba4bb74
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605
am: aeb6c685e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304
Change-Id: I99bd7cdf3832ce418150d4dffa7092f890b19917
2021-10-08 07:39:56 +00:00
Chen Chen
ac97c4755d
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c
am: 3449eccd85
am: 3ca98306af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587
Change-Id: I7b30ef5878a6c691fc223f4282016c700dce5c9e
2021-10-08 07:39:53 +00:00
Chen Chen
ac48c3a2fb
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: d9eca4893d
am: ca21133410
am: d0cebdde1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Ie1829e3ff35ac7d12af98e8b739737089380a9c8
2021-10-08 07:39:49 +00:00
Chen Chen
c849c3ff86
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: 44deff97de
am: b51bfd47db
am: 5438c59920
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I91021db2cdd4df8ba8426c4a15d874e30b3138ef
2021-10-08 07:39:44 +00:00
TreeHugger Robot
ef0bd08a22
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
am: 074f18fd8b
am: 9f388f2a66
am: 15189d2ff6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I35275f1b649c8a107eb671198dc116268b22c4d4
2021-10-08 07:39:39 +00:00
TreeHugger Robot
d542e403b9
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
am: 818a481294
am: 050872ecf0
am: cbe25da458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I8372d0785f4c7d066c65ea29ce68980e6e364bb0
2021-10-08 07:39:35 +00:00
Weng Su
aaa0fa040b
[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: 9552e28699
-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: I7173bb324e86990b14036486c4920b02f01a9766
2021-10-08 07:39:30 +00:00
Weng Su
d763f14341
[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: b462c1d9d5
-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: Idcffae76635440acba39579a3e139f688ddb0f7e
2021-10-08 07:39:29 +00:00
Weng Su
c6d1339573
[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: d9a3681733
-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: Idbcd39623890f2f9a2b0243f8c7e42fbc55b6833
2021-10-08 07:39:28 +00:00
Weng Su
dc73326e39
[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: 6ba2996eec
-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: I72a7ba7864812835dc377fb34a35fa67f36f6c19
2021-10-08 07:39:28 +00:00
Weng Su
0e2cd55dfb
[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: 55a37d556e
-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: Ibcaa22901d70ef28982a205c6eb5c485d41cac96
2021-10-08 07:39:17 +00:00
Weng Su
21636df6f0
[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: ba11285fd6
-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: Ic3901313b09efb30da0397ae0dd87a31db1eb2b5
2021-10-08 07:39:17 +00:00
Weng Su
a4e6370acf
[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: d3fd57e2e1
-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: I6330f3b0fcf0412c040b5db6bfc63b4e1f467643
2021-10-08 07:39:16 +00:00
Weng Su
4212f9d165
[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: ec9d3cf201
-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: I897e32a6770d7c61204effef92255ff6943dba1b
2021-10-08 07:39:16 +00:00
Weng Su
0439d3baca
[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: c3531fb273
-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: If0aae24e0fbc0defa04f9a3ee4b4be8e0f71f32b
2021-10-08 07:39:06 +00:00
Weng Su
097eef0b83
[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: 658383d2e3
-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: Id048b49e76793e39dd3e7d5594942db98ac243e4
2021-10-08 07:39:06 +00:00
Weng Su
499e526da1
[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: 504af9e6cd
-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: Ic02c7e10aa692466389a1610ed8843690fc2b827
2021-10-08 07:39:01 +00:00
Weng Su
1c6bdf023f
[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: 5c878f37a6
-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: I20853bdff515a8de7515498c929ab204c3fb8f78
2021-10-08 07:39:00 +00:00
Weng Su
e579105a14
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d
am: 973211dba5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: I06ef5c77f0b7eca0f15b78f83b8fd2db3fb29351
2021-10-08 07:38:55 +00:00
Weng Su
bcd7792138
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
-s ours am: 77d30c4d0c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: Ia0c535eff0c406c9b5e52e541a9d75b16e703f29
2021-10-08 07:38:54 +00:00
Weng Su
ca90ea9e47
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b
am: 1400ff3139
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: Iffd455b9592dc57114e8bab3d2a5b7a0f7e197a7
2021-10-08 07:38:53 +00:00
TreeHugger Robot
9048523ba4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469
-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: I53f408bfeed1ac6becafa5c24b2fe58e76bf3bf3
2021-10-08 07:23:42 +00:00
TreeHugger Robot
59d01eec17
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: 07fe34aa57
am: f5e2d0dcb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I11e1e9b92471bd5748b9ae2ef8d2d34d77e821a5
2021-10-08 07:23:40 +00:00
TreeHugger Robot
7e02378a43
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: f40e2700d3
am: 6e2eefe2c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I7b2810f3752ee51594c15240c086703f8dd5765c
2021-10-08 07:23:34 +00:00
TreeHugger Robot
aeb6c685e1
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304
Change-Id: I46569f9acd377a8069dffeaa031bc48dd1a6b14b
2021-10-08 07:23:27 +00:00
Chen Chen
3ca98306af
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c
am: 3449eccd85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587
Change-Id: Ie95237230c4967360faddc55e4840192701fb3da
2021-10-08 07:23:23 +00:00
Chen Chen
d0cebdde1a
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: d9eca4893d
am: ca21133410
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Ia2c4ae9bc4d4c8735dfc1cd0c69b89b7f8263cbe
2021-10-08 07:23:20 +00:00
Chen Chen
5438c59920
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: 44deff97de
am: b51bfd47db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I036c7a53f4e3d37be654eb6132b36d3f94683107
2021-10-08 07:23:14 +00:00