Scott Main
81857ec572
add android wear to the home carousel
...
Change-Id: I1dc50100dd50a710a23b08f677121d499c166b3f
2014-03-18 03:04:40 -07:00
Narayan Kamath
72833176a2
am 5b3dad08: am 6cf9aa2e: am b4b431b0: am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."
...
* commit '5b3dad0804a54b71ace9920f9f5edab53041af15':
Pass int32_t for JNI calls to java Input/Output streams.
2014-03-18 02:54:48 -07:00
Narayan Kamath
5b3dad0804
am 6cf9aa2e: am b4b431b0: am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."
...
* commit '6cf9aa2e5cb0e65ecda9617304af19c827404e1a':
Pass int32_t for JNI calls to java Input/Output streams.
2014-03-18 09:50:15 +00:00
Narayan Kamath
6cf9aa2e5c
am b4b431b0: am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."
...
* commit 'b4b431b0d2f6d57afe80c4119e5f41e4fb72e7d9':
Pass int32_t for JNI calls to java Input/Output streams.
2014-03-18 09:45:25 +00:00
Narayan Kamath
b4b431b0d2
am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."
...
* commit 'd2133079c085cb0879facc8ee72678524d22571a':
Pass int32_t for JNI calls to java Input/Output streams.
2014-03-18 09:41:31 +00:00
Narayan Kamath
d2133079c0
am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."
...
* commit '7c0dfed535bd23ce7cce0f8c498a8d6d3f14ff0f':
Pass int32_t for JNI calls to java Input/Output streams.
2014-03-18 02:38:24 -07:00
Narayan Kamath
7c0dfed535
Merge "Pass int32_t for JNI calls to java Input/Output streams."
2014-03-18 09:34:43 +00:00
Sailesh Nepal
cadc1c144b
frameworks/base: Use Uri for handle
...
Change-Id: I7f3163da47159d68903ce45268429f5949203589
2014-03-17 22:48:39 -07:00
Akira Numata
eff08c4ffe
Insufficient ProcessRecord cleanup when persistent process is killed
...
When persistent process with Service restarts, ActivityManagerService
does not reset ProcessRecord#hasClientActivites to false
(because ProcessRecord of persistent process is continued using
after killing).
It disturbs updating LRU list in ActivityManagerService, and then,
when new process calls ActivityManagerProxy#publishContentProviders,
SecurityException happens because of no entry in the list.
Bug: 13517358
Change-Id: I46b064f71a4f7025ade1bf117801352a7ab22e6a
2014-03-18 05:41:30 +00:00
Mark Renouf
2cd1578f0b
am c1814d26: am ae92a77d: am bb015714: am 29799080: Make InternalListener static to avoid referencing SpeechRecognizer.
...
* commit 'c1814d260ace96784ee0751e42e66aeacd722a2c':
Make InternalListener static to avoid referencing SpeechRecognizer.
2014-03-17 19:12:22 -07:00
Winson Chung
764f00ef24
am 93bb3969: Merge "Fixing issue with cards being rendered under the nav bar after a configuration change due to improperly setting the system insets."
...
* commit '93bb3969c19bc11cba775ddf337062577a8032d7':
Fixing issue with cards being rendered under the nav bar after a configuration change due to improperly setting the system insets.
2014-03-17 19:12:19 -07:00
Mark Renouf
c1814d260a
am ae92a77d: am bb015714: am 29799080: Make InternalListener static to avoid referencing SpeechRecognizer.
...
* commit 'ae92a77d2bc1a053aed7e1e7efeff68f5b003e1d':
Make InternalListener static to avoid referencing SpeechRecognizer.
2014-03-18 02:10:00 +00:00
Winson Chung
93bb3969c1
Merge "Fixing issue with cards being rendered under the nav bar after a configuration change due to improperly setting the system insets."
2014-03-18 02:09:37 +00:00
Winson Chung
bb5278b663
Fixing issue with cards being rendered under the nav bar after a configuration change due to improperly setting the system insets.
2014-03-17 19:07:56 -07:00
Mark Renouf
ae92a77d2b
am bb015714: am 29799080: Make InternalListener static to avoid referencing SpeechRecognizer.
...
* commit 'bb015714274ef9fd613e15a6d4b51716504c3d0b':
Make InternalListener static to avoid referencing SpeechRecognizer.
2014-03-18 02:06:13 +00:00
Mark Renouf
bb01571427
am 29799080: Make InternalListener static to avoid referencing SpeechRecognizer.
...
* commit '297990806dcbdc4413314847b897c9cb5452a1bc':
Make InternalListener static to avoid referencing SpeechRecognizer.
2014-03-18 02:02:59 +00:00
Mark Renouf
654818a9e3
am 95478f67: Merge "Make InternalListener static to avoid referencing SpeechRecognizer."
...
* commit '95478f67a459490d2dd6c1fa525c29ef90b34b93':
Make InternalListener static to avoid referencing SpeechRecognizer.
2014-03-17 19:01:20 -07:00
Mark Renouf
297990806d
Make InternalListener static to avoid referencing SpeechRecognizer.
...
Change-Id: I03bc1a5f5188551608395f3468aa69e622601820
(cherry picked from commit b37866db469e81aca534ff6186bdafd44352329b)
2014-03-18 01:58:39 +00:00
Mark Renouf
95478f67a4
Merge "Make InternalListener static to avoid referencing SpeechRecognizer."
2014-03-18 01:58:26 +00:00
Winson Chung
24e9460867
am 7b5d857e: Merge "Using the RecentsService connection to toggle recents"
...
* commit '7b5d857efa32b911336e0e84934c9e3ac4058db1':
Using the RecentsService connection to toggle recents
2014-03-17 18:36:09 -07:00
Winson Chung
7b5d857efa
Merge "Using the RecentsService connection to toggle recents"
2014-03-18 01:23:23 +00:00
Winson Chung
47c4c69575
Using the RecentsService connection to toggle recents
...
- Adding over scroll snap back when flinging stack
Change-Id: Ife9692ece95e0a40649d0b4b72ec4ea99ffabc16
2014-03-17 18:10:24 -07:00
Wonsik Kim
dd659c530d
am edb67190: Merge "Revert "VideoPlaneView initial implementation""
...
* commit 'edb67190d65659ff1da563f1d081d9429bd31a31':
Revert "VideoPlaneView initial implementation"
2014-03-17 18:03:48 -07:00
Wonsik Kim
edb67190d6
Merge "Revert "VideoPlaneView initial implementation""
2014-03-18 01:00:59 +00:00
Ricardo Cervera
b1b1d1c4ef
am 1de493c4: am e4b49435: am 86fcf070: am 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
...
* commit '1de493c4143b9710e2b94b405f73f2024f5981f4':
docs: Added release notes for SDK 22.6.1
2014-03-17 17:31:22 -07:00
Ricardo Cervera
1de493c414
am e4b49435: am 86fcf070: am 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
...
* commit 'e4b49435a556816da706ac8ea6be6c99c1f06bc9':
docs: Added release notes for SDK 22.6.1
2014-03-18 00:28:21 +00:00
Ricardo Cervera
e4b49435a5
am 86fcf070: am 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
...
* commit '86fcf070a58fcbc621a8d406d77dfaa918710a84':
docs: Added release notes for SDK 22.6.1
2014-03-18 00:25:16 +00:00
Ricardo Cervera
86fcf070a5
am 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
...
* commit '97a05b39fc6f680913bba17f939ad65ceb09fc23':
docs: Added release notes for SDK 22.6.1
2014-03-18 00:20:52 +00:00
Victoria Lease
c37c858042
am 37b93080: Merge "malloc some advances"
...
* commit '37b9308034ba5f74fa0343adb5ddcb8911187139':
malloc some advances
2014-03-17 17:16:07 -07:00
Victoria Lease
37b9308034
Merge "malloc some advances"
2014-03-18 00:13:46 +00:00
Adam Lesinski
f80fdf4b47
am 10caca13: am f5f6487e: am d8e585e7: am 006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
...
* commit '10caca13da7c6acde00411dfb4ab128c75b24e86':
Remove reflection instantiation of Accessibility
2014-03-17 16:36:45 -07:00
Ben Murdoch
1c8a1978bf
am c4c484c6: am e9529bc4: am d292aac5: am 889a1ddd: Fix JavaDoc
...
* commit 'c4c484c6a77b6b88030f1cb7e810918d8ad92146':
Fix JavaDoc
2014-03-17 16:36:42 -07:00
Doug Zongker
a3ec5dd797
am 11e09bd6: Merge "resolved conflicts for merge of a1ca303a to master"
...
* commit '11e09bd6d11c97fcd3ea72a00cddec4a1d63061d':
Fix javadoc.
2014-03-17 16:33:20 -07:00
Adam Lesinski
10caca13da
am f5f6487e: am d8e585e7: am 006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
...
* commit 'f5f6487e5999f6b4984e03bf6fe831ed83f5f4b6':
Remove reflection instantiation of Accessibility
2014-03-17 23:32:32 +00:00
Ben Murdoch
c4c484c6a7
am e9529bc4: am d292aac5: am 889a1ddd: Fix JavaDoc
...
* commit 'e9529bc4cb28176fddf1e7916c7791e5974f2fc3':
Fix JavaDoc
2014-03-17 23:32:25 +00:00
Doug Zongker
11e09bd6d1
Merge "resolved conflicts for merge of a1ca303a to master"
2014-03-17 23:30:38 +00:00
Alan Viverette
da7062030d
am 97d9b654: Lower tap timeout to 100ms, because 180ms is a lot of ms
...
* commit '97d9b65470957ce4c9983921bd59c4cf902885ce':
Lower tap timeout to 100ms, because 180ms is a lot of ms
2014-03-17 16:29:58 -07:00
Doug Zongker
f168e4c46c
resolved conflicts for merge of a1ca303a to master
...
Change-Id: I37ef6102fd79e396fa3e50d6c012a667488a306d
2014-03-17 16:24:30 -07:00
Kenny Root
a365906e67
Use the correct package name for CHOOSER
...
Bug: 13013106
Change-Id: I1f715de18e7108274f5a98234376d48c2d329438
2014-03-17 16:21:56 -07:00
Alan Viverette
97d9b65470
Lower tap timeout to 100ms, because 180ms is a lot of ms
...
Change-Id: I708848480544825474785e0918feba70c1089090
2014-03-17 16:16:33 -07:00
Dianne Hackborn
f0f94d129b
Treat IME processes as hosting activities
...
When we stop using an IME process, we still treat that
process as if it is hosting activities (in the activity part
of the LRU list), to try to keep it around. This is intended
to help the experience of switching between IMEs, reducing
the chance of your previous IME process being killed and thus
requiring much more time to switch.
Change-Id: Ie5793fd9b40d980fa18f80246326511ed6ae0597
2014-03-17 16:04:21 -07:00
Victoria Lease
3af2a37e05
malloc some advances
...
Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
2014-03-17 16:03:28 -07:00
Alan Viverette
4cf2050ba3
am 33e3e1b9: Merge "Build logtags for services"
...
* commit '33e3e1b9203d4cb3f44c41f38ea401d101e92af2':
Build logtags for services
2014-03-17 15:57:59 -07:00
Alan Viverette
33e3e1b920
Merge "Build logtags for services"
2014-03-17 22:55:19 +00:00
ztenghui
c43cc87b51
am d5a8503c: Merge "Fix the missing spot shadow when DEBUG_SHADOW is turned on"
...
* commit 'd5a8503c7a7bff3876226ac4b47e6bce51d7d85a':
Fix the missing spot shadow when DEBUG_SHADOW is turned on
2014-03-17 15:40:44 -07:00
ztenghui
d5a8503c7a
Merge "Fix the missing spot shadow when DEBUG_SHADOW is turned on"
2014-03-17 22:38:47 +00:00
ztenghui
99af9429cd
Fix the missing spot shadow when DEBUG_SHADOW is turned on
...
In the current design, this error should be tolerated since the delta should
be small enough. So we should not return here.
Change-Id: I251db2882b331d37ae7f0896e9aa95d69a5650da
2014-03-17 15:35:25 -07:00
Alan Viverette
12cf314d87
Build logtags for services
...
Change-Id: I6a146ae46df1a9d215fcf5bab7a2ef1876b94a1e
2014-03-17 15:31:04 -07:00
Mark Renouf
b37866db46
Make InternalListener static to avoid referencing SpeechRecognizer.
...
Change-Id: I03bc1a5f5188551608395f3468aa69e622601820
2014-03-17 18:15:51 -04:00
Ricardo Cervera
97a05b39fc
am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
...
* commit 'f7c3ecc1e14ebe3666822ad23f9da340f731d1b9':
docs: Added release notes for SDK 22.6.1
2014-03-17 22:14:25 +00:00