drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,493 Commits 1 Branch 0 Tags
Commit Graph

59493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
7f9052735b am 44445730: Merge "Fix some TextLayoutCache issues" 
* commit '444457306041f00331283d0d470434d4922418f8':
  Fix some TextLayoutCache issues
 2011-09-14 11:07:12 -07:00
Fabrice Di Meglio
4444573060 Merge "Fix some TextLayoutCache issues" 2011-09-14 11:05:04 -07:00
Gilles Debunne
16e1516ce8 am a4102b97: Merge "Bug 5295607: IOOB problems in Suggestions" 
* commit 'a4102b972e9facb287e3c3ee2d52b93d8325e83a':
  Bug 5295607: IOOB problems in Suggestions
 2011-09-14 11:04:47 -07:00
Gilles Debunne
a4102b972e Merge "Bug 5295607: IOOB problems in Suggestions" 2011-09-14 11:02:43 -07:00
Matthew Xie
4e5f916f3c am f16e2aea: Merge "Keep Binder reference in the mServiceRecordToPid hashmap" 
* commit 'f16e2aea541f9be26f8194d803fbf2a5971aaa5e':
  Keep Binder reference in the mServiceRecordToPid hashmap
 2011-09-14 10:50:22 -07:00
Matthew Xie
f16e2aea54 Merge "Keep Binder reference in the mServiceRecordToPid hashmap" 2011-09-14 10:48:43 -07:00
Daniel Sandler
714898ac42 am 28739171: Merge "When the status bar hides, close the notification panel." 
* commit '28739171f2135c1083dc5f87a3827f9212a55580':
  When the status bar hides, close the notification panel.
 2011-09-14 10:25:17 -07:00
Daniel Sandler
28739171f2 Merge "When the status bar hides, close the notification panel." 2011-09-14 10:23:21 -07:00
Gilles Debunne
bd4016e9c8 Bug 5295607: IOOB problems in Suggestions 
The start and end of the suggestion span were cached, where as
they should be retrieved when the user clicks since text may have
changed in the meantime.

Change-Id: Iab47f9969d538d8213a8c5b76b4b7ace8dc9428e
 2011-09-14 10:10:49 -07:00
Scott Main
e92aa4834b am b5dfcb8a: Merge "docs: update usb driver directory" 
* commit 'b5dfcb8a3d1e2a4ec39d9f27e185f3eca6910a31':
  docs: update usb driver directory
 2011-09-14 10:00:08 -07:00
Scott Main
b5dfcb8a3d Merge "docs: update usb driver directory" 2011-09-14 09:57:46 -07:00
Eric Laurent
4f4dd8ab6b am 16066ec5: Merge "Issue 5044873: Pb with BT SCO AudioManager API" 
* commit '16066ec591d05830a925b34f966f8c552a81ca70':
  Issue 5044873: Pb with BT SCO AudioManager API
 2011-09-14 09:20:18 -07:00
Eric Laurent
16066ec591 Merge "Issue 5044873: Pb with BT SCO AudioManager API" 2011-09-14 09:18:23 -07:00
Narayan Kamath
ae5008fc7b am 8dd41fb9: Merge "Don\'t wait indefinitely for audio tracks to finish playing." 
* commit '8dd41fb992668b67db9a0899f5d1768680a55620':
  Don't wait indefinitely for audio tracks to finish playing.
 2011-09-14 09:13:11 -07:00
Narayan Kamath
8dd41fb992 Merge "Don't wait indefinitely for audio tracks to finish playing." 2011-09-14 09:11:17 -07:00
Jean-Michel Trivi
ec17c5c8d5 am e83f771f: Merge "Bug 5300223 RemoteControlClient uses PendingIntent" 
* commit 'e83f771f0ab8e1e72e1fd2147085223ac8a00ba2':
  Bug 5300223 RemoteControlClient uses PendingIntent
 2011-09-14 09:09:03 -07:00
Jean-Michel Trivi
e83f771f0a Merge "Bug 5300223 RemoteControlClient uses PendingIntent" 2011-09-14 09:05:36 -07:00
Matthew Xie
f1754050ce Keep Binder reference in the mServiceRecordToPid hashmap 
so that the Binder object does not get destroyed when the thread
that registers the service record ends.
bug 5276332

Change-Id: Id17a4c279e03aa6928dca5bf048c7c90862bd9cf
 2011-09-14 09:05:27 -07:00
