Robin Lee
b26ce1e13b
resolve merge conflicts of 90f009ebb5
to master
...
Test: make RunSettingsRoboTests
Change-Id: I7f0eece61918c29d33316fa755eca2e8f4deba46
2017-03-27 17:35:57 +01:00
Robin Lee
90f009ebb5
Merge "[VpnSettings]Crash when activity has been recycled" am: fb81f50c27
...
am: c834ed1e4e
Change-Id: I32ddda40ed4654288eef45dfdb2f53b2f9aba988
2017-03-27 16:25:24 +00:00
Robin Lee
c834ed1e4e
Merge "[VpnSettings]Crash when activity has been recycled"
...
am: fb81f50c27
Change-Id: I588fc958daacfd0b7859c00c6b5b164e6e02a33d
2017-03-27 16:22:56 +00:00
Robin Lee
fb81f50c27
Merge "[VpnSettings]Crash when activity has been recycled"
2017-03-27 16:18:20 +00:00
TreeHugger Robot
f7fb763ed5
Merge "Populate summary for top level wifi picker options"
2017-03-27 15:48:55 +00:00
TreeHugger Robot
0ba5805455
Merge "Add strings that will be needed for screen saver settings"
2017-03-25 20:35:08 +00:00
TreeHugger Robot
08a3bb368b
Merge "Update Sound settings."
2017-03-25 18:30:36 +00:00
TreeHugger Robot
6ec9bd777a
Merge "Update storage summary text."
2017-03-25 18:21:03 +00:00
TreeHugger Robot
4fa5c7b8ba
Merge "Move reset options to one place"
2017-03-25 18:17:15 +00:00
TreeHugger Robot
2dd81e9007
Merge "Change default value for vibrate on touch to 0 (off)."
2017-03-25 17:54:49 +00:00
TreeHugger Robot
4eade0aad5
Merge "Fix Accessibility Settings crash"
2017-03-25 14:58:45 +00:00
Robin Lee
edecaa782f
Merge "UserCredentialsSettings: that fresh new blank look"
2017-03-25 11:15:26 +00:00
TreeHugger Robot
0bb84ce016
Merge "Add new adaptive brightness strings."
2017-03-25 07:40:10 +00:00
Casey Burkhardt
059a8e3d12
Fix Accessibility Settings crash
...
Update preference key to reference new magnification preference screen.
Bug: 36606349
Test: Manual
Change-Id: Iefb114bea6a58d6f8939ae863959d4a6922f5a1d
2017-03-24 23:33:45 -07:00
Lei Yu
d87667fd40
Merge "Update fragment title for usage detail page."
2017-03-25 06:18:07 +00:00
Lei Yu
c67e4dbf8a
Merge "Revamp the battery usage details page."
2017-03-25 06:17:53 +00:00
TreeHugger Robot
1e89072887
Merge "Added Night display strings"
2017-03-25 06:09:20 +00:00
Andrew Sapperstein
dd482159fb
Add new adaptive brightness strings.
...
Adds new strings for the revised adaptive brightness settings UX.
Bug: 36475419
Test: is string updates
Change-Id: I4a8e1072577e440488b3f98545be3c323b49be32
2017-03-24 23:08:52 -07:00
TreeHugger Robot
51ec591bc3
Merge "Fix crash in TetherSettings."
2017-03-25 04:44:15 +00:00
Sean Stout
2da00baf7a
Added Night display strings
...
Bug: 34900174
Test: manual
Change-Id: I9e3b05dc840686bc1d44e0e750576908b2931159
2017-03-24 21:43:35 -07:00
Zhihong Li
f52128f7cb
Merge "Show correct Wi-Fi status when switching to multi window mode" am: 4cc1f72576
am: a4def43fad
...
am: 76fb361b9d
Change-Id: Ib19926feb7d3a2da0a8aaa9dc9c5ee3bcae6c2af
2017-03-25 04:26:06 +00:00
Zhihong Li
76fb361b9d
Merge "Show correct Wi-Fi status when switching to multi window mode" am: 4cc1f72576
...
am: a4def43fad
Change-Id: If2afcfba3811c1768a16b0f87cdae05bc50b7f31
2017-03-25 04:23:32 +00:00
Zhihong Li
a4def43fad
Merge "Show correct Wi-Fi status when switching to multi window mode"
...
am: 4cc1f72576
Change-Id: Id60415285629e6d7a712a9f441e6e7839732bf94
2017-03-25 04:21:03 +00:00
Treehugger Robot
4cc1f72576
Merge "Show correct Wi-Fi status when switching to multi window mode"
2017-03-25 04:14:58 +00:00
TreeHugger Robot
f4004ce808
Merge "Misc fixes for items under system setting"
2017-03-25 04:09:20 +00:00
TreeHugger Robot
12e272ab8f
Merge changes from topic 'accessibilitybutton-target'
...
* changes:
Update magnification strings
Settings revisions for Accessibility button
2017-03-25 04:04:11 +00:00
jackqdyulei
94dd5bf84d
Update fragment title for usage detail page.
...
Bug: 36367764
Fix: 36568434
Test: Build
Change-Id: Ib4e76e20b81a6b54efcc34d151dce5098a860c2a
2017-03-24 21:01:18 -07:00
jackqdyulei
ddba966700
Revamp the battery usage details page.
...
This cl adds AdvancedPowerUsageDetail to show the usage details page.
The AdvancedPowerUsageDetail contains all the needed ui components:
1. App Header
2. Two buttons
3. Usage breakdown preference category
4. Power management preference category
This cl also adds preference controller for two buttons but the
detail implementation will be added in the following cl.
Following cl will also remove previous detail page.
Bug: 35810915
Test: RunSettingsRoboTests
Change-Id: I17f95d1288762094671c0f148fa73367e51f175e
2017-03-24 20:58:44 -07:00
Fan Zhang
2a9255b33c
Misc fixes for items under system setting
...
- Show summary under virtual keyboard: list all avaiable keyboards
- Set about phone subtext to device model string.
- Update DND Suggestion text
Change-Id: I20acffcf691d1354c7636f5851b376099844700f
Fix: 35959817
Fix: 36395109
Test: robotests
2017-03-25 02:43:23 +00:00
Casey Burkhardt
5477832096
Update magnification strings
...
- Adjusts string for triple-tap instructions
- Adds summary text to Settings > Accessibility > Magnification
Bug: 30960346
Test: Manual
Change-Id: I151eeaa8b08c86ba8f9dec90d14388f1d775fb57
2017-03-24 19:24:34 -07:00
TreeHugger Robot
cb25394618
Merge changes Ie7c3cd59,Ieed87d17
...
* changes:
Update the battery string based on new mock.
Update the string in battery screen
2017-03-25 01:15:46 +00:00
Ajay Panicker
1783e0020b
Merge "Add default value to Bluetooth AVRCP version property get" am: 84cf0b2a4b
am: 0347c57ef5
...
am: 4d20929038
Change-Id: I5086968b1ecaf0d171f0e85c73ca255636ecb92f
2017-03-25 01:05:22 +00:00
Ajay Panicker
4d20929038
Merge "Add default value to Bluetooth AVRCP version property get" am: 84cf0b2a4b
...
am: 0347c57ef5
Change-Id: I65b5233f4980b4981a58e3b4059999c2edb4232e
2017-03-25 01:02:50 +00:00
Ajay Panicker
0347c57ef5
Merge "Add default value to Bluetooth AVRCP version property get"
...
am: 84cf0b2a4b
Change-Id: I21a5388ee633edb4f7b59a61390b71ea59df7205
2017-03-25 01:00:51 +00:00
Treehugger Robot
84cf0b2a4b
Merge "Add default value to Bluetooth AVRCP version property get"
2017-03-25 00:58:14 +00:00
Fan Zhang
51059c5c91
Move reset options to one place
...
Change-Id: I419c16cbfc69861e01f28c14abdde137bd78f0bb
Fix: 36458355
Test: make RunSettingsRoboTests
2017-03-24 17:26:33 -07:00
Charles He
eff418df7f
Merge "VPN settings: update strings for always-on VPN"
2017-03-25 00:01:19 +00:00
Casey Burkhardt
bc3827d717
Settings revisions for Accessibility button
...
Populates and displays a warning message when a feature that relies
on the Accessibility button is enabled, but not assigned.
Bug: 34720082
Test: Manual
Change-Id: Ie7031716a91fdf7fc40f32bf4e0ad17af85aa573
2017-03-24 17:01:06 -07:00
TreeHugger Robot
ece7be14cb
Merge "New strings for Storage settings revamp."
2017-03-24 23:51:59 +00:00
TreeHugger Robot
d3eb1f7f1f
Merge "Update WriteWifiConfigToNfcDialog."
2017-03-24 23:48:06 +00:00
jackqdyulei
5776507642
Update the battery string based on new mock.
...
The mock has been updated, upload the string first before the
string freeze.
Now the screen still uses old string, following cl will update
the screen and remove the old string.
Bug: 36576021
Test: Build
Change-Id: Ie7c3cd59dddd9223bc89c2aedd957a836e52456a
2017-03-24 16:22:19 -07:00
jackqdyulei
164c8177a9
Update the string in battery screen
...
Only update the string in battery main screen and advanced screen
Bug: 36367764
Test: Manual
Change-Id: Ieed87d1766cf24d198eabfdc05f14b7653187f0f
2017-03-24 16:14:07 -07:00
TreeHugger Robot
24a3b7b33c
Merge "Update FakeUid with new methods"
2017-03-24 23:04:03 +00:00
Saige McVea
5bbf987d1a
Merge "Resolved accessibility service preference summary strings to use a common resource."
2017-03-24 22:56:04 +00:00
Amin Shaikh
42cee74e6b
Update settings tests to use new constructor.
...
Bug: 36571359
Test: m RunSettingsRoboTests
Change-Id: Id8a722fa7627e83d3ed4840128cfca0cb03289d2
2017-03-24 15:50:04 -07:00
Maurice Lam
8d5a4f1689
Support center alignment
...
Update styles to reference the theme attribute suwGlifHeaderGravity
to, directly or indirectly via SuwDescription.Glif.
Test: Existing tests pass
Bug: 36368632
Change-Id: I6c7c234c32fdd614d4a9cdfabbef05626dad0a93
2017-03-24 15:48:14 -07:00
Doris Ling
df4c67cc69
Update Sound settings.
...
- change the summary to show the automatic rules info instead.
- removed ringtone preference category
- add dividers above DND and Emergency broadcast
Change-Id: Iee497d194b70af72cfd69b315d639ca62720643b
Fix: 34975939
Test: make RunSettingsRoboTests
2017-03-24 15:46:09 -07:00
TreeHugger Robot
661dc1229c
Merge "Add new strings for system dashboard."
2017-03-24 22:41:02 +00:00
Jason Monk
f61d1cd025
Add strings that will be needed for screen saver settings
...
Bug: 35031991
Test: none
Change-Id: I5e088b0669e762eec05cee7a2f1c724c9e526052
2017-03-24 18:04:15 -04:00
Doris Ling
4573a8bced
Change default value for vibrate on touch to 0 (off).
...
Change-Id: Ic4f1b3d7c608f5e5501af91a746afea038fd9564
Fix: 36273830
Test: make RunSettingsRoboTests
2017-03-24 14:14:11 -07:00