510 Commits

Author SHA1 Message Date
Mathias Agopian
ed81f2216a fix a few typos in comments. this is really intended as a git pull/push test. 2009-04-16 12:29:34 -07:00
Mathias Agopian
402c34649f fix some issues with Surface's lifetime management.
To deal with Java's lack of destructors and delayed garbage collection, we used to duplicate Surface.cpp objects in some case; this caused some issues because Surface is supposed to be reference-counted and unique.
2009-04-16 12:29:34 -07:00
Mathias Agopian
a6b40ba521 fix a rookie mistake causing Singleton<> to be a "multiton". Also improve the BufferMapper's debugging, but turn it off.
Squashed commit of the following:

commit 04e9cae7f806bd65f2cfe35c011b47a36773bbe5
Author: Mathias Agopian <mathias@google.com>
Date:   Wed Apr 15 18:30:30 2009 -0700

    fix and improve BufferMapper's tracking of mapped buffers.

commit 1a8deaed15811092b2349cc3c40cafb5f722046c
Author: Mathias Agopian <mathias@google.com>
Date:   Wed Apr 15 00:52:02 2009 -0700

    fix some bugs with the Singleton<> class. untested.

commit ed01cc06ad70cf640ce1258f01189cb1a96fd3a8
Author: Mathias Agopian <mathias@google.com>
Date:   Tue Apr 14 19:29:25 2009 -0700

    some work to debug the Singleton<> template.
2009-04-15 18:34:24 -07:00
Mathias Agopian
5f105d38e2 Merge commit 'goog/master' into merge_master 2009-04-14 15:21:33 -07:00
Mathias Agopian
032c85d636 Merge commit 'goog/master_gl' into merge_master 2009-04-14 14:56:34 -07:00
Mathias Agopian
85d7a06826 Merge commit 'goog/master' into merge_master 2009-04-14 14:45:37 -07:00
Yu Shan Emily Lau
b3c5b03055 Merge branch 'readonly-p4-master' 2009-04-14 14:33:23 -07:00
Yu Shan Emily Lau
810ec50a1e AI 146179: am: CL 145971 am: CL 145757 Suppress the flaky tests
Original author: yslau
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146179
2009-04-14 14:32:03 -07:00
Dan Bornstein
649435a40f Merge branch 'readonly-p4-master' 2009-04-14 12:42:22 -07:00
Dan Bornstein
5a0e535782 AI 146178: am: CL 145970 am: CL 145743 Excise the "de" locale out of testResourceBundles(), leaving a
TODO and long comment about the situation.
  Original author: danfuzz
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146178
2009-04-14 12:41:05 -07:00
Brett Chabot
3071177a4a Merge branch 'readonly-p4-master' 2009-04-14 12:39:37 -07:00
Brett Chabot
23d1b4b21c AI 146177: am: CL 145969 am: CL 145735 Suppress the flaky DatabaseLockTest
Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146177
2009-04-14 12:38:22 -07:00
Lorenzo Colitti
cb1ac4f88f Merge branch 'readonly-p4-master' 2009-04-14 12:10:26 -07:00
Lorenzo Colitti
d86e6ddfc1 AI 146166: am: CL 145920 Don't filter out IPv6 multicast packets.
Original author: lorenzo

Automated import of CL 146166
2009-04-14 12:08:54 -07:00
Leon Scroggins
96c27559b0 Merge commit 'goog/master' 2009-04-14 12:06:19 -07:00
Android (Google) Code Review
894fa6cc14 Merge change 79
* changes:
  Squashed commit of the following:
2009-04-14 11:54:14 -07:00
Leon Scroggins
90402eb626 Merge branch 'readonly-p4-master' 2009-04-14 11:07:14 -07:00
Leon Scroggins
17c3bfc8c9 AI 146153: Make the TextDialog invisible, so that we only show WebKit's rendering of the textfield, yet we retain the benefits of having the TextDialog.
Frame.cpp:
  Removed a line that should not be there anyway.  Somehow when merging in Apple's ENABLE(TEXT_CARET) changes we left in a line that disables the blinking Cursor.
  Platform.h:
  Let WebKit draw the cursor.
  RenderThemeAndroid.cpp:
  Make the active selection color (the color of a selection in an active <textfield> or <textarea>) visible, and match the selection color shown in other places in Android.
  WebViewCore.cpp:
  Make the focused node's document's focus controller active.  This allows webkit to draw the cursor.
  TextDialog.java:
  Set WillNotDraw to true, and remove our background, so that the TextDialog is completely invisible.  Note that I have not changed its visibility to View.VISIBLE, which would have other undesired effects (would not accept touch events, for example).  Since we are not drawing, remove onPreDraw, which is no longer necessary.  In onSelectionChanged, pass a message to webkit telling it that the selection has changed.  It is important that the two threads always agree (albeit webkit may be behind) because the user will now only see the selection drawn by webkit.  Remove some old flawed code whose purpose was to keep the selection up to date and do not send key events for arrow keys (which would mess up the selection that was correct thanks to onSelectionChanged).
  BUG=1781070,1712752,916193,1411370,1160999,1775425,1354814

Automated import of CL 146153
2009-04-14 10:57:13 -07:00
Jack Palevich
e909ae55e3 Add clarifying comment.
(Primarily as a test of the master_gl branch.)
2009-04-13 22:03:39 -07:00
Jack Palevich
e88531ce4b Merge commit 'goog/master' into HEAD 2009-04-13 19:52:45 -07:00
Jianhong Jiang
3ca47d101d Squashed commit of the following:
commit b6cf47306b642f7cf7e1b55cce448e0deff38f36
Author: Jianhong Jiang <jianhong@google.com>
Date:   Mon Apr 13 11:07:01 2009 -0700

    Change tabs into 4 spaces.

