Svetoslav Ganov
b30ed1fc87
am 99e10991: Merge "The time and data pickers did not support IME editor action correctly."
...
* commit '99e109915e2fe08179f6a64c607ef56a91fb1dfa':
The time and data pickers did not support IME editor action correctly.
2011-09-09 11:26:59 -07:00
Svetoslav Ganov
99e109915e
Merge "The time and data pickers did not support IME editor action correctly."
2011-09-09 11:24:24 -07:00
Svetoslav Ganov
c11da87053
am 5b60d38a: Merge "Update the sharing UI according to latest UX specs."
...
* commit '5b60d38a8a9f506e32987911d34e94f9e167f099':
Update the sharing UI according to latest UX specs.
2011-09-09 11:20:36 -07:00
Svetoslav Ganov
5b60d38a8a
Merge "Update the sharing UI according to latest UX specs."
2011-09-09 11:18:40 -07:00
Jeff Brown
deb5882b2e
am 1d50a2c0: Merge "Adjust layers for system overlays."
...
* commit '1d50a2c0682926f783f9acab5c4bdeca1d3cb9cd':
Adjust layers for system overlays.
2011-09-09 11:08:21 -07:00
Jeff Brown
1d50a2c068
Merge "Adjust layers for system overlays."
2011-09-09 11:06:25 -07:00
Brian Colonna
e9ee5fef97
am f7317477: Merge "Moved FaceLock bind/unbind calls inside of null check"
...
* commit 'f7317477457365656193fdf7f1cd9b81fef1fe4b':
Moved FaceLock bind/unbind calls inside of null check
2011-09-09 10:53:57 -07:00
Brian Colonna
f731747745
Merge "Moved FaceLock bind/unbind calls inside of null check"
2011-09-09 10:52:09 -07:00
Daniel Sandler
61ff7546ce
am 99f6ecc2: Merge "Show roaming icon in status bar."
...
* commit '99f6ecc2fd952a6d10b248081833705ca35f859e':
Show roaming icon in status bar.
2011-09-09 10:41:07 -07:00
Daniel Sandler
99f6ecc2fd
Merge "Show roaming icon in status bar."
2011-09-09 10:39:04 -07:00
Subir Jhanb
0676104c6f
am 37f8b51b: Merge "NPE check in the SyncStateContract BUG:5196483"
...
* commit '37f8b51b43c5f5c90062d504608edc8e79c0a5d6':
NPE check in the SyncStateContract BUG:5196483
2011-09-09 10:37:59 -07:00
Subir Jhanb
37f8b51b43
Merge "NPE check in the SyncStateContract BUG:5196483"
2011-09-09 10:36:09 -07:00
Ken Wakasa
50a9964091
am 758c787d: Merge "Suppress "Automatic" subtype name in tablet\'s IME switcher panel"
...
* commit '758c787d7a51456340d37a4f32e3c028ba09caf2':
Suppress "Automatic" subtype name in tablet's IME switcher panel
2011-09-09 10:22:00 -07:00
Ken Wakasa
758c787d7a
Merge "Suppress "Automatic" subtype name in tablet's IME switcher panel"
2011-09-09 10:19:51 -07:00
Fred Quintana
95df5a2c6d
am 7cbfa977: Merge "Add a form of getAuthToken that both accepts an options Bundle and doesn\'t accepts an activity."
...
* commit '7cbfa977ecb2a7330b372ab59233aa4392c101bd':
Add a form of getAuthToken that both accepts an options Bundle and doesn't accepts an activity.
2011-09-09 09:56:20 -07:00
Peter Ng
79376dc494
am a6f61c5c: Merge "Status bar close dragdown resized to 32dp"
...
* commit 'a6f61c5c39b82950dda6095be76256f865c44566':
Status bar close dragdown resized to 32dp
2011-09-09 09:54:01 -07:00
Fred Quintana
7cbfa977ec
Merge "Add a form of getAuthToken that both accepts an options Bundle and doesn't accepts an activity."
2011-09-09 09:52:45 -07:00
Peter Ng
a6f61c5c39
Merge "Status bar close dragdown resized to 32dp"
2011-09-09 09:52:05 -07:00
Ken Wakasa
bbf0b66ede
Suppress "Automatic" subtype name in tablet's IME switcher panel
...
bug: 5282718
Change-Id: Ibecd6309eba9ac2fe173be7db4ba353e5821bd43
2011-09-10 01:47:49 +09:00
Marco Nelissen
29c8921763
am 02ea7d48: Merge "Fix bug 5045498 Unhide Remote Control Client API"
...
* commit '02ea7d48773210fa0f29299269aca26b3201b1d0':
Fix bug 5045498 Unhide Remote Control Client API
2011-09-09 09:08:05 -07:00
Eric Laurent
c406a3bd34
am ebf6478f: Merge "Fix issue 4673378: switching from VoIP to GSM call"
...
* commit 'ebf6478f557c20fc1c23f9537fcdc3f3c66decb4':
Fix issue 4673378: switching from VoIP to GSM call
2011-09-09 09:07:54 -07:00
Justin Ho
f25544583e
am ce002753: Merge "Add default videos for background replacement."
...
* commit 'ce0027532dc10bf9b25f4eeff1a7540f10fe9a26':
Add default videos for background replacement.
2011-09-09 09:07:47 -07:00
Ken Wakasa
2f060bf268
am 8b83a729: Fix a bug in InputMethodSubtype constructor
...
* commit '8b83a7297680911d666546ee0b3a464514dc2c27':
Fix a bug in InputMethodSubtype constructor
2011-09-09 09:07:27 -07:00
Mathias Agopian
42ec1f0327
am 94d86dae: Merge "Fix another problem with refreshing the screen when switching to/from overlay"
...
* commit '94d86daeb55ad36ec2e4371ca62646b89b4a2a47':
Fix another problem with refreshing the screen when switching to/from overlay
2011-09-09 09:07:10 -07:00
Mathias Agopian
8fcb4df11f
am 28706e3f: Merge "Improve SF dumpsys output wrt HWC"
...
* commit '28706e3fbddf89136e2f1b9c4ad7bea85eee328e':
Improve SF dumpsys output wrt HWC
2011-09-09 09:07:06 -07:00
Jim Miller
06cd5ec976
am 4f4ed38a: Merge "Fix 5185505: Add support for weak biometric sensors to lockscreen."
...
* commit '4f4ed38a8852bcf45fbec460ab61256fe98b2b40':
Fix 5185505: Add support for weak biometric sensors to lockscreen.
2011-09-09 09:06:58 -07:00
Chih-Chung Chang
ebe5d63765
am fa720d30: Merge "Fix 5278371: OOM in MediaItemThumbnailTest"
...
* commit 'fa720d301569df2b766c04225ad0187f40a1a9e7':
Fix 5278371: OOM in MediaItemThumbnailTest
2011-09-09 09:06:32 -07:00
Mathias Agopian
e1de2531e7
am 6b77231b: Merge "Fix an issue is SF that caused drawing artifacts when hwc changed mode"
...
* commit '6b77231bccc3efcb744fc5b2df0619b2b4690771':
Fix an issue is SF that caused drawing artifacts when hwc changed mode
2011-09-09 09:06:27 -07:00
Michael Jurka
33761ede90
am 6c0d41a4: Merge "Fix FrameLayout padding when foreground drawable is set"
...
* commit '6c0d41a4ea56a8da79ee3ded62706ec983a39c0b':
Fix FrameLayout padding when foreground drawable is set
2011-09-09 09:06:11 -07:00
Michael Jurka
c1b9ac8a17
am 6f90f2a1: Merge "Updated Recent Apps visuals"
...
* commit '6f90f2a1aab5c4e56012b65b788b84370e231bc6':
Updated Recent Apps visuals
2011-09-09 09:06:02 -07:00
Michael Jurka
0eec069544
am 3705b22c: Merge "Adding null check to prevent monkey crash. (5263199)"
...
* commit '3705b22c9704050dfb46d784ae84e9d7f9357ad4':
Adding null check to prevent monkey crash. (5263199)
2011-09-09 09:05:53 -07:00
Fabrice Di Meglio
f7c05c0927
am 2295cc77: Merge "Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field"
...
* commit '2295cc77c72d451e7a1c9ec48f120a8e73651b6d':
Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field
2011-09-09 09:05:43 -07:00
Adam Powell
b90015e3c5
am 9c7b547e: Merge "Fix bug 5279075 - Handle action bar config changes when action mode is active"
...
* commit '9c7b547e7f537e81abb8d556aff13919e0571d8a':
Fix bug 5279075 - Handle action bar config changes when action mode is active
2011-09-09 09:05:38 -07:00
JP Abgrall
571a514153
am 40e8b411: Merge "NetworkManagementService: adjust the qtaguid idx to new kernel"
...
* commit '40e8b4118fb03a0499b4383ff0d6d582b6d1cf64':
NetworkManagementService: adjust the qtaguid idx to new kernel
2011-09-09 09:05:31 -07:00
Chet Haase
7c34e75746
am e2ca0876: Merge "Throw an exception if a both nav and system bars are configured"
...
* commit 'e2ca08765e1e2da8edcbb9e43b0d2c2f79bd5101':
Throw an exception if a both nav and system bars are configured
2011-09-09 09:05:19 -07:00
Fred Quintana
89e22992b9
am 16e1678d: Merge "Make the SyncManager have wakelocks per account, not per account type, otherwise the parallel sync behavior of gmail can cause the first account to finish to release the wakelock that is used for the other account, which will result in the device g
...
* commit '16e1678df48f6de4eb602f9cd18baa1e40b1181f':
Make the SyncManager have wakelocks per account, not per account type, otherwise the parallel sync behavior of gmail can cause the first account to finish to release the wakelock that is used for the other account, which will result in the device going to sleep before the sync is complete.
2011-09-09 09:05:11 -07:00
Fabrice Di Meglio
92789136c1
am 0669577b: Merge "Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field"
...
* commit '0669577b13302767e90a193c5f48e7faae580654':
Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field
2011-09-09 09:04:53 -07:00
Eric Laurent
e61417a95d
am 1a4cbba9: Merge "Fixed digital audio output detection"
...
* commit '1a4cbba932bc5da29a8933ddf8d6fe8d5a0826b8':
Fixed digital audio output detection
2011-09-09 09:04:35 -07:00
Matthew Xie
b49d2ed321
am 5d61d8dd: Merge "Apply timeout for powerdown event and reset state machine when bluez crashes"
...
* commit '5d61d8ddec486645c9e851dcc7583cabef50c851':
Apply timeout for powerdown event and reset state machine when bluez crashes
2011-09-09 09:04:20 -07:00
Eric Laurent
8cde171e98
am 11e2e5de: Merge "AudioTrack: extend callback thread sleep time"
...
* commit '11e2e5dece7a92f50b73240dc0300343a7b495bf':
AudioTrack: extend callback thread sleep time
2011-09-09 09:03:16 -07:00
Robert Greenwalt
b3e26eb241
am 4ef6d2ea: Merge "Pass roaming info to ConnectivityService."
...
* commit '4ef6d2ea215169c2c0cbab14228e5073e986392b':
Pass roaming info to ConnectivityService.
2011-09-09 09:03:03 -07:00
Teng-Hui Zhu
2df91e228c
am a4248f69: Merge "Don\'t sleep when inline video start"
...
* commit 'a4248f6932750ac8a472a02fb9d3927194ba59b6':
Don't sleep when inline video start
2011-09-09 09:02:46 -07:00
Romain Guy
1ba08da1b8
am f5ad309a: Merge "Add support for 3 new blend modes when blending with framebuffer: Add Multiply Screen"
...
* commit 'f5ad309a60360af2e0ea8f40c764b9eafa9eb669':
Add support for 3 new blend modes when blending with framebuffer: Add Multiply Screen
2011-09-09 09:02:25 -07:00
Pannag Sanketi
5a8c298018
am 5303254c: Merge "Always set geometry in queuebuffer"
...
* commit '5303254cc944449d08c8489caf288516445f7af0':
Always set geometry in queuebuffer
2011-09-09 09:02:16 -07:00
Svetoslav Ganov
6a587dffa1
am 53df60b8: Merge "Touch explorer does not cancel long press correctly causing system crash."
...
* commit '53df60b81eac34445389ae05a6b664077d27cbd7':
Touch explorer does not cancel long press correctly causing system crash.
2011-09-09 09:01:57 -07:00
Jeff Sharkey
332ea4db33
am b0d89922: Merge "Always disable() through SBMS; watch date."
...
* commit 'b0d89922b186b62701aa7ee1ed8f808fac2c1d9b':
Always disable() through SBMS; watch date.
2011-09-09 09:01:46 -07:00
Jaikumar Ganesh
8f9c21780b
am d4d2ba80: Merge "Fix crash while connecting channel."
...
* commit 'd4d2ba8037b3262d01ba26a7fe007e86a38b1ab1':
Fix crash while connecting channel.
2011-09-09 09:01:37 -07:00
Jaikumar Ganesh
3bed2b1383
am cedd4608: Merge "Make Bluetooth Health APIs public."
...
* commit 'cedd460820ffc3e88fdac5926baf588279c38b6f':
Make Bluetooth Health APIs public.
2011-09-09 09:01:27 -07:00
Romain Guy
0e75168920
am 8312b20d: Merge "Save/restore display lists\' canvas properly"
...
* commit '8312b20d83b3ce886485c14f7ec5c8b45056a62f':
Save/restore display lists' canvas properly
2011-09-09 09:01:08 -07:00
Brian Colonna
15ea55a6f1
Moved FaceLock bind/unbind calls inside of null check
...
- I am not sure under what circumstances mKeyguardView can be null in
onScreenTurnedOn() and I never saw this behavior before the commit,
but it can happen and prevent the device from booting
- Patched to fix line length
Change-Id: I39efa5c1d68158af5c108430036fe7c715ef855b
2011-09-09 11:53:36 -04:00