13620 Commits

Author SHA1 Message Date
Michael Jurka
c77ffe608d Merge "fixing bug where changing alpha on one textview changed alpha on all other textviews with the same drawable" 2010-09-15 19:44:29 -07:00
Wu-cheng Li
606c3de595 am d63d7474: am 3fd5fa4c: Fix the runtime restart due to name change.
Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f'

* commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f':
  Fix the runtime restart due to name change.
2010-09-15 19:11:05 -07:00
Erik
ffc9bf68d6 am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'

* commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
  b/3004029 Fixed content resolver loss
2010-09-15 19:10:10 -07:00
Erik
d0f81ea95c am 42e72e57: am 344d9663: Merge "Close tz query cursor when done." into gingerbread
Merge commit '42e72e570b66c3bed316a9e7a766d2f8fc986ae6'

* commit '42e72e570b66c3bed316a9e7a766d2f8fc986ae6':
  Close tz query cursor when done.
2010-09-15 19:10:04 -07:00
Wu-cheng Li
16d508acb3 am 4db458b4: am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
Merge commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548'

* commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548':
  Update camera API and javadoc for API review comments.
2010-09-15 19:03:01 -07:00
Michael Jurka
406f0522e5 fixing bug where changing alpha on one textview
changed alpha on all other textviews with the 
same drawable

Change-Id: I19c808c59654da9ed907d1356bbefe3d9926add0
2010-09-15 18:51:22 -07:00
David Brown
b6f8989385 am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '0237cf2eace5d35410e95f586fd40c3068c94582'

* commit '0237cf2eace5d35410e95f586fd40c3068c94582':
  Mark MODIFY_PHONE_STATE permission as signatureOrSystem
2010-09-15 17:43:34 -07:00
Wu-cheng Li
d63d74749f am 3fd5fa4c: Fix the runtime restart due to name change.
Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp

* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
  Fix the runtime restart due to name change.
2010-09-15 17:24:40 -07:00
Wu-cheng Li
3fd5fa4ca9 Fix the runtime restart due to name change.
bug:3001395
bug:3001399
Change-Id: I73fd1a63fea0807531b01ae2a754b32efffd41b1
2010-09-15 16:08:57 -07:00
Erik
bfbab8ca36 am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
Merge commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b' into gingerbread-plus-aosp

* commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b':
  b/3004029 Fixed content resolver loss
2010-09-15 15:54:27 -07:00
Erik
42e72e570b am 344d9663: Merge "Close tz query cursor when done." into gingerbread
Merge commit '344d96635ec40e0c541f32064f42c8ad38e4505a' into gingerbread-plus-aosp

* commit '344d96635ec40e0c541f32064f42c8ad38e4505a':
  Close tz query cursor when done.
2010-09-15 15:54:22 -07:00
Erik
a8cc20e5fb Merge "b/3004029 Fixed content resolver loss" into gingerbread 2010-09-15 15:51:53 -07:00
Erik
344d96635e Merge "Close tz query cursor when done." into gingerbread 2010-09-15 15:51:37 -07:00
Erik
09bd4bf85e b/3004029 Fixed content resolver loss
We were creating a static AsyncQueryHandler which only held a
weak reference to the content resolver. This caused db updates
to be dropped once the original context had been gc'd. This
fix creates a new handler for each update to ensure we have a
valid resolver.

Change-Id: I049d8390ac0215e12e63d57b0bae4d3f6df64b6a
2010-09-15 15:45:19 -07:00
Chet Haase
5ae52f68cf am 8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread
Merge commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9' into gingerbread-plus-aosp

* commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9':
  Add new/changed drawable assets from design team
2010-09-15 15:36:58 -07:00
Chet Haase
8f385affaf Merge "Add new/changed drawable assets from design team" into gingerbread 2010-09-15 15:33:31 -07:00
Vasu Nori
5e89ae29f0 fix compiled statement bugs, synchronization bugs
1. when LRU cache wants to remove the eldest entry, it may be finalizing
a statement that is still in use
2. a couple of synchronization issues.
3. a bit code refactoring in SQLiteCompiledSql
4. remove a bunch of unsed debug code from SQLiteDatabase

