Commit Graph

52132 Commits

Author SHA1 Message Date
Alexey Kuzmin
df51217157 Move vibration preview invokation to the correct place
am: f8eb8c3c90

Change-Id: I252301516d7be6b5026e4fba5b5e9144889f6b1f
2019-06-04 18:00:48 -07:00
Kevin Chyn
b979a38c8d Merge changes from topic "face-settings-challenge" into qt-r1-dev
* changes:
  Resolve challenge lifecycle race conditions
  Revert "Add generateChallenge() in onResume()"
2019-06-04 23:52:13 +00:00
Kevin Chyn
f20bb1c635 Resolve challenge lifecycle race conditions
1) FaceSettings now gets closed when it loses foreground. This prevents
   A) Keyguard/LockSettingsService's resetLockout's revokeChallenge from
   leaving FaceSettings with a stale HAT which prevents users from
   enrolling or toggling elements that require the HAT.
   B) generateChallenge has a timeout, which may already have been met
   C) User may have forgotten FaceSettings was open and lost context. Thus
   it makes no sense to show ConfirmLock* since the user may have no idea
   why it's showing anymore.

2) FaceSettings now generatesChallenge in onResume. onCreate is too early
   since again, FaceSettings can be launched via intent while on Keyguard.
   Similarly, we must ensure that Settings's challenge is generated
   late enough (e.g. when it actually gains foregroundness)

Fixes: 133440610
Fixes: 133498264

Test: Open face settings, confirm password, lock screen. After unlocking,
      user needs to re-open face settings.

Test: Modify HAL/framework to show re-enroll notification
      Tap re-enroll notificaton on keyguard
      Delete and re-enroll in settings, successful

Test: FaceSettings enroll works accross orientation change

Test: Tapping enroll button doesn't cause challenge to be revoked
      due to onStop()

Change-Id: I60f606314c458a61e9c1b4f4b66bc27bc44287da
2019-06-04 14:27:28 -07:00
Kevin Chyn
e716ce107d Revert "Add generateChallenge() in onResume()"
This reverts commit d59150eca6.

Bug: 133498264
Bug: 133440610

Reason for revert: Fixing in a different way

Change-Id: Ie444278a9e8b8aac259c31d311757ab8a39567f4
2019-06-04 13:29:57 -07:00
Alexey Kuzmin
f8eb8c3c90 Move vibration preview invokation to the correct place
Bug: 133711461
Bug: 130332550
Test: Open Settings > Accessibility > Vibration. Switch between the
vibration settings several times. The preview should be played, and it
should be in line with the selected setting

Change-Id: I65fcd679c4c61afa4cce9cee652987d81572096c
2019-06-04 15:44:43 +00: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
Lei Yu
7f8a269a3a Merge "Use new API to build NetworkTemplate" into qt-dev
am: c9fbd2ee50

Change-Id: I237921af2781264fdbec688ddc06ca7c66961856
2019-06-03 10:06:14 -07:00
Lei Yu
c9fbd2ee50 Merge "Use new API to build NetworkTemplate" into qt-dev 2019-06-03 16:54:29 +00: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
Bill Yi
5540373d4f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 2407b65709 -s ours
am skip reason: subject contains skip directive

Change-Id: I9ea5834b80b4ad5a6cf17c58186010acc11e85b4
2019-06-01 11:36:05 -07: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
TreeHugger Robot
4a9055a99c Merge "Revert "Remove Permissions Hub."" into qt-r1-dev 2019-05-31 21:54:29 +00: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
Mehdi Alizadeh
cad67cdc0a Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev 2019-05-31 21:08:08 +00:00
Mehdi Alizadeh
ffea2ae488 Disables the Gesture nav option if 3P launcher is default
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.

Bug: 129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest

Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
2019-05-31 12:26:28 -07:00
Julia Reynolds
2c47160eff Merge "Update notification settings animation" into qt-dev
am: 1746ccca94

Change-Id: I0901382721e411cdd3a3970fe85f13524853b944
2019-05-31 10:41:13 -07:00
Lei Yu
677d5a5e01 Merge "Fix issues in battery usage accounting" into qt-dev
am: 2148c1a207

Change-Id: Ifd2d4c3928ba706071a575c28db21c7586a2e692
2019-05-31 10:40:50 -07:00
Julia Reynolds
1746ccca94 Merge "Update notification settings animation" into qt-dev 2019-05-31 17:27:09 +00:00
Lei Yu
ded55a1401 Use new API to build NetworkTemplate
This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.

