Commit Graph

8333 Commits

Author SHA1 Message Date
Grace Kloba
8831d4dc55 am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp

* commit '8f655cb6c836380778545fb13044d97ef57139d6':
  Update the comment which supposed to be checked in
2010-04-19 16:15:41 -07:00
Grace Kloba
8f655cb6c8 Merge "Update the comment which supposed to be checked in in the last CL." into froyo 2010-04-19 16:11:21 -07:00
Grace Kloba
f706ef857b Update the comment which supposed to be checked in
in the last CL.

Fix http://b/issue?id=2607352
2010-04-19 16:05:19 -07:00
Adam Powell
7f30f8abe3 am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Merge commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47' into froyo-plus-aosp

* commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
2010-04-19 15:38:11 -07:00
Adam Powell
93d35f7743 Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:33:08 -07:00
Adam Powell
8568c3a09b Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
Change-Id: I7eb38c53c3a03b23786b8b0c2d16139acd0eb38e
2010-04-19 15:26:15 -07:00
Grace Kloba
e3ce4c89cc am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Merge commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp

* commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
  Remove fixed size restriction on the SurfaceView
2010-04-19 13:17:53 -07:00
Grace Kloba
2dc784988a Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 2010-04-19 13:14:21 -07:00
Grace Kloba
66fa5cc73d am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp

* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
  Force redraw in touch_up if there is a move.
2010-04-19 12:18:22 -07:00
Grace Kloba
6edb3792d8 Remove fixed size restriction on the SurfaceView
before setting it to the full screen content view.

Fix http://b/issue?id=2607352
2010-04-19 12:14:17 -07:00
Grace Kloba
c36862d53a Force redraw in touch_up if there is a move.
Fix http://b/issue?id=2606815
2010-04-19 10:16:42 -07:00
Grace Kloba
17e36d233d am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo
Merge commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34' into froyo-plus-aosp

* commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34':
  Missed a case to resumeUpdatePicture.
2010-04-16 16:38:25 -07:00
Grace Kloba
3c44db3f67 Merge "Missed a case to resumeUpdatePicture." into froyo 2010-04-16 16:34:43 -07:00
Grace Kloba
aa373c9868 Missed a case to resumeUpdatePicture.
Fix http://b/issue?id=2603882
2010-04-16 15:49:36 -07:00
Vasu Nori
66bee81321 am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo
Merge commit '1fc46c623f9af8aaccfd519ece78331d9a95e579' into froyo-plus-aosp

* commit '1fc46c623f9af8aaccfd519ece78331d9a95e579':
  accept close() on database objects even if the database is closed
2010-04-16 14:53:32 -07:00
Vasu Nori
0dbb9cee58 accept close() on database objects even if the database is closed
bug:2602878
Change-Id: I3075f801ef35d72792ff3daaa1e887e53b58f5f8
2010-04-16 14:24:57 -07:00
Mike Reed
e0a4068640 am f066611a: retool resize logic to use max dimension and max area.
Merge commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a' into froyo-plus-aosp

* commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a':
  retool resize logic to use max dimension and max area.
2010-04-16 12:24:09 -07:00
Mike Reed
f066611aab retool resize logic to use max dimension and max area.
Change-Id: I32446b41afe9e7c241868c0cb7b9b7d9056b2d38
http://b/issue?id=2598253
2010-04-16 15:19:02 -04:00
Mike LeBeau
f04be52a38 am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp

* commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
  For search suggestions in the search dialog, allow the 'title'
2010-04-16 07:27:34 -07:00
Mike LeBeau
0c5ad4f1b3 Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo 2010-04-16 07:23:12 -07:00
Dianne Hackborn
292bdbd9c4 am e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp

* commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
  A little more improvement of the Service javadoc.
2010-04-15 13:36:44 -07:00
Dianne Hackborn
e3094117a0 Merge "A little more improvement of the Service javadoc." into froyo 2010-04-15 13:33:21 -07:00
Robert Greenwalt
d65d5f114f am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit 'bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp

* commit 'bf943f296864d9647268fb5a55805ebf1fcba173':
  Fix SntpClient to give accurate time info.
2010-04-15 13:33:03 -07:00
Robert Greenwalt
499a121c13 Fix SntpClient to give accurate time info.
Old calc was off by 2x and was affected by the user-settable system clock.  The error
came because it was calculating the offset between our clock and the NTP clock and the algebra
had two factors of the offset instead of the desired 1.

bug:2600010
Change-Id: I0856091d32b50e6909e4889fb98df819e0aeabbe
2010-04-15 12:31:55 -07:00
Dianne Hackborn
ee3bcc4c64 A little more improvement of the Service javadoc.
Change-Id: I15fb191a26f2ef86a2bf553177cb2d08905adb1c
2010-04-15 12:22:01 -07:00
Mike LeBeau
70b3fb4a77 For search suggestions in the search dialog, allow the 'title'
line of text to be up to 2 lines (rather than the usual 1) if
no 'description' line is provided.

Change-Id: Ibc60d72868a4ad9630d38ee9b8cfe3f37c736e64
2010-04-15 11:35:47 -04:00
Dmitri Plotnikov
13932d8506 am 5304d8fd: Merge "Introducing "strict project map"." into froyo
Merge commit '5304d8fdc9064f2831ef16db9242f17110287997' into froyo-plus-aosp

* commit '5304d8fdc9064f2831ef16db9242f17110287997':
  Introducing "strict project map".
