Daniel Sandler
47fc765540
am 688ad19d: (-s ours) am f340d082: Merge "More precise status bar battery icons." into gingerbread
...
* commit '688ad19d95a324a4588023779082e949a1d3f8ec':
More precise status bar battery icons.
2010-12-07 17:23:49 -08:00
Mike Lockwood
b3f522f34b
Merge "MTP: Read property code before calling isDeviceProperty in MtpProperty::read()"
2010-12-07 17:21:01 -08:00
Mike Lockwood
bf1dbd1938
MTP: Read property code before calling isDeviceProperty in MtpProperty::read()
...
Change-Id: I0b1493f3af5d9caac08327f9ffba91ee255d3d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 17:16:20 -08:00
Mike Lockwood
c7f2f0ab01
Merge "MTP: Improve MtpProperty logging support"
2010-12-07 17:15:02 -08:00
Mike Lockwood
e4880e421f
MTP: Improve MtpProperty logging support
...
Change-Id: I46800b99763edcc5e994d912941f9f5e9b1c94d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 17:13:12 -08:00
Mike Lockwood
9cf29560e8
Merge "MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc"
2010-12-07 17:11:07 -08:00
Mike Lockwood
612ca8781f
Merge "MTP: Use correct return type for getSupportedObjectProperties"
2010-12-07 17:10:43 -08:00
Mike Lockwood
ea4af54093
Merge "Revert "MTP: Remove static library build for linux host.""
2010-12-07 17:10:25 -08:00
Mike Lockwood
ecce2f6d82
Merge "MTP: Implement MTP_DEVICE_PROPERTY_IMAGE_SIZE device property."
2010-12-07 17:10:02 -08:00
Romain Guy
6e52b45656
Merge "Fix possible NPE in ViewRoot with GL rendering enabled. Bug #3257222 "
2010-12-07 17:06:02 -08:00
Romain Guy
dbf78bdb7a
Fix possible NPE in ViewRoot with GL rendering enabled.
...
Bug #3257222
Change-Id: Ic11cbe5f06311627eb7eac4dfa8864b43651d904
2010-12-07 17:04:03 -08:00
Dan Bornstein
a2584aa9a3
Merge "Fix another set of out-of-date headers."
2010-12-07 16:39:45 -08:00
Wei-Ta Chen
1fbe4abaf9
Merge "Unhide inPreferQualityOverSpeed in BitmapFactory.Options."
2010-12-07 16:39:13 -08:00
Dan Bornstein
7715d21797
Fix another set of out-of-date headers.
...
This time in XML files.
Change-Id: Iebe36810c3a2d7a6ff354f43808b1b8649b85637
2010-12-07 16:27:55 -08:00
Dan Bornstein
8028a951c3
Merge "Fix newlines in this file."
2010-12-07 16:27:31 -08:00
Dan Bornstein
c087a87e01
Fix newlines in this file.
...
They were CRLF instead of just LF.
Change-Id: I2d06d19b4d8ca969527d93bd996103c161e48a79
2010-12-07 16:23:05 -08:00
Dan Bornstein
331edf84e2
Merge "These files had an older header."
2010-12-07 16:18:02 -08:00
Mindy Pereira
1a94f3b582
Merge "Make horizotnalscrollview and scrollview edgeglows match the new algorithm."
2010-12-07 16:10:57 -08:00
Wei-Ta Chen
0e007d7ab9
Unhide inPreferQualityOverSpeed in BitmapFactory.Options.
...
The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.
The field by default is not set and thus does not affect existing
applications.
Bug: 3238925
Related changes: https://android-git.corp.google.com/g/#change,83291 and
https://android-git.corp.google.com/g/#change,83294
Change-Id: I969f5c413f9b2179454aeb90e18ae8222ee583b4
2010-12-07 16:10:16 -08:00
Makoto Onuki
debfb7fc01
Merge "Add space after property name in error message"
2010-12-07 16:05:22 -08:00
Xia Wang
8c1c1e875e
Make the scan test log consistent.
...
Change-Id: I44fd790c21fed6bb2b615a047b762b5ac7c451bb
2010-12-07 15:39:11 -08:00
Dan Bornstein
c086ca1fa7
These files had an older header.
...
This patch replaces the file headers with the approved Android
header text.
Change-Id: I63cbd21e9112dab404158fb65f74bc6ca5b07eac
2010-12-07 15:35:20 -08:00
Mindy Pereira
b1297f7635
Make horizotnalscrollview and scrollview edgeglows match the new algorithm.
...
Instead of going past the left and right sides, the glow now
stretches just to the width of the edge and stops.
For horizontalscrollview, instead of going past the top and bottom,
now stretches just to the height and stops.
Change-Id: I0cc9bdef3ab263b16dd32e088c6b64ff5a8809c8
2010-12-07 15:33:51 -08:00
Makoto Onuki
a52a5e7c4c
Add space after property name in error message
...
Change-Id: I15c1acc468ff17a1ebd1bc28288d0ac7113748b2
2010-12-07 15:27:53 -08:00
Romain Guy
5d2089bf94
Merge "Fixing the build breakage"
2010-12-07 15:18:02 -08:00
Svetoslav Ganov
3119fd426d
Fixing the build breakage
...
Change-Id: I8589e5fcdeec127c84d2b419f6ef44d7011a5a6b
2010-12-07 15:15:34 -08:00
Brad Fitzpatrick
4ce445f027
Merge "Fix doc typo."
2010-12-07 14:54:24 -08:00
Brad Fitzpatrick
26b71be600
Fix doc typo.
...
Change-Id: I9d4db682e3d365e783d5d70fbf66d47fe04e88eb
2010-12-07 14:52:58 -08:00
Gilles Debunne
2f0c6a460a
Merge "No NPE in Browser when pasting in WebTextView."
2010-12-07 14:48:38 -08:00
Xia Wang
923e5b7700
Merge "Add Wi-Fi stress tests."
2010-12-07 14:47:07 -08:00
Gilles Debunne
6da7e935f9
No NPE in Browser when pasting in WebTextView.
...
Bug 3258790
Change-Id: I25d67ee85babb1bb3e4d05ea7b4e4d3756c60411
2010-12-07 14:35:47 -08:00
Xia Wang
90e1c782a6
Add Wi-Fi stress tests.
...
- Wi-Fi scan stress
- Wi-Fi reconnection stress
- Measure Wi-Fi scanning performance:
. Average scanning time
. Scanning quality
Change-Id: Ifce496876811816b452aed4ae9642fdb2db44798
2010-12-07 14:21:51 -08:00
Romain Guy
49c7a01a87
Merge "Adding DatePciker widget based on the Calednar team code. Updated DatePciker and DatePickerDialog as the second part of the Time/Date pciker refresh feature."
2010-12-07 14:04:47 -08:00
Shih-wei Liao
b314748911
Merge "Make ScriptC's mEnvironment.mIsThreadable survive the bcc caching and then cache-reloading."
2010-12-07 14:02:31 -08:00
Daniel Sandler
688ad19d95
am f340d082: Merge "More precise status bar battery icons." into gingerbread
...
* commit 'f340d082b8488de6f131c1e5932cd3abc16b47c1':
More precise status bar battery icons.
2010-12-07 14:01:31 -08:00
Xavier Ducrohet
ef18795931
Merge "LayoutLib: explicitely override PropertyValuesHolder native code."
2010-12-07 14:01:03 -08:00
Brian Muramatsu
504bb5adee
Merge "Fix Settings getFloat Methods"
2010-12-07 13:49:56 -08:00
Shih-wei Liao
b7282bd2e7
Make ScriptC's mEnvironment.mIsThreadable survive the bcc caching and
...
then cache-reloading.
Change-Id: I0f5d54160dd9ee567fae53c69b246f99096993da
2010-12-07 13:47:14 -08:00
Svetoslav Ganov
50f34d14f6
Adding DatePciker widget based on the Calednar team code. Updated DatePciker and DatePickerDialog as the second part of the Time/Date pciker refresh feature.
...
Change-Id: Id32c614bcd799463ca33bf08fb7d5cf44f8326a6
2010-12-07 13:34:23 -08:00
Romain Guy
92d502022d
Merge "Fix 9patch rendering Bug #3253396 "
2010-12-07 13:29:51 -08:00
Romain Guy
8ab4079ca2
Fix 9patch rendering
...
Bug #3253396
Some quads were incorrectly assumed to be degenerate.
Change-Id: I9155699edc3424afe9d5a131886bb9966d46b109
2010-12-07 13:30:10 -08:00
Jean-Baptiste Queru
65dd62a306
resolved conflicts for merge of ee27dd35 to master
...
Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7
2010-12-07 13:17:37 -08:00
Jean-Baptiste Queru
ee27dd356e
am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master
...
* commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
Strings for NI position request are moved to resources
2010-12-07 13:02:22 -08:00
Gilles Debunne
1ab60b44e6
Merge "Fix for Blink in TextView."
2010-12-07 12:55:09 -08:00
Jean-Baptiste Queru
12902d687f
resolved conflicts for merge of 78742e01 to stage-korg-master
...
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
2010-12-07 12:51:49 -08:00
Costin Manolache
5f383ad969
Fix bug in permission grant system.
...
Change-Id: Ieae1a576fdcba30b24e0430f322843369de2a697
2010-12-07 12:27:54 -08:00
Steve Block
689a342b0f
Add WebView.removeJavascriptInterface()
...
Bug: 3234178
Change-Id: I7136f8d76b20f90a7e9e1c55b6755ffe6c35b77b
2010-12-07 20:16:13 +00:00
Gilles Debunne
f48e83b328
Fix for Blink in TextView.
...
The callback is removed when the window is detached. Prevents weak references to
the TextView from being kept.
No longer created for non editable texts (!).
Hiding the cursor handle when cursor is hidden.
Change-Id: Ic92f6cfc5b6ef6460f1edc6b9a564e4153d9c40f
2010-12-07 12:13:51 -08:00
Xavier Ducrohet
8d74c978bb
LayoutLib: explicitely override PropertyValuesHolder native code.
...
Change-Id: Ic7dd9efc990d01b20db144117cb11eb130349048
2010-12-07 12:10:51 -08:00
Kenny Root
9aa6ea8386
Merge "DefaultContainerService's JNI library is required"
2010-12-07 12:04:58 -08:00