Bug: 133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
2019-05-31 10:19:17 -07:00
Lei Yu
2148c1a207 Merge "Fix issues in battery usage accounting" into qt-dev 2019-05-31 17:17:51 +00:00
Salvador Martinez
154c485209 Merge "Change switch text color to black in dark mode" into qt-dev
am: ccbdd834ff

Change-Id: Ia64d44b5fd36823c1750ed8afc998f7619155824
2019-05-31 09:15:12 -07:00
TreeHugger Robot
ccbdd834ff Merge "Change switch text color to black in dark mode" into qt-dev 2019-05-31 15:59:42 +00:00
Joel Galenson
2118f8a63f Revert "Remove Permissions Hub."
This reverts commit 1e7c172ad5.

Bug: 132292477
Test: None.
Change-Id: Icae2cd4edbb22e2f3ea72e20f0ebd818f1ac6629
2019-05-31 07:55:19 -07:00
Julia Reynolds
53bbf9b78d Merge "Reorder notification settings" into qt-dev
am: 1abcbaa093

Change-Id: I0e6baba13bfeeee2bdb78b1eeb68f484e5c94b78
2019-05-31 06:32:29 -07:00
TreeHugger Robot
1abcbaa093 Merge "Reorder notification settings" into qt-dev 2019-05-31 13:24:17 +00:00
Julia Reynolds
e3da5c15a4 Update notification settings animation
Test: manual
Fixes: 133874971
Change-Id: I8dc399f9de578197322cadbb7cc2c5f75902461d
2019-05-31 09:18:42 -04:00
Joel Galenson
58246f66db Merge "Remove Permissions Hub." into qt-dev
am: 63088840c4

Change-Id: I59cef5b593630d75b6db51ae324c94f9dc3a8841
2019-05-31 06:07:29 -07:00
TreeHugger Robot
63088840c4 Merge "Remove Permissions Hub." into qt-dev 2019-05-31 13:02:12 +00:00
TreeHugger Robot
1a3112ab32 Merge "Fix exception on non face-enabled devices" into qt-r1-dev 2019-05-31 04:15:54 +00:00
TreeHugger Robot
dbe399a023 Merge "Add generateChallenge() in onResume()" into qt-r1-dev 2019-05-31 00:52:11 +00:00
Bill Yi
71edc54326 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d1ddb16617 -s ours
am skip reason: subject contains skip directive

Change-Id: I86d2ea6736d4765940832bd48b4d37a9bb5046b7
2019-05-30 17:42:52 -07:00
TreeHugger Robot
d1ddb16617 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-05-31 00:30:42 +00:00
Joshua Mccloskey
b471e2439c Merge "String update." into qt-r1-dev 2019-05-30 23:12:53 +00:00
Alex Salo
fa127bd6f7 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev 2019-05-30 22:59:12 +00:00
Bill Yi
bd1ab2754b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6da271a883e0a62cc5f32890c3411e64ef856fa7
2019-05-30 15:17:06 -07:00
Mehdi Alizadeh
4937d4ca1f Merge "Increase char limit to 60 for string translation" into qt-dev
am: 178d4a7f8f

Change-Id: I8369dc9dc525652253f4d5a8945725b09268470c
2019-05-30 15:16:16 -07:00
TreeHugger Robot
178d4a7f8f Merge "Increase char limit to 60 for string translation" into qt-dev 2019-05-30 22:04:47 +00:00
Ilya Matyukhin
d59150eca6 Add generateChallenge() in onResume()
Fixes: 133498264
Fixes: 133440610
Test: open FaceSettings from Settings with and without an enrolled face
Test: open FaceSettings from the notification that asks to re-enroll
Change-Id: I80ca7644f96a538614962232fb3951d1a91d87c7
2019-05-30 15:01:22 -07:00
Lucas Dupin
8c29afdc3f Fix exception on non face-enabled devices
Test: open privacy settings page
Bug: 130327302
Change-Id: I31ba9f30bb7300bff6daea8a51ed6c4dc2a373f2
2019-05-30 14:58:52 -07:00
Salvador Martinez
a2e7357535 Change switch text color to black in dark mode
It seems that the attribute values that are used to text color
in the switch bar are selectors which leads to problems because
they include an alpha value when the switch is "off". This would
cause the contrast between the text and the background to be too
low for GAR. This CL simply makes it so that in dark mode the text
for the switch bar is just true black since adjusting the
attributes would have wide scale implications for all UIs using
device default themes.

Test: visual inspection
Bug: 132755745
Change-Id: I309db82e9bf020fb654e0b93f6ec84380ae092f7
2019-05-30 14:16:52 -07:00