OSDN Git Service
TreeHugger Robot [Thu, 11 Jul 2019 07:40:47 +0000 (07:40 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
Bill Yi [Thu, 11 Jul 2019 07:06:07 +0000 (00:06 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
fa674d85ae -s ours
am skip reason: subject contains skip directive
Change-Id: I4b932251009efe11f3fc0dbaf547aa25d15a45d8
Bill Yi [Thu, 11 Jul 2019 03:45:25 +0000 (20:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia7da4c89d6e06b3d4dce7175a996decf1ea4af22
Bill Yi [Thu, 11 Jul 2019 03:08:17 +0000 (20:08 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I67ba6e489c14dc511d485a4895c9e12fce1c3ee1
Joshua Mccloskey [Wed, 10 Jul 2019 02:45:57 +0000 (19:45 -0700)]
Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
am:
0839185647
Change-Id: I3d79f210409ffbeea116882368f82abf218e6de7
Joshua Mccloskey [Wed, 10 Jul 2019 02:29:45 +0000 (02:29 +0000)]
Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
* changes:
Favor setup face in search settings.
Remove highlighting for work profile
Bill Yi [Wed, 10 Jul 2019 00:28:50 +0000 (17:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
13d6e13166 -s ours
am:
49175304a4 -s ours
am skip reason: subject contains skip directive
Change-Id: I874777f8257c403ea12b844c273fded69cebd48e
Bill Yi [Wed, 10 Jul 2019 00:16:02 +0000 (17:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
13d6e13166 -s ours
am skip reason: subject contains skip directive
Change-Id: I9cadf1b43bc055fffa72a6bb96f929c5e5ed28dc
Bill Yi [Wed, 10 Jul 2019 00:10:26 +0000 (17:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
41a7f9de31 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic3eb1d5258c1893b7b7e355216fc0d51ddce706b
TreeHugger Robot [Tue, 9 Jul 2019 23:10:22 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
joshmccloskey [Tue, 9 Jul 2019 23:05:43 +0000 (16:05 -0700)]
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
am:
007a1aee1b
Change-Id: Iff53397eed65d53a1cc53b01b85d9dab1f004ee3
joshmccloskey [Tue, 9 Jul 2019 22:28:05 +0000 (15:28 -0700)]
Favor setup face in search settings.
Test: Manual.
Fixes:
137135217
Change-Id: I5e0a72a117e2af6d9262d07616cc539ee7a7e55e
TreeHugger Robot [Tue, 9 Jul 2019 22:24:00 +0000 (22:24 +0000)]
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
joshmccloskey [Tue, 9 Jul 2019 22:23:37 +0000 (15:23 -0700)]
Remove highlighting for work profile
Test: Manual.
Fixes:
137126517
Change-Id: Iefcbf498cc0805cd130981e522177a7c16b7adfc
Bill Yi [Tue, 9 Jul 2019 19:31:21 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I84335ed2cdca77f9f506c084b11c5bb3215dd05f
joshmccloskey [Tue, 9 Jul 2019 18:52:01 +0000 (11:52 -0700)]
Diversity extra no longer gets overwritten.
Test: Manual.
Fixes:
136963876
Change-Id: Ia62e7ac1ff942fa078a2fd5f1d7efc339132aaa3
Bill Yi [Tue, 9 Jul 2019 18:46:23 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1c15e397059f357be547ce32fcdbae885bff5925
Curtis Belmonte [Tue, 9 Jul 2019 00:10:19 +0000 (17:10 -0700)]
Fix work account setup lock screen content for face auth
am:
5604585930
Change-Id: I4c17bde1aa4d4a07c2d9b4bb72fbc07832d1bd1f
TreeHugger Robot [Mon, 8 Jul 2019 21:27:57 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
Curtis Belmonte [Mon, 8 Jul 2019 18:23:28 +0000 (11:23 -0700)]
Fix work account setup lock screen content for face auth
For devices which provide biometric authentication options, such as
fingerprint or face, we should be showing different content on the lock
setup screen during the corp account setup wizard. Namely, the title
should read "Choose screen lock", and the "Not now" option should be
changed to "Continue without [auth method]". However, we currently only
check for whether fingerprint authentication is available, leading to
incorrect text for devices with face authentication.
This CL fixes the issue by changing the introducing a private method to
check for any biometric authentication (currently just mForFingerprint ||
mForFace). It then uses this method in place of the existing
mForFingerprint checks in SetupChooseLockGeneric.
Test: On a device with fingerprint auth and one with face auth:
1. Set a work profile with TestDPC and add some password quality requirement
2. adb shell settings put global device_provisioned
3. adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
4. Verify that the correct content is now shown (screenshot/xZPVtpa3j3Z)
5. Verify that setting lock with and without biometric auth still works
Fixes:
136556653
Change-Id: I46d3c964f05986aa97cc8ed77fe0ac125337ddd0
Bill Yi [Sat, 6 Jul 2019 02:13:54 +0000 (19:13 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
292e7ad110 -s ours
am:
ce4d5fbff9 -s ours
am skip reason: subject contains skip directive
Change-Id: If3c82155189da3a0564c2eb682eee98245e91e82
Bill Yi [Sat, 6 Jul 2019 02:09:11 +0000 (19:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
bad6060727 -s ours
am skip reason: subject contains skip directive
Change-Id: I2cd9425cab5d5da12695fd2d58c5335687f8ed3c
Bill Yi [Sat, 6 Jul 2019 02:08:40 +0000 (19:08 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icdaa795f233501177a08cdce04829dd97ded4e98
Bill Yi [Sat, 6 Jul 2019 02:04:54 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
292e7ad110 -s ours
am skip reason: subject contains skip directive
Change-Id: I1957817bdae8c4294cc6cc144a4dafea472004a6
Bill Yi [Fri, 5 Jul 2019 23:53:24 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9933f3eb0721fab73ff7776324de6ce088469a67
Bill Yi [Fri, 5 Jul 2019 21:38:28 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e
Bill Yi [Thu, 4 Jul 2019 00:16:33 +0000 (17:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
a0fb9000bb -s ours
am:
b038d65f4c -s ours
am skip reason: subject contains skip directive
Change-Id: I9ecb0c88a6ecd0b7feb5bcfbfa815b4da71a1df4
Mark Chien [Wed, 3 Jul 2019 23:37:08 +0000 (16:37 -0700)]
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
am:
8a44e4f274
Change-Id: I68703e3184557d1cd2597f0601a6e2fec1710c71
Bill Yi [Wed, 3 Jul 2019 23:30:18 +0000 (16:30 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
246873db8e -s ours
am skip reason: subject contains skip directive
Change-Id: I22be0cf868553d2728e0d3e407b1edb6c10e02b1
Kevin Chyn [Wed, 3 Jul 2019 23:25:09 +0000 (16:25 -0700)]
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
am:
47593cd29b
Change-Id: Icbde69859391ec8b3497c736d6812e30ddcd417d
Bill Yi [Wed, 3 Jul 2019 23:24:44 +0000 (16:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
a0fb9000bb -s ours
am skip reason: subject contains skip directive
Change-Id: I6a45fa6f274773e72385e7e1f8356b7e7ad68995
Mark Chien [Wed, 3 Jul 2019 13:16:03 +0000 (13:16 +0000)]
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
TreeHugger Robot [Wed, 3 Jul 2019 07:21:59 +0000 (07:21 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Wed, 3 Jul 2019 06:30:20 +0000 (23:30 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41
Bill Yi [Wed, 3 Jul 2019 02:46:11 +0000 (19:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9ea845510ab634d146f09f885ab0de8cd789c325
Kevin Chyn [Wed, 3 Jul 2019 02:07:49 +0000 (02:07 +0000)]
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
TreeHugger Robot [Tue, 2 Jul 2019 00:17:22 +0000 (00:17 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
Bill Yi [Mon, 1 Jul 2019 23:21:33 +0000 (16:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
da20a84f9b -s ours
am skip reason: subject contains skip directive
Change-Id: Id4b0bbaac5733f8ed1f9eb99acdb67efcb4ff624
Bill Yi [Mon, 1 Jul 2019 21:22:44 +0000 (14:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I90c0ada933cdd3d4b2431efdfe8290d3479aeac7
Bill Yi [Mon, 1 Jul 2019 19:27:35 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6ab947284694fa3922d185f58f57c5acfd83b2ee
Robert Snoeberger [Mon, 1 Jul 2019 17:36:26 +0000 (10:36 -0700)]
Merge "Remove "clocks" from string" into qt-r1-dev
am:
a4a25871d4
Change-Id: I1236d44d730c5c24569002c4aab4c600b653706e
Robert Snoeberger [Mon, 1 Jul 2019 17:19:27 +0000 (17:19 +0000)]
Merge "Remove "clocks" from string" into qt-r1-dev
Robert Snoeberger [Thu, 27 Jun 2019 21:06:44 +0000 (17:06 -0400)]
Remove "clocks" from string
Fixes:
136193731
Bug:
136090066
Test: manual
Change-Id: I63751bb31016754930a4773d791f118103026ada
Amin Shaikh [Mon, 1 Jul 2019 12:09:31 +0000 (05:09 -0700)]
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
am:
0217400ea5
Change-Id: Id0dde389a42cf51d3bbabcd5476058f0acff44ad
TreeHugger Robot [Mon, 1 Jul 2019 11:52:33 +0000 (11:52 +0000)]
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
Bill Yi [Mon, 1 Jul 2019 09:58:55 +0000 (02:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
26a2694bd3 -s ours
am:
ae58e057d7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibf26ca776141d30988f7ac69f14b7023d946d7fc
Bill Yi [Mon, 1 Jul 2019 09:58:21 +0000 (02:58 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
512b97f994 -s ours
am skip reason: subject contains skip directive
Change-Id: I2b9b5e64590a28f14e95fbca98b54806b10e1f62
Bill Yi [Mon, 1 Jul 2019 09:45:08 +0000 (02:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
26a2694bd3 -s ours
am skip reason: subject contains skip directive
Change-Id: I2c38c37556229f6ce9ac6acbbd5367bd239ff1ff
TreeHugger Robot [Mon, 1 Jul 2019 09:35:06 +0000 (09:35 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
TreeHugger Robot [Mon, 1 Jul 2019 09:35:04 +0000 (09:35 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Pasty Chang [Mon, 1 Jul 2019 01:57:28 +0000 (18:57 -0700)]
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
am:
2ba113898a
Change-Id: I247d6d369c41afb1e6fc5d14749877a2f2d8d2a1
Pasty Chang [Mon, 1 Jul 2019 01:20:54 +0000 (01:20 +0000)]
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
Bill Yi [Sun, 30 Jun 2019 23:21:10 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6d165ca5174555cba705f59a270f935cd6d52a6c
Bill Yi [Sun, 30 Jun 2019 22:39:46 +0000 (15:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If33daab9a7d9e2c88b602147d66da40968412de6
Bill Yi [Sun, 30 Jun 2019 21:58:27 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I047beafb83c4c8df261fb5ac7c49dd81cb4470e0
tmfang [Sat, 29 Jun 2019 11:41:29 +0000 (04:41 -0700)]
Merge "Add summary for white balance feature" into qt-r1-dev
am:
9cd8167bff
Change-Id: Id3d86efde3f1335f1f978f0f4d1339e7cd1461ab
TreeHugger Robot [Sat, 29 Jun 2019 10:57:45 +0000 (10:57 +0000)]
Merge "Add summary for white balance feature" into qt-r1-dev
Kevin Chyn [Fri, 28 Jun 2019 20:42:20 +0000 (13:42 -0700)]
Send userId together with enroll / setFeature / getFeature method update
Test: Enroll E2E
Bug:
136264301
Change-Id: Ie3f98ab80c831083d750d9459ed7a189df25dd66
Amin Shaikh [Thu, 27 Jun 2019 21:40:39 +0000 (17:40 -0400)]
Update ic_sync_problem to GM2.
- Use tint instead of custom fillColor to be consistent with overlays.
- Standardize on using @android:color/white as fill color
- Update list of overlayed icons.
Bug:
131346125
Test: make
Change-Id: I4bc88e5842ba2f149356929a77b81459ce5042c5
Andrew Sapperstein [Fri, 28 Jun 2019 17:43:13 +0000 (10:43 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev am:
72aded338a
am:
647f685063
Change-Id: I2e1f86871882063de4b4627e80c9327d2338b4e7
Andrew Sapperstein [Fri, 28 Jun 2019 17:32:22 +0000 (10:32 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev
am:
72aded338a
Change-Id: I93faf2c99489405fe82a75adf24f4d885bbe1558
Andrew Sapperstein [Fri, 28 Jun 2019 16:56:04 +0000 (16:56 +0000)]
Merge "Add UI for mainline modules licenses." into qt-dev
Yanting Yang [Fri, 28 Jun 2019 14:34:11 +0000 (07:34 -0700)]
Fix RTL issue of Deferred Setup card
am:
f6972b29b1
Change-Id: Ib90d60e14dce7a3bafec01170994485752dd632c
Yanting Yang [Thu, 27 Jun 2019 13:20:12 +0000 (21:20 +0800)]
Fix RTL issue of Deferred Setup card
Correct layout gravity to "start" to apply RTL layout.
Fixes:
131913172
Test: visual
Change-Id: I5935c5c1415070803141634ff4e92f1c65fc94f6
(cherry picked from commit
c200df360cc5dfb29a649ebbba7a632c77408e3d)
Winson Chung [Thu, 27 Jun 2019 23:44:58 +0000 (16:44 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am:
9591c3f963
am:
8d08713c96
Change-Id: I565145cdcb2344737e2455ce819e831aefa8798f
Winson Chung [Thu, 27 Jun 2019 23:23:53 +0000 (16:23 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am:
9591c3f963
Change-Id: I45e8c0e6e3caa9551646c0d26eac1a78a2fa56cd
Winson Chung [Thu, 27 Jun 2019 22:47:14 +0000 (22:47 +0000)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
Evan Severson [Thu, 27 Jun 2019 21:32:34 +0000 (14:32 -0700)]
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
am:
f461d8dc52
Change-Id: I4729bdde26d5953839a623cd9ea483a387a5d901
Joel Galenson [Thu, 27 Jun 2019 21:32:33 +0000 (14:32 -0700)]
Remove Permissions Hub. DO NOT MERGE
am:
69d9899868
Change-Id: Id79ab681beaad7aca73d6f234b739470b85e19cd
Evan Severson [Thu, 27 Jun 2019 21:21:56 +0000 (21:21 +0000)]
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
Amin Shaikh [Thu, 27 Jun 2019 20:37:56 +0000 (13:37 -0700)]
Update Settings overlayed icons.
am:
c477507f4e
Change-Id: I58e03056f7bd1f61b089c3fb60c17f8afc7a8488
Amin Shaikh [Thu, 23 May 2019 15:23:46 +0000 (11:23 -0400)]
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
Merged-In: Ib548c0b47db0064bcb1536c9b7a650912f28273f
Louis Chang [Thu, 27 Jun 2019 01:57:54 +0000 (09:57 +0800)]
Adding unique task affinity for FallbackHome activity
Settings activities were launched and resided on home task
which was originally started by FallbackHome. Adding a
unique task affinity for FallbackHome activity in order to
prevent the task being reused by other Settings activities.
Bug:
135696366
Test: starting Settings activity before FallbackHome finishes
Change-Id: I3fe41dd3b77e37236b11006dbf08727783b6a2ec
Joel Galenson [Thu, 30 May 2019 15:30:49 +0000 (08:30 -0700)]
Remove Permissions Hub. DO NOT MERGE
Bug:
132292477
Test: View all related screens.
(cherry picked from commit
1e7c172ad5704754266bee50a9bc59b3205e8b70)
This should have been submitted with ag/
8109287
Bug:
136012133
Test: Clicked through permission screens on cuttlefish
Change-Id: I2663aa365baf78ccc6f0a3d585b09da0dd387970
markchien [Mon, 17 Jun 2019 15:21:52 +0000 (23:21 +0800)]
Fix entitlement failed when device is on CBRS
When active cellular internet is switched to CBRS in DSDS case,
default data sub id may not be changed. Fix by using active
subscription id and pass this sub id to entitlement app.
Bug:
134994718
Test: atest TetherServiceTest
Test: manual test with carrer SIMs.
Change-Id: I30a1d70c0690f0dba8f4171a2bde884f9b7ccfc4
Sunny Shao [Wed, 26 Jun 2019 11:43:25 +0000 (04:43 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev am:
5a69fac694
am:
bfffb2ae74
Change-Id: Iac5fbc9c5486a7ea4db51bfc2cccc10cd8cd37e0
pastychang [Wed, 26 Jun 2019 10:12:57 +0000 (18:12 +0800)]
Fix status bar color of a11y doesn't apply stencil
View of content parent should not account for system screen decorations
and make statusbar layout can be overrided by stencil customization.
Bug:
126065441
Test: Manual
Change-Id: Iefbdc4a0613e1ae0b63c35769f1c8ec9581d7869
Sunny Shao [Wed, 26 Jun 2019 11:35:26 +0000 (04:35 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
am:
5a69fac694
Change-Id: I085502786e8883c7ffb346592bfebc1a3bb08209
TreeHugger Robot [Wed, 26 Jun 2019 11:15:35 +0000 (11:15 +0000)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
tmfang [Wed, 26 Jun 2019 09:22:10 +0000 (17:22 +0800)]
Add summary for white balance feature
Create a string id for summary.
This string should be empty string for AOSP.
Test: visual
Bug:
134790233
Change-Id: I06b5d0b35ac08565d3496f8559f5bd85cd56c6b8
Antony Sargent [Wed, 26 Jun 2019 06:11:15 +0000 (23:11 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am:
3288037bd2
am:
fb52368873
Change-Id: I86d589bc1304c625da724c122dd083691fa46447
Antony Sargent [Wed, 26 Jun 2019 06:02:14 +0000 (23:02 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am:
3288037bd2
Change-Id: I5833f9ece2590b16ef3184f8d315fd092f683207
TreeHugger Robot [Wed, 26 Jun 2019 05:35:29 +0000 (05:35 +0000)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
Bill Yi [Wed, 26 Jun 2019 05:20:09 +0000 (22:20 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
9905cc9b50 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibe77e3e737a791657ce507dd56b5dc9f86de40e3
TreeHugger Robot [Wed, 26 Jun 2019 04:00:28 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Joshua Mccloskey [Wed, 26 Jun 2019 01:53:40 +0000 (18:53 -0700)]
Merge "Adding slice for Face Enrollment" into qt-r1-dev
am:
35252d1b9f
Change-Id: I93e1619aed2080d9a08891e5d57c37b1a6423a7d
Joshua Mccloskey [Wed, 26 Jun 2019 01:15:50 +0000 (01:15 +0000)]
Merge "Adding slice for Face Enrollment" into qt-r1-dev
Vishwath Mohan [Wed, 26 Jun 2019 00:01:31 +0000 (17:01 -0700)]
Change fingerprint reference to biometric for lockdown
am:
947a93ea75
Change-Id: I638ee2644283c20d5538ec3ed91266227b82044e
Andrew Sapperstein [Tue, 18 Jun 2019 16:44:18 +0000 (09:44 -0700)]
Add UI for mainline modules licenses.
Added a module licenses option that lives in Legal information settings.
Clicking that option opens module licenses page, which displays every
module by name, filtered to exclude modules without license files.
Clicking a module in the list opens HTMLViewer.
Created ModuleLicensesProvider, a new ContentProvider that serves as a
redirect for the Uris sent to HTMLViewer so that they open asset files.
In order to provide the redirect, the provider will write the license file
to a file in Settings' cache directory when the license does not exist
in the cache or is outdated. The provider then opens that cached file.
Fixes:
135183006
Test: robotests
Change-Id: I7d69da34780c8c4efb150d0c0411078c12bc80d8
Bill Yi [Tue, 25 Jun 2019 22:43:36 +0000 (15:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
134640169
Change-Id: Ifd9077857dbae28a18cf494a4c318669ec2b1519
Antony Sargent [Tue, 25 Jun 2019 21:01:36 +0000 (14:01 -0700)]
Check isWfcProvisionedOnDevice in WifiCallingSettings
On the SIM details page, the preference leading to a page for
configuring wifi calling will appear based on the results of the
MobileNetworkUtils#isWifiCallingEnabled helper function. That helper
uses the ImsManager to check several conditions, among them both
isWfcEnabledByPlatform and isWfcProvisionedOnDevice.
The page for configuring wifi calling has a tabbed UX, with one tab for
each active subscription that supports it. The WifiCallingSettings class
gets a list of the active subscriptions to determine which tabs to show,
and removes any that don't support wifi calling, but was only using the
isWfcEnabledByPlatform test to do so. This is a problem because the code
for showing the contents inside the tab, in WifiCallingSettingsForSub,
includes a sanity check of isWfcProvisionedOnDevice and calls finish()
if that returns false.
What this meant in practice is that if you happened to have 2
subscriptions where one returns true for both isWfcEnabledByPlatform and
isWfcProvisionedOnDevice, but the other only returned true for
isWfcEnabledByPlatform, then you'd never be able to succesfully use the
wifi calling page at all because the tab for the subscription you
*aren't* trying to configure would always call finish() early.
The right long term solution to this problem is probably to remove the
tabbed UX entirely from this page, since we probably don't need it given
the overall new multi-SIM UX. But there may still be legacy uses and
that is likely a bigger change than we want to make right now.
As a stopgap, this CL just adds a check of isWfcProvisionedOnDevice to
the code for filtering out ineligible subscriptions from the tabbed
interface, which we should have always had anyway.
Fixes:
135591718
Test: make RunSettingsRoboTests
Change-Id: I656c3d3fb30cb6fabcb86685eae38c5f0cd0c6f2
Bill Yi [Tue, 25 Jun 2019 20:54:17 +0000 (13:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
01d889815d -s ours
am skip reason: subject contains skip directive
Change-Id: I0d72ad4df778c60fc79b9a9ff213d999ba52dabb
Vishwath Mohan [Tue, 25 Jun 2019 20:39:58 +0000 (13:39 -0700)]
Change fingerprint reference to biometric for lockdown
Changes the lockdown description to reference biometric unlocks more
generally, and not just fingerprint unlock.
Bug:
135282412
Test: The string for lockdown does not refer to fingerprint
Change-Id: I8f1cf43bc8d42288d96a272b3243a7863c8d4941
TreeHugger Robot [Tue, 25 Jun 2019 19:24:19 +0000 (19:24 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Antony Sargent [Tue, 25 Jun 2019 19:02:56 +0000 (12:02 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am:
87fadeeb4a
am:
48c61f173d
Change-Id: Id9d90c2d8c8b9362fc8d765626c3bf46413a651b
Antony Sargent [Tue, 25 Jun 2019 18:44:50 +0000 (11:44 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
am:
87fadeeb4a
Change-Id: Ib32dca04f573f3d84f77215c5ab891cb873072af
TreeHugger Robot [Tue, 25 Jun 2019 17:54:54 +0000 (17:54 +0000)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
Bill Yi [Tue, 25 Jun 2019 17:33:04 +0000 (10:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6a0682180e39156f0959521d47ec707c8da28819
Bill Yi [Tue, 25 Jun 2019 16:12:11 +0000 (09:12 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
279050c8d6 -s ours
am:
a5830871e2 -s ours
am skip reason: subject contains skip directive
Change-Id: Idf035b9a914825a6ec86464bcdc500ede6569875
Bill Yi [Tue, 25 Jun 2019 15:57:36 +0000 (08:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
279050c8d6 -s ours
am skip reason: subject contains skip directive
Change-Id: I60113754c64466c9729ef69156de47efcf8f775c