Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,065 Commits 3 Branches 0 Tags
33761ede90f3b5fc3bf7dd950357d6ecfff3c922
Commit Graph

18772 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Dave Santoro
dd15cbfd60 am 9fefa3c7: Merge "Add raw entities URI for profiles." 
* commit '9fefa3c716e9c8d7dfb6c851c91e37e37732a955':
  Add raw entities URI for profiles.
 2011-09-08 13:39:46 -07:00
Dave Santoro
21f0de55c5 am a8f09b09: Merge "Add data_set for Settings table as well." 
* commit 'a8f09b0946db9327f1d453cac92987f5e26e5102':
  Add data_set for Settings table as well.
 2011-09-08 13:39:41 -07:00
Dave Santoro
9fefa3c716 Merge "Add raw entities URI for profiles." 2011-09-08 13:38:00 -07:00
Dave Santoro
a8f09b0946 Merge "Add data_set for Settings table as well." 2011-09-08 13:37:43 -07:00
Subir Jhanb
b7fc29c78d am 3adb1809: Merge "Changing the timeout for detecting syncs that are taking too long to bind BUG: 5222661" 
* commit '3adb1809098998851b2486e5abad1ec612f9f85e':
  Changing the timeout for detecting syncs that are taking too long to bind BUG: 5222661
 2011-09-08 13:26:52 -07:00
Subir Jhanb
3adb180909 Merge "Changing the timeout for detecting syncs that are taking too long to bind BUG: 5222661" 2011-09-08 13:24:45 -07:00
Subir Jhanb
795b6490fe Changing the timeout for detecting syncs that are taking too long to bind 
BUG: 5222661

Change-Id: I9406980e26a4ee30ac6d5470bc97928e3dc74d24
 2011-09-08 13:12:21 -07:00
Isaac Katzenelson
03410afb86 am 5e875259: Merge "Fix snippetizing cursor" 
* commit '5e8752595f7a3d3dd1e0d469ac275295e38bcfe1':
  Fix snippetizing cursor
 2011-09-08 12:50:40 -07:00
Isaac Katzenelson
5e8752595f Merge "Fix snippetizing cursor" 2011-09-08 12:49:13 -07:00
Robert Greenwalt
a6d4248e21 Pass roaming info to ConnectivityService. 
bug:5215657
Change-Id: I77024141a7bbaa47eae021009e16b283699be53e
 2011-09-08 12:01:59 -07:00
Gilles Debunne
da93a46371 am 15208ac5: Merge "No vibration when long pressing in the empty part of an EditText" 
* commit '15208ac5003de16e8e3d9ec26c3ef05347da7731':
  No vibration when long pressing in the empty part of an EditText
 2011-09-08 11:20:04 -07:00
Gilles Debunne
dbac653e64 am df1324c3: Merge "Longpressing in landscape correctly starts selection mode." 
* commit 'df1324c3cfcd94c1a634fd7f1ef97f15e0d727dc':
  Longpressing in landscape correctly starts selection mode.
 2011-09-08 11:20:01 -07:00
Gilles Debunne
15fd3514fa am 0c4f8ec6: Merge "Updated text selection color. As in 133272" 
* commit '0c4f8ec6d33f113e8173efa86901593cd8b84cdf':
  Updated text selection color. As in 133272
 2011-09-08 11:19:58 -07:00
Gilles Debunne
15208ac500 Merge "No vibration when long pressing in the empty part of an EditText" 2011-09-08 11:18:53 -07:00
Gilles Debunne
df1324c3cf Merge "Longpressing in landscape correctly starts selection mode." 2011-09-08 11:18:36 -07:00
Gilles Debunne
0c4f8ec6d3 Merge "Updated text selection color. As in 133272" 2011-09-08 11:18:23 -07:00
Dianne Hackborn
569857cd44 am 4ee36669: Merge "Fix issue #5263361: Browser instance not created in application picker" 
* commit '4ee366690111e5f71a248a2af10301db425162d5':
  Fix issue #5263361: Browser instance not created in application picker
 2011-09-08 10:41:59 -07:00
Steve Block
0596c46b25 am 703bde8c: Merge "Add FrameLayout.getMeasureAllChildren()" 
* commit '703bde8ca5b2b5b7bc4460eacd48194278c45ae3':
  Add FrameLayout.getMeasureAllChildren()
 2011-09-08 10:39:48 -07:00
Dianne Hackborn
4ee3666901 Merge "Fix issue #5263361: Browser instance not created in application picker" 2011-09-08 10:38:42 -07:00
Steve Block
703bde8ca5 Merge "Add FrameLayout.getMeasureAllChildren()" 2011-09-08 10:38:15 -07:00
Dianne Hackborn
905577f634 Fix issue #5263361: Browser instance not created in application picker 
The resolver activity was hiding the following activity from recents.

Also some other fixes: a little better memory use debugging, removed
some unneeded code from window manager, moved some system activities
into their own process, added some more running process information for
manage apps.

Change-Id: I66687d16989ff965d524b92dc360f37c19199717
 2011-09-08 10:35:11 -07:00