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
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
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
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
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
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
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
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
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
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
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
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
Ken Wakasa
8b83a72976
Fix a bug in InputMethodSubtype constructor
...
bug: 5249480
Change-Id: I707e45cc0606dae7824c478ab586fc24d3f417f8
2011-09-09 20:56:29 +09:00
Jim Miller
4f4ed38a88
Merge "Fix 5185505: Add support for weak biometric sensors to lockscreen."
2011-09-09 00:58:01 -07:00
Jim Miller
6edf2637e9
Fix 5185505: Add support for weak biometric sensors to lockscreen.
...
Added binder interfaces to the framework.
Change-Id: I7d55b45baa4d1600ebd2a3828e85c3357cfcfb58
2011-09-09 00:53:02 -07:00
Michael Jurka
6c0d41a4ea
Merge "Fix FrameLayout padding when foreground drawable is set"
2011-09-08 20:56:35 -07:00
Michael Jurka
02473da2b0
Fix FrameLayout padding when foreground drawable is set
...
The padding of the foreground drawable was being added to the padding that already existed, even if the foreground drawable was drawing within the padded region. This was preventing having a foreground drawable and a background drawable set on a FrameLayout that overlapped perfectly.
Change-Id: I355ff9323fb49afc5816f47ec9e257e0ff849861
2011-09-08 20:39:16 -07:00
Jeff Brown
bfcb60ab0f
Adjust layers for system overlays.
...
Prevent system overlays from showing above the notification bar.
Allow secure system overlays to be fullscreen, for the pointer
location view.
Show the drag layer above the notification bar.
Change-Id: Ic8d663792a243cca2cd9952d241d001e0357d551
2011-09-08 18:53:42 -07:00
Fabrice Di Meglio
2295cc77c7
Merge "Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field"
2011-09-08 18:27:29 -07:00
Adam Powell
9c7b547e7f
Merge "Fix bug 5279075 - Handle action bar config changes when action mode is active"
2011-09-08 18:23:26 -07:00
Svetoslav Ganov
f2e7540021
Update the sharing UI according to latest UX specs.
...
bug:3362473
Change-Id: Ic302c289e28061f53446f98e5b97573d57d9cfb8
2011-09-08 18:19:13 -07:00
Fabrice Di Meglio
e4231461f4
Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field
...
Part 2
- use "textview_error_popup_default_width" as a dimension resource instead of a basic constant
Change-Id: Ieb89fc416105716ab491749a82390a7e784b1755
2011-09-08 18:15:50 -07:00
Adam Powell
425689eea2
Fix bug 5279075 - Handle action bar config changes when action mode is active
...
Change-Id: I83d40d2d555b01a9e678231c4f3c5278fab959d7
2011-09-08 18:10:24 -07:00
Fred Quintana
16e1678df4
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 going to sleep before the sync is complete."
2011-09-08 17:53:03 -07:00
Fabrice Di Meglio
0669577b13
Merge "Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field"
2011-09-08 17:35:01 -07:00
Fabrice Di Meglio
33438be008
Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field
...
- cap the popup to 240 (Validated with UX team)
Change-Id: I2923825a19b7c79fa0d1233300f42e10bdda8df7
2011-09-08 17:19:04 -07:00
Matthew Xie
5d61d8ddec
Merge "Apply timeout for powerdown event and reset state machine when bluez crashes"
2011-09-08 17:16:50 -07:00
Robert Greenwalt
4ef6d2ea21
Merge "Pass roaming info to ConnectivityService."
2011-09-08 16:03:45 -07:00
Fred Quintana
fdb2dca454
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.
Change-Id: I7658465ca0956dfd9bb341de03126869e6217d31
2011-09-08 15:59:56 -07:00
Teng-Hui Zhu
a4248f6932
Merge "Don't sleep when inline video start"
2011-09-08 15:41:54 -07:00
Jaikumar Ganesh
d4d2ba8037
Merge "Fix crash while connecting channel."
2011-09-08 15:20:19 -07:00
Jaikumar Ganesh
cedd460820
Merge "Make Bluetooth Health APIs public."
2011-09-08 15:19:37 -07:00
Jaikumar Ganesh
8ee53da561
Fix crash while connecting channel.
...
When an incoming connection comes and then we disconnect it,
and then launch the outgoing connection - we crash because
the channel path chan.mChannelPath is null.
Change-Id: I9115cc038f7ce85a193bf05d14b2b0a5e0579a69
2011-09-08 15:17:25 -07:00
Jaikumar Ganesh
eb9d34630f
Make Bluetooth Health APIs public.
...
Fix a few bugs:
a) Pass a integer token to identify the channel.
b) Close fds in case of errors.
Change-Id: I2046787be5008769435f2f72a5bd67c19b749da0
2011-09-08 15:17:17 -07:00
Romain Guy
8312b20d83
Merge "Save/restore display lists' canvas properly"
2011-09-08 15:06:05 -07:00
Romain Guy
e080af3754
Save/restore display lists' canvas properly
...
Change-Id: Ic016f0215f9fe5c67af98f059ecce4ed94994810
2011-09-08 15:05:26 -07:00
Matthew Xie
694c0b833b
Apply timeout for powerdown event and reset state machine when bluez crashes
...
The powerdown event was missed some time for unknown reasons and bluez could
crash for unknown reasons. We will debug on the issue. But for the time
being, we add a powerdown timer and process power up event to recover from
bluez crash
bug 5239719
Change-Id: Ie7315fb01e029747951e1a97a2d2f1dce53a997b
2011-09-08 15:05:19 -07:00
Teng-Hui Zhu
690ad54090
Don't sleep when inline video start
...
bug:4563692
Change-Id: I0174403e3f78b5a637500fbaaf7f9219efe0cbc8
2011-09-08 14:36:33 -07:00
Fred Quintana
ad93a323fe
Add a form of getAuthToken that both accepts an options Bundle and
...
doesn't accepts an activity.
Bug: 5278759
Change-Id: I513c9b5d8a907e26b9ad3c0d5977614820a4990c
2011-09-08 14:12:49 -07:00
Adam Powell
e1e24f6e60
am dceee864: Merge "Fix bug 5249855 - put content descriptions for action bar tabs on images"
...
* commit 'dceee86438a7e950a63e80bf8f9347aeaa022a71':
Fix bug 5249855 - put content descriptions for action bar tabs on images
2011-09-08 14:02:52 -07:00
Adam Powell
dceee86438
Merge "Fix bug 5249855 - put content descriptions for action bar tabs on images"
2011-09-08 14:01:03 -07:00