Commit Graph

38168 Commits

Author SHA1 Message Date
Juan Lang
c04c3f7bd7 Use SettingsLib's versions of Custom* classes.
Bug: 30046624
Merged-In: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Test: make RunSettingsRoboTests
Change-Id: Icd4390c46532bedb3824511867208337c74c00a3
2017-06-21 14:47:37 -07:00
Bill Yi
85a0fab72f Import translations. DO NOT MERGE am: ae5a31e55c -s ours
am: f6e125b46d  -s ours

Change-Id: I4329c03e80a2f9234e8b23a926ecb39e1a3c56bf
2017-06-21 20:29:57 +00:00
Bill Yi
7b13f1c0fb Import translations. DO NOT MERGE am: ae5a31e55c -s ours
am: a3821d019a  -s ours

Change-Id: I2fdc4eb1a34ad7a16a3325cbee96d61434da5f6f
2017-06-21 20:26:57 +00:00
Bill Yi
f6e125b46d Import translations. DO NOT MERGE
am: ae5a31e55c  -s ours

Change-Id: Ibd2297385f91e2bf12e90f4933c785104aa6e153
2017-06-21 20:23:16 +00:00
Bill Yi
a3821d019a Import translations. DO NOT MERGE
am: ae5a31e55c  -s ours

Change-Id: Ic37588db9f8b69ef7fa7d69c27e717ac4f241383
2017-06-21 20:21:34 +00:00
jackqdyulei
7027c83112 Merge "Increase char limit for "Disconnect"" into oc-dr1-dev
am: 88163b7215

Change-Id: I79b61d5b028dbcf22d8369cef7b92463fd90b498
2017-06-21 20:12:53 +00:00
Doris Ling
c5c2f10fc5 Add summary text for account sync.
Bug: 62862167
Test: builds
Change-Id: I7e3c7e76791d9f79430b2b549d4d89a18a4e2bba
2017-06-21 13:12:41 -07:00
TreeHugger Robot
88163b7215 Merge "Increase char limit for "Disconnect"" into oc-dr1-dev 2017-06-21 19:55:51 +00:00
Bill Yi
6e3b702c5a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: ce043d0f98  -s ours

Change-Id: Ic700813442af82b979b645e465b2d5ac28ac4a74
2017-06-21 19:44:58 +00:00
TreeHugger Robot
ce043d0f98 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-21 19:42:37 +00:00
Daniel Nishi
7ffa9b3a7b Merge "Don't accordion the progress bar out." into oc-dr1-dev
am: 648e31c283

Change-Id: If1c7ba281f0a959a9efc1e8c04b1cad8260b7020
2017-06-21 18:26:22 +00:00
Daniel Nishi
648e31c283 Merge "Don't accordion the progress bar out." into oc-dr1-dev 2017-06-21 18:21:20 +00:00
jackqdyulei
caa80a8f41 Increase char limit for "Disconnect"
Bug: 62374362
Test: Build
Change-Id: I3cd8c2d48c5a686c006ab76686a2f017ac9c0ddf
2017-06-21 11:02:20 -07:00
Lei Yu
5445997519 Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
am: 2e34b94817

Change-Id: I986039cb676054b31b41ce54ab3c9c034297721f
2017-06-21 17:49:50 +00:00
Lei Yu
2e34b94817 Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev 2017-06-21 17:44:44 +00:00
Matthew Fritze
eeec8eecc0 Merge "Block inline-results from Settings search" into oc-dr1-dev
am: bea9a5d739

Change-Id: Ie9ba24744922dccedfec07a034c2374695f77214
2017-06-21 17:42:48 +00:00
TreeHugger Robot
bea9a5d739 Merge "Block inline-results from Settings search" into oc-dr1-dev 2017-06-21 17:26:10 +00:00
Salvador Martinez
776fe841f9 Merge "Add info string to advanced battery usage page" into oc-dr1-dev
am: 94d0a9c554

Change-Id: If9b2ac97f41d55cf93dc33bbf129d56dfd9de225
2017-06-21 17:06:35 +00:00
Salvador Martinez
94d0a9c554 Merge "Add info string to advanced battery usage page" into oc-dr1-dev 2017-06-21 17:02:32 +00:00
Ajay Kumar Nadathur Sreenivasan
c14e0660a7 Merge "Add missing 'pin' screen lock option" into oc-dr1-dev
am: f5b77d65b4

Change-Id: Ife35a27b745d0ea08b2580c3e41c6fdc38f3d1c4
2017-06-21 16:44:14 +00:00
Ajay Kumar Nadathur Sreenivasan
f5b77d65b4 Merge "Add missing 'pin' screen lock option" into oc-dr1-dev 2017-06-21 16:39:50 +00:00
Sean Stout
763acf0981 Add Night Light to Settings widget
Night Light now appears as an option when placing the Settings widget

Bug: 62823114
Test: manual - Place Settings widget on launcher
Change-Id: I521980ec63b2e9034f44d2de7796dcb64f870b06
2017-06-21 16:24:34 +00:00
Bill Yi
ae5a31e55c Import translations. DO NOT MERGE
Change-Id: Idfada62fcc0224d6bffd354ab140fd5300a5a8a3
Auto-generated-cl: translation import
2017-06-20 21:36:56 -07:00
Bill Yi
44fd91be3b Import translations. DO NOT MERGE
Change-Id: I82b2878398a5fffe928a175a72d80a75bfff8f56
Auto-generated-cl: translation import
2017-06-20 21:20:19 -07:00
jackqdyulei
f60c265a11 Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev
am: b010eed05d

