Commit Graph

52868 Commits

Author SHA1 Message Date
Lei Yu
f2fd366d55 Merge "Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370 am: c48d4d2f28" into qt-r1-dev-plus-aosp
am: cded060f7f

Change-Id: I860f33e4bdc6405f60f9601384fc5b9164a09e2a
2019-05-16 09:41:57 -07:00
Fan Zhang
5789d6e2b6 Merge "Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13 am: 2fef4914b2" into qt-r1-dev-plus-aosp
am: a3d1be5957

Change-Id: I18c4c60adca94c0bb7c9545b8432b718d91e50c3
2019-05-16 09:38:53 -07:00
Mehdi Alizadeh
d8fc9f2141 Merge "Merge "Replace system navigation animations will smaller files" into qt-dev am: b9cb4ab062 am: a4803f3634" into qt-r1-dev-plus-aosp
am: 5c0022b18e

Change-Id: I396b4d359a3b6f1e74118e08e4c1499f308fb3f3
2019-05-16 09:37:17 -07:00
Sorin Dinu
bc4135f118 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
am: 342ae33d8e

Change-Id: If9a09cd3c8d1508183932a1e313bfee39496cab4
2019-05-16 09:35:52 -07:00
Kevin Chang
e2ea1bcbb4 Merge "Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443 am: bfed5d1ca1" into qt-r1-dev-plus-aosp
am: a06b899360

Change-Id: I2a43e94f2f8f91eb3efde4653f3ba692263f5394
2019-05-16 09:34:24 -07:00
Kevin Chyn
3ba458c567 Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d am: 71f07614b9
am: be969e7d6b

Change-Id: I757fb0477f700c0a947c5c280284b6f7d7d8bbb7
2019-05-16 09:32:36 -07:00
Kevin Chang
be59ae7350 Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44 am: d3a6120581
am: ad5ff19118

Change-Id: Ic321ec1ae0126f2d490a637c110e164bc5b20f2d
2019-05-16 09:31:38 -07:00
joshmccloskey
dd0c8c22b4 Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3 am: c684e636fc
am: 6f82bd76a5

Change-Id: Ibf7cf5e49941ab6a3ded713c729417a6b4bb0d61
2019-05-16 09:30:39 -07:00
Beverly
4ff1bbb172 Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd52b am: fd589a9980
am: 23b583f894

Change-Id: I327f0cf829e492b5068d93b905561c986b82a089
2019-05-16 09:28:49 -07:00
Kevin Chyn
75fdf1dc0c Merge "Update enroll to match mocks" into qt-dev am: dbe4384909 am: a4edd2b9a2
am: 4310498646

Change-Id: I5540ebd631e4f49a0414c7f85eb4d689d8fe2e41
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

Change-Id: I45669bd49d533e17fa2aaa3c3a41f625bd955668
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

Change-Id: I98aeb638588e2d6964ff3dbd3ccca5a0a2bc86d5
2019-05-16 00:41:08 -07:00
Android Build Merger (Role)
cded060f7f Merge "Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370 am: c48d4d2f28" into qt-r1-dev-plus-aosp 2019-05-16 07:30:35 +00:00
Lei Yu
4247221729 Merge "Add empty check for path in UsageGraph" into qt-dev am: 825ac6e370
am: c48d4d2f28

Change-Id: I5c2c42995e9fa19993a8ea336bf23d111943e2c3
2019-05-16 00:30:25 -07:00
Android Build Merger (Role)
a3d1be5957 Merge "Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13 am: 2fef4914b2" into qt-r1-dev-plus-aosp 2019-05-16 07:29:46 +00:00
Fan Zhang
c2e67e03f8 Merge "Fix preview image alignment issue due to clip padding." into qt-dev am: 0376a3ce13
am: 2fef4914b2

Change-Id: I1ce371067445e984844aba027e6816c09000f88b
2019-05-16 00:29:39 -07:00
Android Build Merger (Role)
5c0022b18e Merge "Merge "Replace system navigation animations will smaller files" into qt-dev am: b9cb4ab062 am: a4803f3634" into qt-r1-dev-plus-aosp 2019-05-16 07:29:04 +00:00
Mehdi Alizadeh
0b0ba71a99 Merge "Replace system navigation animations will smaller files" into qt-dev am: b9cb4ab062
am: a4803f3634

