Deepanshu Gupta
169c11dd39
Merge "Add missing DateFormat method." into lmp-mr1-dev
2015-01-08 01:17:32 +00:00
Deepanshu Gupta
565b6b415a
Merge "Update platform.dir search in tests." into lmp-mr1-dev
2015-01-08 01:17:23 +00:00
Adam Powell
b6ab098bad
Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
...
Add API for handling nested pre-processing of accessibility events
similar to nested pre-scroll or pre-fling. This allows custom views to
delegate a nested scroll to a parent via the accessibility system.
Use this functionality to allow opening the ResolverDrawerLayout via
accessibility commands.
Bug 18827274
Change-Id: Icd5a502605b78a861bb03e7b11923841a72eb9ab
2015-01-07 17:00:12 -08:00
Deepanshu Gupta
1330f79f95
Replace java.util.LinkedHashMap.eldest()
...
Provide an alternate implementation for the above method and replace the
calls to it, since the method is not available on host VM.
Change-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788
2015-01-07 16:32:21 -08:00
Deepanshu Gupta
a98a9b30be
am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e
...
* commit 'd8e99c5861b09de8f709c9284240e2c3115507bb':
Fix tests on jenkins, take 2.
2015-01-07 23:57:59 +00:00
Joe Fernandez
ec5f593415
am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 2015 automerge: 0e13957
...
* commit '97b7b8637bc50cbcd9ad9a63fcb34355439b0701':
docs: Update Dashboard for January 2015
2015-01-07 23:57:54 +00:00
Deepanshu Gupta
d8e99c5861
am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
...
automerge: 0b1188e
* commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
Fix tests on jenkins, take 2.
2015-01-07 23:53:09 +00:00
Joe Fernandez
97b7b8637b
am d385640f: am 491a8257: docs: Update Dashboard for January 2015
...
automerge: 0e13957
* commit '0e13957a4deab3a90492d9ae2f6d35d3b5c1773e':
docs: Update Dashboard for January 2015
2015-01-07 23:51:33 +00:00
Christopher Tate
413ec4a657
am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
...
* commit 'bee49807dde9f19d5163e87b71fe17392bfe857c':
Support single-package backup rejection by the transport
2015-01-07 23:23:14 +00:00
Christopher Tate
bee49807dd
Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
2015-01-07 23:19:50 +00:00
Andres Morales
1ce7d179bf
Wipe FRP partition if OEM unlock enabled
...
Not all devices invoke recovery on every userdata wipe,
so we can't rely on code in the
recovery OS to do this. This results in fastboot -w
not properly wiping the FRP partition. This patch
fixes the issue by having the framework level service
check the OEM unlock enabled bit, and wiping the partition
if it is set.
Bug: 18644051
Change-Id: Id97a29916fe39561700912a920c5741109842bdb
2015-01-07 14:46:19 -08:00
Dianne Hackborn
ab2df067fc
Add new debug feature to track associations between processes. Also
...
add some debugging for spurious service ANRs.
Bug: 18201239
Change-Id: Icd43f35c696d71453e1d4deea855984b2d14b347
2015-01-07 14:01:13 -08:00
RoboErik
13d1057d5b
am 2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE
...
* commit '2610d71251e3e376e2514f20986c81e5d55f1b55':
Don't unmute when trying to show volume UI. DO NOT MERGE
2015-01-07 22:00:28 +00:00
Rich Slogar
3bb85fb8c9
docs: build link update
...
Change-Id: I06a3e7fc914dff829bd1d210675daf5f99ba68e0
2015-01-07 13:54:30 -08:00
Eric Gilmore
1b554a3183
Removing three obsolete lessons from TOC, which in turn removes them
...
from building-userinfo.jd when built.
Change-Id: If5cfbfadadb202946267ff83f665f8414875bd8c
2015-01-07 13:35:45 -08:00
Deepanshu Gupta
6aede34e24
Add missing DateFormat method.
...
Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
2015-01-07 12:26:31 -08:00
Deepanshu Gupta
0359b4b199
Update platform.dir search in tests.
...
The tests search for a built sdk using some heuristics. The default path
of the built sdk has changed now, and this updates the search
accordingly.
Change-Id: I36d465d8c5f6cfd971bbdf95878fb144de233c6c
2015-01-07 12:21:59 -08:00
RoboErik
2610d71251
Don't unmute when trying to show volume UI. DO NOT MERGE
...
When a MediaSession is active the adjust volume event to show UI was
causing the stream to be unmuted. Since this happens after every mute
event you were unable to mute while a session was active. This change
doesn't unmute for events that just show the UI.
bug:18844550
Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab
2015-01-07 20:13:31 +00:00
Deepanshu Gupta
0b1188e3c1
am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
...
* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
Fix tests on jenkins, take 2.
2015-01-07 19:46:03 +00:00
Deepanshu Gupta
3bd33f1d9e
Merge "Fix tests on jenkins, take 2." into lmp-dev
2015-01-07 19:29:40 +00:00
Deepanshu Gupta
d657b14927
Fix tests on jenkins, take 2.
...
Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0
2015-01-07 11:22:22 -08:00
Wale Ogunwale
6763058fe7
am f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
...
* commit 'f61bc8a2624bc70c903238229a62abc3351ed620':
Bring task with root activity to front when launching from recents.
2015-01-07 18:08:55 +00:00
Wale Ogunwale
f61bc8a262
Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
2015-01-07 18:02:41 +00:00
Geoff Mendal
56db82282d
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2015-01-07 17:02:35 +00:00
Geoff Mendal
fb7a35fc1f
Import translations. DO NOT MERGE
...
Change-Id: I91b076501cd9499fcd60f899fe7299735bf8c140
Auto-generated-cl: translation import
2015-01-07 08:58:27 -08:00
Ben Murdoch
d4bc95770d
am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
...
* commit '1eee52b1aa0ba0cc05ac513d0fa91de9ee643faf':
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
2015-01-07 15:55:12 +00:00
Ben Murdoch
1eee52b1aa
Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
2015-01-07 15:50:52 +00:00
Geoff Mendal
d79d0310b1
am 585a210d: (-s ours) Import translations. DO NOT MERGE
...
* commit '585a210ddb09d41c5ee4347e991c4fc51e2dbebe':
Import translations. DO NOT MERGE
2015-01-07 15:32:10 +00:00
Geoff Mendal
585a210ddb
Import translations. DO NOT MERGE
...
Change-Id: I41b418841fd7a2c436257ec29312411b1277b867
Auto-generated-cl: translation import
2015-01-07 07:24:21 -08:00
Ben Murdoch
574fa34dd5
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
...
Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
2015-01-07 15:13:48 +00:00
Robin Lee
26e2da8ff8
am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
...
* commit '374c358dd201583771b7aa391c56618548f543a6':
Profile owner hint in warning for extra CAs
2015-01-07 12:36:11 +00:00
Robin Lee
374c358dd2
Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
2015-01-07 12:30:57 +00:00
Vladimir Marko
152d7282a4
Check for OOM in BitmapFactory's getMimeTypeString().
...
Bug: 18909596
(cherry picked from commit 7ab249a18e )
Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3
2015-01-07 11:50:04 +00:00
Deepanshu Gupta
fa490b78df
am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins
...
* commit '984823f543b58ff3c064a203762530f972870d64':
Fix tests on jenkins
2015-01-07 10:10:24 +00:00
Quddus Chong
dc1db5bf54
am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs
...
* commit 'bc8b0541d7df2969264587c739e820eab7bbeea1':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
2015-01-07 10:10:19 +00:00
Quddus Chong
0178c0d782
am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs
...
* commit '7628b7282608e3995a800085746f9432b2e00623':
docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
2015-01-07 10:10:13 +00:00
Quddus Chong
1f03d4ba75
am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs
...
* commit 'fbb2796079ad17ecb5894766e518d14f7e37a0db':
docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
2015-01-07 10:10:08 +00:00
Joe Fernandez
912b25743d
am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
...
* commit '52aec00cb4109ae56633e02dd698de0f0f0c9191':
docs: studio index typo
2015-01-07 10:10:03 +00:00
Joe Fernandez
ea765e7d80
am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
...
* commit '76094382cf8a8860f2fb3d837246deb1b8baed96':
docs: studio bundle checksum update
2015-01-07 10:09:58 +00:00
Joe Fernandez
909f840cda
am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
...
* commit '4c5b5cffa7412a66cb56fe7b78daa7c0ee3d689a':
docs: Checklist for TV Apps
2015-01-07 10:09:52 +00:00
Deepanshu Gupta
984823f543
am 7f9582ce: am 48603a39: Fix tests on jenkins
...
* commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5':
Fix tests on jenkins
2015-01-07 09:23:17 +00:00
Quddus Chong
bc8b0541d7
am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs
...
* commit '96f11258ab19962c93b615c00b387bdc05c0d75b':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
2015-01-07 09:23:10 +00:00
Quddus Chong
7628b72826
am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs
...
* commit 'decac4319172c5f1c618de93dcb2a15678c3e214':
docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
2015-01-07 09:23:07 +00:00
Quddus Chong
fbb2796079
am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs
...
* commit '4d39cfa415f1c391a94b001319b8d1c7b02b61c2':
docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
2015-01-07 09:23:02 +00:00
Joe Fernandez
52aec00cb4
am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
...
* commit 'ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
docs: studio index typo
2015-01-07 09:22:58 +00:00
Joe Fernandez
76094382cf
am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
...
* commit 'c6fe54ed869d270533f6a3cf6ddea1e10d83afcc':
docs: studio bundle checksum update
2015-01-07 09:22:53 +00:00
Joe Fernandez
4c5b5cffa7
Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
2015-01-07 09:14:17 +00:00
Joe Fernandez
0e13957a4d
am d385640f: am 491a8257: docs: Update Dashboard for January 2015
...
* commit 'd385640f815a820aa1fecc2c009e1d0dfbe23777':
docs: Update Dashboard for January 2015
2015-01-07 08:48:04 +00:00
Joe Fernandez
d385640f81
am 491a8257: docs: Update Dashboard for January 2015
...
* commit '491a8257f46999d75ddc5c4c9eb599067ad380a0':
docs: Update Dashboard for January 2015
2015-01-07 08:41:24 +00:00
Joe Fernandez
491a8257f4
docs: Update Dashboard for January 2015
...
Change-Id: I20b2b2e22199db64367d5ed99b751353c3add07b
2015-01-07 00:31:45 -08:00