Change-Id: I10ef631d4a870ce52c4730645e2f0da10cdfd8a1
2017-06-21 03:25:43 +00:00
Doris Ling
33b2f7f466 Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev
am: 153e2b89b9

Change-Id: I3eaa11054beabf83765bf548a5dca6337817a546
2017-06-21 03:23:34 +00:00
TreeHugger Robot
b010eed05d Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev 2017-06-21 03:16:33 +00:00
TreeHugger Robot
153e2b89b9 Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev 2017-06-21 03:14:29 +00:00
Kevin Chyn
8dbfc66a74 Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev
am: 58f668ef6b

Change-Id: Ie1f930d8ebf08b6b3c92da4925144c1b3a70b50e
2017-06-21 03:02:36 +00:00
TreeHugger Robot
58f668ef6b Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev 2017-06-21 02:52:01 +00:00
Salvador Martinez
cbefbc261f Add info string to advanced battery usage page
This CL adds an FYI string under the battery graph to let users
know that their current estimate is coming from the enhanced
estimate provider when it is enabled.

Test: Robotests
Bug: 38399654
Change-Id: If5cd622ef0251a5a483cef870fc2261369e14845
2017-06-20 18:37:49 -07:00
Lei Yu
216710961b Merge "Update anomaly High usage" into oc-dr1-dev
am: 50062193c4

Change-Id: I5de568b3397dc18ee800aa866b883fe33dcb3d95
2017-06-21 01:06:55 +00:00
Lei Yu
50062193c4 Merge "Update anomaly High usage" into oc-dr1-dev 2017-06-21 01:03:42 +00:00
Lei Yu
17b88aca70 Merge "Update footer string in battery settings" into oc-dr1-dev
am: eca713c1c2

Change-Id: Iaaa78a3742a91f7d2d4e0a2edd361589fb340a39
2017-06-21 01:03:15 +00:00
Lei Yu
76b09dfae5 Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
am: 65afc6f86b

Change-Id: Ie4169d421e4c31e0e4eb780a9b1c8b3921db3fd4
2017-06-21 01:02:56 +00:00
Lei Yu
eca713c1c2 Merge "Update footer string in battery settings" into oc-dr1-dev 2017-06-21 00:52:07 +00:00
Lei Yu
65afc6f86b Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev 2017-06-21 00:51:31 +00:00
Kevin Chyn
57d52c6b50 Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
am: b4bbc52e27

Change-Id: I7d9ba9fb5b1bd75a3565963bc13b82606761970b
2017-06-20 23:38:12 +00:00
TreeHugger Robot
b4bbc52e27 Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev 2017-06-20 23:36:27 +00:00
Fan Zhang
1d3f5e55cd Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev
am: 58d27eef9a

Change-Id: I352415bd83dccd9f86cf9017816d5858b0afbedb
2017-06-20 23:34:24 +00:00
TreeHugger Robot
58d27eef9a Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev 2017-06-20 23:23:40 +00:00
jackqdyulei
b7c8809d3b Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
am: 7de9af3b8f

Change-Id: I7230df797ff3cc6435d9145527bc962a0df9deb3
2017-06-20 23:11:47 +00:00
jackqdyulei
4b5a6a5284 Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
am: 9d0d6e4fcc

Change-Id: If6960f114f3d42e95061a8e832f9b99695c2bd7f
2017-06-20 23:05:34 +00:00
jackqdyulei
7de9af3b8f Merge "Hide wifi and bt in battery settings" into oc-dev
am: 05777a7918

Change-Id: I2c12178379cfed44d6007533f420c7611038bfed
2017-06-20 23:03:00 +00:00
jackqdyulei
23f388076d Make icon in Anomaly detail page have badge.
Anomaly detail page is using the correct API but wrong parameters.
This cl fix it by specifying the correct userId.

Bug: 38306392
Test: RunSettingsRoboTests

Change-Id: If593bf8a7881a9eecbaa62858492878235d88397
2017-06-20 16:01:17 -07:00
jackqdyulei
9d0d6e4fcc Merge "Hide wifi and bt in battery settings" into oc-dev
am: 05777a7918

Change-Id: If676ec0119bebed800727f618225fd355e9da74f
2017-06-20 22:55:47 +00:00
jackqdyulei
4d75698dac Merge "Refine Anomaly detail page" into oc-dr1-dev
am: aad82fa4ee

Change-Id: I0537ea1cd0c318d7c03a3a40865dcda7ea126c6b
2017-06-20 22:36:50 +00:00
TreeHugger Robot
05777a7918 Merge "Hide wifi and bt in battery settings" into oc-dev 2017-06-20 22:35:59 +00:00
TreeHugger Robot
aad82fa4ee Merge "Refine Anomaly detail page" into oc-dr1-dev 2017-06-20 22:14:55 +00:00
Kevin Chyn
00d21e3c75 FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT
Fixes: 62681560

Test: open fingerprint settings, use an unenrolled fingerprint to
authenticate 20 times in a row. Look at logs and it shouldn't be flooded
with fingerprint logs

Change-Id: I59051e8d3a9e040bcd894e956abcbf0497838988
2017-06-20 14:24:43 -07:00