Narayan Kamath
69bc1b2696 Don't wait indefinitely for audio tracks to finish playing. 
If the track doesn't make progress for a fixed amount of time,
bail.

bug:5309562
Change-Id: I76966b8b3b2f05ba577892899791a09f50a70107
 2011-09-14 16:51:05 +01:00
Eric Laurent
d7454be47f Issue 5044873: Pb with BT SCO AudioManager API 
Do not identify the SCO connection client by the binder interface
passed when starting the connection as this binder changes if the
AudioManager proxy changes. Use the client PID instead.

This solves an issue with gTalk starting a SCO connection from one
AudioManager proxy and then changing audio mode from another thus
terminating the previously started SCO connection.

Change-Id: Ia3067fecc551fc15df3bf75ce0c43d181859e4f0
 2011-09-14 08:45:58 -07:00
Justin Ho
9053f828c9 am d8c82516: Merge "Moving tablet unlock screen assets to tablet-specific folders Refreshing visual style to match phone unlock assets Bug: 5231253" 
* commit 'd8c82516dd664d3d7617d19bd1f8530f1d922957':
  Moving tablet unlock screen assets to tablet-specific folders Refreshing visual style to match phone unlock assets Bug: 5231253
 2011-09-14 07:41:34 -07:00
Justin Ho
d8c82516dd Merge "Moving tablet unlock screen assets to tablet-specific folders Refreshing visual style to match phone unlock assets Bug: 5231253" 2011-09-14 07:39:56 -07:00
The Android Open Source Project
b91f5ec605 am 3483632f: Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release 
* commit '3483632f289c86efb7f7bda47d6e0244b394d838':
  Make copies of NetworkInfo to give out.
  Fix no data issue after system server crash
 2011-09-14 07:26:29 -07:00
The Android Open Source Project
3483632f28 Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release 
Change-Id: I2ef7b37dce08a4012ed7ba1704841fb2af846b76
 2011-09-14 07:22:47 -07:00
Mike Lockwood
cbc4b25065 am 6b5a7521: Merge "Move Power Manager minimum screen brightness to a framework resource" 
* commit '6b5a752130ff35a2029309854b1680dc33bf186f':
  Move Power Manager minimum screen brightness to a framework resource
 2011-09-14 07:17:48 -07:00
Mike Lockwood
6b5a752130 Merge "Move Power Manager minimum screen brightness to a framework resource" 2011-09-14 07:12:46 -07:00
Ed Heyl
724ffc3658 keep history after reset to GRK39D 2011-09-14 04:28:58 -07:00
Jean-Baptiste Queru
68853af2c7 am 200fc8ba: am 1d6a69f8: Ignore e4f0da70 from gingerbread-plus-aosp 
* commit '200fc8babe02cb17cfaabb1197f9c63b33c1eb2a':
  Added interface to SurfaceTexture needed by WebKit.
 2011-09-13 22:42:16 -07:00
Jean-Baptiste Queru
200fc8babe am 1d6a69f8: Ignore e4f0da70 from gingerbread-plus-aosp 
* commit '1d6a69f84f8d14dc8bf90f421ad49ea7f4df88b1':
  Added interface to SurfaceTexture needed by WebKit.
 2011-09-13 22:40:47 -07:00
Adam Powell
75cb7384f8 am 87e47b19: Merge "Un-force fading edges in ListPopupWindows." 
* commit '87e47b19b3fe5bf8d8de677b347fc098e85b2624':
  Un-force fading edges in ListPopupWindows.
 2011-09-13 21:50:15 -07:00
Adam Powell
87e47b19b3 Merge "Un-force fading edges in ListPopupWindows." 2011-09-13 21:48:33 -07:00
Adam Powell
5c3a77c0ff Un-force fading edges in ListPopupWindows. 
Change-Id: Iefb1f64b1f8927fd3c29a8d448a1517afac1ffe1
 2011-09-13 21:43:29 -07:00
Chia-chi Yeh
e5518c2249 am 6d8b9b84: Merge "RTP: Update parameters for larger packet intervals." 
* commit '6d8b9b84ac83acfc193fd633ba961168867124fa':
  RTP: Update parameters for larger packet intervals.
 2011-09-13 21:22:47 -07:00
