Commit Graph

53270 Commits

Author SHA1 Message Date
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
Mill Chen
77259dc9bb Revert "Update dialog background color for dark theme"
This reverts commit 3032628269.

Reason for revert: This will also change the background color of other components within dialog.

Bug: 132753127
Bug: 132623454
Test: visual
Change-Id: I59d4731e84e8d516a01780c4cce70b2d86208098
2019-05-16 14:46:52 +08: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
931b2dbf09 Merge "Update footer buttons depending on entry point" into qt-dev
am: 7411ce155d

Change-Id: I70f6b8d6551af985d36b628fbab4218cec1f34c9
2019-05-15 19:01:31 -07:00
Kevin Chang
55bfbfed1a Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev
am: 4891ea2d44

Change-Id: I514363a1d5ceb90435c0d6a960242503d6725c59
2019-05-15 19:00:30 -07:00
joshmccloskey
ecb58423a3 Merge "Re enable remove button after cancel" into qt-dev
am: b195c402f3

Change-Id: I5e93ad399778971bdc22112982184db562306c66
2019-05-15 18:58:57 -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
Android Build Merger (Role)
90ecaab8f8 Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: e6eeb7bd55 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp 2019-05-16 01:07:57 +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
Xin Li
f8a2db708b [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: e6eeb7bd55 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib2112047ef62fa9e995a97bcf0a0e19f61cdea76
2019-05-15 17:38:54 -07:00
Beverly
52fa75463b Merge "Always include uid as part of recentApp key" into qt-dev
am: 08ef7bd52b

Change-Id: I2f30889666946880c3331b1727ce7b8e0de5658d
2019-05-15 17:32:04 -07:00
Kevin Chyn
e70836257c Merge "Update enroll to match mocks" into qt-dev
am: dbe4384909

Change-Id: I8c561725aa3cac2d4d6fd624c8f7be57faa9036f
2019-05-15 17:27:51 -07: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
Xin Li
87f090ba57 DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
Bug: 132622481
Change-Id: I3f8a777574eb05716d4ff18e64c9750184de26b6
2019-05-15 16:55:39 -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
Mehdi Alizadeh
a4803f3634 Merge "Replace system navigation animations will smaller files" into qt-dev
am: b9cb4ab062

Change-Id: If9f5e6e3023224af6592f6bff91f3838e7ee3ca1
2019-05-15 15:31:05 -07:00
Lei Yu
2d0bf613e7 Merge "Add empty check for path in UsageGraph" into qt-dev
am: 825ac6e370

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

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

Change-Id: I9f28e42375848c8708b3632d6ea5bf7691a4abdc
2019-05-15 14:50:58 -07:00
Mehdi Alizadeh
cfa4e2b734 Merge "Replace system navigation animations will smaller files" into qt-dev
am: b9cb4ab062

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

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