Android Build Merger (Role)
342ae33d8e
Merge "Merge "Added icons for partial system update card in the Security category" into qt-dev am: 2e26605065 am: bfb45b6177" into qt-r1-dev-plus-aosp
2019-05-16 07:28:18 +00:00
Sorin Dinu
d58aefc32a
Merge "Added icons for partial system update card in the Security category" into qt-dev am: 2e26605065
...
am: bfb45b6177
2019-05-16 00:28:05 -07:00
Android Build Merger (Role)
a06b899360
Merge "Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443 am: bfed5d1ca1" into qt-r1-dev-plus-aosp
2019-05-16 07:27:30 +00:00
Kevin Chang
4fd093fbfa
Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443
...
am: bfed5d1ca1
2019-05-16 00:27:19 -07:00
Kevin Chyn
be969e7d6b
Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d
...
am: 71f07614b9
2019-05-15 23:24:28 -07:00
Kevin Chang
ad5ff19118
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44
...
am: d3a6120581
2019-05-15 23:17:11 -07:00
joshmccloskey
6f82bd76a5
Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3
...
am: c684e636fc
2019-05-15 23:11:07 -07:00
Beverly
23b583f894
Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd52b
...
am: fd589a9980
2019-05-15 23:04:07 -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
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
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 Chyn
71f07614b9
Merge "Update footer buttons depending on entry point" into qt-dev
...
am: 7411ce155d
2019-05-15 19:15:36 -07:00
Kevin Chang
d3a6120581
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev
...
am: 4891ea2d44
2019-05-15 19:14:13 -07:00
joshmccloskey
c684e636fc
Merge "Re enable remove button after cancel" into qt-dev
...
am: b195c402f3
2019-05-15 19:12:19 -07:00
Kevin Chyn
7411ce155d
Merge "Update footer buttons depending on entry point" into qt-dev
2019-05-16 01:24:28 +00:00
Kevin Chang
4891ea2d44
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev
2019-05-16 01:10:11 +00:00
Kevin Chyn
2ac89c87c6
Update footer buttons depending on entry point
...
Bug: 130917883
Test: Manual
Change-Id: I8954f782dc26d0ceb6f55a9efe29c3e1b290c6bd
2019-05-15 18:03:26 -07:00
TreeHugger Robot
b195c402f3
Merge "Re enable remove button after cancel" into qt-dev
2019-05-16 00:51:26 +00: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
Beverly
fd589a9980
Merge "Always include uid as part of recentApp key" into qt-dev
...
am: 08ef7bd52b
2019-05-15 15:54:20 -07:00
Kevin Chyn
a4edd2b9a2
Merge "Update enroll to match mocks" into qt-dev
...
am: dbe4384909
2019-05-15 15:47:52 -07:00
TreeHugger Robot
08ef7bd52b
Merge "Always include uid as part of recentApp key" into qt-dev
2019-05-15 22:47:28 +00: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
Mehdi Alizadeh
cfa4e2b734
Merge "Replace system navigation animations will smaller files" into qt-dev
...
am: b9cb4ab062
2019-05-15 14:43:37 -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
joshmccloskey
77735226a8
Re enable remove button after cancel
...
Fixes: 132753128
Test: Manual.
Change-Id: I36ef74455dc8ceca52dfbc8d0e6fbef770b2533d
2019-05-15 12:44:14 -07:00
Beverly
10d8894686
Always include uid as part of recentApp key
...
- so that work apps are also tracked
Test: atest RecentNotifyingAppsPreferenceControllerTest
Fixes: 132183578
Change-Id: Iceb9604674a3525b93c1cdde6e32a3a83b813866
2019-05-15 14:46:35 -04: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
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
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
Salvador Martinez
ba5964d99d
Merge "Fix dark theme and battery saver interaction" into qt-dev
2019-05-15 01:33:08 +00:00
Kevin Chang
5111c50977
Fix no reaction when tapping permission dialog button in shortcut service page
...
Bug: 132579785
Test: Visual
Change-Id: If9102228439ce23bdfb925baf6f583bb9d4d550d
2019-05-15 09:07:22 +08: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
Lei Yu
6b2030a17a
Merge "Use NetworkTemplate to query data" into qt-dev
2019-05-15 00:27:23 +00:00
