Vasu Nori
9ec496b484
am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
...
* commit 'e1cbd0a85f09a54f8bf28545ac67455b7dcd2532':
Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
2011-02-03 12:24:59 -08:00
Vasu Nori
e1cbd0a85f
Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
...
This reverts commit 6bc710f769 , reversing
changes made to 7ba35f5ab3 .
2011-02-03 12:20:31 -08:00
Michael Jurka
d51e0820b3
am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb
...
* commit '8275c6087897e8fd614681d1cd12db62e6b9fcd5':
adding fast setters for translationx/y
2011-02-03 12:02:37 -08:00
Michael Jurka
8275c60878
Merge "adding fast setters for translationx/y" into honeycomb
2011-02-03 12:00:37 -08:00
Romain Guy
cb2c84fd81
am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565 " into honeycomb
...
* commit '3b66e43e8c5671c646ccc6d52b0f2dec13898c91':
Refresh display lists when turning off layers rendering. Bug #3420565
2011-02-03 11:46:47 -08:00
Romain Guy
3b66e43e8c
Merge "Refresh display lists when turning off layers rendering. Bug #3420565 " into honeycomb
2011-02-03 11:43:17 -08:00
Romain Guy
9d18f2d189
Refresh display lists when turning off layers rendering.
...
Bug #3420565
Change-Id: I2139540e591a97cd487e3d7cce6b70d6b23df9de
2011-02-03 11:32:38 -08:00
Cary Clark
859563ebf7
am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb
...
* commit 'aa7dc92838f4e3d423b2a738f54de9b83f83794b':
stop GL drawing thread before killing WebCore
2011-02-03 08:52:21 -08:00
Cary Clark
aa7dc92838
Merge "stop GL drawing thread before killing WebCore" into honeycomb
2011-02-03 08:48:24 -08:00
Cary Clark
d9fd857ca9
stop GL drawing thread before killing WebCore
...
The TexturesGenerator thread references pictures owned by the
WebCore thread, so must be stopped before the WebCore thread
is deleted.
Requires a companion change in external/webkit
bug:3406185
Change-Id: I5b2f8b3b52367b05301c76e5bd22a95fcd0338d5
2011-02-03 05:37:04 -05:00
Michael Jurka
dece29ffd3
adding fast setters for translationx/y
2011-02-03 01:41:49 -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
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
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
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
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
Romain Guy
57188f0d1d
am c1f8bcff: Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433 " into honeycomb
...
* commit 'c1f8bcffb8612ef5bdddc4bca6eca23804cbe453':
Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433
2011-02-02 00:49:31 -08:00
Romain Guy
c1f8bcffb8
Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433 " into honeycomb
2011-02-02 00:47:21 -08:00
Romain Guy
beff8d83ef
Fix incorrect dirty rectangle transformation in hardware layers.
...
Bug #3413433
Change-Id: Iba201c7c4b4f11937797f3afcbf20c5a7395be25
2011-02-01 23:53:34 -08:00
Romain Guy
debeeef504
am d51eaa64: Merge "Update layers based on the dirty region. Bug #3413433 " into honeycomb
...
* commit 'd51eaa64e3f2d9684b2dd18ebd67734f4e0e7801':
Update layers based on the dirty region. Bug #3413433
2011-02-01 23:07:54 -08:00
Romain Guy
d51eaa64e3
Merge "Update layers based on the dirty region. Bug #3413433 " into honeycomb
2011-02-01 23:05:35 -08:00
Romain Guy
3a3133d876
Update layers based on the dirty region.
...
Bug #3413433
This helps Launcher when a widget updates during a scroll, or when interacting
with widgets on the workspace if layers are still turned on.
Change-Id: Ic7a42eb34f74f4ae988039754f815e2efd1d1e4f
2011-02-01 23:01:43 -08:00
Romain Guy
a42ee6994b
am 518813ec: Merge "New API to let apps draw without layers. Bug #3413433 " into honeycomb
...
* commit '518813ec13153c7b02fb417720f353330e5d946e':
New API to let apps draw without layers. Bug #3413433
2011-02-01 22:04:31 -08:00
Romain Guy
518813ec13
Merge "New API to let apps draw without layers. Bug #3413433 " into honeycomb
2011-02-01 22:02:00 -08:00
Wink Saville
ff34565fcb
am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb
...
* commit '1bf518d8b333768e26bacf340f88f7d4ba8b9a91':
Add TelephonyManager.getCurrentPhoneType
2011-02-01 21:03:58 -08:00
Wink Saville
1bf518d8b3
Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb
2011-02-01 21:02:10 -08:00
Michael Jurka
3b723ace40
am 46ab5e13: Merge "add missing call to superclass method" into honeycomb
...
* commit '46ab5e13f27324d634ff27b7fd75c5d432b915bf':
add missing call to superclass method
2011-02-01 20:55:15 -08:00
Michael Jurka
b8f939fb57
add missing call to superclass method
2011-02-01 20:50:30 -08:00
Wink Saville
9d72be3318
Add TelephonyManager.getCurrentPhoneType
...
The new method getCurrentPhoneType has the old behavior of getPhoneType
and does not check for voice capable. This allows code to assume
the old behavior.
bug: 3198435
Change-Id: I0542838ceca2f757cceb6cd7f795e95fe886523e
2011-02-01 19:22:15 -08:00
Ben Murdoch
6a48ba740e
am 3b8657de: Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb
...
* commit '3b8657debcbcf1bb4e66ac797d7ea15d737ecb42':
Move setExpandedTileBounds from WC to UI thread
2011-02-01 18:39:51 -08:00
Ben Murdoch
3b8657debc
Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb
2011-02-01 18:37:43 -08:00
Ben Murdoch
fa148f6889
Move setExpandedTileBounds from WC to UI thread
...
Bug: 3412928
Change-Id: I2d5c8cc1ba188152dd570ef3a0f2f2f14d64465f
2011-02-02 02:27:40 +00:00
Brian Muramatsu
0872e36ccb
am 1d696fa4: Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb
...
* commit '1d696fa45881ff234c9b76eef8ee5aab444ba918':
Fix Incorrect Times in TimePickerDialog
2011-02-01 18:10:59 -08:00
Brian Muramatsu
1d696fa458
Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb
2011-02-01 18:09:36 -08:00
Brian Muramatsu
87879e8ef9
Fix Incorrect Times in TimePickerDialog
...
Bug 3414311
TimePicker#setCurrentHour subtracts 12 from the given hour if
is24HourView returns false. TimePickerDialog calls setCurrentHour before
setIs24HourView, so the 12 will always be substracted from the time.
Reorder the statements so that TimePickerDialog sets is24HourView,
before setting the hour and time.
Change-Id: Ib997397b04dbdd767e67806aea7614426019e938
2011-02-01 17:56:29 -08:00
Romain Guy
849d0a37cf
New API to let apps draw without layers.
...
Bug #3413433
Launcher now enables layers all the time, but in some cases (for instance, when the
workspace is not scrolling,) it is more efficient to draw without the layer.
Change-Id: I625fb5b48506acda9ae75356fdbbe812c85f2aab
2011-02-01 17:56:09 -08:00
Jaikumar Ganesh
25bbfda244
am 485d577a: Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb
...
* commit '485d577af1b410769e1a364d8e2bf7837fb313b0':
Fix BluetoothAdapter Connection change intent doc.
2011-02-01 17:08:46 -08:00
Jaikumar Ganesh
485d577af1
Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb
2011-02-01 17:06:56 -08:00
Jaikumar Ganesh
0b5b35f8a1
Fix BluetoothAdapter Connection change intent doc.
...
Bug: 3414206
Change-Id: Icf87e28e11b0b5072fe546225bbfb1dc68487ef0
2011-02-01 16:53:14 -08:00