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

62618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
6b1a981c4b am 50445568: Merge "Fixing FBO font rendering bug that resulted from using old surface size." 
* commit '5044556861af496d6451aef3f69a4df0d1b591c9':
  Fixing FBO font rendering bug that resulted from using old surface size.
 2011-11-17 09:15:42 -08:00
Alex Sakhartchouk
5044556861 Merge "Fixing FBO font rendering bug that resulted from using old surface size." 2011-11-17 09:13:24 -08:00
Matthew Xie
c7680e20fe am 1bce803f: am 37fb92fb: am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '1bce803f663d50a3a60fab63f565f91bce5c35e5':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-17 07:52:26 -08:00
Mathias Agopian
7f61b7098d am 280271d1: am f14ce7db: am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1 
* commit '280271d1f279212e6017deb8ca453edb791ed196':
  remove hack that hardcoded the refresh rate
 2011-11-17 07:52:24 -08:00
Mangesh Ghiware
1ea3b330f8 am 163994c1: am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '163994c1d4206813f621bad04b808d08f753fb7d':
  Revert change to setInitialScale() to take display density into account.
 2011-11-17 07:52:22 -08:00
satok
c3770ac54e am 8bc972a5: am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 
* commit '8bc972a5a4c3e24d1b9ba9b1dd4b4e2bbb5dadac':
  Clean up the spell checker framework
 2011-11-17 07:52:20 -08:00
Daniel Sandler
b05366ac9d am 28b23cde: am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1 
* commit '28b23cdef491a270d6fcd4d60f5aebef3f10f370':
  Add a default Dreams component.
 2011-11-17 07:52:17 -08:00
Daniel Sandler
05e54db587 am 0505984a: am e11bcd1d: am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1 
* commit '0505984abb503dbb64a521d7d1e27550f7a7b91b':
  Remove day of week from phone notification panel.
 2011-11-17 07:52:15 -08:00
Mathias Agopian
b1fcce962c am 905a12a9: am abdade71: am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 
* commit '905a12a949e779b50ad7ab0d69047b6e047ad7b8':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
 2011-11-17 07:52:11 -08:00
Marco Nelissen
46652de202 am 5a1623b3: am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1 
* commit '5a1623b379662e95580736510e1640148c228123':
  Change MediaController look b/5584613
 2011-11-17 07:52:08 -08:00
Matthew Xie
1bce803f66 am 37fb92fb: am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '37fb92fb634d10ca94731a73f2a60d86135baa6a':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-17 07:48:29 -08:00
Mathias Agopian
280271d1f2 am f14ce7db: am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1 
* commit 'f14ce7db5dc327724984946e7754c777908cc2ad':
  remove hack that hardcoded the refresh rate
 2011-11-17 07:48:27 -08:00
Mangesh Ghiware
163994c1d4 am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '5511635090072ce02a4fb07ec25a7c279a7bbc8a':
  Revert change to setInitialScale() to take display density into account.
 2011-11-17 07:48:24 -08:00
satok
8bc972a5a4 am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 
* commit '9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
  Clean up the spell checker framework
 2011-11-17 07:48:17 -08:00
Daniel Sandler
28b23cdef4 am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1 
* commit '8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
  Add a default Dreams component.
 2011-11-17 07:48:15 -08:00
Daniel Sandler
0505984abb am e11bcd1d: am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1 
* commit 'e11bcd1d72cb45af984b9d457c4306f51923e853':
  Remove day of week from phone notification panel.
 2011-11-17 07:48:12 -08:00
Mathias Agopian
905a12a949 am abdade71: am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 
* commit 'abdade71bc17153696fe2abe281c5a3b0c2e5abe':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
 2011-11-17 07:48:10 -08:00
Marco Nelissen
5a1623b379 am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1 
* commit '3de689186531cebfabcb4b4d4163eae6baac528d':
  Change MediaController look b/5584613
 2011-11-17 07:48:01 -08:00
Glenn Kasten
05284ef10c am 7418e385: Merge "MidiFile uses C++ Thread not createThreadEtc" 
* commit '7418e385f4523b94662d3fef614dac26d8a36885':
  MidiFile uses C++ Thread not createThreadEtc
 2011-11-17 07:16:21 -08:00
Glenn Kasten
b640058827 am b447e9ce: Merge "JetPlayer uses C++ Thread not createThreadEtc" 
* commit 'b447e9ce1d3dc603a8879340f36a4ca4f22d6b62':
  JetPlayer uses C++ Thread not createThreadEtc
 2011-11-17 07:16:18 -08:00
Glenn Kasten
7418e385f4 Merge "MidiFile uses C++ Thread not createThreadEtc" 2011-11-17 07:14:41 -08:00
Glenn Kasten
b447e9ce1d Merge "JetPlayer uses C++ Thread not createThreadEtc" 2011-11-17 07:14:29 -08:00
Dianne Hackborn
d1cc1c8199 am 77c5f4de: am 9aa6bd1c: am 717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming. 
* commit '77c5f4def49357a89abd9849b0bab950179d71f4':
  Add new ManagedEGLContext class to help apps participate in memory trimming.
 2011-11-17 05:51:08 -08:00
Dianne Hackborn
c1103b763d am 7cd2b19a: am 65952ec4: am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1 
* commit '7cd2b19a926224dee2b2e12f37c1d71ce658bf97':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
 2011-11-17 05:51:06 -08:00
Robert Greenwalt
45f29e4255 am 89d94e35: am 795fcd07: am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1 
* commit '89d94e35509a03de47e3e29b92229a851fcee4d2':
  Fix TelephonyManager to grab the best context
 2011-11-17 05:51:04 -08:00