Change-Id: Ia955e14fed992cf2beeae9e23aa814a7c0340f95
2019-05-16 00:28:52 -07:00
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

Change-Id: I634870e2c6a8c3c7b388f64161be4e4aee993667
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

Change-Id: I1073aedd07cd6f4b47cfe83409fd63f8ef2b7d1c
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

Change-Id: I5ab6c5ddd6246af3e29610a234e58e460bd96a61
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

Change-Id: I9dd092a2cec7018aa7c3257f5e8244eb2ed4a60f
2019-05-15 23:17:11 -07:00
joshmccloskey
6f82bd76a5 Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3
am: c684e636fc

Change-Id: I504d4f969f8a2f7df3db28a74069ef03a7d4e834
2019-05-15 23:11:07 -07:00
Mehdi Alizadeh
1716fca02f Merge "Replace system navigation animations will smaller files" into qt-dev am: b9cb4ab062 am: cfa4e2b734
am: 684f3b22c9

Change-Id: I890bb3fbd0e9c9794fdeacbed511da62a080ce28
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

Change-Id: I949e79f8cd95138d36901770c9324d0981149cbd
2019-05-15 23:04: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

Change-Id: I0d7e09529af9a8d28507be073cebcc30c3568691
2019-05-15 22:54:23 -07:00
Kevin Chyn
4310498646 Merge "Update enroll to match mocks" into qt-dev am: dbe4384909
am: a4edd2b9a2

Change-Id: I50e01bc3a5169a840db2af3c7e836e1a039a0b52
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

Change-Id: I2373bd354a2226961d8813186435c0ef4942fb20
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

Change-Id: Ib126893499663f636ceb244588dc8e4caf64ae44
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

Change-Id: I6442ceb64367a73097f66edef35137679819b58f
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

Change-Id: I665c2343b39db80d099f6f13a9d601e3b1d96d26
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

Change-Id: I47085873bd446aff399c94c2dca7fa9c0eee8d10
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

Change-Id: If24fb2625730e97da26a00504f740a8e87480b80
2019-05-15 19:55:16 -07:00
Kevin Chyn
71f07614b9 Merge "Update footer buttons depending on entry point" into qt-dev
am: 7411ce155d

Change-Id: Iec08981b1956fa9e02ba7de2a5edf9398dc3dcc4
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

Change-Id: I639de6d72f9cc973449f74dc5fda9af55e1839b1
2019-05-15 19:14:13 -07:00
joshmccloskey
c684e636fc Merge "Re enable remove button after cancel" into qt-dev
am: b195c402f3

Change-Id: If9118f204cded6ea9493b46724cf58e4f2ee4cf5
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

Change-Id: I48c62d62e2b4902adb800e5b62528b13f56ebccf
2019-05-15 17:27:22 -07:00
Lei Yu
c48d4d2f28 Merge "Add empty check for path in UsageGraph" into qt-dev
am: 825ac6e370

Change-Id: Ic29926ea84ec4be6f2200eaa34103c618a65727e
2019-05-15 16:51:42 -07:00
Salvador Martinez
e44f8c9dfb Merge "Fix dark theme and battery saver interaction" into qt-dev am: ba5964d99d
am: db30782bbf

Change-Id: I74bebd7ad974750c96353e9bdae1656df90cabdd
2019-05-15 16:51:33 -07:00
Fan Zhang
2fef4914b2 Merge "Fix preview image alignment issue due to clip padding." into qt-dev
am: 0376a3ce13

Change-Id: I39f1a49aaaf698358fca54e69fb6beb65d452a22
2019-05-15 16:41:39 -07:00
Beverly
fd589a9980 Merge "Always include uid as part of recentApp key" into qt-dev
am: 08ef7bd52b

Change-Id: I305672e35b3df07cb9bd0f0635033e1106a0f884
2019-05-15 15:54:20 -07:00
Kevin Chyn
a4edd2b9a2 Merge "Update enroll to match mocks" into qt-dev
am: dbe4384909

Change-Id: Id5692eacf7cfcbdbaae484aaf578ef1852fab68f
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