46817 Commits

Author SHA1 Message Date
Gilles Debunne
682e32b743 am 0a301f58: am 949d0c8c: Merge "Text handles positions\' are correctly updated." into honeycomb-mr1
* commit '0a301f58a2b09a3c8aa083574121d21f275f62b9':
  Text handles positions' are correctly updated.
2011-03-08 10:27:47 -08:00
Gilles Debunne
0a301f58a2 am 949d0c8c: Merge "Text handles positions\' are correctly updated." into honeycomb-mr1
* commit '949d0c8c384437d92fc1432b750da6da59df1fa7':
  Text handles positions' are correctly updated.
2011-03-08 10:24:30 -08:00
Gilles Debunne
830fbd6008 Merge "Removed unnecessary memory allocation in TextView." 2011-03-08 10:22:20 -08:00
Gilles Debunne
949d0c8c38 Merge "Text handles positions' are correctly updated." into honeycomb-mr1 2011-03-08 10:21:54 -08:00
Irfan Sheriff
c23971b3e4 Handle client loss for a full connection
Bug: 3513246
Change-Id: I928544a05702bb004457e2b0d2eeb3c34f98edf9
2011-03-08 10:18:38 -08:00
Ramesh Sudini
979f47544b Telephony: Fix config to reflect the correct CM conn type.
Reflect the correct connectivity manager connection type in the config.xml.

Change-Id: I9cb108c4543f9f765348843a02bc29c2dd58c076
2011-03-08 09:40:57 -08:00
Leon Scroggins
bb085ff0d2 am f279269a: am 055a8585: Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1
* commit 'f279269a4c2e86092b99b67766b9fc1077f2526d':
  Do not attempt to start action mode if there is no parent.
2011-03-08 09:16:34 -08:00
Leon Scroggins
f279269a4c am 055a8585: Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1
* commit '055a858562e04c903988d09973accc8aeeece02c':
  Do not attempt to start action mode if there is no parent.
2011-03-08 09:10:27 -08:00
Leon Scroggins
055a858562 Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1 2011-03-08 09:06:54 -08:00
Leon Scroggins
93553d7fb3 Do not attempt to start action mode if there is no parent.
Bug:3514747
Change-Id: Id4c5c803bfb8bb2f5f81fa15599784e808e0d223
2011-03-08 11:43:40 -05:00
Simon Wilson
73cf2ade30 am 92fb1668: am 10993b2d: am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
* commit '92fb16685fd8d28b231a02bfa3ef76d3924210ad':
  mms: mms wap push length check before pdu processing.
2011-03-08 08:03:55 -08:00
James Dong
7a689f1455 am 73179134: (-s ours) am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
* commit '73179134d59944a4b190c991b92b73c91fd4e0ed':
  Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
2011-03-08 08:03:44 -08:00
Simon Wilson
92fb16685f am 10993b2d: am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
* commit '10993b2d1e3614073970aad119ffb2cc9bc8f73f':
  mms: mms wap push length check before pdu processing.
2011-03-08 07:58:20 -08:00
James Dong
73179134d5 am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
* commit 'b1be086e1d2f15c858b4aa7f40d49667b3e26d3a':
  Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
2011-03-08 07:58:14 -08:00
Patrick Scott
85a50ff48b Pass the auto login header information to the app.
Add a new callback to handle auto login requests.

Bug: 3367381
Change-Id: I2ee8038cdf8a4ff9d1d3de0c871a0c60f1769655
2011-03-08 08:35:54 -05:00
Bjorn Bringert
2cad2cc153 Exception handling clean-up in TextToSpeech.java
This is just a code clean-up change. It should have no effects
on behavior.

- The exception clean-up code was copied in lots of places,
  added a restart() method for it.

- Use Log.e to print exception stack trace instead of doing
  it manually.

- Moved return statements outside finally-blocks. Having them
  in the finally-block makes no difference, but can be misleading.
  Also, Eclipse complains about it.

Change-Id: Ibfb18ca89d81d1fd8d212f29b6f8ab305b52ec49
2011-03-08 11:53:12 +00:00
Kristian Monsen
47db61de63 Fix for bug 3469242 Turn of extra debugging before shipping
Reverting 3469242 Turn of extra debugging before shipping
manually since that was done in master.

