Commit Graph

5973 Commits

Author SHA1 Message Date
Fred Quintana
5db771f49c am fbbe2cd2: am 055e4ea5: Merge change Ief544bc6 into eclair-mr2
Merge commit 'fbbe2cd28a7185fb1a64d780a8839494f9cbe866'

* commit 'fbbe2cd28a7185fb1a64d780a8839494f9cbe866':
  fix grammar in the grant permissions UI
2009-10-16 11:36:00 -07:00
Fred Quintana
fbbe2cd28a am 055e4ea5: Merge change Ief544bc6 into eclair-mr2
Merge commit '055e4ea56c42e714dc471d86311f64437f4ed786' into eclair-mr2-plus-aosp

* commit '055e4ea56c42e714dc471d86311f64437f4ed786':
  fix grammar in the grant permissions UI
2009-10-16 11:26:20 -07:00
Android (Google) Code Review
055e4ea56c Merge change Ief544bc6 into eclair-mr2
* changes:
  fix grammar in the grant permissions UI
2009-10-16 14:16:13 -04:00
Mike Lockwood
77b722b60f am 5e6aa492: am 2086152c: am f55aa972: Merge change I01935be3 into eclair
Merge commit '5e6aa492b78f38d0dabaaa1559e2a3afe5259d74'

* commit '5e6aa492b78f38d0dabaaa1559e2a3afe5259d74':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:59:13 -07:00
Mike Lockwood
5e6aa492b7 am 2086152c: am f55aa972: Merge change I01935be3 into eclair
Merge commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b' into eclair-mr2-plus-aosp

* commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:48:30 -07:00
Mike Lockwood
2086152c1b am f55aa972: Merge change I01935be3 into eclair
Merge commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542' into eclair-mr2

* commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:38:03 -07:00
Android (Google) Code Review
f55aa972f9 Merge change I01935be3 into eclair
* changes:
  Remove PowerManager.setAutoBrightness()
2009-10-16 12:29:15 -04:00
Mike Lockwood
dc3494e3d8 Remove PowerManager.setAutoBrightness()
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Add SCREEN_BRIGHTNESS_MODE_MANUAL and SCREEN_BRIGHTNESS_MODE_AUTOMATIC constants.

Change-Id: I01935be3fcb48cf76392d2c594205cb47babc5b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-16 07:42:26 -07:00
Cary Clark
39e6773431 do not merge: fix copy/paste using trackball on passion
This fix is alrady in mr2. It does not affect sholes --
this is a trackball only bug.

The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.

Clicking the trackball at the end of selecting text no longer
sends a click event.

Requires a companion fix in external/webkit
Fixes http://b/issue?id=2187591
2009-10-16 09:27:47 -04:00
Patrick Scott
8a7df536ae am 93968f43: am e1f43dad: Share chunks between all ByteArrayBuilders.
Merge commit '93968f43aff775395f71b7e03316dad6c4bea473'

* commit '93968f43aff775395f71b7e03316dad6c4bea473':
  Share chunks between all ByteArrayBuilders.
2009-10-16 05:37:01 -07:00
Patrick Scott
93968f43af am e1f43dad: Share chunks between all ByteArrayBuilders.
Merge commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12' into eclair-mr2-plus-aosp

* commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12':
  Share chunks between all ByteArrayBuilders.
2009-10-16 05:31:59 -07:00
Patrick Scott
e1f43dadb9 Share chunks between all ByteArrayBuilders.
If a single ByteArrayBuilder accumulates many chunks, it is possible that many
of those chunks will not be reused and will just take up memory in the pool. If
the pool is shared across all instances, fewer chunks need to be allocated. This
allows a site like http://www.606studios.com/bendisboard/showthread.php?t=170286
to load without crashing due to OOM.

The shared pool contains SoftReferences to each chunk. If the vm feels memory
pressure, it is allowed to mark these references for collection. Before
accessing the pool of chunks, I remove any queued references from the pool.

