Antony Sargent
16f93e0d19
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604 am: 24ebff2ff3
...
am: 40a63920f5
Change-Id: Icd3286369b6ff0abd9eccfc75cedc2b8acc8f544
2019-06-13 18:59:38 -07:00
TreeHugger Robot
8f9afaf99b
Merge "Set the mAccountName as null while device has no any account"
2019-06-14 00:40:59 +00:00
Antony Sargent
40a63920f5
Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604
...
am: 24ebff2ff3
Change-Id: I2968c6b031bc4c91753344a2b853e5e374e47d39
2019-06-13 17:31:52 -07:00
Antony Sargent
24ebff2ff3
Merge "Fix Calls/SMS default SIM selector" into qt-dev
...
am: 7af299c604
Change-Id: I35b3e57d151b6d20e5b088a7d6269490317644e5
2019-06-13 16:48:19 -07:00
TreeHugger Robot
7af299c604
Merge "Fix Calls/SMS default SIM selector" into qt-dev
2019-06-13 23:25:04 +00:00
Antony Sargent
22b827db55
Fix Calls/SMS default SIM selector
...
In cases where a SIM is initially disabled, even after you turn it on
the ListPreference's for selecting the default SIM for Calls and SMS
weren't working because the preference change listener wasn't getting
registered. This CL fixes that for these controllers by always
registering a change listener whenever we make the preference visible.
Fixes: 134472294
Bug: 135142209
Test: make RunSettingsRoboTests
Change-Id: Ia9362b7f26309bdbd6c5e8140fb606b28e2b34d8
2019-06-13 23:24:34 +00:00
Brad Ebinger
b2e2d82c53
[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a am: 33b1bfb8fb -s ours am: f51dc265a0 -s ours
...
am: 1984bd6d51 -s ours
am skip reason: change_id Ib448a6901581294050fc988ed9c16f7e93066860 with SHA1 9761dd4634 is in history
Change-Id: Ia28ae2172ac2ff9aa8d9b2e840289a4cd187f9e0
2019-06-13 14:24:47 -07:00
Brad Ebinger
1984bd6d51
[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a am: 33b1bfb8fb -s ours
...
am: f51dc265a0 -s ours
am skip reason: change_id Ib448a6901581294050fc988ed9c16f7e93066860 with SHA1 9761dd4634 is in history
Change-Id: Id950f68115adcbccdc67c4db5dada37ace579246
2019-06-13 14:02:41 -07:00
Brad Ebinger
f51dc265a0
[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a
...
am: 33b1bfb8fb -s ours
am skip reason: change_id Ib448a6901581294050fc988ed9c16f7e93066860 with SHA1 9761dd4634 is in history
Change-Id: I1486dd381d91fcbc415c03b616d716165325a689
2019-06-13 13:52:20 -07:00
Brad Ebinger
33b1bfb8fb
Merge "Allow SimDialogActivity to be started for result"
...
am: 11d92e894a
Change-Id: I016022dbc01916c32511244c1031f9a15359ecf5
2019-06-13 13:42:41 -07:00
Brad Ebinger
11d92e894a
Merge "Allow SimDialogActivity to be started for result"
2019-06-13 20:17:19 +00:00
Julia Reynolds
76c59e5b8a
Refresh the whole rule in zen listing screen am: 78ef02eb8f am: 56897c6bfc
...
am: 70af71155d
Change-Id: I839febe5e36cf88a99e107f4c5f96fd88bda8825
2019-06-13 11:43:17 -07:00
Julia Reynolds
2ab97e02cd
Refresh the whole rule in zen listing screen am: 78ef02eb8f am: 39bff61eea
...
am: 01be0f85b3
Change-Id: Ia366dd746291e127eb618ea9410a4d2f2aa83670
2019-06-13 11:42:55 -07:00
Julia Reynolds
70af71155d
Refresh the whole rule in zen listing screen am: 78ef02eb8f
...
am: 56897c6bfc
Change-Id: Ic78fc2340681f9b53f3913a6d7d23b72027cc00f
2019-06-13 11:34:57 -07:00
Julia Reynolds
01be0f85b3
Refresh the whole rule in zen listing screen am: 78ef02eb8f
...
am: 39bff61eea
Change-Id: I77d343b8a0ccb1658c6a9c090d93cde7a06984af
2019-06-13 11:33:23 -07:00
Julia Reynolds
39bff61eea
Refresh the whole rule in zen listing screen
...
am: 78ef02eb8f
Change-Id: I701a3678ab547584360c42e4f7b53755ba4059d6
2019-06-13 11:25:22 -07:00
Julia Reynolds
56897c6bfc
Refresh the whole rule in zen listing screen
...
am: 78ef02eb8f
Change-Id: I60352b05ca01838882b31f0106108c5392bc3c50
2019-06-13 11:25:21 -07:00
Julia Reynolds
78ef02eb8f
Refresh the whole rule in zen listing screen
...
Because the whole rule is pushed to NMS when it's
enabled/disabled.
Test: manual
Fixes: 135170330
Change-Id: I4bbc30f82dab07cff9184f9ab8a6f729499c6126
2019-06-13 16:48:22 +00:00
Yiwei Zhang
23ee53b746
Merge "Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39 am: 3b8681d8c6" into qt-r1-dev-plus-aosp
...
am: d7f6cf0691
Change-Id: I29f623fe0b7a488b84bee2fd3c865cb5ff001552
2019-06-13 09:13:01 -07:00
Yiwei Zhang
ad7e3ee351
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39 am: a05cb731e7
...
am: 9dd8ac1751
Change-Id: I115e563987fde5e3027f87f40e08be13de0dea3c
2019-06-13 09:10:25 -07:00
Android Build Merger (Role)
d7f6cf0691
Merge "Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39 am: 3b8681d8c6" into qt-r1-dev-plus-aosp
2019-06-13 15:53:56 +00:00
Yiwei Zhang
9dd8ac1751
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39
...
am: a05cb731e7
Change-Id: Ie602e1f6913968c1e9213166cf9b69021699b5f7
2019-06-13 08:52:43 -07:00
Yiwei Zhang
aab44f2cd1
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39
...
am: 3b8681d8c6
Change-Id: Ibe0f46e3bf763e99b7c818a0213fe50d04a3aa9b
2019-06-13 08:52:40 -07:00
Yiwei Zhang
3b8681d8c6
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
...
am: 0de0d5be39
Change-Id: Ib806945a955125febf2d7eb8c37e735c9e2ade0d
2019-06-13 08:46:47 -07:00
Yiwei Zhang
a05cb731e7
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
...
am: 0de0d5be39
Change-Id: I16a67e516ff20ec1aa38aa83d11c433e82299597
2019-06-13 08:45:42 -07:00
TreeHugger Robot
0de0d5be39
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
2019-06-13 15:38:54 +00:00
TreeHugger Robot
3075023d2a
Merge "Fix double divider in Apps & notifications page"
2019-06-13 13:38:32 +00:00
Jason Chiu
cfa36dbaeb
Fix double divider in Apps & notifications page
...
- The second divider is shown after we set a background to the pinned
header.
- Fix it by simply hiding the pinned header instead of its inner views.
Fixes: 133231218
Test: robotest, visual
Change-Id: I53add6f01930299425ce96d23350f9f066e85145
2019-06-13 18:23:37 +08:00
TreeHugger Robot
ff89b713b7
Merge "Migrate VirtualKeyboardFragment to DashboardFragment"
2019-06-13 08:35:30 +00:00
Raff Tsai
74942cee5e
Migrate VirtualKeyboardFragment to DashboardFragment
...
Fixes: 134451794
Test: robolectric
Change-Id: I2a40090178b3daea894bdad570549c7bfa34e4e6
2019-06-13 15:17:00 +08:00
Kevin Yao
f1c0f23510
Merge "Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2 am: 2bff53a21e" into qt-r1-dev-plus-aosp
...
am: 570124c7bd
Change-Id: Ia3a9b4258ec53e4fbb40f8c52f3cf9717fe6861f
2019-06-12 21:56:55 -07:00
Kevin Yao
697d261c2b
Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2 am: e6ae9219ce
...
am: 96a8cd4ef6
Change-Id: I37de163f9c03b9a6224b289a8a8b88fbab60b280
2019-06-12 21:56:33 -07:00
Android Build Merger (Role)
570124c7bd
Merge "Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2 am: 2bff53a21e" into qt-r1-dev-plus-aosp
2019-06-13 04:52:17 +00:00
Kevin Yao
34bce74a91
Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2
...
am: 2bff53a21e
Change-Id: Ibb387aa5b515c9b99a9c9ad1dc29b45ae186d140
2019-06-12 21:52:05 -07:00
Kevin Yao
96a8cd4ef6
Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2
...
am: e6ae9219ce
Change-Id: I7cca7c8fb1970861726c9fa9d0dc7db5fef8edc6
2019-06-12 21:52:03 -07:00
Kevin Yao
e6ae9219ce
Merge "Fix typo for Accessibility permission dialog" into qt-dev
...
am: e78e4dc6f2
Change-Id: Ia3292d11926a24e9e907c71b5d85bf97a062a066
2019-06-12 21:47:04 -07:00
Kevin Yao
2bff53a21e
Merge "Fix typo for Accessibility permission dialog" into qt-dev
...
am: e78e4dc6f2
Change-Id: I154f5f038a2944f9c1376b4baba8a4cd85b49adb
2019-06-12 21:47:04 -07:00
TreeHugger Robot
e78e4dc6f2
Merge "Fix typo for Accessibility permission dialog" into qt-dev
2019-06-13 04:30:26 +00:00
Yiwei Zhang
240760c570
Game Driver: Add UI support for prerelease Game Driver
...
Bug: 134881329
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I9c710a5e6adff9b01c656d576f53f9b4b3360207
2019-06-12 18:09:36 -07:00
Kevin Chyn
64fec889df
Merge changes from topic "face-bypass-move" into qt-r1-dev am: ffcc25ba92
...
am: db00ff2165
Change-Id: I9a93753fd094d8a3634c17e18c8b1900d4632312
2019-06-12 15:19:24 -07:00
Kevin Chyn
db00ff2165
Merge changes from topic "face-bypass-move" into qt-r1-dev
...
am: ffcc25ba92
Change-Id: I787f5858cefad29869bcae364a0b1f1a4aa9cc4c
2019-06-12 15:04:46 -07:00
Michael Groover
ed1d864f31
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942 am: b31b522513
...
am: 724a977f8c
Change-Id: I51fb1404863db0988c3e3a80013bdcb762b32c66
2019-06-12 14:58:52 -07:00
Michael Groover
d207e7a4ca
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942 am: 628d311d0c
...
am: edef325b20
Change-Id: I4b6d164ac33975e1c31ae19ffa427a26eeab4925
2019-06-12 14:56:13 -07:00
Kevin Chyn
fffc309491
Call finish() when enrollment loses focus am: e9d50cd91b
...
am: d7ec14a5b5
Change-Id: I44f1df3f1692f008e8a5251715bc341e3dae169e
2019-06-12 14:55:25 -07:00
Kevin Chyn
ffcc25ba92
Merge changes from topic "face-bypass-move" into qt-r1-dev
...
* changes:
Make bypass controller consistent with rest of face unlock settings
Move lockscreen bypass setting to Settings > Security > Face unlock
2019-06-12 21:51:42 +00:00
Michael Groover
724a977f8c
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
...
am: b31b522513
Change-Id: Iecf9903356794b13ce628843d0dfda821d6305d3
2019-06-12 14:36:59 -07:00
Michael Groover
edef325b20
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
...
am: 628d311d0c
Change-Id: I1679817363e1f9e7d5541c8bd575194d24605edd
2019-06-12 14:33:33 -07:00
Kevin Chyn
d7ec14a5b5
Call finish() when enrollment loses focus
...
am: e9d50cd91b
Change-Id: Ic48cdf5e244689481b8b53af5b55b4b316dc5c56
2019-06-12 14:30:30 -07:00
Michael Groover
628d311d0c
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
...
am: ad85d6b942
Change-Id: Ie49e2845fe5c3389b9a44803e293789971ecb485
2019-06-12 14:20:33 -07:00
Michael Groover
b31b522513
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
...
am: ad85d6b942
Change-Id: I8884f4b01a3980bfc00e9a57ea1b8c43c27578d3
2019-06-12 14:17:03 -07:00