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
Fan Zhang
b91a26b356
Add help url placeholder for SimLock settings
...
Bug: 38412798
Test: manual
Change-Id: I77a8fa89c2b16da9269b40c5efcb6d0f868d5b76
2017-06-19 21:11:48 +00:00
Fan Zhang
7f530922f8
Update gesture title
...
Change-Id: I95de69c0b7a8c1bda4781c33aaf025b3ec5c275b
Fix: 36685646
Test: visual
2017-06-19 19:52:45 +00:00
Lei Yu
5350ec84c6
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
...
am: d55579889a
Change-Id: I5c689e2f50f06c6501a771dd957e4408e888a092
2017-06-19 17:22:57 +00:00
Lei Yu
d55579889a
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
2017-06-19 17:03:29 +00:00
Alison Cichowlas
eeda4ae540
Merge "Notification settings update." into oc-dr1-dev
...
am: cd9224a058
Change-Id: I22d96e1d02f9a5a19f0eae1db368ad71d9de9b7b
2017-06-19 15:10:02 +00:00
Alison Cichowlas
7b0a8b6815
Notification settings update.
...
- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.
Bug: 62705435
Test: make RunSettingsRoboTests; manual verification
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
2017-06-19 08:53:45 -04:00
TreeHugger Robot
fa8fa0d212
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-17 06:00:21 +00:00
Maurice Lam
a57730aa57
Align fingerprint illustration size
...
Test: Manual
Bug: 62677095
Change-Id: I352bf5e20f4ce254d0777dfd544f4604f5c86dcb
2017-06-16 21:34:34 -07:00
Maurice Lam
3346d456f9
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev
...
am: 2b836b0c0c
Change-Id: I8229328b2d1ab55c76cf939b55d8528f511dfcda
2017-06-17 00:20:54 +00:00
TreeHugger Robot
2b836b0c0c
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev
2017-06-17 00:07:39 +00:00
Maurice Lam
9b8f36e359
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
...
am: 98a9d341c8
Change-Id: Iac233acde24c37fd7f93faba312bc5d894bb224d
2017-06-16 22:17:18 +00:00
jackqdyulei
837200041f
Move "Received files" in BluetoothSettings
...
Move it from menu to preference
Also clean up the code about menu since there is no menu anymore
in BluetoothSettings
Bug: 35876447
Test: RunSettingsRoboTests
Change-Id: I4a3821595a0cc75382f1cf74bcafb3ecc44cc178
2017-06-16 13:45:46 -07:00
Maurice Lam
f3c5b4d3eb
Make Accessibility settings a SUW suggestion
...
Make it a suggestion so that SUW can show it during deferred setup
Test: Manual
Bug: 38506169
Change-Id: I03d5d0d7c2e5168b8d3ccccedce74620675865b8
2017-06-16 13:20:54 -07:00
Maurice Lam
846172564e
Make confirm lock screen use the right theme
...
Test: cd tests/robotests && mma
Bug: 62348472
Change-Id: Ie05c2e6adba8450a1092f0fefcad6b003398de7d
2017-06-16 13:02:36 -07:00
Lei Yu
1522839283
Merge "Display anomaly in battery usage page" into oc-dr1-dev
...
am: b275471725
Change-Id: Ib9a7a971bdd3c9685287d25985f06f39507dbdad
2017-06-16 17:06:37 +00:00
Lei Yu
b275471725
Merge "Display anomaly in battery usage page" into oc-dr1-dev
2017-06-16 16:55:53 +00:00
Christine Franks
3fb1655289
Merge "Update Night display icon in Settings" into oc-dr1-dev
...
am: ddd692cf1a
Change-Id: I1af8434bc68283f5579cdf01901022d292ba2a13
2017-06-16 14:43:56 +00:00
Christine Franks
ddd692cf1a
Merge "Update Night display icon in Settings" into oc-dr1-dev
2017-06-16 14:36:12 +00:00
Bill Yi
76d55da74b
Import translations. DO NOT MERGE
...
Change-Id: I1c041b74f7d78f0b69a4c8553118ed069393586e
Auto-generated-cl: translation import
2017-06-16 07:00:00 -07:00
Charles He
569a238509
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
...
am: add67648c7
Change-Id: I2058ec725fb10fc0a8572237d5927f70b3d89525
2017-06-16 11:44:42 +00:00