Commit Graph

11157 Commits

Author SHA1 Message Date
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
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
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
Vasu Nori
071df261ed change TAG value from "Cursor" to "SQLiteCursor"
it is confusing to figure out where the debug messages are coming from.
this TAG value change helps

Change-Id: I3a6f445fbced4a962cc13dbb8dd1d7968f9aec9d
2010-09-14 16:02:02 -07:00
Jaikumar Ganesh
4c9a5be4a3 Merge "Rework Bluetooth tethering networking configuration." 2010-09-14 15:27:47 -07:00
Jaikumar Ganesh
707952ecd4 Rework Bluetooth tethering networking configuration.
Limit it to 5 for now, and store the iface.

Change-Id: Ia6044b8e8f886dcd587ab0bb57273e0c11b6cd74
2010-09-14 15:25:14 -07:00
Adam Powell
6fe4e3fd36 Merge "Improve ListView smooth scrolling timing" 2010-09-14 15:14:56 -07:00
Adam Powell
234a571530 Improve ListView smooth scrolling timing
Change-Id: Icbd727efd5bafa1a80d65003aead1697f6103fda
2010-09-14 15:12:11 -07:00
Vasu Nori
a4ab724b48 Merge "revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5" 2010-09-14 13:37:57 -07:00
Shimeng (Simon) Wang
cbce2e7da4 Merge "Fix comment." 2010-09-14 13:37:37 -07:00
Vasu Nori
b83cb7cda3 revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5
can't change return type from void to int.

Change-Id: Iec3d95c731f117aca20b29c719cef7bcc6356ac0
2010-09-14 13:36:01 -07:00
Shimeng (Simon) Wang
7924a4a3a0 Fix comment.
Change-Id: I927565aadc7f4a5aac6c0a11c28210440600e8a4
2010-09-14 13:20:46 -07:00
Vasu Nori
5402590f1c change return type from void to int on execSQL() methods
1. let execSQL() methods return the number of rows affected by the SQL
staement executed.
2. remove synchronized on 2 public methods. since public API is not
supposed to have synchronized, this was a mistake in previously submitted
CL

Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5
2010-09-14 12:14:26 -07:00
Vasu Nori
b729dcc8a9 Revert "caching code retooled to reduce locking + handle SMP"
This reverts commit 992f7d52fa.

Change-Id: Ia5b789d1b2195d6ce43baffe24296c857f9b30f6
2010-09-14 11:55:24 -07:00
Romain Guy
282315e154 am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
Merge commit '52e19d5917b8f057131c1dc8b3eb772febd791d9' into gingerbread-plus-aosp

* commit '52e19d5917b8f057131c1dc8b3eb772febd791d9':
  Change the keep alive time for excess idle threads.
2010-09-14 11:36:55 -07:00
Romain Guy
52e19d5917 Merge "Change the keep alive time for excess idle threads." into gingerbread 2010-09-14 11:34:01 -07:00
Romain Guy
6b424f4770 Change the keep alive time for excess idle threads.
Change-Id: Ie076544df5ee8df185f0824333fdc62203a565c2
2010-09-14 11:30:27 -07:00
Brian Carlstrom
e68f8b7ebe am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp

* commit '405d4db50b3db1fc5e015475218e190d193332d4':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-14 11:29:57 -07:00
Brian Carlstrom
405d4db50b Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Bug: 2672817
Change-Id: Ibe20830f024f76232f3628cfca922d49a5a06bef
2010-09-14 11:24:13 -07:00
Brian Carlstrom
0535d8577f am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp

* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -07:00
Brian Carlstrom
9412623842 Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread 2010-09-14 11:15:01 -07:00
Amith Yamasani
9322775014 Add a missing setOnCloseListener and a new setIconfied method.
Keep track of the currently iconified state as well, if the app
wants to know.
2010-09-14 10:55:10 -07:00
Leon Scroggins III
720d5985f5 am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp

* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
  Add an option to hide the Voice Search icon.
2010-09-14 10:26:44 -07:00
Leon Scroggins III
901b7b9b17 am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread

* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
  Add an option to hide the Voice Search icon.