Change-Id: I45454dc2dbadd7d8842ba77dd2b0e9ff138ec6f4
2010-09-15 15:30:24 -07:00
Chet Haase
0183e3bd5d Add new/changed drawable assets from design team
Change-Id: I8b2274357e41093e120bee42272026446e94872d
2010-09-15 15:27:25 -07:00
Wu-cheng Li
4db458b4f7 am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp

* commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57':
  Update camera API and javadoc for API review comments.
2010-09-15 15:01:09 -07:00
Wu-cheng Li
7836660f5e Update camera API and javadoc for API review comments.
bug:3001395
bug:3001399
Change-Id: I7030c4eff94ab11f44b862e8c206fb69a4e5c428
2010-09-15 14:47:37 -07:00
Adam Powell
0b2d306e70 Style new popup widgets.
Change-Id: I208ed292afd9919071778baa9ea61d7ca9e7743c
2010-09-15 14:39:48 -07:00
Paul Westbrook
a29d8394f1 Merge "Enable downloads of https urls" 2010-09-15 14:23:28 -07:00
Paul Westbrook
86a6019f02 Enable downloads of https urls
Bug: 3001890
Change-Id: Ibb2bc5c8efe90744a3b6f76bd31c3199a7365827
2010-09-15 13:37:46 -07:00
Erik
5ba5de93c7 Close tz query cursor when done.
Change-Id: I9cb30539b12121f01e093985985e3c802f7a9e8c
2010-09-15 13:37:19 -07:00
Makoto Onuki
90bf7c7916 Add AbstractCursor.getNotificationUri.
We'll need it for some tests.

Change-Id: I5db9f570d8ff2f58c73654fbe4a6df881894f865
2010-09-15 13:21:51 -07:00
Erik
ac212158f0 am 0b46070d: am 426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f'

* commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f':
  Fixes some bugs in TimeZoneUtils
2010-09-15 12:32:46 -07:00
Jeff Brown
49478536b6 am 14bc6b5d: am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '14bc6b5d0677e5c454a67775c852f90389bb4567'

* commit '14bc6b5d0677e5c454a67775c852f90389bb4567':
  Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-15 12:32:29 -07:00
Erik
088fbbc7b6 am 86e19914: am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
Merge commit '86e1991428c2bc78354965c51b2821ae16f32a55'

* commit '86e1991428c2bc78354965c51b2821ae16f32a55':
  Adds time zone functionality into fw as a hidden api
2010-09-15 11:38:26 -07:00
Dianne Hackborn
a6555fd4b1 am 264e7277: am 934516e1: Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread
Merge commit '264e727775728d0478fcb95855e8ea3801f34c8f'

* commit '264e727775728d0478fcb95855e8ea3801f34c8f':
  Fix issue #2999795: Runtime restart on Crespo
2010-09-15 11:38:02 -07:00
Brad Fitzpatrick
b835d9abd6 am f26ac1f8: am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c'

* commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c':
  Unify some duplicate StrictMode-enabling code.
2010-09-15 11:37:54 -07:00
Romain Guy
9ec0c471c1 am 282315e1: am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
Merge commit '282315e154b63a2eec84609600c81ad9e1c72994'

* commit '282315e154b63a2eec84609600c81ad9e1c72994':
  Change the keep alive time for excess idle threads.
2010-09-15 11:37:37 -07:00
Brian Carlstrom
b3f23da320 am e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0'

* commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-15 11:37:22 -07:00
Brian Carlstrom
7352c8bb42 am 0535d857: am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '0535d8577fb2a3687428f462c591ae3220e1f773'

* commit '0535d8577fb2a3687428f462c591ae3220e1f773':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-15 11:36:58 -07:00
David Brown
0237cf2eac am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp

* commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed':
  Mark MODIFY_PHONE_STATE permission as signatureOrSystem
