Xin Li
148da1edf8
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."
...
am: 0a8e4aebf5 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibf11decc47dc2c10fcfea38a9fd10c93a321ee66
2019-05-16 20:45:16 -07:00
joshmccloskey
88582128aa
Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3 am: ecb58423a3
...
am: 3bea5a13b1
Change-Id: I7e5d3357d07ab807cea936364c8762ce6b388b06
2019-05-16 20:29:43 -07:00
Xin Li
af42065ea6
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
...
am: 87f090ba57 -s ours
am skip reason: subject contains skip directive
Change-Id: I2fb161dff7084788c521c82344a5ebb2dc5cc929
2019-05-16 19:22:57 -07:00
Joshua Mccloskey
a396a8c1ba
Merge "Modified string" into qt-r1-dev
...
am: 4a6d3f6403
Change-Id: I7b16f828ec9618181bbb4c0a178f22b5db592a52
2019-05-16 19:16:15 -07:00
joshmccloskey
f5cbb30b04
Added information icon
...
am: 8fd6269f40
Change-Id: Ic1de71704ff41a7916eb5cd9f87f93b7983f15fe
2019-05-16 19:15:28 -07:00
Joshua Mccloskey
4a6d3f6403
Merge "Modified string" into qt-r1-dev
2019-05-17 02:10:24 +00:00
Xin Li
93b230b2c5
Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: e6eeb7bd55 -s ours am: 90ecaab8f8
...
am: ec2c2c299d -s ours
am skip reason: subject contains skip directive
Change-Id: I4a271c2dd7b311909d55db75638a65af0f1778e0
2019-05-16 18:45:03 -07:00
Badhri Jagan Sridharan
bf5686e5f5
Help URI for USB contaminant dialog
...
Bug: 132737150
Test: build test.
Change-Id: If6ac3b086edaee18cd982ef12220b480d12f5228
2019-05-16 18:08:37 -07:00
Xin Li
0a8e4aebf5
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."
2019-05-17 00:58:08 +00:00
Kevin Chyn
8737949f0e
De-dupe animation name
...
Bug: 132916308
Test: Builds
Change-Id: Ief29915641826a270f54adc3752b62cd9ee99ebe
2019-05-16 17:06:37 -07:00
Marc Plano-Lesay
fcb000cf0c
Make the private DNS mode dialog entries full width.
...
Using wrap_content requires to tap on the text specifically, while the
full width usually works for this kind of dialogs.
Change-Id: I95035202c1a3b3bdcbd91a4ff0e60f42392a3ba5
Fixes: 132914632
Test: Screenshot
2019-05-16 23:38:25 +00:00
Lei Yu
c15ca62386
Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62
...
am: 28e19d2883
Change-Id: I57765cf4f1adb41b6e2c2885f210ec366bc14811
2019-05-16 13:25:45 -07:00
Lei Yu
bbf4219bf0
Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62
...
am: d6bdbfabc7
Change-Id: I74cc36427decbbdf7ccc58a2b0cb9d4cd2dcff48
2019-05-16 12:33:13 -07:00
Alexey Kuzmin
a8378744cb
Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200
...
am: 486b89da28
Change-Id: Ibaecc9622270e13c25284905235c3c64fd0ea1e7
2019-05-16 12:15:08 -07:00
Alexey Kuzmin
cec630a67a
Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200
...
am: bfcf644bed
Change-Id: Ic87e16fd98b702ec64c50f4199af733db017370f
2019-05-16 12:12:08 -07:00
joshmccloskey
8fd6269f40
Added information icon
...
Bug: 132820419
Test: Manual.
Change-Id: If67a0ab96e9991f117e0a93c70a77266473b1df8
2019-05-16 19:10:15 +00:00
joshmccloskey
6513beb966
Modified string
...
Fixes: 132650058
Test: Builds.
Change-Id: I41e3b52570ec7e789692a179aaad96320de3db3a
2019-05-16 19:09:28 +00:00
Lei Yu
28e19d2883
Merge "Use short summary in advanced BT header" into qt-dev
...
am: b6012f8d62
Change-Id: Ibb3270dc2ecf9dfd942fe17f9aa9fb65369a1654
2019-05-16 11:58:25 -07:00
Lei Yu
d6bdbfabc7
Merge "Use short summary in advanced BT header" into qt-dev
...
am: b6012f8d62
Change-Id: Ib222bc7eb04ce08942d7da6dfc5ef7dd07b7e129
2019-05-16 11:58:16 -07:00
Lei Yu
b6012f8d62
Merge "Use short summary in advanced BT header" into qt-dev
2019-05-16 18:18:45 +00:00
Alexey Kuzmin
bfcf644bed
Merge "Fix usage hint of ringtone vibration preview" into qt-dev
...
am: 71f6523200
Change-Id: I5525f5de544a5eb51fdcc7b832ab4a3c3b2ad2d8
2019-05-16 11:08:45 -07:00
Alexey Kuzmin
486b89da28
Merge "Fix usage hint of ringtone vibration preview" into qt-dev
...
am: 71f6523200
Change-Id: Ia81d515bc26a87b636da2d1ce6e65ae5051cc405
2019-05-16 11:05:29 -07:00
Xin Li
80f649e908
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: e6eeb7bd55 -s ours am: f8a2db708b
...
am: 924854583f -s ours
am skip reason: subject contains skip directive
Change-Id: Id637c65e35b273a5b03e2a7196c2f34aff305e21
2019-05-16 10:28:33 -07:00
Beverly
0203b824fe
Merge "Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd52b am: 52fa75463b" into qt-r1-dev-plus-aosp
...
am: 478776a510
Change-Id: Ibca6104ef03b4c7c378dd55c561184408fe317f8
2019-05-16 10:28:01 -07:00
Leon Liao
72dd2e8079
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
...
am: e51e69284c
Change-Id: I4ae93049dee05c78106b6b0c2383b65d10bf3000
2019-05-16 10:12:03 -07:00
TreeHugger Robot
71f6523200
Merge "Fix usage hint of ringtone vibration preview" into qt-dev
2019-05-16 16:51:32 +00:00
Kevin Chyn
7c860c3f18
Merge "Merge "Update enroll to match mocks" into qt-dev am: dbe4384909 am: e70836257c" into qt-r1-dev-plus-aosp
...
am: b8bb3f2b2b
Change-Id: If722f4ebce9c2c70c9e47040624b75cd9fed11e2
2019-05-16 09:43:51 -07:00
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
Pavel Grafov
f59ce06159
Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2
...
am: 72b85a3798
Change-Id: I8daf4f4a34631700b6e3b62bcc24a9f3554fbad6
2019-05-16 09:13:35 -07:00
Kevin Chyn
9c5ee1901a
Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d
...
am: 931b2dbf09
Change-Id: Iaf67be105743793899c7ca17110059a8186602e3
2019-05-16 08:33:28 -07:00
Kevin Chang
4fedf61fc6
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44
...
am: 55bfbfed1a
Change-Id: I65575bbe0d03e6d0d944a17c81b730246f2c472f
2019-05-16 08:13:15 -07:00
Leon Liao
9eda4b017e
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
...
am: dfae7fe0e0
Change-Id: I14b955b57ebafbc99a656270c967cd3a7c5417e9
2019-05-16 07:50:37 -07:00
Android Build Merger (Role)
79ecab0822
Merge "Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2 am: 52f1e826e9" into qt-r1-dev-plus-aosp
2019-05-16 14:44:00 +00:00
joshmccloskey
3bea5a13b1
Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3
...
am: ecb58423a3
Change-Id: I59851775776af148ea407aa76f02782ccd0f2a1d
2019-05-16 07:27:43 -07:00
Xin Li
ec2c2c299d
Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: e6eeb7bd55 -s ours
...
am: 90ecaab8f8
Change-Id: I8621fd4452aaed3fae05a17dbb35f72466950ac6
2019-05-16 06:13:48 -07:00
Leon Liao
e51e69284c
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
...
am: 764b8491e1
Change-Id: I8074cfd21490785952d180819c34dd383dff6ed3
2019-05-16 06:11:43 -07:00
Leon Liao
dfae7fe0e0
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
...
am: 764b8491e1
Change-Id: Icd56f53ece053032281761da0d6d650b0e76c9d7
2019-05-16 06:11:41 -07:00
Leon Liao
764b8491e1
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
2019-05-16 13:02:56 +00:00
Pavel Grafov
c9ff73c032
Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2
...
am: 52f1e826e9
Change-Id: I3a167359052d16a6f7446e988bc7df1864057388
2019-05-16 05:47:05 -07:00
Pavel Grafov
52f1e826e9
Merge "Make credential confirmation activity resizeable." into qt-dev
...
am: e455680bd2
Change-Id: I94f9c4c8b214d52e62fe603b06fbef73dca59a0a
2019-05-16 05:26:23 -07:00
Pavel Grafov
72b85a3798
Merge "Make credential confirmation activity resizeable." into qt-dev
...
am: e455680bd2
Change-Id: I48363a2d8d7cb20144ff1bba003b8b37ebf1944b
2019-05-16 05:26:22 -07:00