George Mount
52fb8a4245
am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
...
* commit '1a285496fb504d4c4d41e97a7c3b67210c1a67ef':
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
2014-10-10 20:52:22 +00:00
George Mount
1a285496fb
Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
2014-10-10 20:48:10 +00:00
George Mount
5ac9b20b41
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
...
Bug 17938614
Change-Id: Ia341fdd63ab57ec16a3de6349b7eb07fdc0a48ae
2014-10-10 13:22:36 -07:00
Jerome Dochez
c9c512e0ff
am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev
...
* commit 'f47f8855175213b4bf1014593f97bc81c042dfd1':
Added a daemon mode to aapt to receive streams of commands from gradle.
2014-10-10 19:24:48 +00:00
Jerome Dochez
f47f885517
Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev
2014-10-10 19:21:49 +00:00
Selim Cinek
5c401a0e0b
am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev
...
* commit '3e683b6a0f40e176ba9ffce652939ecef23b9dc2':
Fixed a bug where the panel got into a wrong state
2014-10-10 18:53:10 +00:00
Selim Cinek
3e683b6a0f
Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev
2014-10-10 18:49:12 +00:00
Christopher Tate
2c15bbc838
am 1133e29f: Tweak wallpaper restore rejection threshold
...
* commit '1133e29f22252cc36102f41204c3de35779e49d2':
Tweak wallpaper restore rejection threshold
2014-10-10 18:05:32 +00:00
Christopher Tate
1133e29f22
Tweak wallpaper restore rejection threshold
...
Raise the height ratio threshold slightly in order to start accepting
restores of height=1920 images onto height=2560 devices.
Bug 17882661
Change-Id: I63b47817fdf754cda9a052bddb62aee764522c6f
2014-10-10 17:54:14 +00:00
Jinsuk Kim
3170c03543
am 294297df: Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev
...
* commit '294297df4e3f327a81d922563c518aee8ee3e51d':
CEC: Prevents HdmiControlService from turning on TV on wakeup
2014-10-10 14:45:33 +00:00
Dianne Hackborn
18d2d51ee3
am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev
...
* commit '7ea69880bdbf2c51140460dcfd063dc015c3ce26':
Improve some docs, fix some debugging.
2014-10-10 14:44:59 +00:00
Jinsuk Kim
294297df4e
Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev
2014-10-10 03:52:27 +00:00
Dianne Hackborn
7ea69880bd
Merge "Improve some docs, fix some debugging." into lmp-dev
2014-10-10 01:27:13 +00:00
Dianne Hackborn
ab4a81b3c6
Improve some docs, fix some debugging.
...
- Add docs to Binder, Messenger, ResultReceier to explain their
relation (or lack there-of) to process lifecycle.
- Clarify some aspects of process lifecycle for services.
- Fix help text of am command.
- Fix per-package dumping of battery stats to not include history.
- Fix per-package dumping of proc stats to only include aggregated
and current stats and fix some formatting.
- Fix per-process dumping of meminfo to have an option to interpret
the input as a package, so including all processes that are
running code of that package.
- Fix top-level per-package debug output to correctly include all
of these improvements and give them a little more time (10s) to
complete for timing out.
Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
2014-10-09 18:21:59 -07:00
Selim Cinek
6bb4a9b356
Fixed a bug where the panel got into a wrong state
...
Bug: 17939708
Change-Id: Ieaa9dc2fc0c92ce52b02ac4ea452df47ee492ac3
2014-10-09 17:48:05 -07:00
Svetoslav
9ab1b1bbe6
am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev
...
* commit 'c43caf52a61e56d5ed78f947fc8c299ad5273abf':
Fix child view ordering for accessibility.
2014-10-10 00:10:38 +00:00
Svetoslav
c43caf52a6
Merge "Fix child view ordering for accessibility." into lmp-dev
2014-10-10 00:03:54 +00:00
Svetoslav
88e447b576
Fix child view ordering for accessibility.
...
When reporting views to accessibility services we are ordering the
children in a parent based on their location on the screen. The
initial implementation worked pretty well in practive but violated
the transitivity property leading to rare crashes in apps. The current
implementation does not violate transitivity but does not produce
good ordering.
Given the lack of time and to minumize risk this change uses the
old strategy which works most of the time and if that fails we
fall back to the current strategy. Coming up with a correct strategy
that produces good results requires more time.
bug:17887986
Change-Id: I1c233ecdf318befc315e793696ac48bd6c652ab6
2014-10-09 16:40:47 -07:00
Selim Cinek
3e056aa0e0
am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev
...
* commit 'f9df9dd845ba1d1b14b450bd9df654243921381f':
Fixed an issue where the notification could become transparent
2014-10-09 23:06:32 +00:00
Christopher Tate
ad716e42e8
am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem
...
* commit '2aa1d18e3acd269ed7a5f5a4843d447735f0676c':
Fix bug 17931760 - spurious timeout leads to mayhem
2014-10-09 23:06:27 +00:00
Selim Cinek
f9df9dd845
Merge "Fixed an issue where the notification could become transparent" into lmp-dev
2014-10-09 23:05:04 +00:00
Selim Cinek
59d9723dd7
Fixed an issue where the notification could become transparent
...
Bug: 17668881
Change-Id: If8389084c7696bb8d3c0155f1262ec1fe7973c44
2014-10-09 15:54:40 -07:00
Christopher Tate
2aa1d18e3a
Fix bug 17931760 - spurious timeout leads to mayhem
...
We know a priori that the PMBA metadata package's backup pass
doesn't need to be tracked for timeout, because it's run inline
rather than as an asynchronous separate-process operation.
Change-Id: Ifd21ab3a016917f5e557a38c1c88f8d8ac1337d2
2014-10-09 15:20:24 -07:00
Christoph Studer
a2830b7da7
am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev
...
* commit '2c2cb29a3d7f0a90d753b0fa9c32c1fc5cdbff32':
WallpaperCropper: Use white color for action bar
2014-10-09 21:01:07 +00:00
Christoph Studer
2c2cb29a3d
Merge "WallpaperCropper: Use white color for action bar" into lmp-dev
2014-10-09 20:56:45 +00:00
Christoph Studer
9e8482062d
WallpaperCropper: Use white color for action bar
...
Bug: 17343815
Change-Id: I5802f04204d081b97fbc2e2cb203fa03f16fea6a
2014-10-09 13:50:21 -07:00
Justin Koh
1840bfee70
Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev
2014-10-09 20:49:03 +00:00
Justin Koh
b0b823f71b
Make GlobalKeyManager broadcasts send as foreground
...
Should prioritize these since they are due to user interaction.
Change-Id: If36d5502dbd53de6102b05fd54caed56e22685da
2014-10-09 13:33:19 -07:00
Adam Lesinski
f23e3ea629
am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev
...
* commit 'aeef612f200b6b5cee214230271e1c3d718151ee':
Search all packages for a given type string when looking up resources by name
2014-10-09 19:30:31 +00:00
Dianne Hackborn
0e259ce2d7
am 6166a824: Merge "Implement issue #17906468 : Allow search request to fall back to global search" into lmp-dev
...
* commit '6166a824b2ea7b7918f54769005ab691e15f77f7':
Implement issue #17906468 : Allow search request to fall back to global search
2014-10-09 19:30:26 +00:00
Jorim Jaggi
fc779ccf86
am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev
...
* commit '01f1c5c85476b7eee3155ac1a1f6b570582ecd6c':
Fix content description for bluetooth icon
2014-10-09 19:30:16 +00:00
Joe Fernandez
487e15b901
am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev
...
* commit '401418d53b699e6cde53e45fba066c933868b6c1':
Revert "Removed preview license."
2014-10-09 19:30:00 +00:00
Sandeep Siddhartha
eecf74bcf7
am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev
...
* commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135':
Add tests for model management [SDK Only]
2014-10-09 19:29:55 +00:00
Etan Cohen
4354e6046e
am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.
...
* commit '5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
TD_SCDMA is more like GSM than CDMA - re-classifying.
2014-10-09 19:29:43 +00:00
Robin Lee
4a718f2af3
am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev
...
* commit 'a300025d23fac899c2294a8281b12b52d4e830b6':
DevicePolicy: One cert tracker warning per profile
2014-10-09 19:11:29 +00:00
Joe Fernandez
5b349c4ce9
am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
...
* commit 'e2f757d9f3341b66d75d335cd9dd29848a4b8969':
docs: Android TV publishing requirements
2014-10-09 19:11:22 +00:00
Chong Zhang
d25b996a7a
am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost
...
* commit 'a6ae8ba4a59f3f893fe8893335e7517388123c10':
MediaHTTPConnection: do not use proxy for localhost
2014-10-09 19:11:11 +00:00
Christopher Tate
f857b272c2
am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev
...
* commit '2e0f66820e12bbd24f476fba863d9dab564c6f97':
Also monitor MOVED_TO events for wallpaper updates
2014-10-09 19:11:06 +00:00
Fred Fettinger
708206c35e
am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
...
* commit '6c858c25f31bcdd72b60cbd0c91b085d9f298ffa':
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
2014-10-09 19:09:50 +00:00
mike dooley
3175824a78
am 879142bf: Fix hangouts conference calling regression.
...
* commit '879142bf1c6b72670d4aedac82938f00a97acf5b':
Fix hangouts conference calling regression.
2014-10-09 19:09:41 +00:00
Tim Kilbourn
5d7f58be2c
am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev
...
* commit '37bd07768a05aabb0905608606f354a488a2d5cf':
Don't start SearchDialog on television.
2014-10-09 19:09:30 +00:00
Jeff Brown
ab46eda872
am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev
...
* commit '704998abbafea84c28c0bcd0c540af87562b4cc9':
Ensure we correctly unblank displays when added.
2014-10-09 19:09:01 +00:00
smain@google.com
8433b63c02
am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below
...
* commit 'b880707c7facd8f9232379ef481b2b5a0030b682':
fix unclickable link due to overlay from offset dev below
2014-10-09 19:08:56 +00:00
smain@google.com
3ae2a71539
am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev
...
* commit '9f928944fa4186e97b051b0076d7e30469b92124':
update droiddoc option to include api level 21 for javadoc tagging
2014-10-09 19:08:41 +00:00
Christopher Tate
b03b6a6c5a
am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev
...
* commit '6dea8de7097eb91c9595cea63acd489e34c63aac':
Actually tell the widget service that restore is starting
2014-10-09 19:08:33 +00:00
Adam Lesinski
aeef612f20
Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev
2014-10-09 19:02:24 +00:00
Dianne Hackborn
6166a824b2
Merge "Implement issue #17906468 : Allow search request to fall back to global search" into lmp-dev
2014-10-09 19:00:12 +00:00
Jorim Jaggi
01f1c5c854
Merge "Fix content description for bluetooth icon" into lmp-dev
2014-10-09 18:29:36 +00:00
Adam Lesinski
e60a87f552
Search all packages for a given type string when looking up resources by name
...
Previously we would stop at the first match when looking for a type string,
but we should search all packages in case a feature Split added a type
with the same name.
Bug:17924027
Change-Id: I6bc7ef073324db99448538cd8bdf566658f066ff
2014-10-09 11:26:19 -07:00
Joe Fernandez
401418d53b
Merge "Revert "Removed preview license."" into lmp-dev
2014-10-09 18:03:21 +00:00