OSDN Git Service
Rose Liu [Fri, 4 May 2018 17:20:52 +0000 (17:20 +0000)]
Merge "Add @SystemApi to related VR functions that will be used by VrCore Services."
android-build-team Robot [Fri, 4 May 2018 16:23:18 +0000 (16:23 +0000)]
Merge "wifi: implement hashCode to be consistent with equals"
android-build-team Robot [Fri, 4 May 2018 14:15:02 +0000 (07:15 -0700)]
Merge "Update dnd defaults for new users" into pi-dev am:
8aec7be10e
am:
e799bda2e0
Change-Id: Ia9dff7647091ebdd62738030b888d0d805b043b3
android-build-team Robot [Fri, 4 May 2018 14:05:10 +0000 (07:05 -0700)]
Merge "Update dnd defaults for new users" into pi-dev
am:
8aec7be10e
Change-Id: I2f6bdb45f12e90ea3a1d6ce01f2bebcd82a8b31e
android-build-team Robot [Fri, 4 May 2018 13:54:27 +0000 (13:54 +0000)]
Merge "Update dnd defaults for new users" into pi-dev
Nicolas Geoffray [Fri, 4 May 2018 12:57:48 +0000 (05:57 -0700)]
Merge "Light grey some View APIs." into pi-dev am:
854c050ccb
am:
954dec64b0
Change-Id: Ifd717f9663b8eaf5f9fb2dd1218a8b43fadcae3d
Nicolas Geoffray [Fri, 4 May 2018 12:49:18 +0000 (05:49 -0700)]
Merge "Light grey some View APIs." into pi-dev
am:
854c050ccb
Change-Id: Iba28e31113c4f23727db00860fddf2cdf3c791e6
Nicolas Geoffray [Fri, 4 May 2018 12:36:12 +0000 (12:36 +0000)]
Merge "Light grey some View APIs." into pi-dev
Nicolas Geoffray [Fri, 4 May 2018 11:13:40 +0000 (04:13 -0700)]
Merge "Add more light grey APIs." into pi-dev am:
a0e2aa194f
am:
9e1549cc7a
Change-Id: I26dbfa981759ff712a18bbe37c968d0b1e0edac0
Nicolas Geoffray [Fri, 4 May 2018 11:03:02 +0000 (04:03 -0700)]
Merge "Add more light grey APIs." into pi-dev
am:
a0e2aa194f
Change-Id: I398e9c48d2d245c72dcd66533ab748e5ec57ab63
Nicolas Geoffray [Fri, 4 May 2018 10:54:45 +0000 (10:54 +0000)]
Merge "Add more light grey APIs." into pi-dev
Nicolas Geoffray [Fri, 4 May 2018 08:38:55 +0000 (09:38 +0100)]
Light grey some View APIs.
bug:
79206637
Test: m
Change-Id: Ibbc28177f7946367657f9880a7f255488fb4d0cc
Jimmy Chen [Wed, 2 May 2018 08:47:26 +0000 (16:47 +0800)]
wifi: implement hashCode to be consistent with equals
Per Effective Java, if a class implements equals(),
it should override hashCode().
Test: (new) unit tests
Bug:
37000525
Change-Id: If4175a7e2bc34935c525d0fb96fbbe1e904030e3
Henry Liu [Fri, 20 Apr 2018 07:48:30 +0000 (15:48 +0800)]
Fix default launcher setting is reset after restoring
1. Do not remove launcher's prefer activity set during SetupWizard
2. Bypass SetupWizard's launcher activity during SetupWizard
Bug:
31955881
Test: m -j RunFrameworksServicesRoboTests
Change-Id: I035198186363d7adf65bb7ec5e4cc74260e290ea
Eugene Susla [Fri, 4 May 2018 03:50:49 +0000 (20:50 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] [Companion] Nullcheck if ListView is null" into pi-dev am:
8df7766b0b
am:
96fbbcae74 -s ours
Change-Id: I0abe900d3a5944a28162f83401458e4f4c65d53e
Eugene Susla [Fri, 4 May 2018 03:45:05 +0000 (20:45 -0700)]
Merge "[DO NOT MERGE] [Companion] Nullcheck if ListView is null" into pi-dev
am:
8df7766b0b
Change-Id: Ia63928128a95f88872cfcee1dad5f87850cc66a4
Eugene Susla [Fri, 4 May 2018 03:31:25 +0000 (03:31 +0000)]
Merge "[DO NOT MERGE] [Companion] Nullcheck if ListView is null" into pi-dev
android-build-team Robot [Fri, 4 May 2018 03:29:00 +0000 (20:29 -0700)]
Merge "Adding a wrapper around Tonal API" into pi-dev am:
790d1a0efa
am:
122150603c
Change-Id: I19460f95a651e3f38686949c4c52621ae4293c6c
android-build-team Robot [Fri, 4 May 2018 03:20:58 +0000 (20:20 -0700)]
Merge "Adding a wrapper around Tonal API" into pi-dev
am:
790d1a0efa
Change-Id: Iff442e50199b7ad8ca3538820562b8b975353e48
android-build-team Robot [Fri, 4 May 2018 03:15:56 +0000 (20:15 -0700)]
Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev am:
ec41a069fd
am:
c1d985cf8b
Change-Id: I4df0cd841757ed13a9f7bf0f5bbf4d2df8ff0fb2
android-build-team Robot [Fri, 4 May 2018 03:09:19 +0000 (03:09 +0000)]
Merge "Adding a wrapper around Tonal API" into pi-dev
android-build-team Robot [Fri, 4 May 2018 03:07:48 +0000 (20:07 -0700)]
Merge "Turns DEBUG to false in statsd." into pi-dev am:
1e9761df82
am:
77e1d3fc95
Change-Id: I59e2723e423748e24a5985d7db8377ce0588aef0
android-build-team Robot [Fri, 4 May 2018 03:03:53 +0000 (20:03 -0700)]
Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev
am:
ec41a069fd
Change-Id: If18ec5d227a70e070a1a66d9a229de04d986d27f
android-build-team Robot [Fri, 4 May 2018 02:58:48 +0000 (19:58 -0700)]
Merge "Metrics for user choices in storage wizard." into pi-dev am:
1e42d8f76b
am:
d6b216de7f
Change-Id: I5e3cd2a93c6833ac33864c06a1ed5c8e93d9d211
android-build-team Robot [Fri, 4 May 2018 02:58:24 +0000 (19:58 -0700)]
Merge "Turns DEBUG to false in statsd." into pi-dev
am:
1e9761df82
Change-Id: I4f1f138ce9f1e2526c8ba44d0b6d8b6be7a2b63c
android-build-team Robot [Fri, 4 May 2018 02:47:10 +0000 (19:47 -0700)]
Merge "Metrics for user choices in storage wizard." into pi-dev
am:
1e42d8f76b
Change-Id: I7b21817142cbdaa51350c0f41751b3f0c45f6ecc
android-build-team Robot [Fri, 4 May 2018 02:46:31 +0000 (19:46 -0700)]
Merge "Reduced the opacity of the ripple when dark" into pi-dev am:
69a053ccce
am:
c114904d12
Change-Id: Ida015dd78dd2e45f8b4f73fe92d0dacace200898
android-build-team Robot [Fri, 4 May 2018 02:43:03 +0000 (02:43 +0000)]
Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev
android-build-team Robot [Fri, 4 May 2018 02:41:44 +0000 (02:41 +0000)]
Merge "Turns DEBUG to false in statsd." into pi-dev
android-build-team Robot [Fri, 4 May 2018 02:35:57 +0000 (19:35 -0700)]
Merge "Fixed the RTL appearance of messagingStyle" into pi-dev am:
7a86424275
am:
7b7cf30351
Change-Id: I700511fb06376abd8de7b5be7aadf2607551a868
android-build-team Robot [Fri, 4 May 2018 02:32:11 +0000 (19:32 -0700)]
Merge "Reduced the opacity of the ripple when dark" into pi-dev
am:
69a053ccce
Change-Id: I635d861ef2281378719964b7ab545bd436175cfc
android-build-team Robot [Fri, 4 May 2018 02:32:09 +0000 (02:32 +0000)]
Merge "Metrics for user choices in storage wizard." into pi-dev
android-build-team Robot [Fri, 4 May 2018 02:27:19 +0000 (19:27 -0700)]
Merge "Correct insets for getNonMinimizedSplitScreenSecondaryBounds" into pi-dev am:
040fc4cfdf
am:
ad2a736739
Change-Id: I44d6a26209a76bca5ba8b4fff99e921a9e4e89d7
android-build-team Robot [Fri, 4 May 2018 02:23:02 +0000 (19:23 -0700)]
Merge "Fixed the RTL appearance of messagingStyle" into pi-dev
am:
7a86424275
Change-Id: I1bfb6f11faed88cedccced1a5863511f7c72b45c
android-build-team Robot [Fri, 4 May 2018 02:18:28 +0000 (19:18 -0700)]
Merge "Correct insets for getNonMinimizedSplitScreenSecondaryBounds" into pi-dev
am:
040fc4cfdf
Change-Id: I6f47ed0879a5ea72993049df59ece1eb299c6988
android-build-team Robot [Fri, 4 May 2018 02:16:22 +0000 (02:16 +0000)]
Merge "Reduced the opacity of the ripple when dark" into pi-dev
android-build-team Robot [Fri, 4 May 2018 02:12:22 +0000 (02:12 +0000)]
Merge "Fixed the RTL appearance of messagingStyle" into pi-dev
android-build-team Robot [Fri, 4 May 2018 02:08:23 +0000 (02:08 +0000)]
Merge "Correct insets for getNonMinimizedSplitScreenSecondaryBounds" into pi-dev
Felipe Leme [Fri, 4 May 2018 02:07:06 +0000 (02:07 +0000)]
Merge "Make Autofill PERF tests more lenient to error."
android-build-team Robot [Fri, 4 May 2018 01:54:43 +0000 (18:54 -0700)]
Merge "Fixed a leak with TransformStates" into pi-dev am:
650d79e7af
am:
f73e79ba30
Change-Id: Ifb899656faf6b8f2c64a6c67a5ab14094cc6fdf3
Lucas Dupin [Fri, 4 May 2018 01:44:59 +0000 (18:44 -0700)]
Merge "Fix issue where line breaks would be wrong" into pi-dev am:
dd49a8ccd7
am:
c1bf01b026
Change-Id: I65b2ccc5cb365f341300b13476799bd101913c80
android-build-team Robot [Fri, 4 May 2018 01:43:02 +0000 (18:43 -0700)]
Merge "Fixed a leak with TransformStates" into pi-dev
am:
650d79e7af
Change-Id: I5c20e88a79cd3eab981dbfd339f132e42c4dc46c
android-build-team Robot [Fri, 4 May 2018 01:40:44 +0000 (18:40 -0700)]
Merge "Bigger ownerInfo padding" into pi-dev am:
96dc1ca74e
am:
6e69842874
Change-Id: I1697397a0aafc7cb0c0220da8982d926a6ac68fb
Lucas Dupin [Fri, 4 May 2018 01:38:20 +0000 (18:38 -0700)]
Merge "Fix issue where line breaks would be wrong" into pi-dev
am:
dd49a8ccd7
Change-Id: I144652e4ae256ff714e919f040e180aa64081584
Lucas Dupin [Fri, 4 May 2018 01:34:45 +0000 (18:34 -0700)]
Merge "Update views when next slice is null" into pi-dev am:
88e264576a
am:
5ae43b4e39
Change-Id: I55ce1ebd406239bcecae1a05e97107e7d9fe80cb
Sunny Goyal [Wed, 2 May 2018 20:20:04 +0000 (13:20 -0700)]
Adding a wrapper around Tonal API
Bug:
79111591
Test: Verified API on launcher build
Change-Id: I84e0e8b9d5cfb8c915dcc1123d150df4ecb3a9b1
android-build-team Robot [Fri, 4 May 2018 01:33:00 +0000 (18:33 -0700)]
Merge "Bigger ownerInfo padding" into pi-dev
am:
96dc1ca74e
Change-Id: I058acb76ff1d92c29fd35bff51a24c83b7355806
android-build-team Robot [Fri, 4 May 2018 01:30:05 +0000 (18:30 -0700)]
[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev am:
8d16d7915d am:
eaa6d200b3 -s ours am:
4d94bf0498 -s ours am:
df1dbb0bfa -s ours
am:
c34fb2b13e -s ours
Change-Id: Ia8a8f54a4a47d881bc0357ff8fa819c67417e61f
Lucas Dupin [Fri, 4 May 2018 01:27:45 +0000 (18:27 -0700)]
Merge "Update views when next slice is null" into pi-dev
am:
88e264576a
Change-Id: I51146ff0981c0d11df251aff373ffafa5273b80e
Selim Cinek [Fri, 4 May 2018 01:26:41 +0000 (18:26 -0700)]
Merge "Changed the way the ellipsizing of text is measured" into pi-dev am:
497fa8b8ab
am:
de0ec73030
Change-Id: Iac49fa43c932e66f1f437c06cab9f32cb16dcab1
android-build-team Robot [Fri, 4 May 2018 01:22:56 +0000 (18:22 -0700)]
[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev am:
8d16d7915d am:
eaa6d200b3 -s ours am:
4d94bf0498 -s ours
am:
df1dbb0bfa -s ours
Change-Id: Id5a442c513e67f70d37f72b3f2a4a2742171d7d1
android-build-team Robot [Fri, 4 May 2018 01:22:06 +0000 (01:22 +0000)]
Merge "Fixed a leak with TransformStates" into pi-dev
Lucas Dupin [Fri, 4 May 2018 01:16:22 +0000 (01:16 +0000)]
Merge "Fix issue where line breaks would be wrong" into pi-dev
android-build-team Robot [Fri, 4 May 2018 01:15:47 +0000 (01:15 +0000)]
Merge "Bigger ownerInfo padding" into pi-dev
Lucas Dupin [Fri, 4 May 2018 01:14:10 +0000 (01:14 +0000)]
Merge "Update views when next slice is null" into pi-dev
android-build-team Robot [Fri, 4 May 2018 01:12:05 +0000 (18:12 -0700)]
[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev am:
8d16d7915d am:
eaa6d200b3 -s ours
am:
4d94bf0498 -s ours
Change-Id: I37240064ca3a5c1d7131154bd933e6b4d3e26a60
Selim Cinek [Fri, 4 May 2018 01:08:32 +0000 (18:08 -0700)]
Merge "Changed the way the ellipsizing of text is measured" into pi-dev
am:
497fa8b8ab
Change-Id: I65cf2e2ca592616f68811f80dee92e786a93329c
android-build-team Robot [Fri, 4 May 2018 01:06:40 +0000 (18:06 -0700)]
[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev am:
8d16d7915d
am:
eaa6d200b3 -s ours
Change-Id: Icb1b568faee09aa2113c1d832974f37d21ee96b0
android-build-team Robot [Fri, 4 May 2018 00:58:59 +0000 (17:58 -0700)]
Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev
am:
8d16d7915d
Change-Id: Ib34226b3ce41e83ae018c86d5a4e53564e207b46
Selim Cinek [Fri, 4 May 2018 00:57:27 +0000 (17:57 -0700)]
Reduced the opacity of the ripple when dark
It was at 87 before and much reduced now.
Test: visually
Change-Id: I90bfbc6866e4d7399730635c04649b9415f7d598
Fixes:
79219117
android-build-team Robot [Fri, 4 May 2018 00:57:00 +0000 (17:57 -0700)]
[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-mr1-dev am:
d0e8f1f155 -s ours am:
9f3c57ed1c
am:
b0eb787490 -s ours
Change-Id: I0d9195100d08f80c5a8ac7f15d96b7372320efb6
Selim Cinek [Fri, 4 May 2018 00:54:13 +0000 (00:54 +0000)]
Merge "Changed the way the ellipsizing of text is measured" into pi-dev
android-build-team Robot [Fri, 4 May 2018 00:51:40 +0000 (17:51 -0700)]
[automerger skipped] Merge "Add app op for Bluetooth scans" into pi-dev am:
6fb01a8a56
am:
8966f68c30 -s ours
Change-Id: I1c289cc0698703ee3260fe993d7c5367faae2f6b
android-build-team Robot [Fri, 4 May 2018 00:47:48 +0000 (00:47 +0000)]
Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev
android-build-team Robot [Fri, 4 May 2018 00:44:56 +0000 (17:44 -0700)]
[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-mr1-dev am:
d0e8f1f155 -s ours
am:
9f3c57ed1c
Change-Id: Ie8f51862ce2cc860c6fe532899b5f072b68beb1a
Dianne Hackborn [Fri, 4 May 2018 00:44:26 +0000 (17:44 -0700)]
Merge "Fix issue #
77931346: The notification that should not be named appeared" into pi-dev am:
98d2d895b5
am:
f482546c10
Change-Id: I756e5fed1ccf6ac1f93d7f0bddc74b8f7e541724
Selim Cinek [Fri, 4 May 2018 00:41:21 +0000 (17:41 -0700)]
Fixed the RTL appearance of messagingStyle
LTR text was still appearing LTR, but we rather use
viewstart
Test: visually
Change-Id: Id95a8422f1a6143b642e5653d201861cdb6d0ca7
Fixes:
79223146
android-build-team Robot [Fri, 4 May 2018 00:36:00 +0000 (17:36 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev am:
96e62bb999 am:
d9a2898a88 am:
435b77411b am:
28c425472f
am:
3ec5192a4b
Change-Id: I595926d0bfcebbfa4e8e0dd9f7b6a3de6b0b9c44
android-build-team Robot [Fri, 4 May 2018 00:35:56 +0000 (17:35 -0700)]
[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-mr1-dev
am:
d0e8f1f155 -s ours
Change-Id: Id2d529132100406ca0cefd262d738f498439a8b1
android-build-team Robot [Fri, 4 May 2018 00:28:20 +0000 (00:28 +0000)]
Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-mr1-dev
android-build-team Robot [Fri, 4 May 2018 00:24:24 +0000 (17:24 -0700)]
Merge "Add app op for Bluetooth scans" into pi-dev
am:
6fb01a8a56
Change-Id: I42db780781f14b1ba7fcf8116e8d6509eb6ec664
android-build-team Robot [Fri, 4 May 2018 00:21:43 +0000 (17:21 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev am:
a9e5b5dce0 am:
7e01400018 am:
71e0f8ffef am:
10fc71709b
am:
71db71a3c1
Change-Id: I1e7fc1dd9d7319858fdebb96e8614d8754945199
Dianne Hackborn [Fri, 4 May 2018 00:18:21 +0000 (17:18 -0700)]
Merge "Fix issue #
77931346: The notification that should not be named appeared" into pi-dev
am:
98d2d895b5
Change-Id: I1753b00beb6fbcb7b7e5273e4d371b3609acd310
android-build-team Robot [Fri, 4 May 2018 00:10:27 +0000 (17:10 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev am:
96e62bb999 am:
d9a2898a88 am:
435b77411b
am:
28c425472f
Change-Id: I0d97ec811452dcad69938180962bb88515fdd0e4
Rob Carr [Fri, 4 May 2018 00:09:03 +0000 (17:09 -0700)]
Merge "WindowManager: Reapply magnification spec when adding windows." into pi-dev am:
04e1f8e691
am:
07a2ea35ba
Change-Id: I7bd6083e3b6ffa12c8a28b412a1552eecd6bff14
Yangster-mac [Wed, 2 May 2018 21:16:48 +0000 (14:16 -0700)]
Reset statsd and correctly record the dump reason when system
server restarts/crashes.
Test: statsd test
BUG: b/
79161505
Change-Id: I0646c764964f6eafde91f9ae0179a1c837af320d
android-build-team Robot [Fri, 4 May 2018 00:01:53 +0000 (00:01 +0000)]
Merge "Add app op for Bluetooth scans" into pi-dev
Dianne Hackborn [Fri, 4 May 2018 00:01:01 +0000 (00:01 +0000)]
Merge "Fix issue #
77931346: The notification that should not be named appeared" into pi-dev
Dianne Hackborn [Fri, 4 May 2018 00:00:07 +0000 (00:00 +0000)]
Merge "Add app op for Bluetooth scans"
Rob Carr [Thu, 3 May 2018 23:59:22 +0000 (16:59 -0700)]
Merge "SurfaceControl: Close CloseGuard when destroying surface in transaction." into pi-dev am:
625de7758b
am:
15d55c26cf
Change-Id: I015977e3c79f0fe19fc60d028770fa00a9a669b8
android-build-team Robot [Thu, 3 May 2018 23:57:15 +0000 (16:57 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev am:
96e62bb999 am:
d9a2898a88
am:
435b77411b
Change-Id: I258cea0c5c81db769e8bf98c644196571e0dce43
android-build-team Robot [Thu, 3 May 2018 23:43:46 +0000 (16:43 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev am:
96e62bb999
am:
d9a2898a88
Change-Id: I2d4e8373092b33af5cc41287073842b8637b9e9e
android-build-team Robot [Thu, 3 May 2018 23:39:01 +0000 (16:39 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev am:
a9e5b5dce0 am:
7e01400018 am:
71e0f8ffef
am:
10fc71709b
Change-Id: I2243b2cefae86d41f3db1697dc980a64c29309ce
android-build-team Robot [Thu, 3 May 2018 23:31:58 +0000 (16:31 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev
am:
96e62bb999
Change-Id: I387591c99f211f3e2399eed316cc1eada3a6b7f5
android-build-team Robot [Thu, 3 May 2018 23:23:41 +0000 (16:23 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev am:
a9e5b5dce0 am:
7e01400018
am:
71e0f8ffef
Change-Id: I684ff4f5fdb0891f718c5c54b8dc61b78b73b02a
android-build-team Robot [Thu, 3 May 2018 23:14:27 +0000 (16:14 -0700)]
Merge "Fixes a visual issue with the Messaging Layout" into pi-dev am:
8e4b8ea38a
am:
f0f0746747
Change-Id: I93da4f1495f292b831ca66098c6c383c02a45007
Selim Cinek [Thu, 3 May 2018 02:01:33 +0000 (19:01 -0700)]
Changed the way the ellipsizing of text is measured
This also fixed the paddings for the bigtext layout
by remeasuring it after the initial measure.
Test: runtest systemui
Change-Id: I4b974645606691e6faf2b99b8e52c791e69ee6ea
Fixes:
79111092
Rob Carr [Thu, 3 May 2018 23:12:38 +0000 (16:12 -0700)]
Merge "WindowManager: Reapply magnification spec when adding windows." into pi-dev
am:
04e1f8e691
Change-Id: I5b7ef60f615f798bf1c34cabd37c2c1dbe43e553
Matthew Ng [Thu, 3 May 2018 23:10:55 +0000 (16:10 -0700)]
Correct insets for getNonMinimizedSplitScreenSecondaryBounds
Fixed the addition error on seascape and added top insets for launcher
to get correct bounds.
Change-Id: I963e69dcba7b20d138ba01e361f21186b773a264
Fixes:
79209096
Test: manual
android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0 skipped:
4eaa691175
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
android-build-team Robot [Thu, 3 May 2018 23:10:17 +0000 (16:10 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev am:
a9e5b5dce0
am:
7e01400018
Change-Id: I863476787647ddcb16e5e0587d0c06a755cb0e07
Rob Carr [Thu, 3 May 2018 23:06:16 +0000 (16:06 -0700)]
Merge "SurfaceControl: Close CloseGuard when destroying surface in transaction." into pi-dev
am:
625de7758b
Change-Id: I254ad6e09b1e5a0677d4dfc52a6abe875c89e79d
Lucas Dupin [Thu, 3 May 2018 23:05:16 +0000 (16:05 -0700)]
Bigger ownerInfo padding
Change-Id: Ia45fb8cae466ee15d6718608d6df26e6b93da171
Fixes:
77507690
Test: visual
android-build-team Robot [Thu, 3 May 2018 22:56:49 +0000 (15:56 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev
am:
a9e5b5dce0
Change-Id: Id8fb16f96cd87b7aeb8cf501a70952e877ac0210
Scott Main [Thu, 3 May 2018 22:53:42 +0000 (22:53 +0000)]
Merge "Delete static versions of _book.yaml and _project.yaml."
Rob Carr [Thu, 3 May 2018 22:52:55 +0000 (22:52 +0000)]
Merge "WindowManager: Reapply magnification spec when adding windows." into pi-dev
Rob Carr [Thu, 3 May 2018 22:52:18 +0000 (22:52 +0000)]
Merge "SurfaceControl: Close CloseGuard when destroying surface in transaction." into pi-dev
Julia Reynolds [Thu, 3 May 2018 22:47:41 +0000 (15:47 -0700)]
Merge "Hide some previously exempt notifications" into pi-dev am:
afbc128d57
am:
8bef20f43b
Change-Id: Ieab41860dd1fcdddc44fd3a1bbeec9666d493e45
Felipe Leme [Thu, 3 May 2018 21:51:12 +0000 (14:51 -0700)]
Make Autofill PERF tests more lenient to error.
These tests were based on CTS autofill tests, where correctness is the priority
(for example, there should be no "orphan" onFillRequest() call) and the number
of UI interactions is small.
But that "correctness" model doesn't work well on PERF, because the
onFillRequest() calls are handled in the main thread and the main test loop can
make hundreds of UI calls. For example, if testFocus_autofillUsernameOnly()
doesn't set the ignored id on the password field, each focus on that field would
result in a new onFillRequest(), which is not called right away. As such, the
main loop would finish, but subsequent tests would hang until all those calls
are made.
Test: mmma -j ./frameworks/base/apct-tests/perftests/core/ && \
adb install -r $OUT/data/app/CorePerfTests/CorePerfTests.apk && \
adb shell am instrument -w -e class android.view.autofill.AutofillPerfTest \
com.android.perftests.core/android.support.test.runner.AndroidJUnitRunner
Bug:
38345816
Change-Id: I83a311e719966dcf41e86142952075e68d0c64bf
android-build-prod (mdb) [Thu, 3 May 2018 22:38:59 +0000 (15:38 -0700)]
Merge "Fix spelling errors in BluetoothGatt documentation" am:
e7b05b8797 am:
ea18806cb7
am:
fe1ad15da1
Change-Id: Id9e0664f5b38b837c7ab484c4dc2aa3b9141bd39
OSDN Git Service
