Commit Graph

12432 Commits

Author SHA1 Message Date
Maurice Lam
57e61ba4f3 Merge "Rename buttons in lock screen setup" into oc-dr1-dev
am: fbfca43e6e

Change-Id: Ia7de9aba909a00bb2bf9acd01d897fcedcdfb4c2
2017-06-27 01:17:25 +00:00
Maurice Lam
467f39d243 Merge "Update skip button label to "Do it later"" into oc-dr1-dev
am: b97f91c971

Change-Id: Iea6dc3f9e7777b750203c36997b75c524f3699ea
2017-06-27 01:17:05 +00:00
Maurice Lam
a3eb263479 Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
am: 624212f43c

Change-Id: I90b4d7d57a7dc3bca86f46b34b0f9af2b78ea574
2017-06-27 01:16:46 +00:00
Maurice Lam
2cc641940d Merge "Update buttons in FP find sensor" into oc-dr1-dev
am: a102714c19

Change-Id: I7ac04a8bf769be782c79bd0e672c38db1bd6187b
2017-06-27 01:16:16 +00:00
Maurice Lam
fbfca43e6e Merge "Rename buttons in lock screen setup" into oc-dr1-dev 2017-06-27 01:10:49 +00:00
Maurice Lam
b97f91c971 Merge "Update skip button label to "Do it later"" into oc-dr1-dev 2017-06-27 01:10:37 +00:00
Maurice Lam
624212f43c Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev 2017-06-27 01:10:23 +00:00
Maurice Lam
a102714c19 Merge "Update buttons in FP find sensor" into oc-dr1-dev 2017-06-27 01:10:10 +00:00
Fan Zhang
6175c9cc6a Merge "Update icon for language settings" into oc-dr1-dev
am: 124232d6fa

Change-Id: I0d5f9f945437312a82a9ced59988d8b653088d6c
2017-06-26 22:22:30 +00:00
Fan Zhang
b30fb0f580 Update icon for language settings
Change-Id: I74691be4d2e8377640b931a3b05021129ce246d5
Fix: 37929875
Test: visual
2017-06-26 19:01:31 +00:00
Maurice Lam
c57b19d80c Rename buttons in lock screen setup
- "Continue" in choose lock flows are renamed to "Next"
- "Done" in fingerprint enroll finish screen is renamed to "Next"
  during setup flow.

Test: Manual
Bug: 62839648
Change-Id: I3ea77b759b654d7c1da1f7b545781c9dfd74caa3
2017-06-23 19:15:06 -07:00
Maurice Lam
d342ad4878 Update skip button label to "Do it later"
Test: Manual
Bug: 62839648
Change-Id: I3616fb8095eb1ca77798d45730a1ffcda8f542a4
2017-06-23 18:55:50 -07:00
Maurice Lam
870b69b067 Add skip button to fingerprint enrolling screen
Test: Manual
Bug: 62839648
Change-Id: I3f05c64eb5b88cd91c8c98b02845a99df2d27203
2017-06-23 18:48:13 -07:00
Maurice Lam
70a031fe06 Update buttons in FP find sensor
Remove the next button (so the user has to touch the sensor to
proceed), and add a skip button.

Test: cd tests/robotests && mma
Bug: 62839648
Change-Id: I555948ac2f3235e08b91f0957aa8e0ce24535c08
2017-06-23 18:05:20 -07:00
Maurice Lam
d396208233 Add fingerprint backup message
am: d793590678

Change-Id: I431ad2491085b9bccc1b90a117a30497f4156c9e
2017-06-23 20:48:45 +00:00
Maurice Lam
d793590678 Add fingerprint backup message
Test: Manual
Bug: 62844631
Change-Id: I7ce5fd4033c9f37f7aa170750edc7ffe0b583fcf
2017-06-23 11:33:41 -07:00
Fan Zhang
88ce094235 Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
am: e28599049e

