Matthew Fritze
af89d062b4
Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev
...
am: 552fc2922a
2017-04-19 22:36:11 +00:00
TreeHugger Robot
552fc2922a
Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev
2017-04-19 22:29:25 +00:00
Sundeep Ghuman
05f252ec53
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
...
am: 8025906b7c
2017-04-19 21:54:21 +00:00
Fan Zhang
0a9fddd631
Merge "Fix malformatted preference xml." into oc-dev
...
am: 569a93b8bb
2017-04-19 21:54:01 +00:00
Adrian Roos
1b322f6283
Merge "Revert "Changed the ambient display setting name"" into oc-dev
...
am: 97d3709b25
2017-04-19 21:53:40 +00:00
TreeHugger Robot
8025906b7c
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
2017-04-19 21:48:19 +00:00
TreeHugger Robot
569a93b8bb
Merge "Fix malformatted preference xml." into oc-dev
2017-04-19 21:42:36 +00:00
Adrian Roos
97d3709b25
Merge "Revert "Changed the ambient display setting name"" into oc-dev
2017-04-19 20:50:33 +00:00
Matthew Fritze
0811fd544b
Revert "Listen to brigtness updates to update brightness summary."
...
This reverts commit 4b95879634
2017-04-19 20:35:36 +00:00
Fan Zhang
a6006285b4
Fix malformatted preference xml.
...
Change-Id: I48273492bebb280f422b97ad0d5cbe23ff667a53
Fix: 37343765
Test: instrumentation test
2017-04-19 12:41:26 -07:00
Fan Zhang
30dd978830
Merge "Fix action bar background not wide enough on tablets" into oc-dev
...
am: 8cd4b4541d
2017-04-19 19:39:03 +00:00
Fan Zhang
3acabbdee9
Merge "Use AfW user handle when setting auto_sync for work" into oc-dev
...
am: 4967646661
2017-04-19 19:38:30 +00:00
TreeHugger Robot
8cd4b4541d
Merge "Fix action bar background not wide enough on tablets" into oc-dev
2017-04-19 19:36:25 +00:00
TreeHugger Robot
4967646661
Merge "Use AfW user handle when setting auto_sync for work" into oc-dev
2017-04-19 19:32:55 +00:00
Fan Zhang
fbb2331ee5
Use AfW user handle when setting auto_sync for work
...
Change-Id: Ib1aa576a0083282dc59d8fe0d5c4784233eef024
Fix: 36675513
Test: make RunSettingsRoboTests
2017-04-19 10:09:11 -07:00
Phil Weaver
8a3d606a60
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev
...
am: d4ce883c64
2017-04-19 16:14:47 +00:00
Phil Weaver
d4ce883c64
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev
2017-04-19 16:09:16 +00:00
Kevin Chyn
98a7794b13
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
...
am: eb62407114
2017-04-19 08:13:20 +00:00
TreeHugger Robot
eb62407114
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
2017-04-19 08:07:54 +00:00
Sundeep Ghuman
1c231d32b1
Force update APs when enabling wifi in WifiSettings.
...
Bug: b/37324736
Test: See bug for repro steps.
Change-Id: I2a789e13781c64d2cc72b059685c5f3dfb9ff2ad
2017-04-18 20:28:50 -07:00
Sunny Goyal
77fca989a0
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
...
am: d2561263a8
2017-04-19 02:53:17 +00:00
TreeHugger Robot
d2561263a8
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
2017-04-19 02:43:48 +00:00
Sundeep Ghuman
56de2b521a
Merge "Remove animations in WifiSettings." into oc-dev
...
am: 36a3579c61
2017-04-19 02:22:28 +00:00
TreeHugger Robot
36a3579c61
Merge "Remove animations in WifiSettings." into oc-dev
2017-04-19 02:17:33 +00:00
Fan Zhang
2bb10c9e57
Merge "Add test to verify regulatory info launches properly" into oc-dev
...
am: 4766183336
2017-04-19 01:52:26 +00:00
TreeHugger Robot
4766183336
Merge "Add test to verify regulatory info launches properly" into oc-dev
2017-04-19 01:48:40 +00:00
Sundeep Ghuman
1e04aa912e
Merge "IPv6 addresses should not be selectable." into oc-dev
...
am: 4ae52fc7f0
2017-04-19 01:05:34 +00:00
TreeHugger Robot
4ae52fc7f0
Merge "IPv6 addresses should not be selectable." into oc-dev
2017-04-19 00:54:33 +00:00
Phil Weaver
ed69e8a417
Respect user's choice on a11y shortcut dialog
...
Wasn't checking if the user actually agreed. Whoops.
Bug: 37123004
Test: Manually verified that canceling leaves the selection
unchanged.
Change-Id: I48a052eb74733d3d0105fc1e72c4bf77ce8be0c5
2017-04-18 17:53:14 -07:00
Sundeep Ghuman
bb46d23c8f
Remove animations in WifiSettings.
...
This addresses jank issues when first showing the WifiSettings. Given
the new loading bar, animated transitions seem less relevant. Based on
user feedback, animations may be readded after a delay in ODR.
Bug: b/37429702
Test: Visual
Change-Id: I9a44820bb354885d0ef31d50278aee6a47727701
2017-04-18 16:45:04 -07:00
Adrian Roos
f33fec4f90
Revert "Changed the ambient display setting name"
...
This reverts commit 8d164e659d
2017-04-18 16:26:00 -07:00
Sundeep Ghuman
6347e1b4b8
IPv6 addresses should not be selectable.
...
Disable selectable when adding ipv6 addresses to the
WifiNetworkDetailsPage.
Bug: b/37351354
Test: make RunSettingsRoboTests
Change-Id: I79bc3dcab7339df96598aa1a6505f0148f8844b0
2017-04-18 15:05:17 -07:00
Saige McVea
f869788eb8
Merge "Conditionally reposition experimental preferences." into oc-dev
...
am: b18e31bc5a
2017-04-18 21:54:38 +00:00
Doris Ling
96840d4010
Merge "Listen to brigtness updates to update brightness summary." into oc-dev
...
am: a88635f5a3
2017-04-18 21:54:23 +00:00
Saige McVea
b18e31bc5a
Merge "Conditionally reposition experimental preferences." into oc-dev
2017-04-18 21:47:25 +00:00
TreeHugger Robot
a88635f5a3
Merge "Listen to brigtness updates to update brightness summary." into oc-dev
2017-04-18 21:47:05 +00:00
Fan Zhang
a006c6de81
Fix action bar background not wide enough on tablets
...
Change-Id: I82e444dc913429c77c768afada24e10c12c79160
Fix: 37475599
Test: make RunSettingsRoboTests
2017-04-18 14:40:25 -07:00
Sunny Goyal
3b172d7b89
Using a common class for loading drawables and handling various badging
...
Test: make RunSettingsRoboTests -j31
Bug: 36591157
Change-Id: I4cb1d313920d5d8604fd79ff65b40e2dda180e2e
2017-04-18 21:34:13 +00:00
Alison Cichowlas
2d8a676b47
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
...
am: cf172040a9
2017-04-18 20:49:52 +00:00
Alison Cichowlas
cf172040a9
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
2017-04-18 20:36:54 +00:00
Doris Ling
4b95879634
Listen to brigtness updates to update brightness summary.
...
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.
Merged-In: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
Change-Id: Ice549ffd708c2dad311a87b6a92bf1c8db426456
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-18 20:01:16 +00:00
Fan Zhang
06ee0e932f
Add test to verify regulatory info launches properly
...
Test: runtest --path tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
Change-Id: I531a05bde858790819ac11c8ffcea2f6d1942ec2
Fix: 34370866
2017-04-18 12:53:24 -07:00
Anna Galusza
86d10d65ab
Merge "Update Setup Wizard Vision Settings colors." into oc-dev
...
am: 221f9245d6
2017-04-18 19:42:39 +00:00
Anna Galusza
221f9245d6
Merge "Update Setup Wizard Vision Settings colors." into oc-dev
2017-04-18 19:35:06 +00:00
Alison Cichowlas
7f431e3cd1
In apps with no channels, provide settings for misc channel in top level.
...
Test: robolectric tests pass, plus manual verification
Bug: 36561295
Change-Id: I58872a41fab562787d85bade0552c7735d716e5b
2017-04-18 18:49:24 +00:00
Matthew Fritze
d9997261dd
Merge "Revert "Add summary to special app access."" into oc-dev
...
am: 4fa0a617ec
2017-04-18 17:44:57 +00:00
Matthew Fritze
4fa0a617ec
Merge "Revert "Add summary to special app access."" into oc-dev
2017-04-18 17:39:13 +00:00
Matthew Fritze
13e5af06b8
Revert "Add summary to special app access."
...
This reverts commit 0e1b53fa6f
2017-04-18 17:35:07 +00:00
Julia Reynolds
41b21fd2d5
Merge "Channel settings updates" into oc-dev
...
am: 526185c89b
2017-04-18 15:11:27 +00:00
TreeHugger Robot
526185c89b
Merge "Channel settings updates" into oc-dev
2017-04-18 15:03:55 +00:00
