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

63710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kolb
d8883f5129 am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1 
* commit 'a4293ba1a0f1129d5879ae9eda45292ff357e20c':
  Remove flicker from WebTextView
 2011-11-09 14:37:36 +00:00
Jamie Gennis
13aeb48dcf am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 
* commit 'd211b4882a662409b85a1f90c71e28faa9c54464':
  SurfaceTexture: unhide setDefaultBufferSize
 2011-11-09 14:37:29 +00:00
Jamie Gennis
08aa0b5742 am 911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1 
* commit '911263dc5df48b89e8f9010fb74dfe2649bdc442':
  EGL: implement loading and saving the cache
  EGL: use an in-memory the blob cache
 2011-11-09 14:37:27 +00:00
Mathias Agopian
3c8f426802 am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1 
* commit '95482b61c348fc54bf44a96a8b73011c90b40520':
  Fix an issue where we could wait for a non-existing transaction
 2011-11-09 14:37:24 +00:00
Irfan Sheriff
70b1999ad5 am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1 
* commit '59c73b92a9ef8df5d4873bc36f05b776c3a476bc':
  Convert soft ap config store to state machine
 2011-11-09 14:37:22 +00:00
Dave Santoro
b7a262cdc1 am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
  Unhide social stream APIs for Contacts.
 2011-11-09 14:37:19 +00:00
Adam Powell
2690e48d1f am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 
* commit '650a3e8894c6d26b258d26bdec856fde7aba43d6':
  Fix the action bar menu layout to use the correct divider drawable.
 2011-11-09 14:37:17 +00:00
Wei Huang
bb28878666 am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 
* commit 'ea50748b546e7dc21dc06195af5f0a8f2b812417':
  Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
 2011-11-09 14:37:14 +00:00
Matthew Xie
afb3fa6c96 am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 14:37:11 +00:00
Dianne Hackborn
ad34155e35 am 665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1 
* commit '665e105f145fcb27a54d53c6c9382bebf50a56d7':
  Cleanup remote execution of perf tests.
 2011-11-09 14:37:10 +00:00
The Android Open Source Project
9594b4a558 am 6dee1a9d: Reconcile with ics-mr0-release 
* commit '6dee1a9d046458134fb019669b5ffe7911dcdb29':
 2011-11-09 14:37:00 +00:00
Adam Cohen
87ce25a772 am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
  Making default widget padding public API
 2011-11-09 14:36:57 +00:00
