Doris Ling
c01898021a
Merge "Fix crash when selecting Settings->Display->Brightness level."
2017-03-27 20:38:25 +00:00
Maurice Lam
40a0db9afd
Merge "Support center alignment"
2017-03-27 20:27:22 +00:00
Doris Ling
7388f43552
Fix crash when selecting Settings->Display->Brightness level.
...
System UI updated the intent string for launching the brightness dialog.
Update the corresponding intent in the settings manifest to match the
change.
Change-Id: I4f8a2d5f424b2a0613d77ff7ca69a9c6237ef8fe
Fix: 36647069
Test: manual
2017-03-27 13:22:19 -07:00
TreeHugger Robot
6677dd91f4
Merge "Expand Wifi Picker Menu by default."
2017-03-27 20:04:22 +00:00
Julia Reynolds
e17590271f
Move automatic rules to main DND settings page.
...
Change-Id: I32b103714d4864ab32e2c85d86106dc118f9c338
Fixes: 31050255
Test: manual
2017-03-27 15:57:39 -04:00
Stephen Chen
11478573ec
Expand Wifi Picker Menu by default.
...
Bug: 36575182
Test: make SettingsFunctionalTests and ran tests on device.
Change-Id: I256ea82a8e4478d81497b9a56cc4fb7755839f1c
2017-03-27 11:26:46 -07:00
Jeff Davidson
00b0ff1377
Fix build breakage in branches downstream of master.
...
R.string.background_activity_summary was deleted in master, but is
still referenced by res/xml/power_usage_details.xml. master builds
because the stale translations are currently still present, but will
suddenly fail to build as soon as the translations are updated.
Downstream branches of master which don't have translations configured
are already broken.
Reintroduce the old string to fix the builds.
Change-Id: I20c6aa41c97644a2733ff92a459587e3cb6bf7a0
Test: Will rely on TreeHugger
Fixes: 36619997
2017-03-27 10:19:20 -07:00
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
2017-03-27 16:25:24 +00:00
Robin Lee
c834ed1e4e
Merge "[VpnSettings]Crash when activity has been recycled"
...
am: fb81f50c27
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
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
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
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
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
2017-03-25 01:02:50 +00:00
Ajay Panicker
0347c57ef5
Merge "Add default value to Bluetooth AVRCP version property get"
...
am: 84cf0b2a4b
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
