Bonian Chen
78c18a1b45
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev
2021-10-07 23:42:43 +00:00
Arc Wang
4b24df9387
Merge "[Large screen] Fix SplitPaitRule not match for deep link problem" into sc-v2-dev am: d2cb885c32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15948302
Change-Id: Ie12e2314024d3eabf1ec2cc69e8565bfc64ca752
2021-10-07 10:38:43 +00:00
Arc Wang
d2cb885c32
Merge "[Large screen] Fix SplitPaitRule not match for deep link problem" into sc-v2-dev
2021-10-07 10:25:37 +00:00
Arc Wang
dcc46cf136
[Large screen] Fix SplitPaitRule not match for deep link problem
...
- Set both secondary ComponentName and secondary Intent action
in SplitPairFilter when registering SplitPairRule for deep link.
- Set ComponentName to the Intent which DeepLinkHomepageActivity
uses to start the deep link page.
This change setup Intent and SplitPairRule to have both
Intent action and ComponentName. It fixes matching problem.
Bug: 201627196
Bug: 199888089
Test: manual
[Unfolded] Long press home (workspace) -> Pop-up menu ->
Tap 'Wallpaper & style' -> Launch Settings in the left as
list and 'Wallpaper & style' in the right as detail.
Change-Id: I8cc8cef911ce0d7d05f332eb86f77f8d2543827f
2021-10-07 17:44:24 +08:00
TreeHugger Robot
1aaa69b8d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours am: d3de9d4b6c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: Ic78d95827b2ddcc7fd3ec0b011b0a1372dfa4067
2021-10-07 09:03:42 +00:00
TreeHugger Robot
07a0e2eaed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours am: 69c9e424e8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: I9f6a9e1755783edad3d256903e87e384331c5846
2021-10-07 08:52:14 +00:00
TreeHugger Robot
d3de9d4b6c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: Iad798b30be36844d9812501e49da3800115db0c9
2021-10-07 08:52:12 +00:00
TreeHugger Robot
69c9e424e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: Ia8eba6d2c5e57bb52b4a5f35b954fb01e0714161
2021-10-07 08:51:58 +00:00
TreeHugger Robot
4f27cbc2ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dd3651cc5e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000260
Change-Id: I355bb467c90371c1259f6bafb1df089aa387769b
2021-10-07 08:51:18 +00:00
TreeHugger Robot
dd3651cc5e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-07 08:40:55 +00:00
TreeHugger Robot
57e7d9c4b3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-07 08:40:47 +00:00
Bill Yi
c18019db27
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idb42ad66d7b7212c8f9c131f939a08b674f3c640
2021-10-07 02:41:09 +00:00
Bill Yi
98f9ed5934
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9a8641798558c7df5e1d65aadaf5ca9f15fc080
2021-10-07 02:37:16 +00:00
Chen Chen
25ab32bab1
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407 am: 4f2a6225c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: I68c7e50dbc5adb8e67026ebedb94741b40e7779c
2021-10-07 00:57:44 +00:00
Chen Chen
25678e730b
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407 am: 579e48b03d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: Ic8e88d314d355a5e324057a630a2806918f2541d
2021-10-07 00:57:02 +00:00
Chen Chen
579e48b03d
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: I25d658e8c82a1e45a69fdd3467309e897e10e8d5
2021-10-07 00:44:35 +00:00
Chen Chen
4f2a6225c9
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: Iad645cc93ddf67fa9cd96b2813f0a4a10f48b007
2021-10-07 00:44:33 +00:00
TreeHugger Robot
4664d0efac
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev am: 7d4dd26362
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995346
Change-Id: I3933dda90e3831133d217bcda65c65ea0dc2fd72
2021-10-06 22:58:42 +00:00
TreeHugger Robot
7d4dd26362
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev
2021-10-06 22:45:23 +00:00
Chen Chen
ca21133410
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Ice32757d6e80f2cb676ff46021ef63e270cef932
2021-10-06 22:09:51 +00:00
Chen Chen
b51bfd47db
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I8c2438f038db09c9efc185f3dba1932fe9cd621f
2021-10-06 22:01:40 +00:00
Chen Chen
d9eca4893d
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Id09bebbaef35ec04876284fb378928139a00c20a
2021-10-06 21:50:35 +00:00
Chen Chen
44deff97de
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I748e0ebed1e2196eb53bbd51b582f816cba86737
2021-10-06 21:50:35 +00:00
Chen Chen
0d70b85832
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I9479a0307e24a3ebde9f4184fe51fa9075f0f127
2021-10-06 21:41:14 +00:00
Chen Chen
b025b7fa88
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I5071ab9c43b8882efb51a7eae9f11a2a982f23cb
2021-10-06 21:30:16 +00:00
Chen Chen
d96d13c4f1
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Icee7ffd9cd3218bb4cd9fcb8fd1c37fc34274507
2021-10-06 21:18:45 +00:00
TreeHugger Robot
9f388f2a66
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I9ea19580e97599fdbf897755f553a845cc8dee8b
2021-10-06 21:03:46 +00:00
TreeHugger Robot
050872ecf0
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I2ef15e8417597360acf885ad323b39db9961b35f
2021-10-06 21:03:13 +00:00
TreeHugger Robot
074f18fd8b
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I1b73519801db7ccb9689ecc46de604607619745b
2021-10-06 20:54:24 +00:00
TreeHugger Robot
818a481294
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I4473dbc8e67fe8dd4f3eb574d021062efc1b975e
2021-10-06 20:53:55 +00:00
TreeHugger Robot
1a049e065e
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev
2021-10-06 20:40:57 +00:00
Weng Su
68952164ad
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: Ied28ec14a4ce1b9e32b155d4a7366aa8c1448ab5
2021-10-06 20:00:28 +00:00
Weng Su
80d84e4053
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -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: Ide926ed389d319955335c51e62e82481e4a1253b
2021-10-06 20:00:27 +00:00
Weng Su
428d973b15
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: Ifd3aab857e11d595387fe735cba89f79e73a50b9
2021-10-06 20:00:26 +00:00
Weng Su
77e284042e
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -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: Ib32827bc5dbd60ff56453afbc093c33e2d758cf0
2021-10-06 20:00:23 +00:00
Weng Su
c0dd58ee8c
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I53212e8b04ccd549b798e8bc9a4c1e761851e9ce
2021-10-06 19:38:30 +00:00
Weng Su
1dbd53eb70
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 9e73b1e4ed -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: I33ac8f836090c7932bba3c653773e2f4351ddbb8
2021-10-06 19:38:28 +00:00
Weng Su
ad77ce9784
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: Id2f473e2997375f9850ee82452c2507d66257240
2021-10-06 19:38:27 +00:00
Weng Su
6b29f7110a
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 36a13c0cfe -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: I5718fce8f4017922fb851e9295c0702d3f9dadeb
2021-10-06 19:38:24 +00:00
Weng Su
0dc4560066
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -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: I4b8032c14d958eda6c3dfc4d495f96c749197826
2021-10-06 19:30:20 +00:00
Weng Su
7ab58102ff
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -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: Ic6479bf42395cd49e5f4a6ddfa360b33e620af3b
2021-10-06 19:30:20 +00:00
Weng Su
bd3dcfc61a
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -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: I7981950ced95539ee550a5a649a8e41dbcb2e239
2021-10-06 19:30:19 +00:00
Weng Su
2323109f93
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -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: I1f32196e2c1afdc764325b2f7547c1a20be4f062
2021-10-06 19:30:18 +00:00
Weng Su
54abe21d12
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -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: Ifd0540cb3d32f1e5cef825e9a1315d3205c78ec6
2021-10-06 19:29:37 +00:00
Weng Su
9e73b1e4ed
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -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: Ib08f2fc4dbf4bd3e5f1b92ecbcaa3b079a341b44
2021-10-06 19:29:36 +00:00
Weng Su
70fce50634
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -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: Ib2cea64f501887fb069bfdffd68bc8108d656115
2021-10-06 19:29:35 +00:00
Weng Su
36a13c0cfe
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -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: I4c861b96d01934a4fd1146df29a77ee9e7dd00ab
2021-10-06 19:29:34 +00:00
Weng Su
00e38c59cc
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: aed1ab9e45 -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: Ie10ab43aaa4b32dd0ef30ec1bb2f7826e13ced7d
2021-10-06 19:22:09 +00:00
Weng Su
107ebcdc9e
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -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: I891871e38efd6074d0a0006ccc53c23fdf60ab1c
2021-10-06 19:22:07 +00:00
Weng Su
f06e103985
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408 am: 18895edd6a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: I76878029325ca87d044bd5544f069fb25eb9cd5a
2021-10-06 19:20:47 +00:00