Commit Graph

54699 Commits

Author SHA1 Message Date
Kevin Chyn
2ec0c38e1f Merge changes from topic "face-settings-challenge" into qt-r1-dev
am: b979a38c8d

Change-Id: I3fd5ba0467eec804d75a5ceb08c56700d7e07b64
2019-06-04 18:48:33 -07: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
Bill Yi
e655774644 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 3d9c7cb356 -s ours
am skip reason: subject contains skip directive

Change-Id: I87aca396c35ec9f0db74cb9079997a3995efbab5
2019-06-04 18:25:55 -07:00
Alexey Kuzmin
ef530610fa Move vibration preview invokation to the correct place
am: f8eb8c3c90

Change-Id: Idb50c3733fd1e127149bc3d48c1ac281638b6cd9
2019-06-04 18:16:10 -07:00
Bill Yi
7ff72e6d75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 3d9c7cb356 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4ebeff5c481ede8d583bd59e4eabd1d3a7dcbe1
2019-06-04 18:09:12 -07:00
Alexey Kuzmin
df51217157 Move vibration preview invokation to the correct place
am: f8eb8c3c90

Change-Id: I252301516d7be6b5026e4fba5b5e9144889f6b1f
2019-06-04 18:00:48 -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
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
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
f5d69d8f4b Merge "Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: 5b09f510e2" into qt-r1-dev-plus-aosp
am: 23ce464bef

Change-Id: I27f6d1770d6209c5649014b969798853b6462412
2019-06-04 07:57:36 -07:00
Alan Stokes
7b707bb204 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: dd1545b098
am: c912a02f50

Change-Id: I620a9a71c4495d1c4fd8db458ae0f3c8dd296f41
2019-06-04 07:53:23 -07:00
Android Build Merger (Role)
23ce464bef Merge "Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: 5b09f510e2" into qt-r1-dev-plus-aosp 2019-06-04 14:44:48 +00:00
Alan Stokes
c912a02f50 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
am: dd1545b098

Change-Id: Iffc9d8bfa0469af6895496c4be8a4c45535c71f5
2019-06-04 07:43:00 -07:00
Alan Stokes
393f4bbee3 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
am: 5b09f510e2

Change-Id: Ie9d15780a3e92c539b78960dc92b8be68ef8813d
2019-06-04 07:42:53 -07:00
Alan Stokes
5b09f510e2 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: Icdfe52632085ea7add4ffa594fddb2d79b412e3b
2019-06-04 07:38:04 -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
tmfang
675bc1940b Ignore failure test case
Test: atest BatteryTipDialogFragmentTest
Bug: 134451831
Change-Id: I5649cbcf0d585514651c5b6befcca271e85a3cb3
2019-06-04 17:33:51 +08:00
Sunny Shao
2c6d308ecb Set the mAccountName as null while device has no any account
It doesn't clean the mAccountName buffer while device has no any account. And it will be put into
the Intent and pass to MeCard when user click the ghost boy avatar. It does not make sense and
modify code to fixed it.

Fixes: 129265427
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard

Change-Id: Ib8cfab2cb416515018f335b21ef49a95699a1597
2019-06-04 15:56:18 +08:00
Kevin Chang
29e482e236 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919 am: 267321cd81
am: d20fa646fc

Change-Id: I2ba78f260e539bee65f3e2a9aae42229f8573dc4
2019-06-03 19:02:25 -07:00
Antony Sargent
03ce225c95 Add a "data during calls" preference am: aeb1da0db9 am: bffd3757e0
am: 39a842b84a

Change-Id: I84c6a980b652d28276b2e1af9e46a7663d05931d
2019-06-03 19:01:53 -07:00
Kevin Chang
99735a39f7 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919 am: d2fa1e6baa
am: 487a0c2a57

Change-Id: I0647c73de02299d00531be23aee066a3a078f992
2019-06-03 19:01:29 -07:00
Antony Sargent
5217f29671 Add a "data during calls" preference am: aeb1da0db9 am: 7f7f7cda18
am: 7a48cb470b

Change-Id: I8f9e97915fa3063d0a2f865ed749201fb404f5bc
2019-06-03 19:00:57 -07:00
Kevin Chang
d20fa646fc Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
am: 267321cd81

Change-Id: Ibdf664068eb0f05b2c04b2399890904785e6e309
2019-06-03 18:51:57 -07:00
Antony Sargent
39a842b84a Add a "data during calls" preference am: aeb1da0db9
am: bffd3757e0

Change-Id: Ib3e766fe79f8db50ddcf56aac60935d128b3f52a
2019-06-03 18:49:44 -07:00
Kevin Chang
487a0c2a57 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
am: d2fa1e6baa

Change-Id: Id64aadc20751d107c93b32a420d679aa2cc9a72b
2019-06-03 18:48:20 -07:00
Antony Sargent
7a48cb470b Add a "data during calls" preference am: aeb1da0db9
am: 7f7f7cda18

Change-Id: Iaafabc24ace39911ab3198cd705311595832cb5d
2019-06-03 18:47:56 -07: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
Kevin Chang
d2fa1e6baa Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am: 68aa4e4919

Change-Id: I183707f6b18a8755eefb2cbcceaa7627b0228a9c
2019-06-03 18:41:08 -07:00
Antony Sargent
bffd3757e0 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: I1b66985de2cc045953a52d647a3568e7a8d03f10
2019-06-03 18:39:54 -07:00
Antony Sargent
7f7f7cda18 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
2019-06-03 18:39:19 -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
Lucas Dupin
a1e19f1349 Merge "Longer character limit" into qt-r1-dev am: a448cb9d07
am: 64dad09e02

Change-Id: I097a7cdffdbe10f2eea448a92da3b27e5205e522
2019-06-03 16:12:24 -07:00
Lucas Dupin
64dad09e02 Merge "Longer character limit" into qt-r1-dev
am: a448cb9d07

Change-Id: I18b0e68a7a0a7842e07f3c4cf067906ec1dc4763
2019-06-03 16:04:59 -07: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
8e94a0fd3f Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 7f8a269a3a
am: b0acf3e230

Change-Id: Ic986b24afbc15490f7d0faea8c7f23a979fdea4d
2019-06-03 10:35:58 -07:00
Lei Yu
b0acf3e230 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
am: 7f8a269a3a

Change-Id: I9aa9be5d62060870b967e81a3e1148375d2a7d35
2019-06-03 10:25:29 -07:00
Lei Yu
68c81d5b79 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 057dc8466a
am: 1fa5118618

Change-Id: Icf8db899a7e0f68082e6eaf61f3f1541d456d880
2019-06-03 10:15:47 -07:00
Lei Yu
1fa5118618 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
am: 057dc8466a

Change-Id: If66ff93e4f4caddd9ebe62f9409812d4ed480c9b
2019-06-03 10:08:14 -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
057dc8466a Merge "Use new API to build NetworkTemplate" into qt-dev
am: c9fbd2ee50

Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3
2019-06-03 10:03:30 -07:00
Lei Yu
c9fbd2ee50 Merge "Use new API to build NetworkTemplate" into qt-dev 2019-06-03 16:54:29 +00:00
Amin Shaikh
5d8b1b3cc5 Update Settings overlayed icons.
- Use tint instead of custom fillColor to be consistent with overlays.
- Update list of overlayed icons.

Bug: 131346125
Test: make
Change-Id: Ib548c0b47db0064bcb1536c9b7a650912f28273f
2019-06-03 12:26:11 -04: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