Cleanup ByteArrayBuilder a little by removing unused methods and fields.
Document some synchronization spots in LoadListener and add a lock when
downloading a certificate.

Bug: 1637965
2009-10-16 08:07:29 -04:00
Mike Lockwood
e9153d6507 am 8ab456b3: am df284aa5: am 37a13208: Add separate configuration flag for hardware ALS support.
Merge commit '8ab456b3fcb7e81af824a69daee31921d531696b'

* commit '8ab456b3fcb7e81af824a69daee31921d531696b':
  Add separate configuration flag for hardware ALS support.
2009-10-15 19:24:40 -07:00
Romain Guy
68608741d4 am 49f8a0ee: am 7d4134a1: am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95'

* commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 19:23:49 -07:00
Mike Lockwood
8ab456b3fc am df284aa5: am 37a13208: Add separate configuration flag for hardware ALS support.
Merge commit 'df284aa534bd5611684604c469c04b4db6bb42c7' into eclair-mr2-plus-aosp

* commit 'df284aa534bd5611684604c469c04b4db6bb42c7':
  Add separate configuration flag for hardware ALS support.
2009-10-15 19:14:32 -07:00
Romain Guy
49f8a0ee91 am 7d4134a1: am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '7d4134a1a67872c056d05330b1453395a7c8c4d1' into eclair-mr2-plus-aosp

* commit '7d4134a1a67872c056d05330b1453395a7c8c4d1':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 19:13:51 -07:00
Mike Lockwood
df284aa534 am 37a13208: Add separate configuration flag for hardware ALS support.
Merge commit '37a13208c93bbe00cf233baf1ebcd6e081972a27' into eclair-mr2

* commit '37a13208c93bbe00cf233baf1ebcd6e081972a27':
  Add separate configuration flag for hardware ALS support.
2009-10-15 19:06:52 -07:00
Mike Lockwood
37a13208c9 Add separate configuration flag for hardware ALS support.
A new flag config_hardware_automatic_brightness_available indicates
that the device has hardware support for automatic screen brightness management,
while config_automatic_brightness_available now indicates that automatic
brightness mode is available in general.

If config_automatic_brightness_available is true but config_hardware_automatic_brightness_available is false,
then automatic brightness mode support in PowerManager support will be used.

Bug b/2015734 (Ambient light sensor support in power manager)

Change-Id: I6cd888252043dd63df3c25a1d14c21a04a91ad28
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-15 19:58:33 -04:00
Romain Guy
7d4134a1a6 am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-mr2

* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 15:42:05 -07:00
Romain Guy
a8a720d8cd Fix possible NPE in the code that restores widgets' state.
Bug #2189714
Reviewed by: ryanpc

Change-Id: I0d74deb6dc8e90e3b0eafd6b3c16b0c557c72873
2009-10-15 15:09:26 -07:00
Fred Quintana
5edb466a62 fix grammar in the grant permissions UI 2009-10-15 13:59:22 -07:00
Leon Scroggins
94bda52a51 am f6411533: am be3feda4: Do not show soft keyboard for readonly textfields.
Merge commit 'f6411533ef8a4e6759dd214636ba3ab1ea25f774'

* commit 'f6411533ef8a4e6759dd214636ba3ab1ea25f774':
  Do not show soft keyboard for readonly textfields.
2009-10-15 13:17:18 -07:00
Leon Scroggins
f6411533ef am be3feda4: Do not show soft keyboard for readonly textfields.
Merge commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be' into eclair-mr2-plus-aosp

* commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be':
  Do not show soft keyboard for readonly textfields.
2009-10-15 13:07:40 -07:00
Cary Clark
3e1bfce7ff am 800ca40d: am 9f208824: Merge change I7f97011b into eclair-mr2
Merge commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5'

* commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5':
  check for native initialization before calling public function
