Marc Plano-Lesay
336b2baa6f
Merge "Make the private DNS mode dialog entries full width."
2019-05-17 22:44:15 +00:00
Kevin Chyn
82ee26b6c1
Merge "De-dupe animation name" into qt-r1-dev am: f0581b95fa
...
am: 2573421a79
Change-Id: I66cc2633ae230ce1eaf5c2fd0483e333f47e65b1
2019-05-17 14:48:45 -07:00
Xin Li
236d27b93f
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: 0a8e4aebf5
-s ours am: 148da1edf8
-s ours am: 5f726765e5
...
am: 62b108d19f
-s ours
am skip reason: subject contains skip directive
Change-Id: I358e13d6d0e3db61fc8fb71eb5bd553dcee9031e
2019-05-17 13:52:04 -07:00
Android Build Merger (Role)
f16d4fb7a7
Merge "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57
-s ours am: af42065ea6
-s ours am: e5107ffba2
am: 0d61126115
-s ours am skip reason: subject contains skip directive"
2019-05-17 19:32:24 +00:00
Xin Li
4ee7ab0563
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57
-s ours am: af42065ea6
-s ours am: e5107ffba2
...
am: 0d61126115
-s ours
am skip reason: subject contains skip directive
Change-Id: I5ec8b2d026af0106c90e71769f23562fc8558b14
2019-05-17 12:11:25 -07:00
Android Build Merger (Role)
18a8434165
Merge changes from topic "am-4f4390cd81144667b143214eb38ca2b9"
...
* changes:
Merge "Modified string" into qt-r1-dev am: 4a6d3f6403
am: a396a8c1ba
Added information icon am: 8fd6269f40
am: f5cbb30b04
2019-05-17 19:11:03 +00:00
Joshua Mccloskey
084f457ab8
Merge "Modified string" into qt-r1-dev am: 4a6d3f6403
...
am: a396a8c1ba
Change-Id: I191cc36f99334b4fa9f53aecc905ba68d066b366
2019-05-17 11:50:59 -07:00
joshmccloskey
7a8b7698fd
Added information icon am: 8fd6269f40
...
am: f5cbb30b04
Change-Id: I46d1ee2922e6c3f92b91c74e785ad63584c4e7f6
2019-05-17 11:49:59 -07:00
TreeHugger Robot
7be4b6d655
Merge "Fix multiple instances for Google SignIn activity appearing in task stack"
2019-05-17 16:44:54 +00:00
Lei Yu
9a3984123c
Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62
am: 28e19d2883
...
am: c15ca62386
Change-Id: Id8b843451db63c5487d4bbfc514d12650796dc8c
2019-05-17 06:10:42 -07:00
Lei Yu
e615e50cf3
Merge "Use short summary in advanced BT header" into qt-dev am: b6012f8d62
am: d6bdbfabc7
...
am: bbf4219bf0
Change-Id: Iacaece69875fceebace363859292b560886be8bf
2019-05-17 05:32:47 -07:00
Alexey Kuzmin
619c667c56
Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200
am: 486b89da28
...
am: a8378744cb
Change-Id: I405fefb68145f41b1bfb62a24a0e3d5cace3980c
2019-05-17 05:31:44 -07:00
Alexey Kuzmin
a6488be950
Merge "Fix usage hint of ringtone vibration preview" into qt-dev am: 71f6523200
am: bfcf644bed
...
am: cec630a67a
Change-Id: I01b8ee39edc7034c21968909fdf5a892b5b91f7b
2019-05-17 05:30:49 -07:00
Leon Liao
21183ba013
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
am: e51e69284c
...
am: 72dd2e8079
Change-Id: I4c2b8cd639ca1642fc5c0b183f3bb3a64b31355b
2019-05-17 05:29:48 -07:00
Pavel Grafov
74f247d7df
Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2
am: 72b85a3798
...
am: f59ce06159
Change-Id: Id3c7af34d5908bd5dbb826fdce88ef60555582da
2019-05-17 03:36:32 -07:00
Kevin Chyn
36902a775c
Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d
am: 931b2dbf09
...
am: 9c5ee1901a
Change-Id: Ibfcbc97c0d9367972e28c9b5adf185b7a160f5ed
2019-05-17 03:35:29 -07:00
Kevin Chang
da907b25f0
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d44
am: 55bfbfed1a
...
am: 4fedf61fc6
Change-Id: Ieed4b97a7d0eab7fe884b3d78c6b930bcfbf392d
2019-05-17 03:34:33 -07:00
Leon Liao
3d7d5a4c66
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
am: dfae7fe0e0
...
am: 9eda4b017e
Change-Id: I4e54d9ea6438c44a217faa92988602238f39b5ec
2019-05-17 00:38:05 -07:00
Kevin Chyn
2573421a79
Merge "De-dupe animation name" into qt-r1-dev
...
am: f0581b95fa
Change-Id: I675d8618a9a1f93526e83cd52bb1ca9719d14006
2019-05-17 00:30:20 -07:00
Xin Li
62b108d19f
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: 0a8e4aebf5
-s ours am: 148da1edf8
-s ours
...
am: 5f726765e5
Change-Id: I9de30c875c828c5c038cafcf2a9ff8db7400bf1c
2019-05-16 23:50:04 -07:00
Kevin Chyn
f0581b95fa
Merge "De-dupe animation name" into qt-r1-dev
2019-05-17 05:58:43 +00:00
Xin Li
0d61126115
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57
-s ours am: af42065ea6
-s ours
...
am: e5107ffba2
Change-Id: I341d55b99c332001907912641f6a6acb14423f76
2019-05-16 22:58:32 -07:00
Pavel Grafov
4b6571849e
Merge "Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2
am: 52f1e826e9" into qt-r1-dev-plus-aosp
...
am: 79ecab0822
Change-Id: Ia0ea30825321a4f9262f2ee5a7692c62f7d7ee5b
2019-05-16 21:58:23 -07:00
Xin Li
5f726765e5
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: 0a8e4aebf5
-s ours
...
am: 148da1edf8
-s ours
am skip reason: subject contains skip directive
Change-Id: I3d6681d652e934742b82cd55160a492005552aac
2019-05-16 21:53:09 -07:00
Xin Li
e5107ffba2
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57
-s ours
...
am: af42065ea6
-s ours
am skip reason: subject contains skip directive
Change-Id: I18b29424dfa9d23c687d1137cb1c2843b95946f3
2019-05-16 21:26:24 -07:00
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
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