OSDN Git Service
Brad Ebinger [Wed, 2 Nov 2016 21:00:05 +0000 (21:00 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" am:
f231db7786 -s ours am:
ccec8919fe
am:
a895383b44
Change-Id: I0c606de6d7bd7eb37a3748c2f6ab3be889f933a6
Brad Ebinger [Wed, 2 Nov 2016 20:55:16 +0000 (20:55 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" am:
f231db7786 -s ours
am:
ccec8919fe
Change-Id: I27443a9024ea4aff209a24a9049832a76f252476
Brad Ebinger [Wed, 2 Nov 2016 20:51:36 +0000 (20:51 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session"
am:
f231db7786 -s ours
Change-Id: Ia5ebf8f639e1336e9e7278faf8eb09285d3c5507
Brad Ebinger [Wed, 2 Nov 2016 20:39:40 +0000 (20:39 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session"
pengzhicai [Wed, 2 Nov 2016 18:34:53 +0000 (18:34 +0000)]
Merge "Fix String is empty issue" am:
80af1ba47b am:
38c585cb8d
am:
d7df704d98
Change-Id: Ia75039c87b396b8b0d15f0758d17e365fb2f18e6
pengzhicai [Wed, 2 Nov 2016 18:29:24 +0000 (18:29 +0000)]
Merge "Fix String is empty issue" am:
80af1ba47b
am:
38c585cb8d
Change-Id: I091572280b0b2a33a2a5e2339a08df0759bb2bd7
pengzhicai [Wed, 2 Nov 2016 18:23:26 +0000 (18:23 +0000)]
Merge "Fix String is empty issue"
am:
80af1ba47b
Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b
Treehugger Robot [Wed, 2 Nov 2016 18:14:49 +0000 (18:14 +0000)]
Merge "Fix String is empty issue"
Brad Ebinger [Wed, 2 Nov 2016 17:47:30 +0000 (17:47 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master am:
def235760e
am:
c50005ee6c
Change-Id: I7b04f249de691f1499d3e2bbcbc93bf81d4fd1ea
Brad Ebinger [Wed, 2 Nov 2016 17:46:43 +0000 (17:46 +0000)]
resolve merge conflicts of
4d75bee to nyc-mr1-dev-plus-aosp
am:
c5eacceb3f
Change-Id: I1fe6eea67081a8d35132d87c8e3e38952e110cc0
Brad Ebinger [Wed, 2 Nov 2016 17:43:49 +0000 (17:43 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
am:
def235760e
Change-Id: I309cd302b14ee0d0980632086855ba2cf97c6798
Brad Ebinger [Wed, 2 Nov 2016 17:28:54 +0000 (10:28 -0700)]
resolve merge conflicts of
4d75bee to nyc-mr1-dev-plus-aosp
Change-Id: Ib11bb52c9d3826e02089485af93856ba891ad034
Phil Weaver [Wed, 2 Nov 2016 17:31:45 +0000 (17:31 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am:
7ffc2a62ff am:
9bfdce4712
am:
a3c03ba74a
Change-Id: I90cf9264ede25712ebaeb1b787cc61c2438f35bc
Phil Weaver [Wed, 2 Nov 2016 17:30:48 +0000 (17:30 +0000)]
Revert "Don't invalidate list data during layout." am:
866ded50bb am:
96b4a68c06
am:
b8a314427b
Change-Id: I5ace1c6b058b795a5b04e48200d2b3d3a1ae2486
Phil Weaver [Wed, 2 Nov 2016 17:26:10 +0000 (17:26 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am:
7ffc2a62ff
am:
9bfdce4712
Change-Id: Ic8a9c38988dd23d0b3c7e1fa96a28a2ffb2f3b6b
Phil Weaver [Wed, 2 Nov 2016 17:25:17 +0000 (17:25 +0000)]
Revert "Don't invalidate list data during layout." am:
866ded50bb
am:
96b4a68c06
Change-Id: I02b34aea90cae2312baa5f8300bc8f6349985470
Phil Weaver [Wed, 2 Nov 2016 17:20:20 +0000 (17:20 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev
am:
7ffc2a62ff
Change-Id: Id1f42e0dcb96e9dab884faa5ecd070ced3c4fba2
Phil Weaver [Wed, 2 Nov 2016 17:20:17 +0000 (17:20 +0000)]
Revert "Don't invalidate list data during layout."
am:
866ded50bb
Change-Id: I191c26bfb9488d5d67514a81387a9cde95a20eb4
Phil Weaver [Wed, 2 Nov 2016 17:13:22 +0000 (17:13 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev
Brad Ebinger [Wed, 2 Nov 2016 16:59:30 +0000 (16:59 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
Brad Ebinger [Fri, 28 Oct 2016 19:29:55 +0000 (12:29 -0700)]
Modify ConnectionServiceAdapter to include Session
Modifies the ConnectionServiceAdapter to include Session Information in
the AIDL interface so that external Sessions can be started in Telecom
from Telephony.
Test: Manual testing and Unit Tests pass
Bug:
26571395
Change-Id: I31bbfe433dd062a50bd05083e1a639dd4cd03403
Shuo Gao [Wed, 2 Nov 2016 16:13:46 +0000 (16:13 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours am:
e319e7335c -s ours am:
2e40559326 -s ours
am:
2aa15664af -s ours
Change-Id: I551a90774c523e4c27c87a4f804d2562490ca41a
Thomas Buhot [Wed, 2 Nov 2016 16:12:46 +0000 (16:12 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours am:
5e089ad195 -s ours am:
a71a6ec8fb -s ours
am:
a682048141 -s ours
Change-Id: I1e78b118ee1f4d4551558399b3cd2e9960270594
Shuo Gao [Wed, 2 Nov 2016 16:07:59 +0000 (16:07 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours am:
e319e7335c -s ours
am:
2e40559326 -s ours
Change-Id: I7e74e80dabc62b2270628848b52b559999d05189
Thomas Buhot [Wed, 2 Nov 2016 16:07:10 +0000 (16:07 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours am:
5e089ad195 -s ours
am:
a71a6ec8fb -s ours
Change-Id: Ib8cba8d490f9777628108b56a6a3a81582c2a483
Shuo Gao [Wed, 2 Nov 2016 16:03:00 +0000 (16:03 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours
am:
e319e7335c -s ours
Change-Id: I848f238db11bc2f67fec83cb157d3cb3faec0212
Thomas Buhot [Wed, 2 Nov 2016 16:02:09 +0000 (16:02 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours
am:
5e089ad195 -s ours
Change-Id: I0062bfb72567ae43dbf50a1127e22b2363cac9e1
Shuo Gao [Wed, 2 Nov 2016 15:57:25 +0000 (15:57 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours
am:
90c736f892 -s ours
Change-Id: I38668b4a372530962a0ae0d6e2a717319731dff0
Thomas Buhot [Wed, 2 Nov 2016 15:56:38 +0000 (15:56 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours
am:
eae299874c -s ours
Change-Id: I6a8b5337f38b099bee806451db1df44c723e6596
Shuo Gao [Wed, 2 Nov 2016 15:51:17 +0000 (15:51 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours
am:
41bdd3a668 -s ours
Change-Id: I70baae78d036713c95c02e9cad497a343d5d1309
Thomas Buhot [Wed, 2 Nov 2016 15:50:38 +0000 (15:50 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours
am:
40d2aa1edc -s ours
Change-Id: I741b9682b066384aadce0dcaf9ca792de015d59e
Shuo Gao [Wed, 2 Nov 2016 15:46:36 +0000 (15:46 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours
am:
eb3696542a -s ours
Change-Id: I9a78875432e05918c574c9d8ea89230067b811cc
Thomas Buhot [Wed, 2 Nov 2016 15:45:43 +0000 (15:45 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours
am:
7b43f2af93 -s ours
Change-Id: Ia6804a8b93168a033075b6e77ac5d1bec63e3d69
Shuo Gao [Wed, 2 Nov 2016 15:41:06 +0000 (15:41 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages
am:
1b5d5bd119 -s ours
Change-Id: I6c218970581361c195471ee435f5a91b109911f0
Thomas Buhot [Wed, 2 Nov 2016 15:40:34 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous
am:
80e6d8873b -s ours
Change-Id: I521a8a64510e89ee97578fc5e2f600b4a1851bd3
Bill Yi [Wed, 2 Nov 2016 13:16:30 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
125deebf5d -s ours am:
3b99360472 -s ours
am:
77323eb2bd -s ours
Change-Id: Ib7e45076dda50cf23ee25743605480c58682af43
Bill Yi [Wed, 2 Nov 2016 13:15:36 +0000 (13:15 +0000)]
Import translations. DO NOT MERGE am:
7d24dd6448 -s ours am:
1aa04e8cae -s ours
am:
70d5453b63 -s ours
Change-Id: Ide7da0fea22b8e7af33a4cecfa7b73264a65846b
Bill Yi [Wed, 2 Nov 2016 13:13:19 +0000 (13:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ba7f49030 -s ours
am:
80914e10e5 -s ours
Change-Id: If559097d398446f5f2f8181ac608c6458c099fb2
Bill Yi [Wed, 2 Nov 2016 13:12:25 +0000 (13:12 +0000)]
Import translations. DO NOT MERGE am:
6fb3b77745 -s ours
am:
9e7ac87d08 -s ours
Change-Id: Icc870fda386710dc570c0c9846b4eba8cf9d47fb
Nimrod Gileadi [Wed, 2 Nov 2016 13:11:33 +0000 (13:11 +0000)]
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev am:
523c4fd695
am:
2c2abe6db3
Change-Id: I478872bddc9526e8477bd1a0ed7ef816e691d3d7
Bill Yi [Wed, 2 Nov 2016 13:11:18 +0000 (13:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
125deebf5d -s ours
am:
3b99360472 -s ours
Change-Id: I3645f4da4f27625faad83dddb191b16a196aeea7
Nimrod Gileadi [Wed, 2 Nov 2016 13:10:36 +0000 (13:10 +0000)]
Increment a MetricsLogger counter on back press. am:
580135c1b8
am:
51ac3a911c
Change-Id: I0b65ca68a743828fa47efd6793c5873cbc9b74a9
Bill Yi [Wed, 2 Nov 2016 13:10:22 +0000 (13:10 +0000)]
Import translations. DO NOT MERGE am:
7d24dd6448 -s ours
am:
1aa04e8cae -s ours
Change-Id: I0957749f702aa34c7ef447e4995e2ae23e1748a1
Bill Yi [Wed, 2 Nov 2016 13:04:36 +0000 (13:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7ba7f49030 -s ours
Change-Id: I2786876548e79632ff8aae52cd058ba4eaa57895
Bill Yi [Wed, 2 Nov 2016 13:04:35 +0000 (13:04 +0000)]
Import translations. DO NOT MERGE
am:
6fb3b77745 -s ours
Change-Id: Id6c5d0487f362fed25ddf6379f44db9b2ad60a1c
Nimrod Gileadi [Wed, 2 Nov 2016 13:03:07 +0000 (13:03 +0000)]
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev
am:
523c4fd695
Change-Id: I2928fafd79f08500c7369691985f6b8b726433c1
Bill Yi [Wed, 2 Nov 2016 13:03:04 +0000 (13:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
125deebf5d -s ours
Change-Id: Ic90df3a0db800052813e23370e1b80846caae456
Nimrod Gileadi [Wed, 2 Nov 2016 13:03:04 +0000 (13:03 +0000)]
Increment a MetricsLogger counter on back press.
am:
580135c1b8
Change-Id: I29fb7f03b5da8edf3643118bc74bba553f2f6ca1
Bill Yi [Wed, 2 Nov 2016 13:03:03 +0000 (13:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
f750173bf1 -s ours
Change-Id: I7ca4f4999b2079b5746a88aa2d69a270c507679d
Bill Yi [Wed, 2 Nov 2016 13:03:03 +0000 (13:03 +0000)]
Import translations. DO NOT MERGE
am:
7d24dd6448 -s ours
Change-Id: Iadd9f2dcec4c026a70aa5169325a6d3e42d15460
Bill Yi [Wed, 2 Nov 2016 13:03:00 +0000 (13:03 +0000)]
Import translations. DO NOT MERGE
am:
212cda9a9a -s ours
Change-Id: I327873e50179cc0e48712ce95b855ddf9f935aae
TreeHugger Robot [Wed, 2 Nov 2016 12:58:12 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 2 Nov 2016 12:57:31 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 2 Nov 2016 12:57:03 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 2 Nov 2016 12:55:14 +0000 (12:55 +0000)]
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev
Bill Yi [Wed, 2 Nov 2016 02:34:21 +0000 (19:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b2c1dbb250552bbd446e51b38be6b9508d2bf0c
Auto-generated-cl: translation import
pengzhicai [Wed, 2 Nov 2016 01:27:20 +0000 (09:27 +0800)]
Fix String is empty issue
Maybe the string is empty
https://code.google.com/p/android/issues/detail?id=226739
Change-Id: I645ae05a8cbe316e29d9710de0bbba64c0c2275d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
Sanket Agarwal [Wed, 2 Nov 2016 01:19:29 +0000 (01:19 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am:
cf4dc9236e am:
f41abccf80
am:
5e8b2e4110
Change-Id: I481283466c74087e4075cbda52f99fa94deae8c6
Joseph Pirozzo [Wed, 2 Nov 2016 01:18:38 +0000 (01:18 +0000)]
MAP MCE am:
b8fc0679e8 am:
b13240028b
am:
5602b26f41
Change-Id: I54f67bbb44c3ecbdaa96b2f71d762bbb8bdce46c
Joseph Pirozzo [Wed, 2 Nov 2016 01:17:45 +0000 (01:17 +0000)]
Pbap disconnect durring connect am:
a4f0127fbb am:
a31933abc3
am:
1c21f0378a
Change-Id: I367eea86cd82017a8c8a9e2922ac5a9580159b96
Joseph Pirozzo [Wed, 2 Nov 2016 01:16:45 +0000 (01:16 +0000)]
MAP MCE am:
631768d814 am:
d94c280a7f
am:
c412914520
Change-Id: Ia56d131194075795c55c899dfbebbe3c2feb1584
Sanket Agarwal [Wed, 2 Nov 2016 01:11:53 +0000 (01:11 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am:
cf4dc9236e
am:
f41abccf80
Change-Id: I12c36ffe83fbab6bb33d1d60581d6253f6f52fd0
Joseph Pirozzo [Wed, 2 Nov 2016 01:11:04 +0000 (01:11 +0000)]
MAP MCE am:
b8fc0679e8
am:
b13240028b
Change-Id: I62a9a758bc46fbb1174fbce4d50f488932d65113
Joseph Pirozzo [Wed, 2 Nov 2016 01:10:02 +0000 (01:10 +0000)]
Pbap disconnect durring connect am:
a4f0127fbb
am:
a31933abc3
Change-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5
Joseph Pirozzo [Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)]
MAP MCE am:
631768d814
am:
d94c280a7f
Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5
Sanket Agarwal [Wed, 2 Nov 2016 01:05:20 +0000 (01:05 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
am:
cf4dc9236e
Change-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401
Joseph Pirozzo [Wed, 2 Nov 2016 01:05:14 +0000 (01:05 +0000)]
MAP MCE
am:
b8fc0679e8
Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f
Joseph Pirozzo [Wed, 2 Nov 2016 01:04:33 +0000 (01:04 +0000)]
Pbap disconnect durring connect
am:
a4f0127fbb
Change-Id: Ib2f65418dee82893a377b780647d823cfa274dd6
Joseph Pirozzo [Wed, 2 Nov 2016 01:03:51 +0000 (01:03 +0000)]
MAP MCE
am:
631768d814
Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
Bill Yi [Wed, 2 Nov 2016 00:57:21 +0000 (17:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief73e3fee1a3f44096c534437fd74b357a2dde8a
Auto-generated-cl: translation import
Sanket Agarwal [Wed, 2 Nov 2016 00:55:40 +0000 (00:55 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
* changes:
MAP MCE
Pbap disconnect durring connect
MAP MCE
Bill Yi [Wed, 2 Nov 2016 00:45:25 +0000 (17:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22df3420e521f99e68d025264954a102f14990df
Auto-generated-cl: translation import
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:44:47 +0000 (00:44 +0000)]
Merge "Add support for opening JAR/ZIP files via FD." am:
7f64c195f7 am:
4c65d49a92
am:
de915e3ade
Change-Id: I625a398a8def68b8b8ef77f1408f5c6f8a85c1fa
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:39:45 +0000 (00:39 +0000)]
Merge "Add support for opening JAR/ZIP files via FD." am:
7f64c195f7
am:
4c65d49a92
Change-Id: I534e70f5218e0f9be73d919a4c9dd509211729f8
Joseph Pirozzo [Thu, 6 Oct 2016 18:44:53 +0000 (11:44 -0700)]
MAP MCE
Fix @LINK to @link in javadoc.
Bug:
30467210
Change-Id: Icac176947bee971c3f5d11fd4166cf8ceb0a437e
(cherry picked from commit
f5fba751d360bbe8294c4640f5ad12a990f13122)
Joseph Pirozzo [Mon, 2 May 2016 14:30:21 +0000 (07:30 -0700)]
Pbap disconnect durring connect
Durring a connect call disconnect from all other pbap devices rather
than from the device you are trying to connect to.
bug:
28406739
Change-Id: Ic0b651f32a0da18950fbc190b1d4503d69ebd203
(cherry picked from commit
bdd24942e47811ffe6bb9814934e6b08a8190e7e)
Joseph Pirozzo [Thu, 1 Sep 2016 21:19:28 +0000 (14:19 -0700)]
MAP MCE
Add MAP client code into packages/apps/Bluetooth. Changes here are to
define the MAP MCE interface and enable its selection when running on a
device that is also running a PBAP client (Car Kitt).
Bug:
30467210
Change-Id: Ifa2cdea7d67f63a2b5f3d971df8ec6d321dc5fee
(cherry picked from commit
433b3054847951e8e7b3864d11990604a66b8651)
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:34:47 +0000 (00:34 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
am:
7f64c195f7
Change-Id: I88af6f42ccd5e6edafa57fd0f147f676da8aa096
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:24:06 +0000 (00:24 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
Phil Weaver [Tue, 1 Nov 2016 23:38:44 +0000 (23:38 +0000)]
Revert "Don't invalidate list data during layout."
This reverts commit
456158ffc29864e02b2f66481fe6b0efcfdacba0.
Change-Id: I7a61dc34dfc81ee650ca0883fe99c0f5dc08ba75
Bryce Lee [Tue, 1 Nov 2016 23:29:16 +0000 (23:29 +0000)]
Merge "Add a way to query for supported Bluetooth profiles." am:
0a86c936a6 am:
6f84631d8d
am:
e07c4cb4e6
Change-Id: I53a4a3df08b8bd169112d004f7fa6ab5495c15fe
Bryce Lee [Tue, 1 Nov 2016 23:24:42 +0000 (23:24 +0000)]
Merge "Add a way to query for supported Bluetooth profiles." am:
0a86c936a6
am:
6f84631d8d
Change-Id: I8d9bce44587a1740f0acbd09552baf7d8b6990a5
Bryce Lee [Tue, 1 Nov 2016 23:20:16 +0000 (23:20 +0000)]
Merge "Add a way to query for supported Bluetooth profiles."
am:
0a86c936a6
Change-Id: Id10ad10a5dbcab92e390a7a245772d2b551ad30c
Treehugger Robot [Tue, 1 Nov 2016 23:12:21 +0000 (23:12 +0000)]
Merge "Add a way to query for supported Bluetooth profiles."
Phil Weaver [Tue, 1 Nov 2016 23:09:02 +0000 (23:09 +0000)]
Don't invalidate list data during layout. am:
456158ffc2 am:
06ffff6132
am:
07f434d02f
Change-Id: I6adaa881b70805d46d2425dd979609c6e99e11c9
vinodkrishnan [Tue, 1 Nov 2016 23:05:53 +0000 (23:05 +0000)]
Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev am:
89e653ccc7
am:
2a569d1490
Change-Id: I6b3e73ca5ff71dbc22f4ee510fa944aaa7eb4464
Vinod Krishnan [Tue, 1 Nov 2016 23:04:59 +0000 (23:04 +0000)]
DO NOT MERGE Wear Fwk: Disable Animations for A11y am:
8500f26d51
am:
305187983b
Change-Id: Ifb4eea689ded623034d5f8aa3158c814620e9de9
Phil Weaver [Tue, 1 Nov 2016 22:59:27 +0000 (22:59 +0000)]
Don't invalidate list data during layout. am:
456158ffc2
am:
06ffff6132
Change-Id: I56cd58a077729b7a8fccb66aeea5e3d69cb2fcdf
vinodkrishnan [Tue, 1 Nov 2016 22:58:04 +0000 (22:58 +0000)]
Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev
am:
89e653ccc7
Change-Id: Id38b4d4b7240ff3e241811d58e56c7cc732ce637
Vinod Krishnan [Tue, 1 Nov 2016 22:57:58 +0000 (22:57 +0000)]
DO NOT MERGE Wear Fwk: Disable Animations for A11y
am:
8500f26d51
Change-Id: I8bddbad4b8777a3fedac2f88717b48d00f596a8c
Phil Weaver [Tue, 1 Nov 2016 22:55:11 +0000 (22:55 +0000)]
Don't invalidate list data during layout.
am:
456158ffc2
Change-Id: I550b63d3fd6b5f451083627dc16f369729b1e1d7
vinodkrishnan [Tue, 1 Nov 2016 22:54:06 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev
Bryce Lee [Sun, 9 Oct 2016 19:54:42 +0000 (12:54 -0700)]
Add a way to query for supported Bluetooth profiles.
Currently there is no way to get the profiles supported by the Bluetooth
adapter. Asking for a profile proxy of an unsupported profile does not
fail and can lead to code indefinitely waiting for the proxy response. This
new code will allow for checking the supported profiles before asking for
the proxies.
Bug:
26451648
Change-Id: I4b48e7151f5ca53851aa3b967c143fae140ecd34
(cherry picked from commit
b1301fa2849bafd6daa422281dc5200863bc761e)
Mark Renouf [Tue, 1 Nov 2016 19:25:29 +0000 (19:25 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev am:
1b6da1f928
am:
a0f2404725
Change-Id: I13c96d992efcaf9b205032839840be4b03256c68
Mark Renouf [Tue, 1 Nov 2016 19:24:26 +0000 (19:24 +0000)]
Workaround for javac compilation issue of lambda code am:
e065f7c5a9
am:
6ce06e63a7
Change-Id: I9a43b4843667bdab5909765b1afa99c9f7b11053
Mark Renouf [Tue, 1 Nov 2016 19:19:40 +0000 (19:19 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev
am:
1b6da1f928
Change-Id: Id8bef52d6b5f45202217c303ad30302694dac3e4
Mark Renouf [Tue, 1 Nov 2016 19:19:28 +0000 (19:19 +0000)]
Workaround for javac compilation issue of lambda code
am:
e065f7c5a9
Change-Id: I247477c4155ddc154e7fe3f1057a767d1ab74336
Mark Renouf [Tue, 1 Nov 2016 19:13:40 +0000 (19:13 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev
Phil Weaver [Tue, 1 Nov 2016 16:55:24 +0000 (09:55 -0700)]
Don't invalidate list data during layout.
When a FastScroller is enabled, we were invalidating the
list data during layout, which left the UI in a bad state.
Long-presses didn't work properly, and TalkBack touches
were impossible to perform.
Bug:
31160338
Test: Manually tested long pressing, and verified
that TalkBack now works with the TestActivity in ag/
1567328.
Change-Id: Iecd2d597259748a3ecbf5573950e565a0e9faa42
Bill Yi [Tue, 1 Nov 2016 18:33:35 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
dc359e7b8d -s ours
am:
ea46f852a8 -s ours
Change-Id: Iff4d29701c6e127938f310e52ed04f8ab6d2a8d7
OSDN Git Service