Joe Onorato
1e2c0d231e Merge "For events, require that the parameters be marked in." into ics-aah 2011-11-08 17:36:35 -08:00
Joe Onorato
2037c2585c For events, require that the parameters be marked in. 
(because they won't work otherwise)

Change-Id: I77f370ca1bc381ea07fc2854d2a90d8138ca1796
 2011-11-08 17:35:09 -08:00
Michael Kolb
a4293ba1a0 Merge "Remove flicker from WebTextView" into ics-mr1 2011-11-08 16:34:53 -08:00
Jamie Gennis
d211b4882a Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 2011-11-08 16:15:26 -08:00
Jamie Gennis
911263dc5d Merge changes I18e5e789,I5cbaae2d into ics-mr1 
* changes:
  EGL: implement loading and saving the cache
  EGL: use an in-memory the blob cache
 2011-11-08 16:14:44 -08:00
Mathias Agopian
95482b61c3 Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1 2011-11-08 15:55:55 -08:00
Jamie Gennis
d90bf3911d EGL: implement loading and saving the cache 
This change adds support for saving and loading the contents of the EGL
cache.  It also adds some simple tests for the EGL cache.

Change-Id: I18e5e789e0897a0783d29d1c1e64d26de2dd44c4
 2011-11-08 15:54:36 -08:00
Irfan Sheriff
59c73b92a9 Merge "Convert soft ap config store to state machine" into ics-mr1 2011-11-08 15:51:43 -08:00
Irfan Sheriff
9575a1bea1 Convert soft ap config store to state machine 
- Create thread when needed
- asynchronous interaction with wifi state machine

Bug: 5587391
Change-Id: Ie6d01b5a6b398a3fa12c384920a473e242443131
 2011-11-08 15:45:42 -08:00
Dave Santoro
b78ae7524e Merge "Unhide social stream APIs for Contacts." into ics-mr1 2011-11-08 14:48:21 -08:00
Adam Powell
650a3e8894 Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 2011-11-08 14:32:29 -08:00
Michael Kolb
39036ace76 Remove flicker from WebTextView 
Bug: 5522186

   Update LayoutParams when position changed only

Change-Id: I54beb489c261090d7ba258354449501b771fd98e
 2011-11-08 14:21:06 -08:00
Mike Lockwood
5e99dbc85c Merge "Add support for disabling wallpaper service" into ics-aah 2011-11-08 14:13:27 -08:00
Mike Lockwood
1b12c7b361 Merge "PhoneWindowManager: stifle warning that ITelephony service does not exist" into ics-aah 2011-11-08 14:10:57 -08:00
Mike Lockwood
39114ab063 PhoneWindowManager: stifle warning that ITelephony service does not exist 
Change-Id: I6df1a74cd3029c4c69362934e0d84213874af4c6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-08 14:05:31 -08:00
Adam Powell
141bdb17dd Fix the action bar menu layout to use the correct divider drawable. 
Change-Id: I9f9fe8318cbad3cfe4e34a37204a6c82a2e9a0c6
 2011-11-08 13:33:58 -08:00
Wei Huang
ea50748b54 Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 2011-11-08 13:16:02 -08:00
Matthew Xie
48542eb39e Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-08 12:19:37 -08:00
Matthew Xie
ad2321027e Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp 
Give APP a way to find out if a service is supported by a remote device
bug 5487202

Change-Id: I5a2d050cf24d945e1c9875963c34177ed1ce773a
 2011-11-08 11:58:12 -08:00
Dianne Hackborn
665e105f14 Merge "Cleanup remote execution of perf tests." into ics-mr1 2011-11-08 11:52:58 -08:00
Mike Lockwood
6026b825de Merge "AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set." into ics-aah 2011-11-08 11:09:54 -08:00
The Android Open Source Project
6dee1a9d04 Reconcile with ics-mr0-release 
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
 2011-11-08 11:08:20 -08:00
Dianne Hackborn
dd13793a25 Cleanup remote execution of perf tests. 
Change-Id: I0d00537194f3a70969220db16f57bda6f25e454b
 2011-11-08 10:59:28 -08:00
Adam Cohen
75b2038004 Merge "Making default widget padding public API" into ics-mr1 2011-11-08 10:53:39 -08:00
Robert Greenwalt
a74ebb6d08 am 604019c8: Merge "Fix build." into ics-mr1 
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.
 2011-11-08 18:33:20 +00:00
Robert Greenwalt
604019c8d4 Merge "Fix build." into ics-mr1 2011-11-08 10:31:37 -08:00
Mike Lockwood
a2aa08e20c AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set. 
This allows Music2 and other media apps to control master volume without changing their code

Bug: 5567694

Change-Id: I48b6260b193b22c395be5a31cd1d270b2929a91e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-08 10:31:21 -08:00
Adam Powell
a7d41ece61 am 8689afbd: Merge "Fix bug 5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1 
* commit '8689afbd63db3b1af6058709da843ea9d6433b21':
  Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
 2011-11-08 18:28:23 +00:00
Danielle Millett
ad28cd9c93 am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 
* commit 'b9b08257370d244b4bccc4e243dda3c4daf4b0af':
  Showing a congratulations screen after choosing face unlock backup lock
 2011-11-08 18:28:21 +00:00
Robert Greenwalt
b45a317b56 am ea54b760: Merge "Wimax : wimax framework related open source." into ics-mr1 
* commit 'ea54b7608584bc0535c9e89417778c3e95b50975':
  Wimax : wimax framework related open source.
 2011-11-08 18:28:16 +00:00
Robert Greenwalt
8588e47358 Fix build. 
Missed a commit that fixed some issues.
bug:5237167

Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded
 2011-11-08 10:12:25 -08:00
Adam Powell
8689afbd63 Merge "Fix bug 5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1 2011-11-08 10:06:00 -08:00
Jason Simmons
bfc3e70662 resolved conflicts for merge of 1366c756 to ics-aah 
Change-Id: I9faea6d9604f44b389acb4268941a7e5917ef1a8
 2011-11-08 10:05:56 -08:00
Danielle Millett
b9b0825737 Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 2011-11-08 10:03:24 -08:00
Robert Greenwalt
ea54b76085 Merge "Wimax : wimax framework related open source." into ics-mr1 2011-11-08 10:01:07 -08:00
Andreas Huber
d6739fccfc am 26f70db9: Merge "Remove surface legacy APIs and code." into ics-mr1 
* commit '26f70db99f483be36caa7a4c84fec5de50bec034':
  Remove surface legacy APIs and code.
 2011-11-08 17:58:45 +00:00
John Reck
d57859c13e am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1 
* commit '99015a2464a40097c3e23e07cdf69da0f886aa66':
  Remove unnecessary memory allocations
 2011-11-08 17:58:43 +00:00
Eric Laurent
281fd7a1c5 resolved conflicts for merge of f3a892ab to ics-aah 
Change-Id: Id9c0ef089d4ed71dbf69c5969b36f9ac44a25ad3
 2011-11-08 09:52:15 -08:00