Commit Graph

12473 Commits

Author SHA1 Message Date
Maurice Lam
2e44cb0f17 Add fingerprint backup message am: d793590678
am: d396208233

Change-Id: I857fd458c046fa053000f7b41280310ce73f73f1
2017-06-23 20:53:41 +00: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
c85c84f12b Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev am: e28599049e
am: 88ce094235

Change-Id: Iefc8c7173e6d375d1045a3b148ba5c0f11c426e2
2017-06-23 17:47:36 +00: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
Maurice Lam
71dfd08b97 Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev am: e1eae4f05f
am: 6d33cabb0f

Change-Id: I3c2517cab313b9f3bf4411bb02de8455ffdb0e66
2017-06-22 21:35:36 +00: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
TreeHugger Robot
03849d1484 Merge "Switch Utils.formatElapsedTime to use ICU's MeasureFormat" 2017-06-22 19:49:35 +00:00
Maurice Lam
e1eae4f05f Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev 2017-06-22 19:48:12 +00:00
Alison Cichowlas
4fe455de57 Notification settings to match ixd mocks:
- added default sound config to general notification settings page
- reordered items to match docs

Bug: 37481153
Test: RunSettingsRoboTests; manual

Change-Id: I2404f0a3f97601c8b3a9d15de58e1d53bf801c45
2017-06-22 10:44:27 -04:00
Roozbeh Pournader
1587224193 Switch Utils.formatElapsedTime to use ICU's MeasureFormat
Previously, localizable strings were used instead, causing various
difficulties and inconsistencies.

Now we use ICU's MeasureFormat. The results for English are almost
identical to the previous results (see below), and we also get higher
quality and better-vetted results for other locales.

Note: This also makes formatted strings shorter by eliminating zeros.
For example, what was previously shown as "2d 0h 15m" is now shown as
"2d 15m".

Bug: 36994779
Bug: 37701311
Test: make -j RunSettingsRoboTests
Change-Id: I78fd09e4e7f63f41ef88d3d3fc4ba2be15e1d812
2017-06-21 21:04:37 -07: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
319516eb66 Merge "Add summary text for account sync." into oc-dr1-dev am: 053e3dcf9f
am: 0376b0b78b

Change-Id: If72db334afd790080bb86038c3e20aca70838605
2017-06-22 00:23:23 +00: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
TreeHugger Robot
9b00e0ca8d Merge "Update entity header to match mock" 2017-06-21 23:52:39 +00:00
Fan Zhang
ab55528e5a Update entity header to match mock
- Also add a small screen width version

Change-Id: I284561cd713d8382845db02c163983623cede038
Fix: 62709577
Test: existing tests still pass
2017-06-21 15:13:31 -07:00
jackqdyulei
c0181d66af Merge "Increase char limit for "Disconnect"" into oc-dr1-dev am: 88163b7215
am: 7027c83112

Change-Id: I5c17a83e483007473ceef77d766f7c728a592a2d
2017-06-21 20:21:54 +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
8b8316ffa7 Merge "Import translations. DO NOT MERGE" 2017-06-21 19:49:34 +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
b6360d932b Merge "Don't accordion the progress bar out." into oc-dr1-dev am: 648e31c283
am: 7ffa9b3a7b

Change-Id: If196b0729631c0817113e53b5126fc30b75c2833
2017-06-21 18:28:53 +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
759fab17a4 Merge "Add info string to advanced battery usage page" into oc-dr1-dev am: 94d0a9c554
am: 776fe841f9

Change-Id: I9f3005e2ad9dbfde4c703c509e798e5292b8a1cb
2017-06-21 17:11:47 +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
TreeHugger Robot
d92d83e496 Merge "Change fingerprint noti settings for consistency with language_and_input.xml" 2017-06-21 13:13:16 +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
Bill Yi
60fd22dee1 Import translations. DO NOT MERGE
Change-Id: I316b6070d49d6a4e684f3a680bbc90fb4217e551
Auto-generated-cl: translation import
2017-06-20 20:54:49 -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
3e3dc6cf07 Merge "Update footer string in battery settings" into oc-dr1-dev am: eca713c1c2
am: 17b88aca70

Change-Id: Ic4e3802cce4147cf189ce86ecc46d12866467fd8
2017-06-21 01:10:08 +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
eca713c1c2 Merge "Update footer string in battery settings" into oc-dr1-dev 2017-06-21 00:52:07 +00:00
Fan Zhang
f18fa145f2 Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev am: 58d27eef9a
am: 1d3f5e55cd

Change-Id: I1f0bd8ed2dcedb9add6c63d1ab72ce30fb93ca70
2017-06-20 23:44:21 +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
add35b994d Merge "Update battery footer text" into oc-dr1-dev am: 2c986d9b94
am: b8d9cacae5

Change-Id: I1b697d40d8fc12ba0825fed2436ac79252a2311f
2017-06-20 21:26:02 +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
d9b04ab360 Merge "Align fingerprint illustration size" into oc-dr1-dev am: 3065eeff42
am: 84f1031a62

Change-Id: Ib537e8cd499806660673f656f22c1a3da40d5b74
2017-06-20 20:11:29 +00: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