2009-10-15 12:53:31 -07:00
Cary Clark
800ca40dfa am 9f208824: Merge change I7f97011b into eclair-mr2
Merge commit '9f2088240272086cd9eb94d01b1872a1088b76f2' into eclair-mr2-plus-aosp

* commit '9f2088240272086cd9eb94d01b1872a1088b76f2':
  check for native initialization before calling public function
2009-10-15 12:48:17 -07:00
Leon Scroggins
be3feda46e Do not show soft keyboard for readonly textfields.
Part of a fix for http://b/issue?id=2159869.  The request to show
the soft input has been moved to nativeTextInputMotionUp, where it
can check if the input field is readOnly.  This way it is also
handled by shortPressOnTextField, for when a user shortpresses
on the field.
2009-10-15 15:44:37 -04:00
Android (Google) Code Review
9f20882402 Merge change I7f97011b into eclair-mr2
* changes:
  check for native initialization before calling public function
2009-10-15 15:41:06 -04:00
Cary Clark
7f97011b55 check for native initialization before calling public function
Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.

These cases can be triggered by the monkey.

Fixes http://b/issue?id=2187719
2009-10-15 15:29:08 -04:00
Fred Quintana
901035acb6 am efe1910b: am 4874dcd4: Merge change I1a23191b into eclair-mr2
Merge commit 'efe1910b375d751a73c9c8d6204759731014cd8c'

* commit 'efe1910b375d751a73c9c8d6204759731014cd8c':
  fix build
2009-10-15 12:09:58 -07:00
Fred Quintana
efe1910b37 am 4874dcd4: Merge change I1a23191b into eclair-mr2
Merge commit '4874dcd417d7a07a8e802709c5d6895dc408d422' into eclair-mr2-plus-aosp

* commit '4874dcd417d7a07a8e802709c5d6895dc408d422':
  fix build
2009-10-15 11:41:21 -07:00
Android (Google) Code Review
4874dcd417 Merge change I1a23191b into eclair-mr2
* changes:
  fix build
2009-10-15 14:33:39 -04:00
Tom Taylor
458de6b00f am a5adb633: am 662e4991: Merge change I6719d39d into eclair-mr2
Merge commit 'a5adb63398a59aabaa03e4ddc9be3dbda55fdff7'

* commit 'a5adb63398a59aabaa03e4ddc9be3dbda55fdff7':
  Fix alert dialog separator
2009-10-15 11:32:25 -07:00
Fred Quintana
1a23191bbd fix build 2009-10-15 11:31:30 -07:00
Tom Taylor
a5adb63398 am 662e4991: Merge change I6719d39d into eclair-mr2
Merge commit '662e49912a0a6e2d3c33c2fef72309b165d775eb' into eclair-mr2-plus-aosp

* commit '662e49912a0a6e2d3c33c2fef72309b165d775eb':
  Fix alert dialog separator
2009-10-15 11:22:26 -07:00
Android (Google) Code Review
662e49912a Merge change I6719d39d into eclair-mr2
* changes:
  Fix alert dialog separator
2009-10-15 14:15:03 -04:00
Cary Clark
69661d3666 am fc52737e: am badd8399: fix copy/paste using trackball on passion
Merge commit 'fc52737ecc8f62b403d0ce534bc7f01fa9c6749a'

* commit 'fc52737ecc8f62b403d0ce534bc7f01fa9c6749a':
  fix copy/paste using trackball on passion
2009-10-15 11:12:54 -07:00
Cary Clark
fc52737ecc am badd8399: fix copy/paste using trackball on passion
Merge commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250' into eclair-mr2-plus-aosp

* commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250':
  fix copy/paste using trackball on passion
2009-10-15 11:02:27 -07:00
Tom Taylor
6719d39db1 Fix alert dialog separator
Update the line that separates the alert dialog's title from a custom view
with the correct asset to match the rest of the UI.
2009-10-15 11:01:26 -07:00
Cary Clark
badd8399ca fix copy/paste using trackball on passion
This fix should be considered for passion mr1, but
does not affect sholes -- this is a trackball only bug.

