OSDN Git Service
Sunny Shao [Thu, 13 Jun 2019 09:06:31 +0000 (17:06 +0800)]
Update testcases which failed due to the SupportLibrary changed
Fragment.oncreate() causes an IllegalStateException. We use a
ShadowFragment to stop the calling sequence.
Fixes:
135086559
Test: robotest
Change-Id: I601e0f2513f826b0b7749cb2c013b7e4c0a94a33
Kevin Yao [Thu, 13 Jun 2019 04:56:55 +0000 (21:56 -0700)]
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
Kevin Yao [Thu, 13 Jun 2019 04:56:33 +0000 (21:56 -0700)]
Merge "Fix typo for Accessibility permission dialog" into qt-dev am:
e78e4dc6f2 am:
e6ae9219ce
am:
96a8cd4ef6
Change-Id: I37de163f9c03b9a6224b289a8a8b88fbab60b280
Android Build Merger (Role) [Thu, 13 Jun 2019 04:52:17 +0000 (04:52 +0000)]
Merge "Merge "Fix typo for Accessibility permission dialog" into qt-dev am:
e78e4dc6f2 am:
2bff53a21e" into qt-r1-dev-plus-aosp
Kevin Yao [Thu, 13 Jun 2019 04:52:05 +0000 (21:52 -0700)]
Merge "Fix typo for Accessibility permission dialog" into qt-dev am:
e78e4dc6f2
am:
2bff53a21e
Change-Id: Ibb387aa5b515c9b99a9c9ad1dc29b45ae186d140
Kevin Yao [Thu, 13 Jun 2019 04:52:03 +0000 (21:52 -0700)]
Merge "Fix typo for Accessibility permission dialog" into qt-dev am:
e78e4dc6f2
am:
e6ae9219ce
Change-Id: I7cca7c8fb1970861726c9fa9d0dc7db5fef8edc6
Kevin Yao [Thu, 13 Jun 2019 04:47:04 +0000 (21:47 -0700)]
Merge "Fix typo for Accessibility permission dialog" into qt-dev
am:
e78e4dc6f2
Change-Id: I154f5f038a2944f9c1376b4baba8a4cd85b49adb
Kevin Yao [Thu, 13 Jun 2019 04:47:04 +0000 (21:47 -0700)]
Merge "Fix typo for Accessibility permission dialog" into qt-dev
am:
e78e4dc6f2
Change-Id: Ia3292d11926a24e9e907c71b5d85bf97a062a066
TreeHugger Robot [Thu, 13 Jun 2019 04:30:26 +0000 (04:30 +0000)]
Merge "Fix typo for Accessibility permission dialog" into qt-dev
Kevin Chyn [Wed, 12 Jun 2019 22:19:24 +0000 (15:19 -0700)]
Merge changes from topic "face-bypass-move" into qt-r1-dev am:
ffcc25ba92
am:
db00ff2165
Change-Id: I9a93753fd094d8a3634c17e18c8b1900d4632312
Kevin Chyn [Wed, 12 Jun 2019 22:04:46 +0000 (15:04 -0700)]
Merge changes from topic "face-bypass-move" into qt-r1-dev
am:
ffcc25ba92
Change-Id: I787f5858cefad29869bcae364a0b1f1a4aa9cc4c
Michael Groover [Wed, 12 Jun 2019 21:58:52 +0000 (14:58 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am:
ad85d6b942 am:
b31b522513
am:
724a977f8c
Change-Id: I51fb1404863db0988c3e3a80013bdcb762b32c66
Michael Groover [Wed, 12 Jun 2019 21:56:13 +0000 (14:56 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am:
ad85d6b942 am:
628d311d0c
am:
edef325b20
Change-Id: I4b6d164ac33975e1c31ae19ffa427a26eeab4925
Kevin Chyn [Wed, 12 Jun 2019 21:55:25 +0000 (14:55 -0700)]
Call finish() when enrollment loses focus am:
e9d50cd91b
am:
d7ec14a5b5
Change-Id: I44f1df3f1692f008e8a5251715bc341e3dae169e
Kevin Chyn [Wed, 12 Jun 2019 21:51:42 +0000 (21:51 +0000)]
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
Michael Groover [Wed, 12 Jun 2019 21:36:59 +0000 (14:36 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am:
ad85d6b942
am:
b31b522513
Change-Id: Iecf9903356794b13ce628843d0dfda821d6305d3
Michael Groover [Wed, 12 Jun 2019 21:33:33 +0000 (14:33 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am:
ad85d6b942
am:
628d311d0c
Change-Id: I1679817363e1f9e7d5541c8bd575194d24605edd
Kevin Chyn [Wed, 12 Jun 2019 21:30:30 +0000 (14:30 -0700)]
Call finish() when enrollment loses focus
am:
e9d50cd91b
Change-Id: Ic48cdf5e244689481b8b53af5b55b4b316dc5c56
Michael Groover [Wed, 12 Jun 2019 21:20:33 +0000 (14:20 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am:
ad85d6b942
Change-Id: Ie49e2845fe5c3389b9a44803e293789971ecb485
Michael Groover [Wed, 12 Jun 2019 21:17:03 +0000 (14:17 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am:
ad85d6b942
Change-Id: I8884f4b01a3980bfc00e9a57ea1b8c43c27578d3
Michael Groover [Wed, 12 Jun 2019 20:31:16 +0000 (20:31 +0000)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
Kevin Chyn [Wed, 12 Jun 2019 19:13:06 +0000 (12:13 -0700)]
Make bypass controller consistent with rest of face unlock settings
1) Should only be shown for owner profile
2) Should be disabled if A) not enrolled, B) DevicePolicyManager, C) HAL issue
Fixes:
134700640
Test: Manual test of conditions above
Change-Id: Id72db59c662df6c529c98aafd610de8c86c77ebd
Kevin Chyn [Wed, 12 Jun 2019 18:55:22 +0000 (11:55 -0700)]
Move lockscreen bypass setting to Settings > Security > Face unlock
Fixes:
134700640
Test: atest FaceSettingsLockscreenBypassPreferenceControllerTest
Test: enabling/disabling setting through Settings > Security > Face unlock
works as expected
Test: preference controller no longer seen in Settings > Display > Lock screen display
Change-Id: I54807ad92fac62398a2b9dab93dd638775a09c8d
Kevin Chyn [Wed, 12 Jun 2019 03:40:30 +0000 (20:40 -0700)]
Call finish() when enrollment loses focus
Bug:
134971919
Test: Entering keyguard on any enrollment screen finishes enrollment now
Test: Going back/forward works
Change-Id: I2c80a5586c10fa3feb780a5eadfe203abed52dea
TreeHugger Robot [Wed, 12 Jun 2019 17:44:14 +0000 (17:44 +0000)]
Merge "Fix launching of work profile notif settings"
Julia Reynolds [Wed, 12 Jun 2019 15:39:39 +0000 (11:39 -0400)]
Fix launching of work profile notif settings
Test: manual
Fixes:
132289017
Change-Id: I3c177aae1f4dd46556b652253d24b225d01987eb
joshmccloskey [Wed, 12 Jun 2019 05:56:01 +0000 (22:56 -0700)]
Merge "Increased toggling area" into qt-r1-dev am:
a854373bee
am:
388b26d4d5
Change-Id: I8deab601444497676d929704637613ab824d19e4
joshmccloskey [Wed, 12 Jun 2019 05:51:01 +0000 (22:51 -0700)]
Merge "Increased toggling area" into qt-r1-dev
am:
a854373bee
Change-Id: I628397789acf5a7b879a52f3d12cc9786d0869e2
TreeHugger Robot [Wed, 12 Jun 2019 05:40:53 +0000 (05:40 +0000)]
Merge "Increased toggling area" into qt-r1-dev
joshmccloskey [Sat, 8 Jun 2019 00:23:44 +0000 (17:23 -0700)]
Increased toggling area
Test: Tapping the whole area will now toggle the switch. Note that
it is no longer possible to individually select the title and subtitle during
talkback, but you can select them as a group.
Test: Verified that without talkback the user must actually press
switch.
Fixes:
130398575
Change-Id: I369637f23e41ac6dc4333293b95a5ccae259ee1f
Fan Zhang [Tue, 11 Jun 2019 21:48:07 +0000 (14:48 -0700)]
Merge "Update mainline module versions string." into qt-dev am:
2aa94b97c7 am:
a621f8a374
am:
32ae5db2ee
Change-Id: I03b897745f6662efd847900313e217e6464bf696
Fan Zhang [Tue, 11 Jun 2019 21:47:44 +0000 (14:47 -0700)]
Merge "Update mainline module versions string." into qt-dev am:
2aa94b97c7 am:
2c9bd6707d
am:
2bbb1bf2e0
Change-Id: I7a31d766b5e8285d49afc523a980692549271745
Fan Zhang [Tue, 11 Jun 2019 21:44:43 +0000 (14:44 -0700)]
Merge "Update mainline module versions string." into qt-dev am:
2aa94b97c7
am:
a621f8a374
Change-Id: Iaafcb9bcc773ecf48fe2e4d57ab8b8ee6223654e
Fan Zhang [Tue, 11 Jun 2019 21:42:45 +0000 (14:42 -0700)]
Merge "Update mainline module versions string." into qt-dev am:
2aa94b97c7
am:
2c9bd6707d
Change-Id: Id9bb6359eaf6ddd60237c929522418ea291412d5
Fan Zhang [Tue, 11 Jun 2019 21:38:42 +0000 (14:38 -0700)]
Merge "Update mainline module versions string." into qt-dev
am:
2aa94b97c7
Change-Id: I0004f9860c2c8f16be3612c165b3e2a40031819c
Fan Zhang [Tue, 11 Jun 2019 21:38:42 +0000 (14:38 -0700)]
Merge "Update mainline module versions string." into qt-dev
am:
2aa94b97c7
Change-Id: I3ac299e4e8b591a54ebb082d57e4dd408152029c
TreeHugger Robot [Tue, 11 Jun 2019 21:20:12 +0000 (21:20 +0000)]
Merge "Update mainline module versions string." into qt-dev
Antony Sargent [Tue, 11 Jun 2019 20:28:20 +0000 (13:28 -0700)]
Merge "Merge "Remove on/off toggle for physical SIMs" into qt-dev am:
5836158f2e am:
af8fa25cfd" into qt-r1-dev-plus-aosp
am:
7a952730bd
Change-Id: Ibac314194218920b10c5808d98527b184ce4b4db
Antony Sargent [Tue, 11 Jun 2019 20:27:54 +0000 (13:27 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev am:
5836158f2e am:
5d186f5346
am:
f0e3ac6f27
Change-Id: I4dd3e2855de57f1a3e3001fa8cda3206e8e045f4
Android Build Merger (Role) [Tue, 11 Jun 2019 20:20:05 +0000 (20:20 +0000)]
Merge "Merge "Remove on/off toggle for physical SIMs" into qt-dev am:
5836158f2e am:
af8fa25cfd" into qt-r1-dev-plus-aosp
Antony Sargent [Tue, 11 Jun 2019 20:19:53 +0000 (13:19 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev am:
5836158f2e
am:
5d186f5346
Change-Id: Ib92cedd28e291ba8e606f21883a7d69e73251a5c
Antony Sargent [Tue, 11 Jun 2019 20:19:51 +0000 (13:19 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev am:
5836158f2e
am:
af8fa25cfd
Change-Id: I51513b2df9aa1d5f22cdb118abe4935f0193e6ec
Antony Sargent [Tue, 11 Jun 2019 20:13:52 +0000 (13:13 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev
am:
5836158f2e
Change-Id: Idfe1855b09448feea3036185f092b3f56b10f18e
Antony Sargent [Tue, 11 Jun 2019 20:12:52 +0000 (13:12 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev
am:
5836158f2e
Change-Id: I3cfdbf15953adff2133ec4e59195c0403701c13e
TreeHugger Robot [Tue, 11 Jun 2019 20:06:54 +0000 (20:06 +0000)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev
Yi Jiang [Tue, 11 Jun 2019 19:34:56 +0000 (12:34 -0700)]
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev am:
9fb76d02bb
am:
ecbaa00855
Change-Id: I01a2ce816150cac7e14f046904b333c93bea49c9
Yi Jiang [Tue, 11 Jun 2019 19:28:15 +0000 (12:28 -0700)]
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
am:
9fb76d02bb
Change-Id: I4131b9f13778ccb1c05ff60a94ebfc49a02319cf
TreeHugger Robot [Tue, 11 Jun 2019 19:13:45 +0000 (19:13 +0000)]
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
tmfang [Tue, 11 Jun 2019 18:02:08 +0000 (11:02 -0700)]
Fix overlapping problem on notification screen am:
564fcb90ab am:
a5715f7d9c
am:
003bdbf7cc
Change-Id: If81ab3a8d637fc16953905b6262ad85d78260b9f
tmfang [Tue, 11 Jun 2019 17:59:45 +0000 (10:59 -0700)]
Fix overlapping problem on notification screen am:
564fcb90ab am:
1c474bf789
am:
114864981a
Change-Id: I1dcbbdece7db796fe2a83fc9c81c88d794534319
tmfang [Tue, 11 Jun 2019 17:55:08 +0000 (10:55 -0700)]
Fix overlapping problem on notification screen am:
564fcb90ab
am:
a5715f7d9c
Change-Id: I06f96d7f366ec3efa9b656c5dbe5d349435e9f60
tmfang [Tue, 11 Jun 2019 17:52:47 +0000 (10:52 -0700)]
Fix overlapping problem on notification screen am:
564fcb90ab
am:
1c474bf789
Change-Id: I39a2ee35350be2439cab8f3718ecc68fc99c4c82
tmfang [Tue, 11 Jun 2019 17:46:32 +0000 (10:46 -0700)]
Fix overlapping problem on notification screen
am:
564fcb90ab
Change-Id: I4843fe2b835b5487695ccb522848127028042d4c
tmfang [Tue, 11 Jun 2019 17:45:44 +0000 (10:45 -0700)]
Fix overlapping problem on notification screen
am:
564fcb90ab
Change-Id: I22700badde84ab5a723b41d59fbd72a9f751452e
Fan Zhang [Tue, 11 Jun 2019 17:12:12 +0000 (17:12 +0000)]
Merge changes I05beec7d,Iad4e9fc2
* changes:
Remove "platform_slice" attribute from Settings.
Use slice uri from slice index db directly.
Yi-Ling Chuang [Tue, 11 Jun 2019 09:14:46 +0000 (17:14 +0800)]
Update sound summary when it is set to None.
Currently when the sound is set to None, we don't update the summary,
unless users go to other pages and come back. Now we refreash it for a
better user experience.
Fixes:
134994978
Test: robotest
Change-Id: I5d9c0238ee31e0c26ebde3201794c17737791c62
tmfang [Tue, 11 Jun 2019 05:56:56 +0000 (13:56 +0800)]
Fix overlapping problem on notification screen
If we didn't set view and lifecycle for EntityHeaderController,
it only sets "z-order" as 0 for action bar.
So, user sees overlapped problem while user is scrolling view.
For now, we set view and lifecycle as parameter for EntityHeaderController,
then EntityHeaderController can change "z-order" while scrolling view.
Test: visual, robotest
Fixes:
132819126
Change-Id: Ieb01b26e4d6ca4d82f72371620938665de8149a0
Fan Zhang [Mon, 10 Jun 2019 21:40:32 +0000 (14:40 -0700)]
Update mainline module versions string.
We are putting this particular Google string into AOSP because:
1. This feature is part of platform mainline and has a hard dependency
to Google Play.
2. Settings code has no way to target gms devices, or mainline devices.
It's either AOSP or OEM. And this change is beyond OEM.
Fixes:
134101529
Test: manual
Change-Id: Ic4e7a7539230db0390bb9230931132e5500a1eb4
Anthony Han [Tue, 11 Jun 2019 00:53:21 +0000 (17:53 -0700)]
Merge "Hide color mode in search during A11y" into qt-r1-dev am:
9eaf5de974
am:
f43839da91
Change-Id: Iace1bdf9a10c85ed9e04ae2d8425f79f42606233
Anthony Han [Tue, 11 Jun 2019 00:32:17 +0000 (17:32 -0700)]
Merge "Hide color mode in search during A11y" into qt-r1-dev
am:
9eaf5de974
Change-Id: I91808e8c6fd981a1fc794d2584214036c8cb895c
Yi Jiang [Wed, 5 Jun 2019 20:20:42 +0000 (13:20 -0700)]
Show a 'permission missing' message in Screen Attention settings.
Bug:
129284701
Test: Manually verified.
Test: atest AdaptiveSleepSettingsTest
Change-Id: I6375929d59479a0aeb7e4aec184bd36e7f3ab33b
TreeHugger Robot [Mon, 10 Jun 2019 23:21:06 +0000 (23:21 +0000)]
Merge "Hide color mode in search during A11y" into qt-r1-dev
Antony Sargent [Mon, 10 Jun 2019 21:41:08 +0000 (14:41 -0700)]
Remove on/off toggle for physical SIMs
Our original design for mobile network subscription management included
having an on/off toggle for both eSIMs and physical SIMs. However, it
turns out that our current telephony stack has some problems with
disabling physical SIMs, so for now we're removing the on/off
toggle. Because of this, we've added a footer to the SIM details page
for physical SIMS letting users know that to disable them you need to
remove them from the device.
Even though we're removing the on/off toggle for pSIMs, there are still
a few edge cases where you could end up with a disabled one (eg having
two SIMs in single-SIM mode where the eSIM is active and then you erased
the eSIM). In order to have a way to re-enable the pSIM in these cases,
this CL changes the relevant pref's summary to "Tap to activate <name>"
and makes the tap action begin the re-enabling. This can affect either
the Mobile network pref on the Network & internet main page (if this
disabled pSIM is the only SIM), or an entry in the Mobile networks list
page (if there are still multiple SIMs present).
Finally, this also fixes a problem where we weren't showing the on/off
toggle for eSIMs if you only had one SIM total; we actually always want
to show it for eSIMs.
Bug:
132921553
Test: make RunSettingsRoboTests
Change-Id: Id0750ebd5bed46dc2450b65b53cc81847ef09b82
Fan Zhang [Sat, 1 Jun 2019 00:01:52 +0000 (17:01 -0700)]
Remove "platform_slice" attribute from Settings.
Bug:
126222433
Test: robo
Change-Id: I05beec7d3e3ec713c40740a1adbcacaee88237b5
Kevin Chang [Mon, 10 Jun 2019 01:23:13 +0000 (18:23 -0700)]
Merge "[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am:
102d43b5c1 am:
d09d7b078d -s ours
am:
f7b44051e9 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1
0e1f39fad8 is in history
Change-Id: I9e25cb5bfcdb206e302cdfd90196fe33c5411ded
Kevin Chang [Mon, 10 Jun 2019 01:22:45 +0000 (18:22 -0700)]
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am:
102d43b5c1 -s ours am:
b2d8610c99 -s ours
am:
a615d6d737 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1
0e1f39fad8 is in history
Change-Id: I3381b5f6151204d7997f84d467afb91124f32706
Android Build Merger (Role) [Mon, 10 Jun 2019 01:17:55 +0000 (01:17 +0000)]
Merge "[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am:
102d43b5c1 am:
d09d7b078d -s ours am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1
0e1f39fad8 is in history" into qt-r1-dev-plus-aosp
Kevin Chang [Mon, 10 Jun 2019 01:17:43 +0000 (18:17 -0700)]
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am:
102d43b5c1
am:
d09d7b078d -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1
0e1f39fad8 is in history
Change-Id: I4b9ccc7684b7eec7afd628e18d3853c227e185fd
Kevin Chang [Mon, 10 Jun 2019 01:17:42 +0000 (18:17 -0700)]
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am:
102d43b5c1 -s ours
am:
b2d8610c99 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1
0e1f39fad8 is in history
Change-Id: I53bd835bc715360953f385234f84cc2363e04375
Kevin Chang [Mon, 10 Jun 2019 01:12:44 +0000 (18:12 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev
am:
102d43b5c1
Change-Id: I12f498a313f5920940d49553f0c11c5619a7a4eb
Kevin Chang [Mon, 10 Jun 2019 01:12:42 +0000 (18:12 -0700)]
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev
am:
102d43b5c1 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1
0e1f39fad8 is in history
Change-Id: I2539e4f01579937bfc201f1c0b3dfd55a0c79e56
Kevin Chang [Mon, 10 Jun 2019 00:57:14 +0000 (00:57 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev
Bill Yi [Sun, 9 Jun 2019 02:43:19 +0000 (19:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am:
af6b60c523 -s ours
am:
41d0fa8eff -s ours
am skip reason: subject contains skip directive
Change-Id: I2de634e0ad9f4584106c822088a96baabf5033d5
Bill Yi [Sun, 9 Jun 2019 02:37:18 +0000 (19:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
af6b60c523 -s ours
am skip reason: subject contains skip directive
Change-Id: Idd860e9f22ab1117549f848c08ca998b63e51469
TreeHugger Robot [Sun, 9 Jun 2019 02:29:19 +0000 (02:29 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Sun, 9 Jun 2019 01:06:25 +0000 (01:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sun, 9 Jun 2019 00:52:31 +0000 (17:52 -0700)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
b567faffaa -s ours am:
d4ac3ef39a -s ours
am:
d9c00773e9 -s ours
am skip reason: subject contains skip directive
Change-Id: I083727de78d915c2d261f8280d584e004b977d7b
Bill Yi [Sun, 9 Jun 2019 00:52:08 +0000 (17:52 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
b567faffaa -s ours am:
49cc947902 -s ours
am:
7738e588ba -s ours
am skip reason: subject contains skip directive
Change-Id: If56b51c1bc3ce2a7c5da11eeadab7213414c30c6
Android Build Merger (Role) [Sun, 9 Jun 2019 00:47:23 +0000 (00:47 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
b567faffaa -s ours am:
d4ac3ef39a -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Bill Yi [Sun, 9 Jun 2019 00:47:07 +0000 (17:47 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
b567faffaa -s ours
am:
d4ac3ef39a -s ours
am skip reason: subject contains skip directive
Change-Id: I34df32a7ca6f22128da89514139383bac56cd965
Bill Yi [Sun, 9 Jun 2019 00:47:06 +0000 (17:47 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
b567faffaa -s ours
am:
49cc947902 -s ours
am skip reason: subject contains skip directive
Change-Id: Icdc5d52a5b7a1d1e4bfa7f622364e6501bb298ea
Bill Yi [Sun, 9 Jun 2019 00:42:07 +0000 (17:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
b567faffaa -s ours
am skip reason: subject contains skip directive
Change-Id: Ic5627d075ca460287a52b3b1d2a17c1fb61fa969
Bill Yi [Sun, 9 Jun 2019 00:42:07 +0000 (17:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
b567faffaa -s ours
am skip reason: subject contains skip directive
Change-Id: If9388b9fa0837bee7929f3aa1227e6e3391215ba
TreeHugger Robot [Sun, 9 Jun 2019 00:31:00 +0000 (00:31 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sat, 8 Jun 2019 19:26:23 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7b9956f00ad7c2e77e75dddb64a3ee70cc72fa78
Bill Yi [Sat, 8 Jun 2019 19:01:55 +0000 (12:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If595c532cf6a8e9724c74c96b29356ab1bdb65b0
Bill Yi [Sat, 8 Jun 2019 18:37:49 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2375b4bbdad6ab78fd8986fe5cc78d5fa697de7
Auto-generated-cl: translation import
Lorenzo Colitti [Sat, 8 Jun 2019 07:01:57 +0000 (00:01 -0700)]
Merge "Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am:
2bcfecdb21 am:
090cd1d05e" into qt-r1-dev-plus-aosp
am:
430def8e4a
Change-Id: I3931c3276092c582c6b58bf56b0d3082122b8456
Lorenzo Colitti [Sat, 8 Jun 2019 07:01:33 +0000 (00:01 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am:
2bcfecdb21 am:
4bee989ec1
am:
37bf2c4591
Change-Id: I6213316de4d3de257898f2ac23ee321aa8a24afb
Android Build Merger (Role) [Sat, 8 Jun 2019 06:56:45 +0000 (06:56 +0000)]
Merge "Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am:
2bcfecdb21 am:
090cd1d05e" into qt-r1-dev-plus-aosp
Lorenzo Colitti [Sat, 8 Jun 2019 06:56:32 +0000 (23:56 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am:
2bcfecdb21
am:
090cd1d05e
Change-Id: I93cb100fcbda15dfd0eba3dff2be301bc26948f3
Lorenzo Colitti [Sat, 8 Jun 2019 06:56:31 +0000 (23:56 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am:
2bcfecdb21
am:
4bee989ec1
Change-Id: Iaaf336ee2d88654bc46fc3caaf5595f651c8f9ba
Lorenzo Colitti [Sat, 8 Jun 2019 06:51:32 +0000 (23:51 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am:
2bcfecdb21
Change-Id: I556ca5d18af9ea673216d63bef71ee9ca66d66ad
Lorenzo Colitti [Sat, 8 Jun 2019 06:51:32 +0000 (23:51 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am:
2bcfecdb21
Change-Id: I1108a0f097e7f6b1fc47f2551f18e6316688a8f9
TreeHugger Robot [Sat, 8 Jun 2019 06:41:11 +0000 (06:41 +0000)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
Kevin Chyn [Sat, 8 Jun 2019 04:17:02 +0000 (21:17 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am:
eeecb3e24d am:
4c4bad8e67
am:
89dac52532
Change-Id: Id871de1d6522553d867320827771c0b7576b1f93
Kevin Chyn [Sat, 8 Jun 2019 04:16:40 +0000 (21:16 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am:
eeecb3e24d am:
ee6cc56b68
am:
482751b66e
Change-Id: I0e010636e162c277e28548005310bc81636baf56
Kevin Chyn [Sat, 8 Jun 2019 04:12:07 +0000 (21:12 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am:
eeecb3e24d
am:
4c4bad8e67
Change-Id: I0a3eda6c744c699af850a48e19180967558113b4
Kevin Chyn [Sat, 8 Jun 2019 04:11:43 +0000 (21:11 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am:
eeecb3e24d
am:
ee6cc56b68
Change-Id: Id0d8da3ec154b635a89799e106e2c8183aa1cba4
Kevin Chyn [Sat, 8 Jun 2019 04:07:07 +0000 (21:07 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
am:
eeecb3e24d
Change-Id: I4d38ec9a0ffa4dbcffee9b5b7e31c20fd5bd3c7b