Chia-chi Yeh
6d8b9b84ac Merge "RTP: Update parameters for larger packet intervals." 2011-09-13 21:21:18 -07:00
Adam Powell
d341531128 am 87105a3d: Merge "Fix bug 5314559 - Slow menu scrolling in browser on some devices" 
* commit '87105a3d48e4bdd60972fc327d774fa50f7ff130':
  Fix bug 5314559 - Slow menu scrolling in browser on some devices
 2011-09-13 21:14:38 -07:00
Adam Powell
87105a3d48 Merge "Fix bug 5314559 - Slow menu scrolling in browser on some devices" 2011-09-13 21:13:15 -07:00
Jeff Sharkey
9deb01fc0c am d18addb4: Remove deprecated TrafficStats API. 
* commit 'd18addb4e3d0cd4da798dd35ad676d98465ebed3':
  Remove deprecated TrafficStats API.
 2011-09-13 21:12:39 -07:00
Jeff Sharkey
d18addb4e3 Remove deprecated TrafficStats API. 
Bug: 5314214
Change-Id: If7dc3ef012a0e998e83ab4fef27ff19398d3e14c
 2011-09-13 20:43:10 -07:00
Adam Powell
f4f520ae9f Fix bug 5314559 - Slow menu scrolling in browser on some devices 
nativeSetIsScrolling has other side effects. Just pause picture
updating when WebView loses focus.

Change-Id: I917851c806f35a91a12a25c7457712123669384f
 2011-09-13 20:16:32 -07:00
Jean-Michel Trivi
6e920e6dac Bug 5300223 RemoteControlClient uses PendingIntent 
API change so RemoteControlClient is given a PendingIntent in
 its constructor, which will be used for receiving media button
 events from remote controls.
Leave the old constructors (but hidden) to not break
 current functionality until the AudioManager and AudioService
 implementations have been updated.

Change-Id: Ifa12c8036c948931adc386a827dce2936788e1cd
 2011-09-13 19:27:20 -07:00
Jeff Brown
831be72ae1 am aab55bf3: Merge "Fix bug in KeyButtonView key injection logic. Bug: 5299191 Bug: 5300282" 
* commit 'aab55bf3e323b73062bd932682886b19c062a8a0':
  Fix bug in KeyButtonView key injection logic. Bug: 5299191 Bug: 5300282
 2011-09-13 19:24:50 -07:00
Jeff Brown
aab55bf3e3 Merge "Fix bug in KeyButtonView key injection logic. Bug: 5299191 Bug: 5300282" 2011-09-13 19:23:01 -07:00
satok
644f781b9d am 41ccb08f: Merge "Skip the exit animation when the IME is destroyed." 
* commit '41ccb08f5af7ff28568b5eb09b1319fb6d8edcfb':
  Skip the exit animation when the IME is destroyed.
 2011-09-13 19:13:43 -07:00
satok
41ccb08f5a Merge "Skip the exit animation when the IME is destroyed." 2011-09-13 19:11:05 -07:00
Adam Powell
c2845b0a8a am cb18db8e: Merge "Fix bug 5312352 - ListView modal multi-select mode bugs" 
* commit 'cb18db8e7e43c4aa15aeb82dbab41ee3ee95f0b4':
  Fix bug 5312352 - ListView modal multi-select mode bugs
 2011-09-13 18:28:22 -07:00
Kenny Root
d5fcb0c2b5 am c924fbd6: Merge "Add verifier device identity" 
* commit 'c924fbd6933f6a96588b6e78d385082155cfd236':
  Add verifier device identity
 2011-09-13 18:28:15 -07:00
Eric Laurent
56e87004fc resolved conflicts for merge of 3f0c8217 to ics-aah 
Change-Id: I6c72eae0add896919f06bf7e0172ddd7fc47e630
 2011-09-13 18:24:16 -07:00
Adam Powell
cb18db8e7e Merge "Fix bug 5312352 - ListView modal multi-select mode bugs" 2011-09-13 18:17:14 -07:00
Adam Powell
1e83b3e6ab Fix bug 5312352 - ListView modal multi-select mode bugs 
When the provided callback returned false for creating the mode, the
item was still getting checked and the bar was flickering. Don't do
that.

Change-Id: I384962742edeac0c43aec6f7898bd50dab064738
 2011-09-13 18:13:31 -07:00
Kenny Root
c924fbd693 Merge "Add verifier device identity" 2011-09-13 17:51:08 -07:00