Commit Graph

13125 Commits

Author SHA1 Message Date
Tony Mak
c74bbcd3b2 A separate entry for work profile CA cert
We mixed both primary and work profile CA certs into single entry
previously which is not aligned with the CTS requirement.
Separate them from now.

Test: m -j RoboSettingsTest
Test: Run related manual test in CtsVerifier

Bug: 64567417

Change-Id: Iaff2d9f25ef15b96c11727e7075bdae8e90ec8ce
2017-08-22 18:24:30 +01:00
Kevin Chyn
e4cfb6a594 Pattern entry views should be consistent
This change makes confirm_pattern consistent with choose_pattern

Fixes: 27290562

Test: manual
Change-Id: Id56492df71624552c8362f648756ba64bf908965
2017-08-22 01:16:08 +00:00
Bill Yi
4ced4787ce Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64086495
Change-Id: I4e5c4860eae1b41fea7a34a88b53630d86745e8e
2017-08-17 16:57:35 -07:00
TreeHugger Robot
8ae8b7a931 Merge "Index TTS-Settings and dedupe TTS-engine in search result." 2017-08-17 17:30:19 +00:00
TreeHugger Robot
682ff5562c Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-17 15:33:39 +00:00
Maurice Lam
3e8718af51 Merge "Add fingerprint illustration image" into oc-mr1-dev am: 89c2adf420
am: 1b6307a9cc

Change-Id: Icb102ad71236e6f71e5994306da6c84da461d2fc
2017-08-17 07:16:24 +00:00
Maurice Lam
a4b54e52ba Merge "Fix bad string reference" into oc-mr1-dev am: f4716e89c0
am: f7a818345d

Change-Id: I3c9bb76c5c986d58e2b91ae25cdb2a7333d78249
2017-08-17 07:13:41 +00:00
Fan Zhang
7e5055b30c Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev am: 9a03b951d2
am: 5c15a79fa4

Change-Id: I28d8eb7ee38102dd74b5b307f45d17ce77476878
2017-08-17 07:12:51 +00:00
Maurice Lam
1b6307a9cc Merge "Add fingerprint illustration image" into oc-mr1-dev
am: 89c2adf420

Change-Id: I44edca5a3310e476dd68e25e0e16560bb5a31b5f
2017-08-17 01:23:19 +00:00
Maurice Lam
f7a818345d Merge "Fix bad string reference" into oc-mr1-dev
am: f4716e89c0

Change-Id: I8f0a632761f30aff990dad51cff99f0a7907b94c
2017-08-17 01:21:10 +00:00
Fan Zhang
5c15a79fa4 Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev
am: 9a03b951d2

Change-Id: If754d6e11ef3d39d716b41a3219a5d30c48fc218
2017-08-17 01:20:19 +00:00
TreeHugger Robot
89c2adf420 Merge "Add fingerprint illustration image" into oc-mr1-dev 2017-08-17 00:49:00 +00:00
Maurice Lam
f4716e89c0 Merge "Fix bad string reference" into oc-mr1-dev 2017-08-16 23:33:43 +00:00
Fan Zhang
18a168239e Index TTS-Settings and dedupe TTS-engine in search result.
Fixes: 63022866
Test: robotests
Change-Id: I5c711e7bafba4e413ee271768c58742be05d8640
2017-08-16 15:46:41 -07:00
Fan Zhang
875b8eae39 Remove gibberish summary in search when query is "lock"
Fixes: 64165687
Test: visual for search
Test: rerun robotest for securitysettings
Change-Id: I5c44e351a767c7ce3037a81d0932d9bd6b59635e
2017-08-16 22:12:44 +00:00
Maurice Lam
6c108ca693 Merge "Use default primary color for choose lock screens" into oc-mr1-dev am: 595627c630
am: 4db65eab00

