Anthony Han
f43839da91
Merge "Hide color mode in search during A11y" into qt-r1-dev
...
am: 9eaf5de974
2019-06-10 17:32:17 -07:00
Yi Jiang
c26745207d
Show a 'permission missing' message in Screen Attention settings.
...
Bug: 129284701
Test: Manually verified.
Test: atest AdaptiveSleepSettingsTest
Change-Id: I6375929d59479a0aeb7e4aec184bd36e7f3ab33b
2019-06-10 17:18:10 -07:00
TreeHugger Robot
9eaf5de974
Merge "Hide color mode in search during A11y" into qt-r1-dev
2019-06-10 23:21:06 +00:00
Antony Sargent
e548fc6334
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
2019-06-10 14:41:08 -07:00
Fan Zhang
13cf250be5
Remove "platform_slice" attribute from Settings.
...
Bug: 126222433
Test: robo
Change-Id: I05beec7d3e3ec713c40740a1adbcacaee88237b5
2019-06-10 14:05:43 -07:00
Kevin Chang
8af10e6da7
Merge "[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1 am: d09d7b078d -s ours
...
am: f7b44051e90e1f39fad8
2019-06-09 18:23:13 -07:00
Kevin Chang
e92c0b1804
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1 -s ours am: b2d8610c99 -s ours
...
am: a615d6d7370e1f39fad8
2019-06-09 18:22:45 -07:00
Android Build Merger (Role)
f7b44051e9
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
2019-06-10 01:17:55 +00:00
Kevin Chang
89679608d7
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1
...
am: d09d7b078d0e1f39fad8
2019-06-09 18:17:43 -07:00
Kevin Chang
a615d6d737
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1 -s ours
...
am: b2d8610c990e1f39fad8
2019-06-09 18:17:42 -07:00
Kevin Chang
d09d7b078d
Merge "Add tutorial dialog for gesture navigation" into qt-dev
...
am: 102d43b5c1
2019-06-09 18:12:44 -07:00
Kevin Chang
b2d8610c99
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev
...
am: 102d43b5c10e1f39fad8
2019-06-09 18:12:42 -07:00
Kevin Chang
102d43b5c1
Merge "Add tutorial dialog for gesture navigation" into qt-dev
2019-06-10 00:57:14 +00:00
Bill Yi
9c2bad63ae
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: af6b60c523 -s ours
...
am: 41d0fa8eff
2019-06-08 19:43:19 -07:00
Bill Yi
41d0fa8eff
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: af6b60c523
2019-06-08 19:37:18 -07:00
TreeHugger Robot
af6b60c523
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-09 02:29:19 +00:00
TreeHugger Robot
82d594c53c
Merge "Import translations. DO NOT MERGE"
2019-06-09 01:06:25 +00:00
Bill Yi
74d401c482
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours am: d4ac3ef39a -s ours
...
am: d9c00773e9
2019-06-08 17:52:31 -07:00
Bill Yi
4c3d0e1c03
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours am: 49cc947902 -s ours
...
am: 7738e588ba
2019-06-08 17:52:08 -07:00
Android Build Merger (Role)
d9c00773e9
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
2019-06-09 00:47:23 +00:00
Bill Yi
09bcb5c20f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours
...
am: d4ac3ef39a
2019-06-08 17:47:07 -07:00
Bill Yi
7738e588ba
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours
...
am: 49cc947902
2019-06-08 17:47:06 -07:00
Bill Yi
49cc947902
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: b567faffaa
2019-06-08 17:42:07 -07:00
Bill Yi
d4ac3ef39a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: b567faffaa
2019-06-08 17:42:07 -07:00
TreeHugger Robot
b567faffaa
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-09 00:31:00 +00:00
Bill Yi
096babc3ec
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I7b9956f00ad7c2e77e75dddb64a3ee70cc72fa78
2019-06-08 12:26:23 -07:00
Bill Yi
d2347cabdb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If595c532cf6a8e9724c74c96b29356ab1bdb65b0
2019-06-08 12:01:55 -07:00
Bill Yi
2abdf5319c
Import translations. DO NOT MERGE
...
Change-Id: Id2375b4bbdad6ab78fd8986fe5cc78d5fa697de7
Auto-generated-cl: translation import
2019-06-08 11:37:49 -07:00
Lorenzo Colitti
fb3000a5c8
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
2019-06-08 00:01:57 -07:00
Lorenzo Colitti
a1568c49d4
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21 am: 4bee989ec1
...
am: 37bf2c4591
2019-06-08 00:01:33 -07:00
Android Build Merger (Role)
430def8e4a
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
2019-06-08 06:56:45 +00:00
Lorenzo Colitti
c0b15ae85f
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21
...
am: 090cd1d05e
2019-06-07 23:56:32 -07:00
Lorenzo Colitti
37bf2c4591
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21
...
am: 4bee989ec1
2019-06-07 23:56:31 -07:00
Lorenzo Colitti
4bee989ec1
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
...
am: 2bcfecdb21
2019-06-07 23:51:32 -07:00
Lorenzo Colitti
090cd1d05e
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
...
am: 2bcfecdb21
2019-06-07 23:51:32 -07:00
TreeHugger Robot
2bcfecdb21
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
2019-06-08 06:41:11 +00:00
Kevin Chyn
186d3d2d96
Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d am: 4c4bad8e67
...
am: 89dac52532
2019-06-07 21:17:02 -07:00
Kevin Chyn
b7cb8b5de2
Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d am: ee6cc56b68
...
am: 482751b66e
2019-06-07 21:16:40 -07:00
Kevin Chyn
89dac52532
Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d
...
am: 4c4bad8e67
2019-06-07 21:12:07 -07:00
Kevin Chyn
482751b66e
Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d
...
am: ee6cc56b68
2019-06-07 21:11:43 -07:00
Kevin Chyn
ee6cc56b68
Only launch fingerprint settings after enrollment if it's from the summary controller
...
am: eeecb3e24d
2019-06-07 21:07:07 -07:00
Kevin Chyn
4c4bad8e67
Only launch fingerprint settings after enrollment if it's from the summary controller
...
am: eeecb3e24d
2019-06-07 21:06:08 -07:00
Kevin Chyn
7afe82e284
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev am: 7b5d1016f4
...
am: a53cf34f7e
2019-06-07 16:10:29 -07:00
Kevin Chyn
a53cf34f7e
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
...
am: 7b5d1016f4
2019-06-07 16:04:05 -07:00
Kevin Chyn
7b5d1016f4
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
2019-06-07 22:44:49 +00:00
Kevin Chyn
eeecb3e24d
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
2019-06-07 15:13:29 -07:00
Kevin Chyn
c976efa3e6
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
2019-06-07 12:41:05 -07:00
Joshua Mccloskey
71c09bab34
Merge "Updating colors for dark theme" into qt-r1-dev am: 6d24819758
...
am: df8ef0d9bb
2019-06-07 12:32:31 -07:00
Joshua Mccloskey
df8ef0d9bb
Merge "Updating colors for dark theme" into qt-r1-dev
...
am: 6d24819758
2019-06-07 12:28:31 -07:00
Joshua Mccloskey
6d24819758
Merge "Updating colors for dark theme" into qt-r1-dev
2019-06-07 19:15:11 +00:00
