Nick Kralevich
77a8b08682
Merge "AudioResampler: use relative instead of absolute labels"
2011-09-16 13:56:16 -07:00
Jeff Brown
0dd2f48612
am a82f4483: (-s ours) Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
...
* commit 'a82f448373ca0f0e67fb52a2bdc489c4ed0b17ac':
Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776
2011-09-16 13:44:40 -07:00
Adam Powell
8096736926
Merge "Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow calls."
2011-09-16 13:44:35 -07:00
Dianne Hackborn
b72c291402
Merge ""Fix" issue #5276520 : Noise on edges of rotation animation"
2011-09-16 13:43:01 -07:00
Jeff Brown
d20d20b5da
Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
2011-09-16 13:42:46 -07:00
John Reck
eb2afca1a7
am 41d6bfb2: (-s ours) Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
...
* commit '41d6bfb27909c2f27e41b5aa1d182e00b4c2f631':
DO NOT MERGE Fix text selection drawing on SW
2011-09-16 13:23:37 -07:00
John Reck
35e59f0617
Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
2011-09-16 13:21:31 -07:00
Jeff Brown
4df42561ed
Merge "Make LTE_FLOAT a strict weak order. Bug: 5327776"
2011-09-16 13:11:24 -07:00
Mathias Agopian
b74b87c516
Merge "cleanup: fix typos in logs"
2011-09-16 12:58:30 -07:00
Fred Quintana
02a7421857
am 3d5759b5: Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
...
* commit '3d5759b527fd0e48cfcc759dfed68fbe5a4dd050':
Add a generic account chooser/add account flow for apps.
2011-09-16 12:14:31 -07:00
Fred Quintana
975b1328f3
Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
2011-09-16 12:13:30 -07:00
Mathias Agopian
06649fece4
cleanup: fix typos in logs
...
Change-Id: Ib5744564a873ea2b84100174673dc4d3ae109fcf
2011-09-16 11:56:40 -07:00
Andreas Huber
9dbb77d04b
Fix androidGetThreadPriority for non-pthread configurations.
...
related-to-build
Change-Id: Ic865af0865906f96fd615a56a030c8e3adaf13c4
2011-09-16 11:47:13 -07:00
Eino-Ville Talvala
50c258b945
am ebdcae73: Merge "Add third video to default system videos." into ics-factoryrom
...
* commit 'ebdcae732f648871dd0df6586a5ba57aae015bd4':
Add third video to default system videos.
2011-09-16 10:53:21 -07:00
Eino-Ville Talvala
f6c0011ad2
Merge "Add third video to default system videos." into ics-factoryrom
2011-09-16 10:52:15 -07:00
Andreas Huber
fcd353149a
Merge "Various improvements to nuplayer playback"
2011-09-16 10:50:51 -07:00
Andreas Huber
0b1f5d51ae
Merge "A new API "androidGetThreadPriority""
2011-09-16 10:50:43 -07:00
John Reck
a956d43509
Merge "Fix text selection drawing on SW"
2011-09-16 10:39:16 -07:00
Andreas Huber
1d60b9629c
A new API "androidGetThreadPriority"
...
Change-Id: I6baeead8c70460863343fd557250635fb1e6a170
2011-09-16 09:33:22 -07:00
Kenny Root
8239e2322e
am 1f9a9288: Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom
...
* commit '1f9a928864be7cfc76c99b8f69706e739e6a7b08':
Be more forgiving in parsing verifier IDs
2011-09-16 09:09:30 -07:00
Kenny Root
c4fd8ada67
Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom
2011-09-16 09:07:52 -07:00
Justin Ho
0aacdd8535
am 6a7ea58e: Merge "Updated Clock and Roboto fonts Bug: 5243711" into ics-factoryrom
...
* commit '6a7ea58e826587aad89791affa29fe51d5c2e58b':
Updated Clock and Roboto fonts Bug: 5243711
2011-09-16 07:35:43 -07:00
Justin Ho
a2688e4c7c
Merge "Updated Clock and Roboto fonts Bug: 5243711" into ics-factoryrom
2011-09-16 07:32:52 -07:00
Brian Colonna
b9c977a712
Merge "Properly laying out FaceLock on lockscreen"
2011-09-16 06:08:22 -07:00
Mark Brophy
22c371d437
Merge "Fix typo in SearchManager javadoc."
2011-09-16 05:47:49 -07:00
Svetoslav Ganov
e624896e7a
am 4e3bee76: Merge "MiltiWaveView accessibility improvement." into ics-factoryrom
...
* commit '4e3bee760a7f00e6ef3c89b937558df1ee6fcda0':
MiltiWaveView accessibility improvement.
2011-09-15 18:54:15 -07:00
Svetoslav Ganov
dd434337ab
Merge "MiltiWaveView accessibility improvement." into ics-factoryrom
2011-09-15 18:52:40 -07:00
Svetoslav Ganov
76a8f2f73e
am 2a6798ad: Merge "Touch explorer does not perform tap with the right pointer." into ics-factoryrom
...
* commit '2a6798ada499dc1dc33db36a15a6ce07e72968ae':
Touch explorer does not perform tap with the right pointer.
2011-09-15 18:50:38 -07:00
Svetoslav Ganov
fcb3f65263
Merge "Touch explorer does not perform tap with the right pointer." into ics-factoryrom
2011-09-15 18:47:49 -07:00
Ying Wang
b6feddd978
am 070e7ee2: Merge "Use the correct dependency" into ics-factoryrom
...
* commit '070e7ee285792a2cc59e7ed1db17832e8c829275':
Use the correct dependency
2011-09-15 17:38:46 -07:00
Gloria Wang
e17ccf5ec3
am 91849473: (-s ours) Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge." into ics-factoryrom
...
* commit '918494732741c1fdceda6d2e4ea8930b559f26a4':
If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge.
2011-09-15 17:38:39 -07:00
Gloria Wang
5e74fb2649
am 62c24d7b: (-s ours) Merge "Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer\'s _release. Related to bug 5252296." into ics-factoryrom
...
* commit '62c24d7bfa5a88655ba9981dba2a565c1136a255':
Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296.
2011-09-15 17:38:36 -07:00
Ying Wang
5668777ffc
Merge "Use the correct dependency" into ics-factoryrom
2011-09-15 17:19:37 -07:00
Dianne Hackborn
c2d413c753
Merge "Fix issue #5300880 : setSystemUiVisibility() always triggers a surface reallocation"
2011-09-15 17:09:01 -07:00
Dianne Hackborn
5036b93b50
Merge "Fix issue #5317970 : Removing active wallpaper from manifest crashes phone"
2011-09-15 17:08:07 -07:00
Gloria Wang
f629de24fa
Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge." into ics-factoryrom
2011-09-15 17:04:27 -07:00
Gloria Wang
d8793af9f2
Merge "Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296." into ics-factoryrom
2011-09-15 17:04:02 -07:00
Gloria Wang
c22866a60b
Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664."
2011-09-15 16:56:41 -07:00
Christopher Tate
8b2651c723
Merge "Don't do full backup/restore before setup"
2011-09-15 16:48:42 -07:00
Fred Quintana
f22ff3ccaa
Merge "Add a generic account chooser/add account flow for apps."
2011-09-15 16:44:53 -07:00
Ed Heyl
229ed03e61
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-09-15 16:18:27 -07:00
Adam Powell
328c1c226d
Merge "Update docs for RelativeLayout to better explain its interpretation of gravity."
2011-09-15 15:02:55 -07:00
Gilles Debunne
c8465cf9d6
Merge "Bug 5319091: Completions delayed in AutoComplete in landscape"
2011-09-15 14:51:35 -07:00
Ashish Sharma
719c60de97
Merge "Add packet counts to uid and iface stats. Needed to add Ethernet overhead to uid_stats (IP level) to compare with interface stats (Ethernet level)."
2011-09-15 14:30:40 -07:00
Svetoslav Ganov
da9782ac07
Merge "TextView should report in an AccessibilityNodeInfo's text its hint if the View text is empty."
2011-09-15 13:11:44 -07:00
Svetoslav Ganov
2e17b9e12f
Merge "CalendarView diregarding XML attributes."
2011-09-15 13:11:08 -07:00
Daniel Sandler
ac3415c6e2
Merge "Fix MENU icon weirdness."
2011-09-15 13:09:29 -07:00
Gilles Debunne
c2b6a6f91d
Merge "Bug 5299484: Recipient address in to field is doubled when entering in landscape mode"
2011-09-15 12:43:51 -07:00
Danielle Millett
475ec8f061
Merge "isPasswordEnabled and isPatternEnabled return true if used as backup method"
2011-09-15 12:14:25 -07:00
John Reck
1e2e9af536
Merge "DO NOT MERGE Fix finalization" into ics-factoryrom
2011-09-15 11:49:00 -07:00