Change-Id: I0e6ec7dd22ec07e09af7d7270c05ad2b6cc624bb
2011-03-08 10:47:43 +00:00
Jesse Wilson
2685aa35ff am 6f31b8c0: am 102930a0: Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
* commit '6f31b8c058964ffd87da9f08fc02727bd9415e0b':
  Remove deprecated and unused entryEvicted method.
2011-03-07 23:28:54 -08:00
Jesse Wilson
6f31b8c058 am 102930a0: Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
* commit '102930a0deaf8280a65321de0d6c120a638da9e2':
  Remove deprecated and unused entryEvicted method.
2011-03-07 23:25:52 -08:00
Jesse Wilson
102930a0de Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1 2011-03-07 23:23:36 -08:00
Romain Guy
f7098ce95d am d00353fe: am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349" into honeycomb-mr1
* commit 'd00353fe3191571a6773ef2d11921cfcff260bc4':
  Add support for partial invalidates in WebView Bug #3461349
2011-03-07 22:45:52 -08:00
Romain Guy
d00353fe31 am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349" into honeycomb-mr1
* commit 'bc8a8e8c926115cb7b3910d016e5cff12b0f7b0a':
  Add support for partial invalidates in WebView Bug #3461349
2011-03-07 22:43:02 -08:00
Romain Guy
bc8a8e8c92 Merge "Add support for partial invalidates in WebView Bug #3461349" into honeycomb-mr1 2011-03-07 22:40:27 -08:00
Xavier Ducrohet
6f2fb57064 LayoutLib: Fix dimension parsing to handle negative value.
Also make TypedArray.getDimensionPixelSize properly
handle negative values (which are not allowed).

Change-Id: I960fc1c9e8ad97852d4a14e4f0f71a2c2034b4e7
2011-03-07 20:50:21 -08:00
Xavier Ducrohet
c12b409351 LayoutLib: Implement some missing add###() method in Path.
Change-Id: Ib62b5df0361ba81846483b1e5f8d7cbdbcb57d40
2011-03-07 20:19:38 -08:00
Jeff Brown
9267beb868 Eliminate some accidental log spam.
Used #ifdef where I should have used #if.

Change-Id: I4cc84484dd508b0ec1a01858d8bd62ec92f23de1
2011-03-07 20:14:09 -08:00
Mike Lockwood
8b4a4207f6 am bd3d019c: am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
* commit 'bd3d019cc66237c23ab0658ff80aa7923e84b239':
  MTP: Use SharedPreferences for MTP device properties rather than sqlite3
2011-03-07 20:08:58 -08:00
Mike Lockwood
bd3d019cc6 am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
* commit '823f5bf3db8b2f588ae917aaff5d27a65c87f132':
  MTP: Use SharedPreferences for MTP device properties rather than sqlite3
2011-03-07 20:06:37 -08:00
Mike Lockwood
823f5bf3db Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1 2011-03-07 20:04:23 -08:00
Santosh Madhava
165c77b9e4 am 5893b453: am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
* commit '5893b453fc762d18e759a391a442600be4924489':
  Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
2011-03-07 19:47:26 -08:00
Santosh Madhava
5893b453fc am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
* commit '0e8dc72db34c0a4eb92763de4e048abc4d20f47f':
  Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
2011-03-07 19:45:25 -08:00
Santosh Madhava
0e8dc72db3 Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1 2011-03-07 19:42:16 -08:00
Andy Stadler
50c294f21b Clarify rules about encryption of emulated storage.
Bug: 3351426
Change-Id: I3a8fcd369862f3eab1781699108e29fe7ab474a0
2011-03-07 19:13:42 -08:00
Wink Saville
c87b1101a9 am 43d55c1a: am ff23352e: am b3c991b0: Provide default value for operator numeric for CDMA.
* commit '43d55c1a6ea9f0cd951c197dfdc3917932e316db':
  Provide default value for operator numeric for CDMA.
2011-03-07 18:56:42 -08:00
Wink Saville
43d55c1a6e am ff23352e: am b3c991b0: Provide default value for operator numeric for CDMA.
* commit 'ff23352ea70339c4230d628ab294fbf52159da06':
  Provide default value for operator numeric for CDMA.
