Kevin Chyn
75fdf1dc0c
Merge "Update enroll to match mocks" into qt-dev am: dbe4384909 am: a4edd2b9a2
...
am: 4310498646
2019-05-16 09:27:49 -07:00
Lei Yu
d6ad2a3340
Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370 am: 2d0bf613e7
...
am: 0b758293c8
2019-05-16 00:50:41 -07:00
Fan Zhang
211a479817
Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13 am: b8cde6da35
...
am: 284789c41d
2019-05-16 00:41:08 -07:00
Mehdi Alizadeh
1716fca02f
Merge "Replace system navigation animations will smaller files" into qt-dev am: b9cb4ab062 am: cfa4e2b734
...
am: 684f3b22c9
2019-05-15 23:11:07 -07:00
Sorin Dinu
023f173f20
Merge "Added icons for partial system update card in the Security category" into qt-dev am: 2e26605065
...
am: ef18f553fa
2019-05-15 22:54:23 -07:00
Kevin Chyn
4310498646
Merge "Update enroll to match mocks" into qt-dev am: dbe4384909
...
am: a4edd2b9a2
2019-05-15 22:51:37 -07:00
Kevin Chang
cca9206ccc
Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443
...
am: a4a1055d7c
2019-05-15 21:45:52 -07:00
Lei Yu
0b758293c8
Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370
...
am: 2d0bf613e7
2019-05-15 20:27:20 -07:00
Fan Zhang
284789c41d
Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13
...
am: b8cde6da35
2019-05-15 20:17:15 -07:00
Mehdi Alizadeh
684f3b22c9
Merge "Replace system navigation animations will smaller files" into qt-dev am: b9cb4ab062
...
am: cfa4e2b734
2019-05-15 20:08:25 -07:00
Salvador Martinez
3af5cccb8d
Merge "Fix dark theme and battery saver interaction" into qt-dev am: ba5964d99d am: db30782bbf
...
am: e44f8c9dfb
2019-05-15 20:07:28 -07:00
Sorin Dinu
ef18f553fa
Merge "Added icons for partial system update card in the Security category" into qt-dev
...
am: 2e26605065
2019-05-15 19:55:16 -07:00
Kevin Chang
a4a1055d7c
Merge "Change string of switchbar and installed service category title" into qt-dev
...
am: d0c5f2d443
2019-05-15 17:27:22 -07:00
Salvador Martinez
e44f8c9dfb
Merge "Fix dark theme and battery saver interaction" into qt-dev am: ba5964d99d
...
am: db30782bbf
2019-05-15 16:51:33 -07:00
Kevin Chyn
a4edd2b9a2
Merge "Update enroll to match mocks" into qt-dev
...
am: dbe4384909
2019-05-15 15:47:52 -07:00
Kevin Chyn
dbe4384909
Merge "Update enroll to match mocks" into qt-dev
2019-05-15 22:34:40 +00:00
Lei Yu
2d0bf613e7
Merge "Add empty check for path in UsageGraph" into qt-dev
...
am: 825ac6e370
2019-05-15 15:20:21 -07:00
Fan Zhang
b8cde6da35
Merge "Fix preview image alignment issue due to clip padding." into qt-dev
...
am: 0376a3ce13
2019-05-15 15:18:28 -07:00
Lei Yu
825ac6e370
Merge "Add empty check for path in UsageGraph" into qt-dev
2019-05-15 22:05:18 +00:00
TreeHugger Robot
0376a3ce13
Merge "Fix preview image alignment issue due to clip padding." into qt-dev
2019-05-15 22:01:06 +00:00
Lei Yu
1cdbbf314d
Merge "Use NetworkTemplate to query data" into qt-dev am: 6b2030a17a am: 6d260e680f
...
am: 9afefb4bca
2019-05-15 14:50:58 -07:00
Mehdi Alizadeh
cfa4e2b734
Merge "Replace system navigation animations will smaller files" into qt-dev
...
am: b9cb4ab062
2019-05-15 14:43:37 -07:00
Fan Zhang
5120371830
Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev am: 17521d0ac7 am: d32e9b5229
...
am: 8bf20201d6
2019-05-15 14:33:49 -07:00
TreeHugger Robot
b9cb4ab062
Merge "Replace system navigation animations will smaller files" into qt-dev
2019-05-15 21:17:13 +00:00
Lei Yu
9afefb4bca
Merge "Use NetworkTemplate to query data" into qt-dev am: 6b2030a17a
...
am: 6d260e680f
2019-05-15 13:32:25 -07:00
Fan Zhang
8bf20201d6
Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev am: 17521d0ac7
...
am: d32e9b5229
2019-05-15 13:31:28 -07:00
Fan Zhang
db3fca16f7
Fix preview image alignment issue due to clip padding.
...
CaptionPropertiesFragment is using a non-standard way to display preview
images. Changed to use LayoutPreference.
Bug: 132797057
Test: visual
Change-Id: I92bfd38e2880226d7385e98ed871dad4e1f30e42
2019-05-15 13:26:39 -07:00
Kevin Chyn
ceb5aa4514
Update enroll to match mocks
...
Test: manual
Fixes: 132803438
Change-Id: I99a10e60833a31b71abf8fdbf7e426e9867a1cf5
2019-05-15 12:51:13 -07:00
Lei Yu
7db71f91bf
Add empty check for path in UsageGraph
...
If path is empty, skip method since there is nothing to draw.
Bug: 132728523
Test: RunSettingsRoboTests
Change-Id: I6fdb7c2f69d3d658c47b58c7304cfeb7d4010a46
2019-05-15 11:36:15 -07:00
Mehdi Alizadeh
001fb53530
Replace system navigation animations will smaller files
...
Bug: 130915285
Test: Manual test
Change-Id: I902177c5f5c0d56f463fbc4e9532c70581fe9154
2019-05-15 11:05:12 -07:00
Sorin Dinu
64f6da4d75
Merge "Added icons for partial system update card in the Security category" into qt-dev am: 2e26605065
...
am: bfb45b6177
2019-05-15 00:00:37 -07:00
Sorin Dinu
bfb45b6177
Merge "Added icons for partial system update card in the Security category" into qt-dev
...
am: 2e26605065
2019-05-14 23:53:19 -07:00
Sorin Dinu
2e26605065
Merge "Added icons for partial system update card in the Security category" into qt-dev
2019-05-15 06:31:49 +00:00
Kevin Chang
556422915d
Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443
...
am: bfed5d1ca1
2019-05-14 20:24:53 -07:00
Salvador Martinez
1e1b7fb99c
Merge "Fix dark theme and battery saver interaction" into qt-dev am: ba5964d99d
...
am: db30782bbf
2019-05-14 19:52:22 -07:00
Kevin Chang
bfed5d1ca1
Merge "Change string of switchbar and installed service category title" into qt-dev
...
am: d0c5f2d443
2019-05-14 19:50:05 -07:00
Kevin Chang
d0c5f2d443
Merge "Change string of switchbar and installed service category title" into qt-dev
2019-05-15 02:13:09 +00:00
Salvador Martinez
db30782bbf
Merge "Fix dark theme and battery saver interaction" into qt-dev
...
am: ba5964d99d
2019-05-14 19:12:12 -07:00
Lei Yu
f84633ec79
Merge "Use NetworkTemplate to query data" into qt-dev am: 6b2030a17a
...
am: 6d260e680f
2019-05-14 18:47:51 -07:00
Salvador Martinez
ba5964d99d
Merge "Fix dark theme and battery saver interaction" into qt-dev
2019-05-15 01:33:08 +00:00
Fan Zhang
ff8a733f63
Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev am: 17521d0ac7
...
am: d32e9b5229
2019-05-14 18:15:28 -07:00
Colin Cross
e43660a00d
Merge "Convert Settings to Android.bp" into qt-dev-plus-aosp
...
am: a7125ade35
2019-05-14 17:58:41 -07:00
Lei Yu
6d260e680f
Merge "Use NetworkTemplate to query data" into qt-dev
...
am: 6b2030a17a
2019-05-14 17:52:06 -07:00
Fan Zhang
d32e9b5229
Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev
...
am: 17521d0ac7
2019-05-14 17:41:06 -07:00
Colin Cross
714163a258
Merge "Use if instead of switch for resources" into qt-dev-plus-aosp
...
am: 341544f133
2019-05-14 17:38:49 -07:00
Lei Yu
6b2030a17a
Merge "Use NetworkTemplate to query data" into qt-dev
2019-05-15 00:27:23 +00:00
TreeHugger Robot
17521d0ac7
Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev
2019-05-15 00:01:30 +00:00
Colin Cross
a7125ade35
Merge "Convert Settings to Android.bp" into qt-dev-plus-aosp
2019-05-14 23:33:31 +00:00
Colin Cross
341544f133
Merge "Use if instead of switch for resources" into qt-dev-plus-aosp
2019-05-14 23:33:25 +00:00
Salvador Martinez
ee5f79edbd
Fix dark theme and battery saver interaction
...
In settings we weren't properly taking into account battery saver
enabled dark theme. This CL makes it so that when battery saver
on we disable the toggle until battery saver is off since
you can't change dark theme in battery saver. Additionally it
adds a message indicating why the toggle was disabled so the
user doesn't get confused.
Test: robotests
Bug: 131913864
Change-Id: I855e429a666098c837650852d1e1355477afa13d
2019-05-14 14:08:24 -07:00
