Michael Groover
628d311d0c
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
...
am: ad85d6b942
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
2019-06-12 14:17:03 -07:00
Michael Groover
ad85d6b942
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
2019-06-12 20:31:16 +00:00
Kevin Chyn
6a4a0e7396
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
2019-06-12 13:27:18 -07:00
Fan Zhang
33caf61878
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7 am: 2c9bd6707d
...
am: 2bbb1bf2e0
2019-06-11 14:47:44 -07:00
Fan Zhang
2bbb1bf2e0
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
...
am: 2c9bd6707d
2019-06-11 14:42:45 -07:00
Fan Zhang
2c9bd6707d
Merge "Update mainline module versions string." into qt-dev
...
am: 2aa94b97c7
2019-06-11 14:38:42 -07:00
Fan Zhang
a621f8a374
Merge "Update mainline module versions string." into qt-dev
...
am: 2aa94b97c7
2019-06-11 14:38:42 -07:00
TreeHugger Robot
2aa94b97c7
Merge "Update mainline module versions string." into qt-dev
2019-06-11 21:20:12 +00:00
Antony Sargent
4d76ef7b2e
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e am: 5d186f5346
...
am: f0e3ac6f27
2019-06-11 13:27:54 -07:00
Antony Sargent
f0e3ac6f27
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
...
am: 5d186f5346
2019-06-11 13:19:53 -07:00
Antony Sargent
af8fa25cfd
Merge "Remove on/off toggle for physical SIMs" into qt-dev
...
am: 5836158f2e
2019-06-11 13:13:52 -07:00
Antony Sargent
5d186f5346
Merge "Remove on/off toggle for physical SIMs" into qt-dev
...
am: 5836158f2e
2019-06-11 13:12:52 -07:00
Yi Jiang
878476e9ba
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev am: 9fb76d02bb
...
am: ecbaa00855
2019-06-11 12:34:56 -07:00
Yi Jiang
ecbaa00855
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
...
am: 9fb76d02bb
2019-06-11 12:28:15 -07:00
TreeHugger Robot
9fb76d02bb
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
2019-06-11 19:13:45 +00:00
Fan Zhang
933786b399
Merge changes I05beec7d,Iad4e9fc2
...
* changes:
Remove "platform_slice" attribute from Settings.
Use slice uri from slice index db directly.
2019-06-11 17:12:12 +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
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
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
d09d7b078d
Merge "Add tutorial dialog for gesture navigation" into qt-dev
...
am: 102d43b5c1
2019-06-09 18:12:44 -07:00
Kevin Chang
102d43b5c1
Merge "Add tutorial dialog for gesture navigation" into qt-dev
2019-06-10 00:57:14 +00: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
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
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
joshmccloskey
10576db765
Updating colors for dark theme
...
Bug: 133277663
Test: Verified colors are correct for dark & light themes.
Change-Id: If1aa5f22286d15918cfec3cd4a6436760bf304b2
2019-06-06 16:48:29 -07:00
Yi Jiang
d2c70cf18b
Merge "Fix screen attention contextual card" into qt-r1-dev am: 03c47e7687
...
am: 02777d3e1b
2019-06-06 13:27:54 -07:00
Yi Jiang
02777d3e1b
Merge "Fix screen attention contextual card" into qt-r1-dev
...
am: 03c47e7687
2019-06-06 13:23:32 -07:00
Yi Jiang
03c47e7687
Merge "Fix screen attention contextual card" into qt-r1-dev
2019-06-06 20:06:21 +00:00
Mehdi Alizadeh
2991fd1b23
Updates System Navigation strings am: 14a1b19735 am: cde53dc119
...
am: 1781d93ff3
2019-06-06 11:45:57 -07:00
Mehdi Alizadeh
1781d93ff3
Updates System Navigation strings am: 14a1b19735
...
am: cde53dc119
2019-06-06 11:31:42 -07:00
Mehdi Alizadeh
cde53dc119
Updates System Navigation strings
...
am: 14a1b19735
2019-06-06 11:28:39 -07:00
Mehdi Alizadeh
14d77491cf
Updates System Navigation strings
...
am: 14a1b19735
2019-06-06 11:28:39 -07:00
Mehdi Alizadeh
14a1b19735
Updates System Navigation strings
...
Bug: 134517326
Test: Verified manually
Change-Id: I777cfdc3a760040fdea745c5247152c5ff0d6218
2019-06-06 18:06:57 +00:00
Kevin Chang
219349cb2b
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp am: 52482edb2b
...
am: abee9d52e4
2019-06-06 02:22:26 -07:00
Kevin Chang
abee9d52e4
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
...
am: 52482edb2b
2019-06-06 02:17:06 -07:00
Kevin Chang
52482edb2b
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
2019-06-06 09:04:42 +00:00
Kevin Chang
9ff00646d0
Add tutorial dialog for gesture navigation
...
Add new tutorial dialog for gesture navigation in order to teach
users how to use the gesture
Fixes: 133650388
Test: Manual
Change-Id: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
Merged-In: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
2019-06-06 06:20:49 +00:00
Kevin Chang
0e1f39fad8
Add tutorial dialog for gesture navigation
...
Add new tutorial dialog for gesture navigation in order to teach
users how to use the gesture
Fixes: 133650388
Test: Manual
Change-Id: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
2019-06-06 13:56:54 +08:00
Antony Sargent
ed8e6fab8d
Merge "Strings for pSIM on/off toggle removal" into qt-dev am: 68a26e5535 am: 5cdf1955f4
...
am: 74401c6716
2019-06-05 20:44:33 -07:00
Yi Jiang
6985649b7e
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev am: d81e2c36f6
...
am: b7098b181f
2019-06-05 20:40:29 -07:00
Antony Sargent
74401c6716
Merge "Strings for pSIM on/off toggle removal" into qt-dev am: 68a26e5535
...
am: 5cdf1955f4
2019-06-05 20:27:01 -07:00
Antony Sargent
2082b0e969
Merge "Strings for pSIM on/off toggle removal" into qt-dev
...
am: 68a26e5535
2019-06-05 19:51:13 -07:00
Antony Sargent
5cdf1955f4
Merge "Strings for pSIM on/off toggle removal" into qt-dev
...
am: 68a26e5535
2019-06-05 19:47:52 -07:00
Antony Sargent
68a26e5535
Merge "Strings for pSIM on/off toggle removal" into qt-dev
2019-06-06 00:19:16 +00:00
