Nicolas Roard
b235502492
Merge "Trigger a full screen repaint when touching layers, as webkitDraw() may not generate the correct invalidations."
2011-10-06 18:29:20 -07:00
Ying Wang
a61153e8ac
Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf"
2011-10-06 18:25:22 -07:00
Anirudh Dewani
2ea0c1972b
Merge "Docs changes for WiFiDirect sample"
2011-10-06 17:57:55 -07:00
Svetoslav Ganov
e0f66c859a
Merge "Accessibility test automation API not working."
2011-10-06 17:28:51 -07:00
Philip Milne
31d246845c
Merge "Move Activity1 and Activity2 to API Demos area in development/samples."
2011-10-06 17:21:08 -07:00
Justin Ho
a2e315be95
Merge "Reference download asset through intermediate."
2011-10-06 16:28:57 -07:00
Jeff Brown
5c905ea7de
Merge "Clean up CursorWindow code. Bug: 5332296"
2011-10-06 16:28:15 -07:00
Justin Ho
05838ff98e
am 65162b1e: Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom
...
* commit '65162b1ee430cb8050109327a7fd958fa72d64ac':
Adding 3 additional notification sounds Bug: 5416299
2011-10-06 15:57:38 -07:00
Justin Ho
271d3ed41c
Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom
2011-10-06 15:51:43 -07:00
Chia-chi Yeh
87b869ece2
Merge "VPN: temporarily disable the default proxy when VPN is active."
2011-10-06 15:29:50 -07:00
Chia-chi Yeh
f2cb45d4f8
Merge "ConnectivityService: detach the logic of global proxy."
2011-10-06 15:29:43 -07:00
Dianne Hackborn
80f66b685a
Merge "Fix issue #5371530 : SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately"
2011-10-06 15:15:32 -07:00
Svetoslav Ganov
5177755699
Merge "Fixing errors in position information of scrollable views reported for accessibility."
2011-10-06 15:13:06 -07:00
Jeff Brown
cc0bf53f21
Clean up CursorWindow code.
...
Bug: 5332296
The code is functionally equivalent, but a little more efficient
and much easier to maintain.
Change-Id: I90670a13799df05831843a5137ab234929281b7c
2011-10-06 14:40:13 -07:00
Chet Haase
e7244280cd
Merge "Fix issue #5367164 : memory leak in LayoutTransition"
2011-10-06 14:35:53 -07:00
Jake Hamby
2da73a572b
Merge "Enable support for multiple SMSDispatchers in CDMALTEPhone."
2011-10-06 14:05:58 -07:00
Robert Ly
fd6d9a0309
Merge "docs: tools and adt notes"
2011-10-06 13:54:42 -07:00
Christopher Tate
00d87d6040
Merge "Disable db_sample logging"
2011-10-06 13:09:58 -07:00
Christopher Tate
06877a7b5c
Merge "Prevent concurrent backup operations"
2011-10-06 13:09:52 -07:00
Xavier Ducrohet
1b22b98a43
Merge "Update dev guide for new build system and new lib system."
2011-10-06 12:56:58 -07:00
Irfan Sheriff
e156080204
Merge "Mobile hotspot provision string"
2011-10-06 12:42:48 -07:00
Daniel Sandler
f6dd719953
Merge "Cascading clear-all in the phone notifications panel."
2011-10-06 12:40:53 -07:00
Chet Haase
7b4bdab36e
Merge "Fix issue #5384631 : hw windows not resizing correctly"
2011-10-06 12:14:26 -07:00
Jeff Sharkey
fdc6ca5527
am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom
...
* commit 'a50d0f8985d811a6a2f49aa65e31892048e96ccf':
Hide quota APIs until finalized.
2011-10-06 11:22:40 -07:00
Jeff Sharkey
a12e2cc771
Merge "Hide quota APIs until finalized." into ics-factoryrom
2011-10-06 11:19:29 -07:00
Scott Main
be9758fea5
Merge "docs: add new action item and state list drawable resource attributes"
2011-10-06 11:19:25 -07:00
Eric Fischer
402cd45604
am 2fc826ec: (-s ours) Import translations for late permission additions.
...
* commit '2fc826ec944cf85d1c3e65011091c58dc94110c0':
Import translations for late permission additions.
2011-10-06 11:03:18 -07:00
Wink Saville
b2c098a902
Merge "Set mGotCountryCode properly."
2011-10-06 10:52:13 -07:00
Steve Block
378903492e
Merge "Improve a warning message in WebViewCore's EventHub"
2011-10-06 10:35:33 -07:00
Ben Murdoch
b8cafd85c6
Merge "Pass correct units for text size in autocomplete drop down."
2011-10-06 10:23:20 -07:00
John Reck
42101dbaec
Merge "Prevent adapter flickering"
2011-10-06 10:22:03 -07:00
Roman Nurik
b670684013
Merge "Mark random music player sample as updated in the resource TOC"
2011-10-06 10:11:32 -07:00
Andreas Huber
0062eff837
Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files."
2011-10-06 09:17:14 -07:00
Steve Block
3b00604f35
Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is empty"
2011-10-06 08:48:52 -07:00
Justin Ho
a7163253f1
Merge "primary progress updated to fix clipping problem"
2011-10-06 07:39:11 -07:00
Justin Ho
554be3acde
Merge "scrubber assets updated to larger size"
2011-10-06 07:39:03 -07:00
Jeff Sharkey
fe5a88d9de
Merge "Refine random stats generation."
2011-10-05 23:38:44 -07:00
Michael Jurka
dc056cb5d9
Merge "Adding logging to debug widget deletions"
2011-10-05 22:11:19 -07:00
Jeff Brown
0d13e57bcf
Merge "Fix build."
2011-10-05 19:11:04 -07:00
Jim Miller
88d0289823
Merge "Fix 5396647: Move lock slider up by 10dip on lock screen."
2011-10-05 19:08:28 -07:00
Roman Nurik
368bd81bb5
Merge "Add ActionBarCompat sample (CL 2 of 2)"
2011-10-05 18:24:42 -07:00
Jeff Brown
1ccc6a8968
Merge "Fix build."
2011-10-05 18:09:41 -07:00
Eric Laurent
475a271e45
Merge "Fix issue 5381089: problem with A2DP music volume"
2011-10-05 18:02:54 -07:00
Jeff Brown
9f5a5e1be1
Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750"
2011-10-05 17:24:29 -07:00
Richard Ngo
c81cfa0c59
Merge "updated blue border for stackviews to new holo blue"
2011-10-05 17:23:33 -07:00
Fabrice Di Meglio
a02befe824
Merge "Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
2011-10-05 17:12:17 -07:00
Irfan Sheriff
68d2146f16
Merge "Add a time threshold for re-enabling networks"
2011-10-05 16:34:40 -07:00
The Android Open Source Project
73dcb60832
Reconcile with ics-factoryrom-release
...
Change-Id: I656e0ea68c6bf350f391a3922884216955997686
2011-10-05 16:16:03 -07:00
George Mount
0b263afd34
Merge "Fix monkey NullPointerException"
2011-10-05 15:33:46 -07:00
Mathias Agopian
2eaf5f53ed
Merge "Force a repaint when hwc invalidate hook is called"
2011-10-05 15:09:46 -07:00
