Romain Guy
b0905c998d
am 20bf23e5: am ac14db72: Merge "Fast transform properties setters. Bug #3413510 " into honeycomb
...
* commit '20bf23e5e4172f5f80ce6c4cc16168355b107f0d':
Fast transform properties setters. Bug #3413510
2011-02-03 17:17:21 -08:00
Daniel Sandler
4dce4fc8ea
am a2e82d4c: am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
...
* commit 'a2e82d4c69bc25eb9f262be0efb4bd38695c4f86':
Implement priority ordering in notifications.
2011-02-03 17:16:54 -08:00
Romain Guy
9bd32c235d
am 109da7df: am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433 " into honeycomb
...
* commit '109da7dfd4c0766274b17467880ee673c731735c':
Allocate layers from the layers pool. Bug #3413433
2011-02-03 17:16:19 -08:00
Justin Ho
8e0bf64c6f
am 8e2c67ea: am be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb
...
* commit '8e2c67ea26d38677802f3029472aa2393f47173d':
Adding new volume control dialog icons
2011-02-03 17:15:21 -08:00
Robert Greenwalt
f8d40f0d55
Merge "Bind addr and prefixLength together in LinkAddress"
2011-02-03 13:17:48 -08:00
Marco Nelissen
770d02c2fa
Unhide MediaStore.getVersion so Music2 can use it.
...
Change-Id: I006860fe2bd828ffdc598dc89329eba952fde5b3
2011-02-03 12:23:40 -08:00
Shimeng (Simon) Wang
4eb02a13b3
Merge "Use more accurate height/width ratio."
2011-02-03 11:44:06 -08:00
Marco Nelissen
3822f73a58
Add a convenience method for getting the media provider version.
...
b/3350571
Change-Id: I1280a49029aa75643397fab7113b4dd80b639809
2011-02-03 10:59:30 -08:00
Shimeng (Simon) Wang
a0cc8642cc
Use more accurate height/width ratio.
...
When calculating the view height, use more accurate height/width
ratio, instead of the second hand ratio after height and width
are calculated and rounded.
This prevents the height value to be fluctuated by 1 sometimes
when zooming.
issue: 3385757
Change-Id: I08bf5478ae8b8fd799df892e19f450cb558d8b7f
2011-02-03 10:24:03 -08:00
Mike Lockwood
04f024d564
Merge changes I80558c62,I6587f580
...
* changes:
UsbService: Blacklist HID boot subclass devices (keyboards and mice)
UsbService: Add support for blacklisting certain USB busses
2011-02-03 09:51:06 -08:00
Romain Guy
20bf23e5e4
am ac14db72: Merge "Fast transform properties setters. Bug #3413510 " into honeycomb
...
* commit 'ac14db72ca55110326f4ceb9ac34fddd360036f4':
Fast transform properties setters. Bug #3413510
2011-02-03 01:37:29 -08:00
Romain Guy
ac14db72ca
Merge "Fast transform properties setters. Bug #3413510 " into honeycomb
2011-02-03 01:11:39 -08:00
Romain Guy
da489796e5
Fast transform properties setters.
...
Bug #3413510
Change-Id: I2c83e219faff697a48a160fee627f87422a2cd08
2011-02-03 01:05:15 -08:00
Daniel Sandler
a2e82d4c69
am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
...
* commit '6f922cbe823c19234bc15eea9ac709f399e9a63c':
Implement priority ordering in notifications.
2011-02-02 22:41:25 -08:00
Daniel Sandler
a31e4190cb
Implement priority ordering in notifications.
...
Ongoings are the only notifications currently given higher
priority (and it's in an internal data structure, not a
public API, so fear not about abuse---this will be no worse
than on the phone where ongoings floated to the top).
The only thing left is to give privileged customers a way to
alter the priority of their notifications.
Bug: 3412807
Bug: 3146719
Change-Id: I9e738cc413982845cf4858faa8ccd0a7dbf3187c
2011-02-03 01:01:20 -05:00
Romain Guy
109da7dfd4
am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433 " into honeycomb
...
* commit '5bfd1afffe361958682bcb899b763ce35ec00c3a':
Allocate layers from the layers pool. Bug #3413433
2011-02-02 21:07:17 -08:00
Romain Guy
5bfd1afffe
Merge "Allocate layers from the layers pool. Bug #3413433 " into honeycomb
2011-02-02 21:05:35 -08:00
Romain Guy
09b7c91de7
Allocate layers from the layers pool.
...
Bug #3413433
This change will be beneficial to Launcher to avoid hiccups when
swiping pages of icons. When a layer is discarded, it is kept
in the layers pool instead of being destroyed right away. This
favors memory reuse over allocations.
Change-Id: Ifb6944ba83d6ceb67c331527c0827b26ce648eb1
2011-02-02 20:28:09 -08:00
Justin Ho
8e2c67ea26
am be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb
...
* commit 'be36f9a3b049157b29d3fbe4f685ed8a3021344e':
Adding new volume control dialog icons
2011-02-02 18:47:50 -08:00
Justin Ho
be36f9a3b0
Merge "Adding new volume control dialog icons" into honeycomb
2011-02-02 18:45:27 -08:00
Justin Ho
6758fce4dd
Adding new volume control dialog icons
...
Change-Id: I025f9372300b30fce9c2190864237a20151b9993
2011-02-02 18:35:54 -08:00
Svetoslav Ganov
0bbfbb5916
Merge "NumberPicker should not play initial animation while in edit mode"
2011-02-02 17:22:21 -08:00
Svetoslav Ganov
5d3aa2c5e9
Merge "Leaking connection to the Text-To-Speech service."
2011-02-02 17:21:27 -08:00
Svetoslav Ganov
4acac231b0
Leaking connection to the Text-To-Speech service.
...
bug:3417215
1. Now the Text-To-Speech instance is exposed to JavaScript
and removed from JavaScript in the attach and detach from
window callbacks which is consistent with what WebView
does with its tree observer callbacks.
Change-Id: I3e084ba938ba6f13c578317129264dbcbdcf6450
2011-02-02 17:20:01 -08:00
Romain Guy
dcbcb680bc
am 44e3b0d0: am f44ed5ad: Merge "Don\'t clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433 " into honeycomb
...
* commit '44e3b0d0344955d5ce1bbb0b329627e24b7dd468':
Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433
2011-02-02 17:15:26 -08:00
Vasu Nori
b73fb5401e
am 99e8e047: am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb
...
* commit '99e8e0470249ce145003cc1eabc5ae391af34a06':
bug:3414192 new API to designate a download to be OTA update
2011-02-02 17:15:16 -08:00
Romain Guy
44e3b0d034
am f44ed5ad: Merge "Don\'t clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433 " into honeycomb
...
* commit 'f44ed5adc42fefa0c91fc79c5e3c20e1cdc7d697':
Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433
2011-02-02 16:47:09 -08:00
Vasu Nori
99e8e04702
am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb
...
* commit '6bc710f769618e87b98d51cd02241e6b1a2fb653':
bug:3414192 new API to designate a download to be OTA update
2011-02-02 16:47:05 -08:00
Romain Guy
f44ed5adc4
Merge "Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433 " into honeycomb
2011-02-02 16:44:07 -08:00
Vasu Nori
6bc710f769
Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb
2011-02-02 16:43:56 -08:00
Irfan Sheriff
2fcaf538ce
am aec39e62: Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'aec39e625b95088f4020302a0eac1f38da43c765':
two digit number handling in croatia and serbia
2011-02-02 16:21:28 -08:00
Irfan Sheriff
aec39e625b
Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-02-02 16:03:29 -08:00
Irfan Sheriff
d6d2de6b3c
resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp
...
Change-Id: I34d034115362f0f858fb65710165bd6cad2fdbd5
2011-02-02 16:02:37 -08:00
Leon Scroggins
8287edd3ae
am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
...
* commit '8257e4d7e2b1ac9b8310a326cf8f4b53aba760ec':
DO NOT MERGE. Only scroll if the IME is open in certain cases.
2011-02-02 15:52:00 -08:00
Romain Guy
62687ec12c
Don't clobber the local dirty rect after rendering a layer.
...
Bug #3417254
Bug #3413433
Change-Id: I8045e9ec414ebe4ce4d38124142a00726d2c634d
2011-02-02 15:44:19 -08:00
Svetoslav Ganov
4fd9dae6a2
NumberPicker should not play initial animation while in edit mode
...
bug:3417930
1. Added a check if the widget is in edit mode to determine if to
play the initial annimation.
Change-Id: Ibcf23fa1ec55a1950323e71eda90da6418b655fb
2011-02-02 15:17:24 -08:00
Vasu Nori
72725ebcad
bug:3414192 new API to designate a download to be OTA update
...
Change-Id: Iae2f6185e130324ad956f594e78b1d8b2176c808
2011-02-02 15:08:49 -08:00
Irfan Sheriff
ec348b4953
resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp
...
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
2011-02-02 14:23:10 -08:00
Irfan Sheriff
0a4b3fd93b
two digit number handling in croatia and serbia
...
If users dial 92-96, dial them normally and not treat
as USSD
Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
2011-02-02 14:08:38 -08:00
Leon Scroggins
8257e4d7e2
Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
2011-02-02 13:41:19 -08:00
Robert Greenwalt
6f6ef48dc9
Merge "Provide an empty List of dns servers, protecting against an NPE if the DHCP server omits the list of DNS servers from the DHCP-OFFER packet."
2011-02-02 13:31:48 -08:00
Jim Miller
b709a85367
am c2c2360b: am 22d23eb5: Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb
...
* commit 'c2c2360bf1c7e005225383ec9fb5c39c0ef88a74':
Fix 3410155: Remove hint text from password entry field.
2011-02-02 13:22:47 -08:00
Jim Miller
c2c2360bf1
am 22d23eb5: Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb
...
* commit '22d23eb5d1093a6525621db211b2f4ac4983c6ba':
Fix 3410155: Remove hint text from password entry field.
2011-02-02 13:19:57 -08:00
Jim Miller
22d23eb5d1
Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb
2011-02-02 12:41:07 -08:00
Stan Chesnutt
045b166ac2
Provide an empty List of dns servers, protecting against an NPE if the
...
DHCP server omits the list of DNS servers from the DHCP-OFFER packet.
Change-Id: I4cdb3d47f36ecceaef390948741c0632067ee8ba
2011-02-02 12:10:21 -08:00
Leon Scroggins
e89d6418be
DO NOT MERGE. Only scroll if the IME is open in certain cases.
...
Bug:3411564
Requires a change in external/webkit.
Already submitted to master.
Change-Id: Id5b8765bde4070f04fce0743c56a038f88e816ec
2011-02-02 15:05:30 -05:00
Jim Miller
4c573605d0
Fix 3410155: Remove hint text from password entry field.
...
Change-Id: I36882a365e721f038366fea086a0727c9608bf67
2011-02-02 10:24:56 -08:00
Brian Carlstrom
dd1729b9e6
Merge "Removing android.security.MessageDigest"
2011-02-02 10:15:06 -08:00
Justin Ho
110913c2ee
am 8dd81a2b: am c2e16dc6: Merge "Removing red cross from hdpi emergency symbol" into honeycomb
...
* commit '8dd81a2b02f69dc277fe7d7808a6872860ec2c94':
Removing red cross from hdpi emergency symbol
2011-02-02 08:39:15 -08:00
Justin Ho
8dd81a2b02
am c2e16dc6: Merge "Removing red cross from hdpi emergency symbol" into honeycomb
...
* commit 'c2e16dc6da4f0727e79f61b0b1d85116a7840f28':
Removing red cross from hdpi emergency symbol
2011-02-02 08:36:39 -08:00