Automerger Merge Worker
d4fd92c566
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 16:12:10 +00:00
Automerger Merge Worker
99eedee50f
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 16:02:22 +00:00
Automerger Merge Worker
751daad079
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d
...
Change-Id: Idef6515e39b51e3a03cac2daaa8a8f790c85a87e
2020-03-12 16:01:42 +00:00
Automerger Merge Worker
da93669044
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c
...
Change-Id: Id580a25bcf5f69aa555dd0fed9087527c36fcedf
2020-03-12 16:01:40 +00:00
Automerger Merge Worker
08aec12201
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
2020-03-12 16:00:46 +00:00
Automerger Merge Worker
6714c01dd6
Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9
...
Change-Id: Ia0c95ff025def6a48d1b84b7f499447912757c72
2020-03-12 11:31:41 +00:00
Automerger Merge Worker
a7c8f74cb2
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883
...
Change-Id: Iec491d3c73c041e0c828a3c90575f3f3dd7d99ab
2020-03-12 11:31:30 +00:00
Automerger Merge Worker
a99bfeadf9
Merge "[Settings] Code refactor" am: a7a9863a52
...
Change-Id: Ice712f8ba7ef3cf07d70a408a9127a530514b2e7
2020-03-12 11:19:13 +00:00
Automerger Merge Worker
6089a14883
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4
...
Change-Id: I66b1015bc59b4a123364bf013627facfce8c5905
2020-03-12 11:19:06 +00:00
Bonian Chen
a7a9863a52
Merge "[Settings] Code refactor"
2020-03-12 11:08:01 +00:00
Bonian Chen
39d12019e4
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION"
2020-03-12 11:06:51 +00:00
Automerger Merge Worker
b2a718f62f
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Icbe574512461d49be73aaca3a3d94779a2017bf4
2020-03-12 09:23:29 +00:00
Automerger Merge Worker
0922e7fdcb
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibbf2edb55ba4f72cbb1d8c96ab266f841bf31f27
2020-03-12 09:23:22 +00:00
Automerger Merge Worker
6708ebae6d
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I94cea1b92275f86a666fcba6c950bf4b4659531f
2020-03-12 09:23:01 +00:00
Automerger Merge Worker
7dc37f978c
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours
...
am skip reason: subject contains skip directive
Change-Id: I70c3e6daa2e2bbe6e2cef1fcbd1e78cd475fbc20
2020-03-12 09:22:57 +00:00
Automerger Merge Worker
f816e89f7a
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia4397258a0b87af025c6d8a866c03a060555b462
2020-03-12 09:21:48 +00:00
Bonian Chen
bfc8714e1f
[Settings] Code refactor
...
Code refactor.
Bug: 150352656
Test: make
Change-Id: I9efd75849ff6972ebddbba767868ad0d0ea0ffda
2020-03-12 16:31:06 +08:00
Bonian Chen
a9d89cfd60
[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION
...
Add flag for startActivity() with URI.
Bug: 150352656
Test: make
Change-Id: I7292f3802e22a73dc61cbbb5551c12ca05261629
2020-03-12 16:14:00 +08:00
Automerger Merge Worker
5a870aa5d5
[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7
2020-03-12 06:42:37 +00:00
Zoey Chen
e34dc697d2
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev
2020-03-12 06:40:04 +00:00
Automerger Merge Worker
a4fc50d316
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
...
Change-Id: If8c5007d7d1c2ca48420850acce74db358959f0f
2020-03-12 06:38:34 +00:00
Calvin Pan
59f5eb638e
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev
2020-03-12 06:25:11 +00:00
Automerger Merge Worker
548e9e0370
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
...
Change-Id: I4ec3a3d4e082fb5f49de2aa1a48482e98afa9951
2020-03-12 06:03:43 +00:00
Automerger Merge Worker
4636557ab7
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
...
Change-Id: Ifd71046d26c35b9bd400d1bc9a164e2210630280
2020-03-12 06:03:23 +00:00
Menghan Li
873b50a46a
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev
2020-03-12 05:37:32 +00:00
Menghan Li
3fd654becb
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev
2020-03-12 05:37:19 +00:00
Automerger Merge Worker
3cce160521
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
...
Change-Id: I345c9b8ccfcb801605066c2f0d14fe4b7a292d80
2020-03-12 04:49:10 +00:00
TreeHugger Robot
40613ef30c
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev
2020-03-12 04:35:32 +00:00
zoey chen
cf33e51a55
Fix Card 2's pin shows ON when only turn on card 1's pin
...
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
Merged-In: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
2020-03-12 03:56:46 +00:00
Automerger Merge Worker
ee7f5bc540
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814
...
Change-Id: I343b3a129ef3875d45aabd52a9ffae85f14b8fcf
2020-03-12 03:04:12 +00:00
TreeHugger Robot
a7bd169814
Merge "Fix WifiTetherSettingsTest" into rvc-dev
2020-03-12 02:54:35 +00:00
Automerger Merge Worker
5f2520f685
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 02:09:20 +00:00
Automerger Merge Worker
10caf51f27
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I26c2fcfc1c38818d168667d1121a0cde3018c566
2020-03-12 01:51:17 +00:00
TreeHugger Robot
f2754332a0
Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev
2020-03-12 01:35:21 +00:00
Automerger Merge Worker
631493c8e7
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours
...
am skip reason: skipped by user siyuanh
Change-Id: I0c69f31c9a4e16d3e6f479feddcf2ab452cab8a8
2020-03-12 00:39:59 +00:00
Automerger Merge Worker
86fac6caee
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
...
Change-Id: I856ecc8f4edacd4879e0e72b81460504d5f8548e
2020-03-12 00:39:49 +00:00
TreeHugger Robot
cbd5ec24d7
Merge "Remove search result for hidden magnification." into rvc-dev
2020-03-12 00:25:03 +00:00
menghanli
a248e0e6d5
Update R acessibility assets and strings (1/n)
...
- Color correction
- Color inversion
- Magnification
- Dwell
- Caption preferences
- Allow shortcut from lockscreen
Bug: 148837311
Test: Manual test
Change-Id: I1f5ff3bcbf53dab508311bcea3712ad2b30898eb
2020-03-12 07:18:58 +08:00
Automerger Merge Worker
69a31c2484
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68
...
Change-Id: I0c30d3f4fb38b5ab066e62935d8ce9a7cf3e4e9b
2020-03-11 21:00:17 +00:00
Kevin Chyn
8ee5045d68
Merge "Partial revert of ag/10482633" into rvc-dev
2020-03-11 20:56:42 +00:00
Automerger Merge Worker
706c05eaf4
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df
...
Change-Id: I366b32e4d47fb10f0ff9b00cfa99d7cc53779ebe
2020-03-11 20:47:37 +00:00
TreeHugger Robot
79336396df
Merge "Update empty state for apps bypassing dnd" into rvc-dev
2020-03-11 20:33:15 +00:00
Automerger Merge Worker
18d9d24ee3
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-11 20:29:24 +00:00
Automerger Merge Worker
31933bea45
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic0716de563c854768010f78b01ee4cbd546e99a0
2020-03-11 20:17:25 +00:00
Automerger Merge Worker
07fb084ce7
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
...
Change-Id: I457fe332b417e991fe7e2625fef8f8f3c176daac
2020-03-11 20:09:21 +00:00
Automerger Merge Worker
61167e098e
Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b
...
Change-Id: I749ba8ae504f37a7a3e9f2c7aa09ebcca8245964
2020-03-11 20:07:54 +00:00
Automerger Merge Worker
fe302e4867
Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
...
Change-Id: I0b9346370cf28648659d38a6a2bdeb0f893195f5
2020-03-11 20:05:37 +00:00
Automerger Merge Worker
19ff9101ee
RESTRICT AUTOMERGE am: 077dd9b07f
...
Change-Id: I73f9a68326f6e6c477fc43eeb84b3349f519b658
2020-03-11 20:05:35 +00:00
Automerger Merge Worker
a3ddb0c4fb
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5ec3ba82e851a69ab1d7aff75603ad6a674661fd
2020-03-11 20:05:00 +00:00
Julia Reynolds
44b5b7c575
Update empty state for apps bypassing dnd
...
Test: atest
Fixes: 150346679
Change-Id: Iccc5f1fb3dd7ee2c114f8757a020833b3b41e91d
2020-03-11 18:09:47 +00:00