Change-Id: I4ee4f15c73d8ef633704553b8147c3c3c3a02a6c
2017-06-23 17:34:00 +00:00
TreeHugger Robot
e28599049e Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev 2017-06-23 17:27:59 +00:00
Bill Yi
0695fc5d2b Import translations. DO NOT MERGE
Change-Id: I277e41f97963c4f676aef802c9f0ce2c47838515
Auto-generated-cl: translation import
2017-06-23 01:33:27 -07:00
Fan Zhang
86542ec1f6 Add a flag to enable/disable new device suggestion
Change-Id: Iebf982731a01b3d6c1d3ad60e9d1f858f4e9151e
Fix: 62907886
Test: make RunSettingsRoboTests
2017-06-22 20:03:09 +00:00
Maurice Lam
6d33cabb0f Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
am: e1eae4f05f

Change-Id: I4ef2d7373d80c95c1df60ee8af9dcae2e3ac61b6
2017-06-22 19:58:02 +00:00
Maurice Lam
e1eae4f05f Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev 2017-06-22 19:48:12 +00:00
Maurice Lam
8ee5170c07 Update CHAR LIMIT for fingerprint dialog
Test: Existing tests pass
Bug: 62401478
Change-Id: I6baf88007c3f61b88603f4d5c1ee52e66e9d54dc
2017-06-21 20:17:41 -07:00
Doris Ling
0376b0b78b Merge "Add summary text for account sync." into oc-dr1-dev
am: 053e3dcf9f

Change-Id: I833262facb7c027e26fd0507f9bd4f471a11e280
2017-06-22 00:13:57 +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
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
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
Bill Yi
44fd91be3b Import translations. DO NOT MERGE
Change-Id: I82b2878398a5fffe928a175a72d80a75bfff8f56
Auto-generated-cl: translation import
2017-06-20 21:20:19 -07: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
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
eca713c1c2 Merge "Update footer string in battery settings" into oc-dr1-dev 2017-06-21 00:52:07 +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
Lei Yu
b8d9cacae5 Merge "Update battery footer text" into oc-dr1-dev
am: 2c986d9b94

Change-Id: I7f5ed8710ba55def643a6f17240d5b0adc25d9ca
2017-06-20 21:10:07 +00:00
jackqdyulei
75eca45b76 Update footer string in battery settings
Bug: 62422269
Test: Screenshot
Change-Id: I4b2e7c40c09878562c4fe2e8a3e8117be7ffc6fd
2017-06-20 14:08:29 -07:00
Lei Yu
2c986d9b94 Merge "Update battery footer text" into oc-dr1-dev 2017-06-20 20:58:30 +00:00
Daniel Nishi
4afc3f2951 Don't accordion the progress bar out.
This stops an animation from triggering on the storage settings screen
when entering it. Because we don't load the screen until data has
loaded, we run no risk of showing an uninitialized progress bar. Thus,
we can just always show the progress bar.

Change-Id: I31814a12b9c39a33fa0fbbc4826eb4138cf09a74
Fixes: 62549522
Test: Manual
2017-06-20 13:56:04 -07:00
Maurice Lam
84f1031a62 Merge "Align fingerprint illustration size" into oc-dr1-dev
am: 3065eeff42

Change-Id: I84c1be2200cf0af4386035c59ec7b0a40a6b6004
2017-06-20 20:07:02 +00:00
Maurice Lam
3065eeff42 Merge "Align fingerprint illustration size" into oc-dr1-dev 2017-06-20 19:56:50 +00:00
jackqdyulei
92e4e1a1ff Update battery footer text
Bug: 62422269
Test: Build
Change-Id: I9cb5edbde3c33a29edfbe03706dd2d71be6a2be0
2017-06-20 10:11:06 -07:00
Fan Zhang
a74337c627 Add logging when entity header buttons are clicked
Change-Id: I673e5b4a6c5f8736bbec72e259a82acb3f514828
Fix: 62709062
Test: make RunSettingsRoboTests
2017-06-20 16:53:14 +00:00
Fan Zhang
f66702c930 Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev
am: 6dfafa5d95

Change-Id: I9f17e8f5f3ffe084567c7be7743cc7b62a4e482d
2017-06-19 23:33:13 +00:00
TreeHugger Robot
6dfafa5d95 Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev 2017-06-19 23:21:13 +00:00
Fan Zhang
d4402d221b Merge "Update gesture title" into oc-dr1-dev
am: e54e0d394e

Change-Id: I1684228f7223342491233f1a68b3c5d5f9ef85ed
2017-06-19 22:07:03 +00:00