8483 Commits

Author SHA1 Message Date
Grace Kloba
20fa839d2b am 19fa6d45: am 738a0460: Merge "Don\'t inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo
Merge commit '19fa6d4586df8ff7897fcc73b2228b431502d58e' into kraken

* commit '19fa6d4586df8ff7897fcc73b2228b431502d58e':
  Don't inflate the zoom button controller until we
2010-04-20 11:47:31 -07:00
Grace Kloba
19fa6d4586 am 738a0460: Merge "Don\'t inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo
Merge commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a' into froyo-plus-aosp

* commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a':
  Don't inflate the zoom button controller until we
2010-04-20 11:43:18 -07:00
Grace Kloba
f4c66efa20 Don't inflate the zoom button controller until we
are going to show it. This should shave 5% of Browser
start up time on Sapphire.

Fix http://b/issue?id=2604295
2010-04-20 11:23:50 -07:00
Daisuke Miyakawa
72c0a3cf28 am e3172405: am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.
Merge commit 'e31724050041b4be41b7c868d531a6c00fd94587' into kraken

* commit 'e31724050041b4be41b7c868d531a6c00fd94587':
  Make vCard allow users to refrain image export. Useful when
2010-04-19 18:59:20 -07:00
Daisuke Miyakawa
e317240500 am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.
Merge commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8' into froyo-plus-aosp

* commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8':
  Make vCard allow users to refrain image export. Useful when
2010-04-19 18:52:07 -07:00
Daisuke Miyakawa
c86f0779d6 Make vCard allow users to refrain image export. Useful when
receivers cannot accept image data.

Bug: 2603200
Change-Id: I3c490b2de37ebb2780df4a27a440df3b0afacb3a
2010-04-20 09:53:30 +09:00
Grace Kloba
fcc08fb8ed am 8831d4dc: am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo
Merge commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken

* commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45':
  Update the comment which supposed to be checked in
2010-04-19 16:19:30 -07:00
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
8dc38941b4 am 7f30f8ab: am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Merge commit '7f30f8abe3161ae912c3475aa89ad14388f576d7' into kraken

* commit '7f30f8abe3161ae912c3475aa89ad14388f576d7':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
2010-04-19 15:41:05 -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
4a77f9e9a2 am e3ce4c89: am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Merge commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7' into kraken

* commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7':
  Remove fixed size restriction on the SurfaceView
2010-04-19 13:21:58 -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
e5afb10cca am 66fa5cc7: am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo
Merge commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken

* commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a':
  Force redraw in touch_up if there is a move.
2010-04-19 12:23:54 -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
eb94c44c0f am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo
Merge commit '17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken

* commit '17e36d233dff7178e60d841a650d9bef5d0af93c':
  Missed a case to resumeUpdatePicture.
2010-04-16 16:40:54 -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
99d43435b6 am 66bee813: am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo
Merge commit '66bee81321f16a3268adc43f5f87fcfbf8c27290' into kraken

* commit '66bee81321f16a3268adc43f5f87fcfbf8c27290':
  accept close() on database objects even if the database is closed
2010-04-16 14:57:26 -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
3edf3a567e am e0a40686: am f066611a: retool resize logic to use max dimension and max area.
Merge commit 'e0a4068640cff64abcd3a70395ad461919b15ea6' into kraken

* commit 'e0a4068640cff64abcd3a70395ad461919b15ea6':
  retool resize logic to use max dimension and max area.
2010-04-16 12:26:52 -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
5fee638e4b am f04be52a: 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 'f04be52a382544ff8006e227c1578a219ba0f23e' into kraken

* commit 'f04be52a382544ff8006e227c1578a219ba0f23e':
  For search suggestions in the search dialog, allow the 'title'
2010-04-16 07:30:18 -07: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
e02ffa34a8 am 292bdbd9: am e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293' into kraken

* commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293':
  A little more improvement of the Service javadoc.
2010-04-15 13:39:16 -07:00
Robert Greenwalt
007302adeb am d65d5f11: am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72' into kraken

* commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72':
  Fix SntpClient to give accurate time info.
2010-04-15 13:37:31 -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
949c34854a am 13932d85: am 5304d8fd: Merge "Introducing "strict project map"." into froyo
Merge commit '13932d85066f191db09c4a2fecfa563f0d63d7b7' into kraken

* commit '13932d85066f191db09c4a2fecfa563f0d63d7b7':
  Introducing "strict project map".
2010-04-14 18:40:17 -07: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
9d3b3e1324 am bad5f620: am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo
Merge commit 'bad5f620df13ae41374e05cad0a391ab084664c4' into kraken

* commit 'bad5f620df13ae41374e05cad0a391ab084664c4':
  verify database state before calling sqlite. Bug:2593970
2010-04-14 16:33:32 -07:00
Grace Kloba
8579f2114a am e35a45b7: am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo
Merge commit 'e35a45b761ee38c04181bff0a72a6501101bf181' into kraken

* commit 'e35a45b761ee38c04181bff0a72a6501101bf181':
  Pass WebKit scrollbar mode to Java. When scrollbar
2010-04-14 16:33:27 -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