2011-03-07 18:54:19 -08:00
Wink Saville
ff23352ea7 am b3c991b0: Provide default value for operator numeric for CDMA.
* commit 'b3c991b0190faa4fc833a5fc9074939fd5d8a3c4':
  Provide default value for operator numeric for CDMA.
2011-03-07 18:51:57 -08:00
Jim Miller
c43f6c58ce Fix 4025690,4027061: Minor tweaks to recent applications layouts
This makes these changes:
- Reduce fade area from 30 pixels to 20 pixels at top and bottom of recents view
when scrollable
- Shift application icon up and to the right in all recent items.

Change-Id: If510b63a92d6396ffb087b12f4ddc8847c95f3d7
2011-03-07 18:49:43 -08:00
Dianne Hackborn
b57af72980 am 78b9035b: am 37e792d5: Merge "Fix issue #3515088: Don\'t be so aggressive trying to reclaim memory" into honeycomb-mr1
* commit '78b9035b51cd5e59500fa242952cb30ee50cddc9':
  Fix issue #3515088: Don't be so aggressive trying to reclaim memory
2011-03-07 18:24:04 -08:00
Dianne Hackborn
78b9035b51 am 37e792d5: Merge "Fix issue #3515088: Don\'t be so aggressive trying to reclaim memory" into honeycomb-mr1
* commit '37e792d53d4b38d1283960d62edcd63ef0a30e5e':
  Fix issue #3515088: Don't be so aggressive trying to reclaim memory
2011-03-07 18:21:55 -08:00
Dianne Hackborn
37e792d53d Merge "Fix issue #3515088: Don't be so aggressive trying to reclaim memory" into honeycomb-mr1 2011-03-07 18:20:23 -08:00
Gilles Debunne
716dbf63d4 Removed unnecessary memory allocation in TextView.
No other obvious unneeded memory allocation related to
text editing and selection was found.

Change-Id: I7d8c9210940982120caeb1e7b75d754557ebf6db
2011-03-07 18:19:36 -08:00
Jeff Brown
050b023568 Merge "Support POLICY_FLAG_ALT et. al." 2011-03-07 18:19:09 -08:00
Chet Haase
bead982ff2 am 79bd55cc: am 4bd6ccd2: Merge "Restore save/restore calls removed recently" into honeycomb-mr1
* commit '79bd55ccb55e85b39a8d0c867add56021cd608e2':
  Restore save/restore calls removed recently
2011-03-07 18:18:21 -08:00
Romain Guy
5f4b02064d am f018560c: am 25b81110: Merge "Fix EGL JNI bugs Bug #3461349" into honeycomb-mr1
* commit 'f018560cb57e47c3e4bc542e4c596c4d3be3d4c4':
  Fix EGL JNI bugs Bug #3461349
2011-03-07 18:16:05 -08:00
Chet Haase
79bd55ccb5 am 4bd6ccd2: Merge "Restore save/restore calls removed recently" into honeycomb-mr1
* commit '4bd6ccd25162a7634a90cfde72dcdc7d581d9a88':
  Restore save/restore calls removed recently
2011-03-07 18:15:34 -08:00
Romain Guy
f018560cb5 am 25b81110: Merge "Fix EGL JNI bugs Bug #3461349" into honeycomb-mr1
* commit '25b81110b1a4d8882727ebdb8aef523f108b53fd':
  Fix EGL JNI bugs Bug #3461349
2011-03-07 18:13:27 -08:00
Adam Powell
e5e8e84fe9 am 6ac23abf: am ad542efb: Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
* commit '6ac23abf0e3978e6995981810ddc01812a235387':
  Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector
2011-03-07 18:12:35 -08:00
Chet Haase
4bd6ccd251 Merge "Restore save/restore calls removed recently" into honeycomb-mr1 2011-03-07 18:12:34 -08:00
Romain Guy
25b81110b1 Merge "Fix EGL JNI bugs Bug #3461349" into honeycomb-mr1 2011-03-07 18:11:21 -08:00
Adam Powell
6ac23abf0e am ad542efb: Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
* commit 'ad542efb8aa241d3e576d9567f5b0979355037b3':
  Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector
2011-03-07 18:10:13 -08:00