android-build-team Robot
47f14462f0
Snap for 5649060 from 9eaf5de974 to qt-qpr1-release
...
Change-Id: I53b7e199d0a1de3447c425d105795ea31757f106
2019-06-11 03:12:16 +00:00
android-build-team Robot
b6aeb67b26
Snap for 5649081 from 102d43b5c1 to qt-release
...
Change-Id: I606152e217799a73ed699dd9b05d9c5b84665948
2019-06-11 03:03:00 +00:00
android-build-team Robot
1b5b7c09cf
Snap for 5648835 from 9eaf5de974 to qt-c2f2-release
...
Change-Id: I91415053d936194a2a6a94841d451445fc2678b4
2019-06-11 03:01:57 +00:00
Fan Zhang
308a532852
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
2019-06-11 02:31:25 +00:00
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
Anthony Han
5904e176c6
Merge "Hide color mode in search during A11y" into qt-r1-dev
...
am: 9eaf5de974
2019-06-10 17:32:13 -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
android-build-team Robot
855987d0e0
Snap for 5647767 from d09d7b078d to qt-c2f2-release
...
Change-Id: I9ea7e4b6393e749a932ffb8dcc83dd8e34550be4
2019-06-10 19:49:24 +00: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
b295e7abed
Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1
...
am: d09d7b078d
2019-06-09 18:17:42 -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
android-build-team Robot
8e7d9d1cd2
Snap for 5645956 from af6b60c523 to qt-qpr1-release
...
Change-Id: I4cc1836061a73bfa9197e1b7feb333fa4a561937
2019-06-09 23:04:38 +00:00
android-build-team Robot
bb0b6246d5
Snap for 5645951 from b567faffaa to qt-release
...
Change-Id: I52b0620bdd5f874156cf1eca827f6343dde867d0
2019-06-09 23:03:10 +00:00
TreeHugger Robot
c9930505be
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-06-09 03:02:37 +00: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
Bill Yi
8ef323524e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: af6b60c523
2019-06-08 19:37:17 -07:00
TreeHugger Robot
af6b60c523
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-09 02:29:19 +00: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
d1b2954cff
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours
...
am: d4ac3ef39a
2019-06-08 17:47:06 -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
android-build-team Robot
ab46732f13
Snap for 5645017 from 2bcfecdb21 to qt-release
...
Change-Id: I87b7cdd74db6c108706bae3448421444779cecea
2019-06-08 23:13:33 +00:00
android-build-team Robot
9937e4a126
Snap for 5645193 from 090cd1d05e to qt-qpr1-release
...
Change-Id: I82e6259d3b8796794cd4dc82cf1803025b37b1ff
2019-06-08 23:11:18 +00:00
Bill Yi
73923ec0e7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I805ccf4d38fa75c5c0c9e9ce538bf48f7db23dda
2019-06-08 12:50:40 -07: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
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
c1d37805fc
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21
...
am: 090cd1d05e
2019-06-07 23:56:31 -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
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
41e92a1e6c
Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d
...
am: ee6cc56b68
2019-06-07 21:11:07 -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
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
1221604283
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
...
am: 7b5d1016f4
2019-06-07 16:02:22 -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
