Robert Greenwalt
c86824de5e
am 07a8778b: Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '07a8778b560ce8d46bcf5aad012be575f3a90500':
Update networktype before sending state change.
2011-01-28 09:22:01 -08:00
Robert Greenwalt
2b1e607682
Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-28 09:08:00 -08:00
Robert Greenwalt
d9187088f6
resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp
...
Change-Id: Ib9d24c211461329955288180978a7c5d383bba75
2011-01-28 09:06:30 -08:00
Ben Murdoch
53d95ddd3e
am 306e96c0: am c38b7c82: Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
...
* commit '306e96c0dd931c9dd83e3d580c5b79141d093646':
Implement the double tap to zoom animation with HW accleration.
2011-01-28 02:42:39 -08:00
Ben Murdoch
5803c2a5df
am c38b7c82: Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
...
* commit 'c38b7c820af52c4d5f6f51c750136d18d9897e5e':
Implement the double tap to zoom animation with HW accleration.
2011-01-28 02:35:22 -08:00
Ben Murdoch
4613570b51
Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
2011-01-28 02:27:38 -08:00
Dianne Hackborn
c560e4e3cf
am bb609471: am 256a09b2: Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
...
* commit 'bb6094718b08e7fe2054b7260a85baae635afe48':
Fix issue #3392073 : At times soft keyboard comes up in...
2011-01-27 22:53:20 -08:00
Dianne Hackborn
3a3a6ce7fe
am f1a9ab26: am d23316bc: Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
...
* commit 'f1a9ab2673a2b5e6f684f7ceced177e3fc749ee7':
Maybe fix issue #3358322 : Status and nav bar died while watching youtube
2011-01-27 22:53:13 -08:00
Dianne Hackborn
311559851f
am 256a09b2: Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
...
* commit '256a09b2fa5cc06775818428de771c7957403452':
Fix issue #3392073 : At times soft keyboard comes up in...
2011-01-27 22:50:56 -08:00
Dianne Hackborn
d7f4f7c167
am d23316bc: Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
...
* commit 'd23316bc8b49f269e5adcc91eae5698549faa0a3':
Maybe fix issue #3358322 : Status and nav bar died while watching youtube
2011-01-27 22:50:52 -08:00
Dianne Hackborn
1444bc6f0f
am 6a11185b: am c8c3021a: Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
...
* commit '6a11185b9293151cb3c12c296cf989ea0e7cb898':
Fix issue #3398767 : Need translucent holo theme
2011-01-27 22:50:45 -08:00
Dianne Hackborn
a2ba76d444
Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
2011-01-27 22:48:58 -08:00
Dianne Hackborn
16cda1f7a3
am c8c3021a: Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
...
* commit 'c8c3021ac3b5ca2315148d5dae143b53b7d68a60':
Fix issue #3398767 : Need translucent holo theme
2011-01-27 22:48:32 -08:00
Dianne Hackborn
a3980da2d0
Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
2011-01-27 22:47:50 -08:00
Dianne Hackborn
0891204682
Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
2011-01-27 22:46:44 -08:00
Romain Guy
f40bb427a6
am 24c29867: am d0b54a73: Merge "Add more debug info for profiling." into honeycomb
...
* commit '24c29867a6851ce2c692a0ea61918d37dcb8e8e0':
Add more debug info for profiling.
2011-01-27 22:35:13 -08:00
Romain Guy
a95ea978ae
am d0b54a73: Merge "Add more debug info for profiling." into honeycomb
...
* commit 'd0b54a73941aa5541ed1adc48f6739bda132970b':
Add more debug info for profiling.
2011-01-27 22:33:02 -08:00
Romain Guy
f930d5de48
Merge "Add more debug info for profiling." into honeycomb
2011-01-27 22:30:57 -08:00
Dianne Hackborn
11e0746577
Fix issue #3392073 : At times soft keyboard comes up in...
...
...gallery while attaching picture to gmail message
In various places we could block switching the IME target incorrectly.
Change-Id: I7e647fb35f4ea6f2e39eb7efd911420ea9ee64fa
2011-01-27 21:56:33 -08:00
Jason Sams
55047abedd
am 3e232f1c: am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
...
* commit '3e232f1c59eb95a7d3b5b3ea411a383b7a8f1b5b':
Fix another barrier bug 3333866 Atomically update put.
2011-01-27 21:28:22 -08:00
Jason Sams
56d0314731
am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
...
* commit '386ef6da5a95243b4a55b3f760621260e20a5e39':
Fix another barrier bug 3333866 Atomically update put.
2011-01-27 21:26:15 -08:00
Jason Sams
61486c0980
Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
2011-01-27 21:24:00 -08:00
Adam Cohen
e3e2f39cd5
am aed413a1: am e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
...
* commit 'aed413a18cac6b39d5e88c53b08bdb019ebb6d8d':
Fixing static StackView scenario (Issue: 3399844)
2011-01-27 20:08:35 -08:00
Adam Cohen
5f8f0282ed
am e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
...
* commit 'e31ecf61042171242e6f31f22df7691c40f189b2':
Fixing static StackView scenario (Issue: 3399844)
2011-01-27 20:06:09 -08:00
satok
2d8facb844
am fb80d648: am 17945d0e: Merge "Update InputMethodPanel when locale was changed." into honeycomb
...
* commit 'fb80d648e2164fac75d41d6024a4d43137c0561f':
Update InputMethodPanel when locale was changed.
2011-01-27 20:04:31 -08:00
Adam Cohen
460529bb93
Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
2011-01-27 20:04:21 -08:00
satok
f4df38935d
am 17945d0e: Merge "Update InputMethodPanel when locale was changed." into honeycomb
...
* commit '17945d0e05c8a4b0aa59032bc054b942c20d9472':
Update InputMethodPanel when locale was changed.
2011-01-27 20:02:04 -08:00
satok
540494935d
Merge "Update InputMethodPanel when locale was changed." into honeycomb
2011-01-27 20:00:43 -08:00
Stephen Hines
d12ebdcc48
am 6059c395: am 55f8f121: Merge "Correctly free resouces bound to scripts when the scripts are deleted." into honeycomb
...
* commit '6059c3955d739ab5fad15f9bf6bb6f743a9b5ac2':
Correctly free resouces bound to scripts when the scripts are deleted.
2011-01-27 19:44:36 -08:00
Stephen Hines
e52dff22ef
am 55f8f121: Merge "Correctly free resouces bound to scripts when the scripts are deleted." into honeycomb
...
* commit '55f8f12119ad2fbb6afcb7647a1a18f4aa86f0f5':
Correctly free resouces bound to scripts when the scripts are deleted.
2011-01-27 19:42:20 -08:00
Stephen Hines
69f5a32563
Merge "Correctly free resouces bound to scripts when the scripts are deleted." into honeycomb
2011-01-27 19:40:24 -08:00
Justin Ho
adce53cfe2
am 1bc3cbbf: am adc0a5bd: Merge "Attenuate notification icons in the system bar." into honeycomb
...
* commit '1bc3cbbf1c8588d5d3f5141eca557b7101bbc692':
Attenuate notification icons in the system bar.
2011-01-27 19:37:11 -08:00
Justin Ho
c924e8100a
am adc0a5bd: Merge "Attenuate notification icons in the system bar." into honeycomb
...
* commit 'adc0a5bdd220dab563cb4836989ad6acb1b32189':
Attenuate notification icons in the system bar.
2011-01-27 19:35:00 -08:00
Justin Ho
362c51c8c1
Merge "Attenuate notification icons in the system bar." into honeycomb
2011-01-27 19:32:13 -08:00
Justin Ho
451aa9aba3
am f4e04584: am 07520feb: Merge "Updated data and wifi indicators, updated GPS" into honeycomb
...
* commit 'f4e045841b4dbdb32975b0d2f430ed1858f6adf7':
Updated data and wifi indicators, updated GPS
2011-01-27 18:45:27 -08:00
Justin Ho
2c1a882863
am 07520feb: Merge "Updated data and wifi indicators, updated GPS" into honeycomb
...
* commit '07520feb6d908930be19d1a93d5a35f64b5a62ab':
Updated data and wifi indicators, updated GPS
2011-01-27 18:42:19 -08:00
Justin Ho
9fbe882c5b
Merge "Updated data and wifi indicators, updated GPS" into honeycomb
2011-01-27 18:39:19 -08:00
Justin Ho
c758649b80
am 5b5092d4: am 06dd4c02: Merge "Updated tether icons" into honeycomb
...
* commit '5b5092d436c2924912460d4d12ea45ee92071117':
Updated tether icons
2011-01-27 18:26:53 -08:00
Justin Ho
3df1b700bf
am 06dd4c02: Merge "Updated tether icons" into honeycomb
...
* commit '06dd4c0220acce71e613c15758729273e99eae6c':
Updated tether icons
2011-01-27 18:24:19 -08:00
Justin Ho
dbdda0ccb7
Merge "Updated tether icons" into honeycomb
2011-01-27 18:21:54 -08:00
Svetoslav Ganov
9abf3a65d8
am 5e83d0f5: am 86471d00: Merge "Accessibility support to NumberPicker, DatePicker, and TimePicker" into honeycomb
...
* commit '5e83d0f58b96376ea4862e8ce1501daf88bf962a':
Accessibility support to NumberPicker, DatePicker, and TimePicker
2011-01-27 18:20:24 -08:00
Jean-Michel Trivi
895a9a9b85
am 965f22ba: am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb
...
* commit '965f22ba325ea488034174bf76194470a6f0ee52':
Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
2011-01-27 18:18:17 -08:00
Svetoslav Ganov
95d14374ae
am 86471d00: Merge "Accessibility support to NumberPicker, DatePicker, and TimePicker" into honeycomb
...
* commit '86471d00f6637dc2c839b2df2a0df511b1ac4dc7':
Accessibility support to NumberPicker, DatePicker, and TimePicker
2011-01-27 18:17:54 -08:00
Svetoslav Ganov
c70aa75c83
Merge "Accessibility support to NumberPicker, DatePicker, and TimePicker" into honeycomb
2011-01-27 18:16:27 -08:00
Jean-Michel Trivi
53ac27fcb2
am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb
...
* commit '3b5d9515f208d28ae168c3f3d3cd442ff6e6e45a':
Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
2011-01-27 18:15:39 -08:00
Jean-Michel Trivi
8e32c046a7
Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb
2011-01-27 18:13:00 -08:00
Daniel Sandler
0ec85d3835
am d07094a1: am e2c251b5: Tapping the ticker again activates the notification.
...
* commit 'd07094a16d4a65ffe1b7c702797c9b9b7aa65a4b':
Tapping the ticker again activates the notification.
2011-01-27 18:01:43 -08:00
Daniel Sandler
b72fff095b
am e2c251b5: Tapping the ticker again activates the notification.
...
* commit 'e2c251b564a46a8f7352094ba8a61d46dc6b676f':
Tapping the ticker again activates the notification.
2011-01-27 17:59:15 -08:00
Jim Miller
b7d342c674
am 6fc22aaa: am a85b789a: Merge "Fix 3381322: Update transition animation from lockscreen to home." into honeycomb
...
* commit '6fc22aaadbe00bae2a313e9238b6dbd2f2d47cdf':
Fix 3381322: Update transition animation from lockscreen to home.
2011-01-27 17:47:06 -08:00
Jim Miller
f107d7496c
am a85b789a: Merge "Fix 3381322: Update transition animation from lockscreen to home." into honeycomb
...
* commit 'a85b789a4a6c58c33dda9e5b00a10faee6bbf561':
Fix 3381322: Update transition animation from lockscreen to home.
2011-01-27 17:44:41 -08:00