Stanley Wang
6c553ea3f1
Fix the problem that the unknown item will be announced when
...
using Switch Access.
- Disable the importantForAccessibility of the
SettingsMainSwitchBar's parent layout.
Fix: 182227784
Test: robotest and operate the switch preference manually
Change-Id: I5e0e4bb972f6996192d5a30525bb5370a006b115
2021-06-28 16:13:20 +08:00
Hugh Chen
bca964069b
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 346b049fb1
-s ours am: 52b13e9795
-s ours am: c52b6bc4bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I5b024d6b80686f7bf3a810d56d9e3770fb44bc41
2021-06-28 07:40:44 +00:00
Hugh Chen
495b66de91
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: c91f8b0991
-s ours am: b17f196c3d
-s ours am: 9e08ebacf4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I251493467f31e090a3c6045c36712ddf8f13e46e
2021-06-28 07:40:38 +00:00
Hugh Chen
8ff6323394
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 1e764fb0a6
-s ours am: 5e708fd301
-s ours am: 603f0a5b14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I32c43f22c00b91633fafa164c9cfb29b157eb743
2021-06-28 07:40:33 +00:00
Hugh Chen
999cccd462
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: d8ef6bc5af
-s ours am: ad3ecbdd0c
-s ours am: 8e922b95f3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Ied2dd046476816e4038800c3be82888056f65e17
2021-06-28 07:40:28 +00:00
Hugh Chen
c4a519897f
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 346b049fb1
-s ours am: 52b13e9795
-s ours am: 80d8aaad3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I95c245b0eda14f6dbf5d95b0bab6bd65e391760d
2021-06-28 07:40:21 +00:00
Hugh Chen
b49d68d7ce
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: c91f8b0991
-s ours am: b17f196c3d
-s ours am: d5b07b03d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Iae9910c8a85ed028079c96d5f09e6291f550087a
2021-06-28 07:40:16 +00:00
Hugh Chen
474c9fd1da
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 1e764fb0a6
-s ours am: 5e708fd301
-s ours am: aff7f97f8c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: Id1304f50a7b82d6836cd4911a5e1730e9eb5ad05
2021-06-28 07:40:12 +00:00
Hugh Chen
d3a1edfdab
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: d8ef6bc5af
-s ours am: ad3ecbdd0c
-s ours am: a3c7b58697
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I5945a5d193132bdfedc1f0c4c3caf359c154fe59
2021-06-28 07:40:07 +00:00
Hugh Chen
80d8aaad3d
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 346b049fb1
-s ours am: 52b13e9795
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I42a6ad11e692ffda53b86b78ca8edb1a9dd3fc29
2021-06-28 07:28:03 +00:00
Hugh Chen
d5b07b03d1
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: c91f8b0991
-s ours am: b17f196c3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I131999e135f1965bafe5b9aa67f5d737b869491f
2021-06-28 07:27:59 +00:00
Hugh Chen
aff7f97f8c
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 1e764fb0a6
-s ours am: 5e708fd301
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: If5378005cf7a5445c24748a4aa07e0b539cec352
2021-06-28 07:27:54 +00:00
Hugh Chen
a3c7b58697
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: d8ef6bc5af
-s ours am: ad3ecbdd0c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Ib708132f72b1eff81c443f2163c8783b9a6fd59c
2021-06-28 07:27:50 +00:00
Hugh Chen
c52b6bc4bb
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 346b049fb1
-s ours am: 52b13e9795
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: Ib77c524d7d6f6ee78e36659c4a4d70f8afc57e6b
2021-06-28 07:27:07 +00:00
Hugh Chen
9e08ebacf4
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: c91f8b0991
-s ours am: b17f196c3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I7c6ed59e3f807f98b8229f4161d61e8bf3255568
2021-06-28 07:27:02 +00:00
Hugh Chen
603f0a5b14
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 1e764fb0a6
-s ours am: 5e708fd301
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I7fdccda404710a99d41947dcc5612c658317c3f1
2021-06-28 07:26:57 +00:00
Hugh Chen
8e922b95f3
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: d8ef6bc5af
-s ours am: ad3ecbdd0c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I069c91a0f6cc3fa255bd261537f75f00e2ddd07c
2021-06-28 07:26:48 +00:00
Hugh Chen
52b13e9795
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 346b049fb1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I1b667afef2b3858cb3cb627404090e5de7dba48b
2021-06-28 07:18:39 +00:00
Hugh Chen
b17f196c3d
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: c91f8b0991
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Iec0be080d17d234d4ef68d1e29bbe7be18a9e91b
2021-06-28 07:18:34 +00:00
Hugh Chen
5e708fd301
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 1e764fb0a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I64dbe7b1dddfaac7d0c35378951df62a4688a477
2021-06-28 07:18:13 +00:00
Hugh Chen
ad3ecbdd0c
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: d8ef6bc5af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Iaf07be5625a927fdffacbe491140018873a40560
2021-06-28 07:18:08 +00:00
Arc Wang
b4e96b1223
Fix ManageApplications pinned header overlaps content
...
A best UX is to hide pinned header when scrolling up
and show pinned header when scrolling down. It needs
CoordinatorLayout and CoordinatorLayout.Behavior to
control the expected UX.
However, we have an outer CoordinatorLayout in
CollapsingToolbarBaseActivity, if we use CoordinatorLayout
here, the inner one will not pass scroll value to its
parent. We will have no overscroll effect problem and
tool bar no collapsed problem.
This workaround draw pinned header at last and
assign background color to cover content.
Bug: 187376670
Test: manual visual
Settings -> Notifications -> App Settings
Settings > Apps > all apps
Change-Id: I217fba917d11f63d954369c18e0361112ff981fe
2021-06-28 15:13:14 +08:00
Hugh Chen
1e764fb0a6
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: Ib79eaf776f222a1af892a881d6f9a9b2d6e28471
2021-06-28 07:07:07 +00:00
Hugh Chen
346b049fb1
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I9c044bc08439ecd3132b3bacd0d47eddd9ccebb0
2021-06-28 07:07:01 +00:00
Hugh Chen
d8ef6bc5af
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I98eb7a2034a40bb28540b2e9dad3b84ecf4d430d
2021-06-28 07:07:00 +00:00
Hugh Chen
c91f8b0991
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I0b6e2fe7b4b98afe4f5eb906b515177f09621946
2021-06-28 07:06:57 +00:00
Hugh Chen
7729da504f
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours am: c6362e92e8
-s ours am: c87b09a9c4
-s ours am: afcfd0ee07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ib5a85d3f3603bdada152c39c86e2e5d5022b0fb5
2021-06-28 07:03:21 +00:00
Hugh Chen
aad3c14d64
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-s ours am: 3f2394bbc7
-s ours am: 5a9f761f75
-s ours am: 3277eb0407
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I33a71b1d173dfa2e1cccd6f8a2bb314343fca595
2021-06-28 07:03:17 +00:00
Hugh Chen
81457e1379
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours am: a539c36421
-s ours am: b42ecba8a3
-s ours am: 948887231a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I936c863fee33c9a2c3094decf3812fdd7081b89e
2021-06-28 07:03:13 +00:00
Hugh Chen
f7023e28d0
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-s ours am: dbcebc42bf
-s ours am: 8b9dbd066a
-s ours am: 12e2f40371
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: I9bca41e6544b811f43b6730cad19bada8981449b
2021-06-28 07:03:08 +00:00
Hugh Chen
4eea5f2f0d
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours am: c6362e92e8
-s ours am: c87b09a9c4
-s ours am: a531e96867
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: I679390cfa159198e1f659827bceec068b0b34d81
2021-06-28 06:58:29 +00:00
Hugh Chen
e60a39d5cb
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-s ours am: 3f2394bbc7
-s ours am: 5a9f761f75
-s ours am: 1913f6d881
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I93b4304994d32f694eb040dfc7fa869172fa8666
2021-06-28 06:58:25 +00:00
Hugh Chen
b8a346a176
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours am: a539c36421
-s ours am: b42ecba8a3
-s ours am: e3db867566
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I2c944cb37db9c1442659b731a86a72e830fdc599
2021-06-28 06:58:21 +00:00
Hugh Chen
67e06cb242
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-s ours am: dbcebc42bf
-s ours am: 8b9dbd066a
-s ours am: ff009f3645
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: Iff71eb760877df7bb314bbca35c2bf32393bbd28
2021-06-28 06:58:17 +00:00
Hugh Chen
afcfd0ee07
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours am: c6362e92e8
-s ours am: c87b09a9c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ied8291f205c9e341b457b4664cffc4fc67444275
2021-06-28 06:58:15 +00:00
Hugh Chen
fdc1865829
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours am: 49d4c89944
-s ours am: 985d52d0c6
-s ours am: 3cf157ae14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: I10f467868cebc4822da1e430f4aeef5280e97219
2021-06-28 06:58:14 +00:00
Hugh Chen
3277eb0407
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-s ours am: 3f2394bbc7
-s ours am: 5a9f761f75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I5a89995984d9d1d0d16af66f3cfb4f7af9c2c20e
2021-06-28 06:58:11 +00:00
Hugh Chen
fe293f564d
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-s ours am: f41af1a1e3
-s ours am: eb41b62299
-s ours am: 8c3fcb589c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I711211683c5147057ea53f8932f627f10a5440ac
2021-06-28 06:58:10 +00:00
Hugh Chen
948887231a
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours am: a539c36421
-s ours am: b42ecba8a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I82bc75b0e0d6d36260673bc144a84b56f3e58541
2021-06-28 06:58:07 +00:00
Hugh Chen
2ad56b2073
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours am: 48ceb503d8
-s ours am: 7f4a301b88
-s ours am: 73f346b222
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I0f34f84ce50247b1cc457755390276c06f7c110a
2021-06-28 06:58:06 +00:00
Hugh Chen
4db80f47ff
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-s ours am: 4c2b189379
-s ours am: 3e51c20e21
-s ours am: 4ec03994a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: Ie7f367481349746cb2c288f7dc76b7982379943a
2021-06-28 06:58:01 +00:00
Hugh Chen
12e2f40371
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-s ours am: dbcebc42bf
-s ours am: 8b9dbd066a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: I2ec23cc754fa2805e14112119e76a0e106d085e4
2021-06-28 06:58:00 +00:00
Hugh Chen
baa8530d75
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
am: bee2daea18
-s ours am: ff719d5bd8
-s ours am: a7dc3a2767
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915
Change-Id: I9d4039680b1791df320505e48111b127d3ccc76a
2021-06-28 06:57:58 +00:00
Automerger Merge Worker
f0ad262500
Merge "[automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc
-s ours am: 76545f383c
-s ours am: 60beadd631
-s ours am: 5be8bd29f5
-s ours" into sc-v2-dev-plus-aosp
2021-06-28 06:57:56 +00:00
Hugh Chen
404673bd0f
[automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc
-s ours am: 76545f383c
-s ours am: 60beadd631
-s ours am: 5be8bd29f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913
Change-Id: I9ac5d2619013700a66f5e99a3ef634806995fa6a
2021-06-28 06:57:54 +00:00
Hugh Chen
5a7bbbfa85
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours am: 49d4c89944
-s ours am: 985d52d0c6
-s ours am: 4d49ac0837
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ifacdbf2091f2ee66e04ba37344e53685941168bc
2021-06-28 06:57:53 +00:00
Hugh Chen
01a30c0e6b
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-s ours am: f41af1a1e3
-s ours am: eb41b62299
-s ours am: ecfff8b79b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: Ib167bfab51e0b122b38372295a4f26c9e7676874
2021-06-28 06:57:49 +00:00
Hugh Chen
1649b3f464
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours am: 48ceb503d8
-s ours am: 7f4a301b88
-s ours am: b03a49d16e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I8716dd6adb96097bb5b0f0982fb55804134c3e6c
2021-06-28 06:57:44 +00:00
Hugh Chen
6549264957
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-s ours am: 4c2b189379
-s ours am: 3e51c20e21
-s ours am: f047ed0a50
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: I29252042dbe97f82e209143df212fa6ca2d95bbe
2021-06-28 06:57:39 +00:00
Hugh Chen
2a2a81dea5
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I7d2147f3fc8860e58a4d8cb4e15eb4b09d000c9c
2021-06-28 06:57:36 +00:00