2010-09-15 11:15:14 -07:00
David Brown
8626d1a336 Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread 2010-09-15 11:11:18 -07:00
Dianne Hackborn
d0fa371f27 Add a new "activated" state to View.
Use this in ListView and GridView if the top view is not checkable.

This allows PreferenceActivity to now highlight the current heading
that is being shown.

Change-Id: I0d28aded9a61a42962b4aece420ae4058712d963
2010-09-15 11:00:44 -07:00
Daisuke Miyakawa
53b34a096b Merge "Take apart LocalePicker#onListItemClick() into two" 2010-09-15 10:54:42 -07:00
Daisuke Miyakawa
88b7349125 Take apart LocalePicker#onListItemClick() into two
It takes some time when Locale is actually switched by the system,
which looks "system halt". Previous implementation doesn't allow
developers to cope with the situation and they just had to let
users wait for a moment.

This change allows the LocalePicker users (developers) to hook
the item change and delay the actual halt. If they don't want it,
calling updateLocale() immediately works fine.

Related
- I29685118467bd2a68b80abcf234f91098839be0b
- Iba7378e51e6d5318e901045ebeda63ea954a0647

Change-Id: I4062a70e11600d87e889b40d30796387c7069e21
2010-09-15 09:21:25 -07:00
Leon Scroggins
366622b165 Merge "Exit action mode when destroying the WebView or loading." 2010-09-15 08:47:57 -07:00
Leon Scroggins
05919f2133 Exit action mode when destroying the WebView or loading.
Bug: 3000317

Change-Id: I7f131d5c159058c33c3249ee4e0fee3a667ec6d8
2010-09-15 11:43:49 -04:00
Irfan Sheriff
3a79c53a25 Merge "Add per network static IP settings" 2010-09-15 08:31:03 -07:00
Leon Scroggins III
ad533cd555 am 720d5985: am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '720d5985f5d31912c97b7e549230d241e58c1298'

* commit '720d5985f5d31912c97b7e549230d241e58c1298':
  Add an option to hide the Voice Search icon.
2010-09-15 07:08:49 -07:00
Jaikumar Ganesh
ea8e8d7342 am b390728b: am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
Merge commit 'b390728b54805ecba3e0690edf2b83b60933e6a7'

* commit 'b390728b54805ecba3e0690edf2b83b60933e6a7':
  Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-15 07:07:38 -07:00
Chris Palmer
c5e2e26b9d am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp

* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
  DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-14 17:45:59 -07:00
Chris Palmer
5bade703fd Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 2010-09-14 17:43:31 -07:00
Vasu Nori
c62c8ae192 Merge "fix bugs in exception throwing code in native_fillwindow" 2010-09-14 16:40:24 -07:00
Vasu Nori
77267fc68f fix bugs in exception throwing code in native_fillwindow
when exceptions are thrown, they are not being handled correctly
and the end result is some random errors/exceptions.
also change LOGD to LOGD_IF(cond,...) in keeping with Android
standards

Change-Id: Ie7f5e5e4b071ca6b2a6aa899c678c81f9ccd8e71
2010-09-14 16:38:01 -07:00
David Brown
f4ece2086f Mark MODIFY_PHONE_STATE permission as signatureOrSystem
This permission isn't needed right now, since there aren't actually any
public APIs that require it.  (There are a few calls in the ITelephony
interface that do, but they're all hidden.)

Since there's no good reason for 3rd party apps to declare it, let's
mark it signatureOrSystem for now.  We can bring it back -- and probably
split it apart into multiple finer-grained permissions -- once we
finally expose full telephony APIs to 3rd party apps (see bug 1043005).

Bug: 2989096
Change-Id: Idf898d5e12d648a959f622cd815e75597195aa82
2010-09-14 16:19:31 -07:00
Erik
0b46070d88 am 426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp

* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
  Fixes some bugs in TimeZoneUtils
2010-09-14 16:19:03 -07:00
Irfan Sheriff
31b62322bf Add per network static IP settings
Remove the existing global static IP settings and add support
for per network configuration

Change-Id: I5a6d8b877471b8c8ad07951c96d273893754607f
2010-09-14 16:15:22 -07:00