OSDN Git Service
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: I3ac299e4e8b591a54ebb082d57e4dd408152029c
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
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
Kevin Chyn [Sat, 8 Jun 2019 04:06:08 +0000 (21:06 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
am:
eeecb3e24d
Change-Id: I16becf1de78463e9379291f6273c963e850d4687
Kevin Chyn [Fri, 7 Jun 2019 23:10:29 +0000 (16:10 -0700)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev am:
7b5d1016f4
am:
a53cf34f7e
Change-Id: I7a1c016807c1592813706cc6bd9aacd0777c70d0
Kevin Chyn [Fri, 7 Jun 2019 23:04:05 +0000 (16:04 -0700)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
am:
7b5d1016f4
Change-Id: Idfc11df50ece3e3553fe6e45715716305c1b06e7
Kevin Chyn [Fri, 7 Jun 2019 22:44:49 +0000 (22:44 +0000)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
Kevin Chyn [Fri, 7 Jun 2019 22:13:29 +0000 (15:13 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
Fixes:
133822544
Test: No more multiple instances of fingerprint settings after enrolling
from within the settings page
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL does not
send the user to fingerprint settings after completing enrollment
Change-Id: I003dc142b01ed6ffae83299ab4b69f4896eb93e3
Kevin Chyn [Fri, 7 Jun 2019 19:41:05 +0000 (12:41 -0700)]
Do not stay on education page if user has enrolled max templates
Fixes:
134769754
Test: Enroll max templates, go back, intro screen is seen instead
Change-Id: I4a5f8d71abff88688f7c77860bb44caa95d17d61
Joshua Mccloskey [Fri, 7 Jun 2019 19:32:31 +0000 (12:32 -0700)]
Merge "Updating colors for dark theme" into qt-r1-dev am:
6d24819758
am:
df8ef0d9bb
Change-Id: Id084a2f9d2b75eea18df67ede8a55545fdc9480f
Joshua Mccloskey [Fri, 7 Jun 2019 19:28:31 +0000 (12:28 -0700)]
Merge "Updating colors for dark theme" into qt-r1-dev
am:
6d24819758
Change-Id: Icde71ef65279e29bf64c0005e29e9db004550054
Joshua Mccloskey [Fri, 7 Jun 2019 19:15:11 +0000 (19:15 +0000)]
Merge "Updating colors for dark theme" into qt-r1-dev
Lorenzo Colitti [Fri, 7 Jun 2019 06:18:21 +0000 (15:18 +0900)]
Disconnect if the user cancels the no/partial connectivity dialog
If the user exits the no Internet or partial connectivity dialog
without taking any action, there is no longer any way to use the
network. So, disconnect the network.
Bug:
130766237
Test: clicking outside dialog disconnects network
Test: orientation changes do not disconnect network
Change-Id: I80c2c98c994dc01e53b32f40332b3f1bd03b6012
George Chang [Fri, 7 Jun 2019 06:39:38 +0000 (23:39 -0700)]
[automerger skipped] Merge "Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1 am:
dc29b325a1" into qt-r1-dev-plus-aosp
am:
771b5468b9 -s ours
am skip reason: change_id If4c8e47c2509b09e8bc1a464e1ab329b945e3d20 with SHA1
6ddff97414 is in history
Change-Id: I8b4127787401f6d5d9384021f7e78da2c173a6ee
George Chang [Fri, 7 Jun 2019 06:39:10 +0000 (23:39 -0700)]
[automerger skipped] Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1 am:
dc6a11a82a
am:
ee0740c4d6 -s ours
am skip reason: change_id If4c8e47c2509b09e8bc1a464e1ab329b945e3d20 with SHA1
6ddff97414 is in history
Change-Id: I7315d98a6c905e915611d95364215bdc2341b4e4
Android Build Merger (Role) [Fri, 7 Jun 2019 06:34:22 +0000 (06:34 +0000)]
Merge "Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1 am:
dc29b325a1" into qt-r1-dev-plus-aosp
George Chang [Fri, 7 Jun 2019 06:34:09 +0000 (23:34 -0700)]
Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1
am:
dc29b325a1
Change-Id: I8a8ce7b773a0c5fa6ead761f288263fe7133ac1c
George Chang [Fri, 7 Jun 2019 06:34:07 +0000 (23:34 -0700)]
Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1
am:
dc6a11a82a
Change-Id: Iccc2bcf6c1bec2b2ff9b3aa096ff1fb8c155f03b
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am:
e4c2e427a1
Change-Id: If4545377b7c6196027b89514a91a2b7068f1202b
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am:
e4c2e427a1
Change-Id: I52186dbe7b550fd6ab2ae0bccdba80ac1e779b1f
George Chang [Thu, 30 May 2019 10:23:18 +0000 (18:23 +0800)]
Fix NFC state switched off every time user entered connection preferences page
NfcAirplaneModeObserver added a scenario that
switched NFC off every time a user entered connection
preferences page if airplane mode was on.
Even when a user manually switched on NFC, the observer would still
turn NFC off when re-entering connection preferences page.
GSAM TS.27 certification requires NFC state to be consistent
under AirplaneMode before and after reboot the device.
NfcAirplaneModeObserver breaks the requirement
because it would always switch NFC off under airplane mode
when a user checked the NFC state in settings page.
Fix it by removing NfcAirplaneModeObserver.
Keep the NFC state consistent.
Bug:
128384879
Test: make RunSettingsRoboTests / Check Nfc on/off Status
Merged-In: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
Change-Id: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
George Chang [Fri, 7 Jun 2019 00:09:46 +0000 (00:09 +0000)]
Merge "Fix NFC state switched off every time user entered connection preferences page"
joshmccloskey [Thu, 6 Jun 2019 23:13:59 +0000 (16:13 -0700)]
Updating colors for dark theme
Bug:
133277663
Test: Verified colors are correct for dark & light themes.
Change-Id: If1aa5f22286d15918cfec3cd4a6436760bf304b2
Yi Jiang [Thu, 6 Jun 2019 20:27:54 +0000 (13:27 -0700)]
Merge "Fix screen attention contextual card" into qt-r1-dev am:
03c47e7687
am:
02777d3e1b
Change-Id: I5acfcf2d99d1e5652cce1d552aa28b7369f8f516
Yi Jiang [Thu, 6 Jun 2019 20:23:32 +0000 (13:23 -0700)]
Merge "Fix screen attention contextual card" into qt-r1-dev
am:
03c47e7687
Change-Id: Ic7a425c3662d834da23629d9fd98dc5fc39e4ccc
Yi Jiang [Thu, 6 Jun 2019 20:06:21 +0000 (20:06 +0000)]
Merge "Fix screen attention contextual card" into qt-r1-dev
Julia Reynolds [Thu, 6 Jun 2019 19:19:15 +0000 (12:19 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am:
f58cd0fb51 am:
df0fdaef74
am:
4c15fab99d
Change-Id: I0f38ea55a246e19bac8b46851fc9763fb56c811e
OSDN Git Service
