Commit Graph

17627 Commits

Author SHA1 Message Date
Kevin Chyn
ffcc25ba92 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
2019-06-12 21:51:42 +00:00
Michael Groover
628d311d0c Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am: ad85d6b942

Change-Id: Ie49e2845fe5c3389b9a44803e293789971ecb485
2019-06-12 14:20:33 -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
a621f8a374 Merge "Update mainline module versions string." into qt-dev
am: 2aa94b97c7

Change-Id: I3ac299e4e8b591a54ebb082d57e4dd408152029c
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
5d186f5346 Merge "Remove on/off toggle for physical SIMs" into qt-dev
am: 5836158f2e

Change-Id: I3cfdbf15953adff2133ec4e59195c0403701c13e
2019-06-11 13:12:52 -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
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
Kevin Chang
d09d7b078d Merge "Add tutorial dialog for gesture navigation" into qt-dev
am: 102d43b5c1

Change-Id: I12f498a313f5920940d49553f0c11c5619a7a4eb
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
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
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
03c47e7687 Merge "Fix screen attention contextual card" into qt-r1-dev 2019-06-06 20:06:21 +00:00
Mehdi Alizadeh
cde53dc119 Updates System Navigation strings
am: 14a1b19735

Change-Id: Ifd443b394ce19ceb0c0fe94abbaaa31d9158c475
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
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
Antony Sargent
2082b0e969 Merge "Strings for pSIM on/off toggle removal" into qt-dev
am: 68a26e5535

Change-Id: I1ab73ba3e6e666a42590030d9dd6903f257b070a
2019-06-05 19:51:13 -07:00
Antony Sargent
68a26e5535 Merge "Strings for pSIM on/off toggle removal" into qt-dev 2019-06-06 00:19:16 +00:00
Yi Jiang
d81e2c36f6 Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev 2019-06-05 23:35:51 +00:00
Yi Jiang
068062d423 Fix screen attention contextual card
Bug: 134537004
Bug: 134537730
Test: Manually verified.
Test: make RunSettingsRoboTests
Change-Id: Ib5dd6444b70a5575863be985f58b48f00f505e53
2019-06-05 16:20:30 -07:00
Julia Reynolds
559a72e27f Merge "Read the subtext of notif importance field on selection" into qt-dev
am: 3f95fda1cf

Change-Id: Icc507ca10f4c657593ed1c6b6cb9d93c0b01f8fe
2019-06-05 14:49:45 -07:00
Antony Sargent
3631ed9dee Strings for pSIM on/off toggle removal
We need to remove the on/off toggle for pSIMs because of unexpected
problems in the telephony stack with being able to disable a pSIM. These
new strings are used in the updated UX we're adding to deal with this.

Bug: 132921553
Test: n/a
Change-Id: I60816289e0ef65bbf882a8dca6f08c46742bb1c9
2019-06-05 14:20:09 -07:00
Yi Jiang
9df180a008 use different description strings for screen attention settings and contextual card
1. Revert the screen attention description string to the old approved
string.
2. Create a new summary string for 'Screen Attention' contextual slice.
3. Fix some character issues.
Bug: 134457354
Bug: 134585794
Test: make RunSettingsRoboTests -j 32
Change-Id: I401fc6707203790e51aed8738b4658c6a30f512e
2019-06-05 13:22:19 -07:00
Julia Reynolds
569732474e Read the subtext of notif importance field on selection
When using a11y services

Test: manual with Talkback
Bug: 133649570
Change-Id: Ic68a948ab5d55e68994e6b14456d25d438637886
2019-06-05 18:31:19 +00:00
Xiangyu/Malcolm Chen
f6ae3fa64a Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am: 13cbb2eea2

Change-Id: I9b9799889ce5e3474ccfcdd4b33dfafcd0092e0e
2019-06-05 11:21:32 -07:00
Xiangyu/Malcolm Chen
13cbb2eea2 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev 2019-06-05 18:03:17 +00:00
Edgar Wang
e1a000f94f New strings for "Automatically lock"
Bug: 132106803
Test: manual
Change-Id: If6fe328ef6570cd96906435eb635576b324269c0
2019-06-05 17:19:48 +08:00
Michael Groover
2123e3543c Remove developer option to disable device ID access restrictions
Bug: 123937881
Test: Manually verified developer option is no longer available.
Change-Id: I00e8db23d88a5c84e273dfa4b8f797fa2a995de0
2019-06-04 18:30:21 -07:00
TreeHugger Robot
3d9c7cb356 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-05 00:23:38 +00:00
Malcolm Chen
57badc2a82 Triggering notifications when dual CDMA SIM combinations are detected
In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.

Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.

Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d
2019-06-04 17:11:09 -07:00
Bill Yi
3c85d10ef2 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I11c95502fa223dc53994a1dde87cc2400106b815
2019-06-04 08:36:03 -07:00
Alan Stokes
dd1545b098 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: I4a8c3e569bfc717802e45abfea0ad6b811c33c96
2019-06-04 07:38:00 -07:00
Alan Stokes
c53f5ecb3d Merge "Cleanup background activity starts for release." into qt-dev 2019-06-04 14:26:29 +00:00
Kevin Chang
267321cd81 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am: 68aa4e4919

Change-Id: I7db65e3ef0ed83e91a666a479cdbe8020aee763c
2019-06-03 18:42:10 -07:00
Antony Sargent
bffd3757e0 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: I1b66985de2cc045953a52d647a3568e7a8d03f10
2019-06-03 18:39:54 -07:00
Kevin Chang
68aa4e4919 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev 2019-06-04 01:29:21 +00:00
TreeHugger Robot
a448cb9d07 Merge "Longer character limit" into qt-r1-dev 2019-06-03 22:45:08 +00:00
Antony Sargent
aeb1da0db9 Add a "data during calls" preference
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.

Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
2019-06-03 15:20:33 -07:00
Lucas Dupin
4e7dd01d0e Longer character limit
Fixes: 134370077
Fixes: 134162233
Test: make
Change-Id: I3f697a093752faca37c4dc165857c97a6b1e410c
2019-06-03 11:33:50 -07:00
Kevin Chang
ba2bdbc93a Update the string of both magnification settings and gesture navigation tutorial dialog
Referenced link for the details:
https://docs.google.com/document/d/1eB2wukextG5UFECTwde5zcmXXTQCvgnqJJjnd1Chu9Q
https://docs.google.com/document/d/14iwCag7FBD4e9bR03HjbC0D2s_u-Fpr3K8vl_XMjkD0

Bug: 133336814
Bug: 133650388
Test: Visual
Change-Id: I4893183b55f609bfee3d1dfe80aa02cce624e857
2019-06-03 21:55:42 +08:00
TreeHugger Robot
b53bebe6ec Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-02 07:27:07 +00:00
TreeHugger Robot
2407b65709 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-01 18:17:35 +00:00
Bill Yi
79bc6c08a1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9675532a8f4b1f551c8130e9243262a52cd8a3d2
2019-06-01 10:26:48 -07:00
Bill Yi
6f9e016e2d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb
2019-06-01 10:06:36 -07:00
Mehdi Alizadeh
c4be5512a7 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am: cad67cdc0a

Change-Id: I9458cdbcc819e1d203266a8ff5b3b4ade1f3aeef
2019-05-31 14:26:04 -07:00