The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.

Clicking the trackball at the end of selecting text no longer
sends a click event.

Requires a companion fix in external/webkit
Fixes http://b/issue?id=2187591
2009-10-15 13:55:06 -04:00
Fred Quintana
462e1b5d6c am 033696e0: am 70d71fdc: Merge change Ib839afc3 into eclair-mr2
Merge commit '033696e0597b64e54c2efa82ac618d6e4228571f'

* commit '033696e0597b64e54c2efa82ac618d6e4228571f':
  remove the bind helper and bind directly
2009-10-15 10:29:55 -07:00
Fred Quintana
033696e059 am 70d71fdc: Merge change Ib839afc3 into eclair-mr2
Merge commit '70d71fdcbf365ed148f2f4252a6975851424637e' into eclair-mr2-plus-aosp

* commit '70d71fdcbf365ed148f2f4252a6975851424637e':
  remove the bind helper and bind directly
2009-10-15 10:24:29 -07:00
Android (Google) Code Review
70d71fdcbf Merge change Ib839afc3 into eclair-mr2
* changes:
  remove the bind helper and bind directly
2009-10-15 13:16:31 -04:00
Fred Quintana
2bc632bcf1 am 3ff0a5e5: am d753f070: Merge change I5d199964 into eclair-mr2
Merge commit '3ff0a5e55da0af3e120adbcc6ec3494d0905964e'

* commit '3ff0a5e55da0af3e120adbcc6ec3494d0905964e':
  add an IPC for sync initialization
2009-10-15 09:59:53 -07:00
Fred Quintana
3ff0a5e55d am d753f070: Merge change I5d199964 into eclair-mr2
Merge commit 'd753f070f73e41bcd316c562e3b807aaf4bf1017' into eclair-mr2-plus-aosp

* commit 'd753f070f73e41bcd316c562e3b807aaf4bf1017':
  add an IPC for sync initialization
2009-10-15 09:50:40 -07:00
Android (Google) Code Review
d753f070f7 Merge change I5d199964 into eclair-mr2
* changes:
  add an IPC for sync initialization
2009-10-15 12:43:23 -04:00
Christian Sonntag
7e60acdac2 am 144c8eb7: am e54ebd8c: Merge change I647ae75e into eclair-mr2
Merge commit '144c8eb7abbfcfdc7ffcc8caa57472b9b7dbda62'

* commit '144c8eb7abbfcfdc7ffcc8caa57472b9b7dbda62':
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.
2009-10-14 18:16:34 -07:00
Christian Sonntag
144c8eb7ab am e54ebd8c: Merge change I647ae75e into eclair-mr2
Merge commit 'e54ebd8c4f589a0a4a257a8d79b288dda67f3f8c' into eclair-mr2-plus-aosp

* commit 'e54ebd8c4f589a0a4a257a8d79b288dda67f3f8c':
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.
2009-10-14 18:11:22 -07:00
Daisuke Miyakawa
1867b9a4c0 am ca802b6e: am 8b12144d: Merge change I170c8251 into eclair-mr2
Merge commit 'ca802b6ed5f60d3abc38d103b1cbd35e8883c4ca'

* commit 'ca802b6ed5f60d3abc38d103b1cbd35e8883c4ca':
  Add tests and fix vCard code.
2009-10-14 16:56:21 -07:00
Android (Google) Code Review
e54ebd8c4f Merge change I647ae75e into eclair-mr2
* changes:
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps. after that apps restored via market/backup will be treated just like any other app and being synced with the server state.
2009-10-14 19:53:09 -04:00
Daisuke Miyakawa
ca802b6ed5 am 8b12144d: Merge change I170c8251 into eclair-mr2
Merge commit '8b12144dad94bc0807e20590d72b4aadc56189d4' into eclair-mr2-plus-aosp

* commit '8b12144dad94bc0807e20590d72b4aadc56189d4':
  Add tests and fix vCard code.
2009-10-14 16:46:09 -07:00