2010-09-14 10:23:35 -07:00
Vasu Nori
9a68713ca0 Merge "sql statement with syntax errors can leave database lock in bad state" 2010-09-14 10:04:13 -07:00
Jaikumar Ganesh
b390728b54 am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
Merge commit 'a224f70b1efc29d9698da5b5c143251a43838f2b' into gingerbread-plus-aosp

* commit 'a224f70b1efc29d9698da5b5c143251a43838f2b':
  Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-14 09:43:31 -07:00
Leon Scroggins III
4a02800946 Add an option to hide the Voice Search icon.
Some search engines do not support voice search, so provide a flag
to disable showing the icon in the SearchDialog.

Change-Id: I7ef4ad5d382edb86c08014260defa4af6d5eca0a
2010-09-14 10:56:25 -04:00
Brian Carlstrom
2c42c8fbaf Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
Bug: 2672817

Change-Id: If5f10fa16eaf5676a0c1540463759cd4e0e837de
2010-09-14 00:11:14 -07:00
Dianne Hackborn
a21e3da559 Fix issue #2967969: Crash rotating screen on "delete account" dialog
- Have PreferenceActivity save and restore its header state.
- Keep track of the current header selection.
- When headers are updated, try to retain the current header selection.

Also fix issue #2995541: Cannot add new contact.  We were not allowing
fragment transactions in some cases.

Change-Id: I4aa4c703ed5f4ecf9f425cd7eeea4740c6360ce9
2010-09-13 22:49:54 -07:00
Jaikumar Ganesh
a224f70b1e Fix interaction between BluetoothEventLoop and BluetoothService.
BluetoothEventLoop primarily handles event notifications from Bluez.
It should know innards of Bonding and especially BondState.
BondState class and BluetoothService call into each other.
When BluetoothEvent loop gets the handle to BondState it leads
to deadlocks and ANRs.

Change-Id: I785c57f6246c1288350d26d4acb87d879b27a5f9
2010-09-13 21:58:10 -07:00
Dianne Hackborn
ade9916d5c resolved conflicts for merge of 6421ae7e to master
Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
2010-09-13 21:41:57 -07:00
Adam Powell
5f12084daa Merge "Fix bug 2995805 - splitMotionEvents behavior change" 2010-09-13 18:18:47 -07:00
Adam Powell
167bc821dd Fix bug 2995805 - splitMotionEvents behavior change
Changed the new split motion events behavior to match the enshrined
behavior. A return value of false from a target's dispatchTouchEvent
will not prevent the target from receiving further events in the
gesture unless it is the initial ACTION_DOWN event.

Change-Id: Ied8d531dfec7009a4124ed670b1700753c3f9caa
2010-09-13 18:11:08 -07:00
Dianne Hackborn
6421ae7eff am 5251c800: Merge "Fix potential crash in sync." into gingerbread
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp

* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
  Fix potential crash in sync.
2010-09-13 17:26:34 -07:00
Dianne Hackborn
5251c800c9 Merge "Fix potential crash in sync." into gingerbread 2010-09-13 17:21:04 -07:00
Dianne Hackborn
50addddba5 Fix potential crash in sync.
Change-Id: I523d8faa24b7ba57dcc09cbe91b5cb91d9f6f262
2010-09-13 17:12:51 -07:00
Dianne Hackborn
e746f03c6c resolved conflicts for merge of 53686433 to master
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
2010-09-13 16:56:10 -07:00
Adam Powell
59a29f4a6c am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
Merge commit 'b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp

* commit 'b07c078921fb917d33075a63d77fdf98221e2bac':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
2010-09-13 16:11:55 -07:00
Adam Powell
57361ef001 DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
Change-Id: I03cc18616dec05eb9e0383dc02371366c70cc12b
2010-09-13 16:08:35 -07:00
Vasu Nori
d31211fd46 sql statement with syntax errors can leave database lock in bad state
bug:2995940
Change-Id: I8571943cb278bbc622b04549478badb56e5f7573
2010-09-13 15:47:49 -07:00
Jaikumar Ganesh
1510770165 Add missing return statement.
Change-Id: Iee4ee8a62c5c85176c457bd674ac25acdf978ae9
2010-09-13 15:24:01 -07:00