commit 93c5890dbcc68e37aa0ef039b4a203acddca8968
Author: Jianhong Jiang <jianhong@google.com>
Date:   Fri Apr 10 14:15:23 2009 -0700

    OpenCore 2.02 related changes.
2009-04-13 19:01:51 -07:00
Jeffrey Sharkey
269ba974fb Merge branch 'readonly-p4-master' 2009-04-13 16:58:42 -07:00
Jeffrey Sharkey
3ff7eb92ad AI 146012: am: CL 145860 am: CL 145568 Hide setStarted() from public API.
It should be renamed to something more meaninful before being exposed.
  Original author: jsharkey
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146012
2009-04-13 16:57:28 -07:00
Dianne Hackborn
81ddb7929f Merge branch 'readonly-p4-master' 2009-04-13 16:55:10 -07:00
Dianne Hackborn
b3cddae499 AI 146011: am: CL 145859 am: CL 145561 Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive).
Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146011
2009-04-13 16:54:00 -07:00
Dirk Dougherty
7c3633fd05 Merge branch 'readonly-p4-master' 2009-04-13 16:52:33 -07:00
Dirk Dougherty
4e44b76fdf AI 146010: am: CL 145858 am: CL 145559 Cleanup for early-look SDK.
Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146010
2009-04-13 16:51:21 -07:00
Dianne Hackborn
75534fbe24 Merge branch 'readonly-p4-master' 2009-04-13 16:13:37 -07:00
Dianne Hackborn
935ae463d4 AI 145994: Integrate #145778 from Donut.
Automated import of CL 145994
2009-04-13 16:11:55 -07:00
Mathias Agopian
77307ab848 Merge commit 'goog/master' into master_gl 2009-04-13 14:31:08 -07:00
Grace Kloba
0f87ca2037 Merge branch 'readonly-p4-master' 2009-04-13 14:05:40 -07:00
Grace Kloba
b3230cb1e3 AI 145922: Fix #1640053, #1777704. When WebKit set scroll position through jni, we need to check whether there is a pending draw as the scroll position should be based on the new picture, not the current picture.
BUG=1640053,1777704

Automated import of CL 145922
2009-04-13 14:04:23 -07:00
Patrick Scott
9536d0b413 Merge branch 'readonly-p4-master' 2009-04-13 09:59:09 -07:00
Patrick Scott
3156bb00dd AI 145870: Add a build property for the default alarm alert. Update the various
framework classes to deal with the new property. Also update various
  documentation that mentions the default ringtones.
  Use the build property as the default alert when the user has not chosen
  an alert for an alarm. This is also used if the alarm alert is null when
  the alarm fires.
  BUG=1723684

Automated import of CL 145870
2009-04-13 09:57:38 -07:00
Mathias Agopian
af9a515299 more debugging tools around BufferMapper 2009-04-10 20:34:46 -07:00
Mathias Agopian
7e25da07af fix KeyedVector::replaceValueAt, which wouldn't even compile if used. 2009-04-10 20:27:25 -07:00
Feng Qian
3d4122c5a2 Merge branch 'readonly-p4-master' 2009-04-10 18:12:55 -07:00
Feng Qian
9ae010a349 AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
2009-04-10 18:11:32 -07:00
Ficus Kirkpatrick
ed740498ca Add method on EncodedStringValue to transform a String[]. 2009-04-10 15:50:01 -07:00
Mathias Agopian
0179ff6594 Merge commit 'goog/master' into master_gl
Conflicts:
	libs/utils/Parcel.cpp
2009-04-10 14:36:33 -07:00
Mathias Agopian
1473f46cbc Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:30 -07:00
Jack Palevich
a8e947f604 Merge branch 'readonly-p4-master' 2009-04-09 19:54:37 -07:00
Jack Palevich
71d83c0489 AI 145639: am: CL 145602 am: CL 145255 Further work on correcting the misspelling of RENDERMODE_CONTUOUSLY
--> RENDERMODE_CONTINUOUSLY. This time we update the spelling
  in the list of APIs in SDK release 3. (Which hasn't actually been
  released yet, so it's OK to do this.)
  Original author: jackpal
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145639
2009-04-09 19:53:26 -07:00
Jack Palevich
3b9ff27e73 Merge branch 'readonly-p4-master' 2009-04-09 19:41:44 -07:00
Jack Palevich
f079c6852f AI 145633: Manually integrate the RENDER_CONTINUOUSLY change from
the donut branch.
  BUG=1766678

Automated import of CL 145633
2009-04-09 19:40:24 -07:00
Fred Quintana
546f75c5c5 Merge branch 'readonly-p4-master' 2009-04-09 15:07:04 -07:00
Fred Quintana
26fc5eba50 AI 145535: reenable the signin notifications
the system process has permissions to control this
  notification but the caller doesn't do we need to call
  clearCallerIdentity() before manipulating the notification
  BUG=1778648

Automated import of CL 145535
2009-04-09 15:05:50 -07:00
Jack Palevich
8ecf3b8763 Merge branch 'readonly-p4-master' 2009-04-09 15:04:22 -07:00
Jack Palevich
3e832dbe96 AI 145534: am: CL 145526 am: CL 145249 Correct misspelling of constant RENDERMODE_CONTUOUSLY --> RENDERMODE_CONTINUOUSLY
Original author: jackpal
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145534
2009-04-09 15:03:04 -07:00
Jack Palevich
9f4d38d396 Merge branch 'readonly-p4-master' 2009-04-09 14:55:24 -07:00