Romain Guy
6e81e57b52
Prevent crash in View when gathering attributes without an AttachInfo.
...
Bug #3385339
Change-Id: I06b6f03721b52ab0b9d13c2fb3e133ae25d99970
2011-01-25 12:59:00 -08:00
Dheeraj Sharma
4ba9e68fa9
am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb
...
* commit 'b8942108826893657ca0b8b6d5d6d153739a76f6':
Video Editor:Fix for 3375632
2011-01-25 12:52:38 -08:00
Dheeraj Sharma
b894210882
Merge "Video Editor:Fix for 3375632" into honeycomb
2011-01-25 12:50:34 -08:00
Amith Yamasani
7abd7429d6
am 6bcbf54f: Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb
...
* commit '6bcbf54feed8ca7c1bf9b509f8581684988d45dd':
Heed the focusability flag in SearchView and set the default to true.
2011-01-25 12:38:40 -08:00
Jeff Brown
1f26ea1306
am 561a434b: Merge "Fix emulator trackball." into honeycomb
...
* commit '561a434b9769217b8936eea40b564bb9615f1a12':
Fix emulator trackball.
2011-01-25 12:36:26 -08:00
Amith Yamasani
6bcbf54fee
Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb
2011-01-25 12:35:06 -08:00
Jeff Brown
561a434b97
Merge "Fix emulator trackball." into honeycomb
2011-01-25 12:33:50 -08:00
Patrick Scott
85b69e0390
Turn off picture splitting for now.
...
Splitting the content was causing a mismatch between the base content picture
and composited layers. It was also happening on every single inval.
Bug: 3372320
Change-Id: I09da2d0f3cba028c355ceba2b4c8e34da5a77028
2011-01-25 15:19:45 -05:00
Amith Yamasani
7f8aef6d5b
Heed the focusability flag in SearchView and set the default to true.
...
Bug: 3385804
Also, allow navigation through keyboard.
Change-Id: I444f142518172b35f33c2a5129179ac996d80dc7
2011-01-25 12:10:56 -08:00
Gilles Debunne
5d1c76095e
am bb37b647: Merge "Fixed CAB background and selection color for legacy applications." into honeycomb
...
* commit 'bb37b6477fe76a045654290f2b998a61ff2632b9':
Fixed CAB background and selection color for legacy applications.
2011-01-25 11:39:39 -08:00
Gilles Debunne
bb37b6477f
Merge "Fixed CAB background and selection color for legacy applications." into honeycomb
2011-01-25 11:37:54 -08:00
Gilles Debunne
2b5a62afde
am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb
...
* commit '2a32a39e9a0455732724bbbbbdce41e12a8ffb1e':
Removed warnings in DynamicLayout
2011-01-25 11:36:21 -08:00
Gilles Debunne
2a32a39e9a
Merge "Removed warnings in DynamicLayout" into honeycomb
2011-01-25 11:34:19 -08:00
Dianne Hackborn
7187ccb93e
Fix issue #3385839 : Fragment.onCreateView is passing in activity...
...
...context for a DialogFragment
Change-Id: I434ebca64d2738da4c27321db8dbbded2cbe167d
2011-01-25 11:28:39 -08:00
Gilles Debunne
8ce7aab79e
Overscoll bounce amplitude is smaller.
...
Per Dan's request for poor behavior on low speed Overscrolls.
Change-Id: I184133df5e6cc68d8d9bf39edb62d42e13d27a90
2011-01-25 11:23:30 -08:00
Wink Saville
ca7c4a5d1c
am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb
...
* commit '774f9be5dc02e8a7f742008872c6214e517cb8a3':
Add debug to CallManager#canDial.
2011-01-25 11:06:24 -08:00
Romain Guy
8699aa3a2f
am 2bd78c9a: Merge "Remove debugging log left by mistake." into honeycomb
...
* commit '2bd78c9a9b15d1c5c06d838c1fca77d9748e1c41':
Remove debugging log left by mistake.
2011-01-25 11:03:55 -08:00
Romain Guy
8d2959ddff
Remove debugging log left by mistake.
...
Change-Id: I7d5165b4b682714940cea9886abeedd3f4858057
2011-01-25 11:03:00 -08:00
Wink Saville
774f9be5dc
Merge "Add debug to CallManager#canDial." into honeycomb
2011-01-25 11:02:25 -08:00
Romain Guy
2bd78c9a9b
Merge "Remove debugging log left by mistake." into honeycomb
2011-01-25 11:01:55 -08:00
Brian Carlstrom
f2b7c84468
am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
...
* commit '8d37c4efeb853fdc6626f89b5bc0ec79eb451162':
Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
2011-01-25 11:00:24 -08:00
Marco Nelissen
8952df7240
am 4b440268: am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
...
* commit '4b44026879723d924ddc306ea1e330a9e87c3a1c':
Increase the number of useful bits in the spectrum.
2011-01-25 10:58:56 -08:00
Nick Pelly
894983f060
am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands little endian
...
* commit '3b61e47a3f173133e5a3cfcbfe6812eb02a0a760':
Make Mifare Classic increment/decrement operands little endian
2011-01-25 10:58:46 -08:00
Hung-ying Tyan
b30392d288
am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread
...
* commit 'df1cc4ef9205239701bbe73f903e89a9dfd2623a':
Get mute state from active call.
2011-01-25 10:58:42 -08:00
Hung-ying Tyan
2b6d07a51a
am 8a424af1: am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
...
* commit '8a424af1d93a13f3b330ffe39de8aa7c592fdf49':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
2011-01-25 10:58:26 -08:00
Brian Carlstrom
8d37c4efeb
Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
2011-01-25 10:58:02 -08:00
Jeff Brown
2996adb765
am e9acc401: (-s ours) am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
...
* commit 'e9acc40151db2c5ec3c958c206f7c2e805709e29':
Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
2011-01-25 10:53:51 -08:00
Andreas Huber
a79ec961af
am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
...
* commit 'ca1cf59f495dacb132f2a83cefad41d51141a699':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-25 10:53:46 -08:00
Brad Fitzpatrick
28ae70ceac
am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
...
* commit '23a813e17d94083c24a34559864722c809b4e0f7':
Avoid using String.format in MediaRecorder
2011-01-25 10:48:05 -08:00
Justin Ho
e73a710bea
am 7cd1cc83: am 28c4f69a: Updated checkbox assets
...
* commit '7cd1cc83194fb25b0bcc9d40b20dcff9a427afe8':
Updated checkbox assets
2011-01-25 10:47:56 -08:00
Gilles Debunne
9eaa9b97d7
am b6b15dca: Merge "TextLine cache is used, even for long lines of text." into honeycomb
...
* commit 'b6b15dca725b3467ea03fa4c0ae29e6b6e753b27':
TextLine cache is used, even for long lines of text.
2011-01-25 10:45:15 -08:00
Gilles Debunne
b6b15dca72
Merge "TextLine cache is used, even for long lines of text." into honeycomb
2011-01-25 10:43:05 -08:00
Robert Greenwalt
678c6a358d
am d14239a2: Merge "Fix tethering when switching default connection" into honeycomb
...
* commit 'd14239a2fb12d775f7b2345286d36ac02234e0a7':
Fix tethering when switching default connection
2011-01-25 10:30:36 -08:00
Shimeng (Simon) Wang
1dc6b9ebc6
am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
...
* commit 'c1e7f2d371aa6c2aa9ed3207689cb53a1f704cbc':
Set high usage delta to 1 to avoid constant V8 GC.
2011-01-25 10:30:33 -08:00
Arnaud Ferir
0d1289122c
am 10ab8617: am 5e81a6e2: Fix trace mismatch.
...
* commit '10ab8617e85c9a675ff8251cd328beb4e047777c':
Fix trace mismatch.
2011-01-25 10:29:59 -08:00
Sylvain Fonteneau
a2eced302b
am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
...
* commit 'e97a42e05cced70dd5713c731a197187b4751800':
Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-25 10:29:51 -08:00
John Wang
c3a5b19c95
am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
...
* commit '78eb92388ce30aee9b9aaa3e6c9a2de185f8d6a4':
Enable recovery in RIL wakelock release check.
2011-01-25 10:29:44 -08:00
Robert Greenwalt
d14239a2fb
Merge "Fix tethering when switching default connection" into honeycomb
2011-01-25 10:27:51 -08:00
Shimeng (Simon) Wang
c1e7f2d371
Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
2011-01-25 10:27:24 -08:00
Nick Pelly
fd06cc10ac
resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
...
Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b
2011-01-25 10:26:54 -08:00
Nick Pelly
bdd265ba5f
resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
...
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
2011-01-25 10:20:02 -08:00
Gilles Debunne
d6e568c4f3
Removed warnings in DynamicLayout
...
Change-Id: Ied1c330795412d0bdcac1236b466951112fabc7d
2011-01-25 10:14:43 -08:00
Marco Nelissen
4b44026879
am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
...
* commit 'c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
2011-01-25 10:11:09 -08:00
Marco Nelissen
c929677e01
Merge "Increase the number of useful bits in the spectrum." into gingerbread
2011-01-25 10:06:16 -08:00
Nick Pelly
8bfdd9a651
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
2011-01-25 10:03:46 -08:00
Jeff Hamilton
883b26db47
am 535ec16c: am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
...
* commit '535ec16c78eada2d32669f5a2f8e3c227a5beecc':
Allow null filters for foreground dispatch to act as catch all.
2011-01-25 10:03:17 -08:00
John Reck
500c9e99f5
am 7f532976: Merge "Docs for Origin" into honeycomb
...
* commit '7f532976baa54d2935a8ba42cc2c529b7460e57a':
Docs for Origin
2011-01-25 10:03:14 -08:00
Jim Miller
00e37916bc
am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
...
* commit '1323ab83e4be088fd66ad73ea9da617e46382987':
Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-25 10:02:53 -08:00
Dianne Hackborn
119919b81a
am 1240719a: am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"
...
* commit '1240719ae06855d38f1fa159dd73e2109bb9586f':
aapt: Allow raw "%" in unformatted string-arrays
2011-01-25 10:02:46 -08:00
John Reck
7f532976ba
Merge "Docs for Origin" into honeycomb
2011-01-25 10:01:16 -08:00