Change-Id: I0d101f0c14572be3f8885e4a02dcb0119b4059ed
2017-08-16 22:10:01 +00:00
Maurice Lam
209410dd2a Fix bad string reference
The source string was removed but there are still references to it.
Updating the references as well in this CL.

Test: mma with ANDROID_AAPT_IGNORE on locale files
Bug: 64763091
Change-Id: I43ef63207e884cbaa92ff3853b0f1fd690cf05f8
2017-08-16 13:39:12 -07:00
Fan Zhang
0654a22578 Merge "Stub out feature flag UI" 2017-08-16 20:27:14 +00:00
Maurice Lam
2bc609a1bd Add fingerprint illustration image
Test: Manual
Bug: 38210310
Change-Id: I95b4940792c172cf866f71c0fef9859e69d60074
2017-08-16 11:44:19 -07:00
Maurice Lam
4db65eab00 Merge "Use default primary color for choose lock screens" into oc-mr1-dev
am: 595627c630

Change-Id: I09fc05b21e993352b4e6402032ca636ae18535e4
2017-08-16 18:30:22 +00:00
Maurice Lam
2c43d273b8 Merge "Update strings for screen lock setup" 2017-08-16 17:40:52 +00:00
Bill Yi
cf96c9b13f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: If0ff6ff971291e101e464f028e79fc18afa5b6a7
2017-08-15 21:53:30 -07:00
Maurice Lam
e9a6e8f1e5 Use default primary color for choose lock screens
Make the settings screens that inherit from SuwThemeGlif use the
default blue primary color.

Test: Manual
Bug: 63143321
Change-Id: I07026139a5e0562c192ec1ca9304d5cd3647d5b0
2017-08-15 19:30:14 -07:00
Fan Zhang
75cd1d2010 Stub out feature flag UI
Bug: 36222960
Test: make -j40 RunSettingsRoboTests
Change-Id: Id2483d39018b2d93868f4ef7032124795ea91a53
2017-08-15 17:42:58 -07:00
Fan Zhang
0764a663fc Merge "Compute aspect ratio properly" 2017-08-15 23:37:59 +00:00
Fan Zhang
36717d4399 Compute aspect ratio properly
Change-Id: Ic4e1f20f7354b9ab5f4e9c7564d16d06324ec23d
Fixes: 64608152
Test: visual
2017-08-15 11:14:58 -07:00
Jesse Evans
51a13df33a Merge "Change strings from Instant app account to setting" into oc-mr1-dev am: 858ea46a3a
am: eee0e82fba

Change-Id: I996ed8caf0581cc3f273423b7d8d3989235e2f4e
2017-08-15 02:43:00 +00:00
Jesse Evans
eee0e82fba Merge "Change strings from Instant app account to setting" into oc-mr1-dev
am: 858ea46a3a

Change-Id: I22fb4b6d3ee5456a591f8dfa8f78d9f6d6da82dd
2017-08-15 01:37:07 +00:00
Maurice Lam
841288144c Update strings for screen lock setup
Manual cherry pick of 3eb4c8333e

Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-14 22:45:30 +00:00
Bill Yi
2b027338e3 Revert "Import translations. DO NOT MERGE"
This reverts commit 5530c73afa.

Change-Id: I7804b7e3e00574424a95788ece7a4d28bcd761a7
Exempt-From-Owner-Approval: translation import
2017-08-14 13:38:36 +00:00
Bill Yi
5530c73afa Import translations. DO NOT MERGE
Change-Id: Iac929c86327445553e3c6e60aa22270bd2c43e5d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-12 08:36:20 -07:00
Jesse Evans
804b0daf49 Change strings from Instant app account to setting
Test: existing tests
Bug: 63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
2017-08-11 18:12:42 -07:00
Maurice Lam
a773403cd2 Update strings for screen lock setup
am: 3eb4c8333e