Jamie Gennis
448ecbd009 am 04dd4dea: am 7765fc65: am fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1 
* commit '04dd4deafdbde8e4a9d12745e3d4a886ef8769f4':
  SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
 2011-11-17 05:51:02 -08:00
Eric Fischer
d3bbdd24ce am 6c932dab: am 02ed923d: (-s ours) am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '6c932dab1cef4fc711c4fdab938bced67b15d5df':
  Import revised translations.  DO NOT MERGE
 2011-11-17 05:51:00 -08:00
Gilles Debunne
aa5cea62c5 am 664d87ef: am b3272d29: am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1 
* commit '664d87ef01f7b4dbd7c96f23db73aba6cbc57481':
  IME action (done, next...) correctly handled
 2011-11-17 05:50:57 -08:00
Dianne Hackborn
77c5f4def4 am 9aa6bd1c: am 717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming. 
* commit '9aa6bd1c34fe3583fe31f283a6415e84fec12567':
  Add new ManagedEGLContext class to help apps participate in memory trimming.
 2011-11-17 05:46:34 -08:00
Dianne Hackborn
7cd2b19a92 am 65952ec4: am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1 
* commit '65952ec4dc0e1703eb87a54c252953c53d07affc':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
 2011-11-17 05:46:32 -08:00
Robert Greenwalt
89d94e3550 am 795fcd07: am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1 
* commit '795fcd07943ac1aaab309a4fa0d6bad1b67671a8':
  Fix TelephonyManager to grab the best context
 2011-11-17 05:46:05 -08:00
Kristian Monsen
a9366a511a am ec2b01e7: Merge "Fix fix for bug 2816327" 
* commit 'ec2b01e78858a4e6b304f07afb32d76bea6804fb':
  Fix fix for bug 2816327
 2011-11-17 05:46:01 -08:00
Jamie Gennis
04dd4deafd am 7765fc65: am fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1 
* commit '7765fc651a9519dd2f0ac9d3374a50e9865c5c99':
  SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
 2011-11-17 05:46:00 -08:00
Eric Fischer
6c932dab1c am 02ed923d: (-s ours) am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '02ed923da995a10c537018861cfc149d04c66bc2':
  Import revised translations.  DO NOT MERGE
 2011-11-17 05:45:54 -08:00
Gilles Debunne
664d87ef01 am b3272d29: am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1 
* commit 'b3272d297bb45e5cd3201766baef4fef7921ce05':
  IME action (done, next...) correctly handled
 2011-11-17 05:45:29 -08:00
Kristian Monsen
ec2b01e788 Merge "Fix fix for bug 2816327" 2011-11-17 05:43:40 -08:00
Alex Sakhartchouk
e679e2ebcf am e693fa3e: am a962ef29: am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 
* commit 'e693fa3e184f7a49f9bf912a0dac057fb339b8a4':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
 2011-11-17 04:13:03 -08:00
Fred Chung
37c52254a1 am d2789aa3: am d592714d: am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1 
* commit 'd2789aa322357ebb453bcad8825a33b27bb78c29':
  Bluetooth HDP sample.
 2011-11-17 04:13:01 -08:00
The Android Open Source Project
59a3c08eb4 am d949eddd: am 4dce941e: am 816e68e2: No-op merge from ics-mr0 
* commit 'd949edddc0c7497a8a45cece5464e041eae8625e':
 2011-11-17 04:12:57 -08:00
Alex Sakhartchouk
e693fa3e18 am a962ef29: am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 
* commit 'a962ef2993099e6c5db3809a7e829e43c8cf084a':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
 2011-11-17 04:08:30 -08:00
Fred Chung
d2789aa322 am d592714d: am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1 
* commit 'd592714d9a48afce69d6904fc539f150b7c02898':
  Bluetooth HDP sample.
 2011-11-17 04:08:28 -08:00
The Android Open Source Project
d949edddc0 am 4dce941e: am 816e68e2: No-op merge from ics-mr0 
* commit '4dce941ecec71aa999cf777a43f05821793b6749':
 2011-11-17 04:08:27 -08:00
Matthew Xie
37fb92fb63 am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '302afb93d4fd908949ac796eda8343f9683e616a':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-16 18:25:04 -08:00
Mathias Agopian
f14ce7db5d am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1 
* commit '1125f89e47b06b12a0e047d64f1ef953d0c48489':
  remove hack that hardcoded the refresh rate
 2011-11-16 18:22:26 -08:00
Matthew Xie
302afb93d4 Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 2011-11-16 18:20:50 -08:00
Mathias Agopian
1125f89e47 Merge "remove hack that hardcoded the refresh rate" into ics-mr1 2011-11-16 18:19:33 -08:00
Mangesh Ghiware
5511635090 am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '4fdfdeedc64eef2efe3811198e8fad40aa1b8fc3':
  Revert change to setInitialScale() to take display density into account.
 2011-11-16 18:03:51 -08:00
Mangesh Ghiware
4fdfdeedc6 Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
Steven Ross
8e954aecab am b076bfc5: Merge "Not showing facelock when plugging/unplugging fixes 5438524" 
* commit 'b076bfc5e33ba9d234c874e3546b452d8410b668':
  Not showing facelock when plugging/unplugging fixes 5438524
 2011-11-16 17:49:02 -08:00
Steven Ross
b076bfc5e3 Merge "Not showing facelock when plugging/unplugging fixes 5438524" 2011-11-16 17:46:44 -08:00