2010-04-14 18:36:36 -07:00
Dmitri Plotnikov
5304d8fdc9 Merge "Introducing "strict project map"." into froyo 2010-04-14 18:33:54 -07:00
Vasu Nori
bad5f620df am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo
Merge commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63' into froyo-plus-aosp

* commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63':
  verify database state before calling sqlite. Bug:2593970
2010-04-14 16:27:04 -07:00
Grace Kloba
e35a45b761 am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo
Merge commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7' into froyo-plus-aosp

* commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7':
  Pass WebKit scrollbar mode to Java. When scrollbar
2010-04-14 16:26:55 -07:00
Dmitri Plotnikov
40eb4aad2b Introducing "strict project map".
Change-Id: I147e10ac6475badf1d21e2c27d1cedbb27bd49df
2010-04-14 16:10:22 -07:00
Vasu Nori
0bbcdc6c5f Merge "verify database state before calling sqlite. Bug:2593970" into froyo 2010-04-14 15:53:43 -07:00
Grace Kloba
8a878dde9d Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don't trigger scroll." into froyo 2010-04-14 12:44:05 -07:00
Andrei Popescu
6083f5eb1b am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo
Merge commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412' into froyo-plus-aosp

* commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412':
  Make sure the onended event is dispatched even when
2010-04-14 12:04:13 -07:00
Dianne Hackborn
11d7502b35 am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo
Merge commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee' into froyo-plus-aosp

* commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee':
  Fix issue #593153: Broadcast time out when sending...
2010-04-14 12:04:07 -07:00
Leon Scroggins
876a5dfe3b am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Merge commit 'b2212464a3bc4103a9e5e88602d1097c835d7949' into froyo-plus-aosp

* commit 'b2212464a3bc4103a9e5e88602d1097c835d7949':
  Ensure the selection does not change in setTextAndKeepSelection.
2010-04-14 12:02:53 -07:00
Kristian Monsen
a18df1341e am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo
Merge commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e' into froyo-plus-aosp

* commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e':
  Fix for 2585858, load invalid urls.
2010-04-14 12:02:10 -07:00
Kristian Monsen
3e360000fc am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo
Merge commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f' into froyo-plus-aosp

* commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f':
  Fix (again) for bug 2558156, update cache encoding correctly
2010-04-14 12:02:01 -07:00
Andrei Popescu
01e3feaf54 Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo 2010-04-14 10:26:58 -07:00
Dianne Hackborn
399cccb857 Fix issue #593153: Broadcast time out when sending...
...ordered broadcast for ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE

Turns out this was because the broadcast receiver for ContextImpl was
not correctly being created, so when it received an ordered broadcast
it would not tell the activity manager when it was done.

This is now fixed, along with a ton of superficial changes to debug
output to help track this down and a little cleanup of dealing with
error cases in dispatching broadcasts.  Also a fix for a NPE when
dumping the broadcast state.

Finally, a little fiddling with package manager to get rid of a lot
of the noise when removing and re-adding packages on the SD card.

Change-Id: I961c14836dc613d3ea8122b6e910ef866e7fcb25
2010-04-14 09:54:21 -07:00
Andrei Popescu
c4fbceb57b Make sure the onended event is dispatched even when
the user dismisses the video before it plays to completion.

Fix bug: 2533272

Change-Id: I73f216f4f416f5fdca0bbba2244b88666f8f6eac
2010-04-14 17:31:17 +01:00
Leon Scroggins
b2212464a3 Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 2010-04-14 06:42:20 -07:00
Kristian Monsen
d503a1524a Merge "Fix for 2585858, load invalid urls." into froyo 2010-04-14 02:22:18 -07:00
Kristian Monsen
53c0c0daf4 Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 2010-04-14 02:22:05 -07:00
Grace Kloba
50004bcd4b Pass WebKit scrollbar mode to Java. When scrollbar
is alwaysOff, don't trigger scroll.

If there is no horizontal and vertical scrollbar,
don't trigger the zoom control neither.

Fix http://b/issue?id=2512549
2010-04-13 22:58:51 -07:00
Dianne Hackborn
7b16f95cd2 am 8e1f2f88: Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo
Merge commit '8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293' into froyo-plus-aosp

* commit '8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293':
  Fix issue #2555171: Switching to app immediately after unmounting...
2010-04-13 18:10:35 -07:00
Dianne Hackborn
53d9264de4 Fix issue #2555171: Switching to app immediately after unmounting...
...SD card causes reboot.

Add option to not include temporarily unavailable recent tasks,
for the recent tasks UI to not display them.

Change-Id: I1495ca217b4292fd56f537459b44c0624262c292
2010-04-13 17:35:22 -07:00
Grace Kloba
53a37509c3 am ba6339fe: Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can\'t depend on contentToView() to convert the doc point to the view point. When we originally convert the
Merge commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2' into froyo-plus-aosp

* commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2':
  If we defer processing the touch events, pass the
2010-04-13 17:24:04 -07:00
Grace Kloba
ba6339fe2b Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can't depend on contentToView() to convert the doc point to the view point. When we originally convert the view to doc, the scroll position in UI doesn't change. When we convert the doc back to view, we are chasing a moving target. That is why we saw bigger delta." into froyo 2010-04-13 17:20:29 -07:00
Grace Kloba
102ed89dbc If we defer processing the touch events, pass the
original view coordinate with TouchEventData and use
them when we reprocess the events. We can't depend
on contentToView() to convert the doc point to the
view point. When we originally convert the view to
doc, the scroll position in UI doesn't change. When
we convert the doc back to view, we are chasing a
moving target. That is why we saw bigger delta.

Fix  http://b/issue?id=2577274
2010-04-13 16:27:41 -07:00