Change-Id: If48e98edbdc3eb7266ca951e23994942f31c2ef4
2017-08-12 00:22:14 +00:00
Maurice Lam
3eb4c8333e Update strings for screen lock setup
Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-11 13:12:20 -07:00
Ajay Nadathur
2c2d41f8e9 Merge "Update strings for skip fingerprint setup" into oc-mr1-dev am: 719d80e6e0
am: aec29ee4be

Change-Id: I66480f242ed99d3f6488b2c832b0b2745e7432e8
2017-08-11 17:25:31 +00:00
Ajay Nadathur
aec29ee4be Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
am: 719d80e6e0

Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a
2017-08-11 17:21:24 +00:00
Ajay Nadathur
58c2da2d9e Update strings for skip fingerprint setup
bug: 64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
2017-08-11 00:42:30 +00:00
Joachim Sauer
8a739a4bd1 Merge "Implement auto 12/24h setting toggle." 2017-08-10 16:36:47 +00:00
Joachim Sauer
95beae0089 Implement auto 12/24h setting toggle.
This implements an explicit toggle to enable/disable automatic 12h/24h
time formatting detection based on the current locale.

Previously automatic detection was the norm on a freshly wiped device,
but could never be re-enabled once either 12h or 24h format was
configured.

Bug: 32761619
Test: m RunSettingsRoboTests
Change-Id: Idbbb8f79fccec95e33bf2f12767d5736e1118fa7
2017-08-10 13:32:17 +01:00
Jayachandran Chinnakkannu
cd4614d488 Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 9476e824be am: 7398553a81
am: eddeef3b0e

Change-Id: I7558b1656b65b8d1da77b53dd24913f21af65080
2017-08-10 06:22:10 +00:00
Jayachandran Chinnakkannu
eddeef3b0e Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 9476e824be
am: 7398553a81

Change-Id: Ib1f0f6349ad278f4db4da83fe2149215dd3c06ce
2017-08-10 06:14:27 +00:00
Jayachandran Chinnakkannu
7398553a81 Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am: 9476e824be

Change-Id: I584d95282cc7c5f681fd6bc5ac4c0f03ad22053c
2017-08-10 06:04:37 +00:00
Jayachandran Chinnakkannu
835152f391 Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am: 9476e824be

Change-Id: I7aa611840a3e14476f7f637be866920b5723d39c
2017-08-10 06:04:30 +00:00
Fan Zhang
17cfd9f500 Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev am: 0dc85bcc1e
am: 1e61f91d7b

Change-Id: I5610152c59889196124ff728e2607de764047e08
2017-08-10 02:31:39 +00:00
Fan Zhang
3f6c90eb34 Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev am: 5b820431d3
am: a8f7f745e1

Change-Id: Ifd5618ddad3fcc9a535fe719470e67946bcd9d2d
2017-08-10 02:30:57 +00:00
Ajay Nadathur
3253b7ee7c Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev am: 0ed0319005
am: b9c3eb954a

Change-Id: Ie7d1d6bd37274ac70c87fc6b8dca5f3118a64a64
2017-08-10 02:20:25 +00:00
Fan Zhang
1e61f91d7b Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
am: 0dc85bcc1e

Change-Id: I3942d07dd5c0acd5640ad50b7311ba15177f5a6d
2017-08-10 00:44:59 +00:00
TreeHugger Robot
0dc85bcc1e Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev 2017-08-10 00:38:43 +00:00
Fan Zhang
a8f7f745e1 Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
am: 5b820431d3

Change-Id: I269323c219ccd8e5d343b62bfbc6160959f5340f
2017-08-10 00:37:34 +00:00
Fan Zhang
e3535d9998 Delete DynamicindexableContentMonitor & all refs to it
Convert input device search into a search query loader

And remove old logic from DynamicIndexableContentMonitor

Change-Id: If652b1ea7c8add9185bbd025055e14925d3a8eec
Bug: 64310452
Bug: 63831980
Test: robotests
2017-08-09 17:27:02 -07:00