Automerger Merge Worker
038905a840
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983
...
Change-Id: Ibe007653565dc79c492a9fe6664b5ce40d9f8774
2020-03-11 20:58:56 +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
279d4d9983
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df
...
Change-Id: I0f8e5ce1eb3dd6358222c81eefeb622cc5bb3ca4
2020-03-11 20:47:43 +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
9b9f4ec1b7
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa
...
Change-Id: I91060da017fe98d629e06d9f817a88d71b33b2a6
2020-03-11 20:23:32 +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
7152f018fa
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
...
Change-Id: I54762e5a403b6879fb3aaf4f93ac8621a1d6dfed
2020-03-11 20:10:36 +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
TreeHugger Robot
5e788604c2
Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev
2020-03-11 17:51:30 +00:00
Jason Hsu
91e5ece7ab
Merge "Align help resource usage in caption preferences." into rvc-dev
2020-03-11 17:47:16 +00:00
jasonwshsu
27d06ff502
Remove search result for hidden magnification.
...
* Use searchable = "false" to suppress search indexes.
Bug: 146019459
Test: manual test
Change-Id: I1188f201ddc9ec8d59faf2bcb549839c054f73bd
2020-03-11 21:58:25 +08:00
Automerger Merge Worker
bafe942da7
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f
...
Change-Id: I0ca06dd373492de0ca127fbe940fd1e29ae0e770
2020-03-11 13:48:13 +00:00
Automerger Merge Worker
539815566f
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584
...
Change-Id: Ibb8f5b1b1e72d75a77c023d2a6bb957954d3b8b9
2020-03-11 13:29:31 +00:00
Automerger Merge Worker
4f2ad111cc
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9
...
Change-Id: I5949b8852d48a200cce8921ac0130a9b075dfb2e
2020-03-11 13:19:49 +00:00
TreeHugger Robot
11dbe14584
Merge "Fix TetherSettingsTest" into rvc-dev
2020-03-11 13:12:56 +00:00
Automerger Merge Worker
aeb13d1dd9
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4
...
Change-Id: I2fbe22e43e922b97f23ebd08f7927730e035c1fa
2020-03-11 12:57:05 +00:00
TreeHugger Robot
16a7ba81f4
Merge "Tweak strings for assist app" into rvc-dev
2020-03-11 12:38:44 +00:00
Automerger Merge Worker
e7e184fdc8
Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2
...
Change-Id: I24caecfcee12f22059d78fe681706aa7ad815b37
2020-03-11 11:51:06 +00:00
Automerger Merge Worker
59da6a7c05
Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e
...
Change-Id: I5f6ac60bbef325bf710978b211b3c6a4ac878c91
2020-03-11 11:51:01 +00:00
Automerger Merge Worker
fde1a52ad1
Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8
...
Change-Id: I463ce8e41de0f920103b03f7a80d90ef721f82d2
2020-03-11 11:50:57 +00:00
Automerger Merge Worker
f3aa88ccf2
Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5
...
Change-Id: I5cf0e713e0016b1463ba7e7e39628adc3cc407c2
2020-03-11 11:40:51 +00:00
TreeHugger Robot
21338186d5
Merge "Fix NPE when coming back to settings homepage." into rvc-dev
2020-03-11 11:40:02 +00:00
Automerger Merge Worker
2df7ee7f0e
Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f
...
Change-Id: I7191ca8a3c7c1afcd4472649c11eb19eb0df919d
2020-03-11 11:34:37 +00:00
Yi-Ling Chuang
b8eb466dd1
Fix WifiTetherSettingsTest
...
Bug: 151201888
Test: run WifiTetherSettingsTest successfully
Change-Id: I80df83f3dc720c80734ec083c33bab5c56c52796
2020-03-11 19:33:09 +08:00
TreeHugger Robot
f9570ad33f
Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev
2020-03-11 11:32:12 +00:00
Automerger Merge Worker
ebe7dcaff8
Merge "Update the OWNER files" into rvc-dev am: a38859b2b7
...
Change-Id: I8507db93e0193beb937e6684c18d4fbbdef08c99
2020-03-11 11:29:06 +00:00
Yi-Ling Chuang
f46fd991fa
Fix DevelopmentSettingsDashboardFragmentTest
...
Fixes: 151206654
Bug: 150907639
Test: robotests
Change-Id: I36a1dacc7fe2ccd3b724a9aa135447db97fa3d41
2020-03-11 19:16:35 +08:00
TreeHugger Robot
a38859b2b7
Merge "Update the OWNER files" into rvc-dev
2020-03-11 11:08:21 +00:00
Tsung-Mao Fang
a5da81db36
Tweak strings for assist app
...
Follow up the new Assist app string updates.
Bug: 151193605
Test: build and see this page.
Change-Id: Ibbc51cd282c6ae0f9ef1722c33688f21e0c78da7
2020-03-11 10:22:09 +00:00
Yi-Ling Chuang
542f76a51e
Fix TetherSettingsTest
...
Fixes: 151204777
Test: run TetherSettingsTest
Change-Id: Ic510aac7fc7f9af095e78473bc191a4e903dcaba
2020-03-11 18:18:36 +08:00
menghanli
19cf6ddff8
Update R acessibility assets and strings (2/n)
...
- Temporary-use template summary by shortcut state
Bug: 148837311
Test: Manual test
Change-Id: Ia720b8f3f317bb1874d6758ebc4fbf4145d0c217
2020-03-11 17:21:27 +08:00
Yi-Ling Chuang
a591d7a082
Fix NPE when coming back to settings homepage.
...
When users navigate back to the homepage, if there is a slice being
displayed, slice callback will be triggered. It will then check if this
slice has any error hint, where NPE would occur if the slice turns out
to be null. Hence, add a null check before checking slice hint.
Fixes: 148158780
Test: rebuild and navigate back to the homepage.
Change-Id: I2b04dc0d64a223cc85f6af55b2ae2dbc5f3e1f40
2020-03-11 16:52:44 +08:00
Sunny Shao
3d3757683c
Update the OWNER files
...
Bug: 151179432
Test: manual review
Change-Id: I2bfd917c2bea2d71303ed9aecf29d850f12eec3d
2020-03-11 16:45:14 +08:00
Arc Wang
0a45c4099d
[Wi-Fi] Fix 2 Wi-Fi shortcuts bug
...
Check feature flag to show the shortcut of
WifiSettingsActivity or WifiSettings2Activity.
Bug: 151133236
Test: manual
Home context menu -> Widgets -> Settings shortcut
Should only show 1 Wi-Fi shortcut option.
Change-Id: Ie980b69ce1f23614475070b5c74d9a6d5cdab7ae
2020-03-11 15:41:13 +08:00
Automerger Merge Worker
423c789130
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3
...
Change-Id: Ic33bc4574017d972cd4007ab25373c9b6443652e
2020-03-11 04:34:11 +00:00
Automerger Merge Worker
cb9cfc19c3
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
...
Change-Id: I0764e99d5970a34f7cf3a01665870123151a94f5
2020-03-11 04:20:12 +00:00
Arc Wang
b8fb854e98
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev
2020-03-11 04:00:49 +00:00
Automerger Merge Worker
a4f49c2211
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2
...
Change-Id: Id257eb221584b0236ca15ed49486419979a8e828
2020-03-11 03:46:30 +00:00
Automerger Merge Worker
88321847f2
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
...
Change-Id: I56111d64a362e93fae8ff5b12af7f12e53bfc043
2020-03-11 03:33:13 +00:00
TreeHugger Robot
6aa40f6ea7
Merge "Revert "Ignore some failed tests."" into rvc-dev
2020-03-11 03:16:49 +00:00
Yi-Ling Chuang
ef4550c504
Revert "Ignore some failed tests."
...
This reverts commit db4fd2b1c3
2020-03-11 03:16:33 +00:00
Automerger Merge Worker
e09cffdfdb
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 am: b56ca208d9
...
Change-Id: I8c71ba4fec4304dbb8d5370c0f71c0ec8202a93d
2020-03-11 00:54:35 +00:00
Automerger Merge Worker
b56ca208d9
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
...
Change-Id: I1f920eab1476d7365ea1cac9fd680f4b2aa56637
2020-03-11 00:42:55 +00:00
Quang Luong
bff2347964
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev
2020-03-11 00:31:29 +00:00
Kevin Chyn
59834e6bf4
Partial revert of ag/10482633
...
SUW is using activity result codes already. Let's stick with the old
behavior until/if there's a way to make it work nicely.
Fixes: 151058692
Test: Skip fingerprint in SUW. Fingerprint not shown again in SUW.
Change-Id: I3c52cddd568dc5ded6bf810272ffb77f0841c692
2020-03-10 17:26:26 -07:00
Christopher Tate
36f182159f
DO NOT MERGE - Track framework changes to crashApplication
...
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
2020-03-10 15:52:05 -07:00
