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

64045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
cfbcd3bf21 AudioManager: Add support for master mute 
Change-Id: I98e87d1e266e0523c4aacb23cc5c4b3fdc7a1eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-15 09:57:33 -08:00
Jason Simmons
fe48e39aeb resolved conflicts for merge of f10a5364 to ics-aah 
Change-Id: I2d6ba86d7a1c4170a30805215ab727fbeac99726
 2011-11-14 19:03:26 -08:00
Dianne Hackborn
f10a536460 Merge "Maybe fix issue #5405788: Device continuously opening and closing..." into ics-mr1 2011-11-14 18:35:46 -08:00
Daisuke Miyakawa
96c73c18ed am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1 
* commit 'd8f5e6badb0dc11055508b83f20e48c82a7058bd':
  Allow ContactsProvider to remove dulicates
 2011-11-14 17:56:41 -08:00
Daisuke Miyakawa
d8f5e6badb Merge "Allow ContactsProvider to remove dulicates" into ics-mr1 2011-11-14 17:54:17 -08:00
Dianne Hackborn
813075a678 Maybe fix issue #5405788: Device continuously opening and closing... 
...the "Complete action using" dialog

I have never been able to reproduce this consistently, but here is
another stab in the twilight.  It looks like during boot we have
a potential race where we could reset the config sequence number after
we had gone through a config change, causing ActivityThread to ignore
a following config change.  Maybe this change will help.

Change-Id: I4b731df5fd5c63894ca2e9bd34693b31ab1c0565
 2011-11-14 17:45:19 -08:00
Jamie Gennis
dd2acce35c am 6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1 
* commit '6b228af6ff20b3f592db4ad5662e1bc401d09b4d':
  EGL: add the ANDROID suffix to the blob cache ext
 2011-11-14 17:39:21 -08:00
Jamie Gennis
6b228af6ff Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1 2011-11-14 17:36:46 -08:00
Jim Miller
00a4ac1d43 am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 
* commit 'ff95f6572596c48b58f5a73d23b2273866ea3fab':
  Fix 5579440: Add transport control view to tablet unlock screens
 2011-11-14 16:16:41 -08:00
Jim Miller
ff95f65725 Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 2011-11-14 16:14:07 -08:00
Tsu Chiang Chuang
464945d18f am 6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1 
* commit '6a54a997e3dc71c5b9c5a1c7829bc3eb35404e92':
  Adding mobile microbenchmark tests.
 2011-11-14 14:38:37 -08:00
Adam Cohen
8222bbf39c am 6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 
* commit '6066a2b4de36549b7d8fe36507b7254e501f0b28':
  Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
 2011-11-14 14:36:11 -08:00
Jean-Michel Trivi
09d936feb8 am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 
* commit '258576a82c2293c3a988bf2dc6744fd8082421f9':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
 2011-11-14 14:36:11 -08:00
Tsu Chiang Chuang
6a54a997e3 Merge "Adding mobile microbenchmark tests." into ics-mr1 2011-11-14 14:35:42 -08:00
Adam Cohen
6066a2b4de Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 2011-11-14 14:33:06 -08:00
Jim Miller
faed16030d Fix 5579440: Add transport control view to tablet unlock screens 
This updated tablet layouts to support showing album art and transport
control views in PIN, pattern and password screens of lock screen.

It also allows the addition of a background protect asset and
the ability to show the system wallpaper on layouts that define a
transport_bg_protect view.

Also updated layout to use new ICS-style buttons on lock screen and
fixed bug with "forgot pattern" button where we were showing the
emergency call icon.

To avoid problems with leading ones in the mono-space clock font,
we now right-justify status text on tablet and remove the AM/PM
indicator.

Status font size adjusted by UX.

Added background protection drop shadow to transport control.

Fixed portrait mode to be right-justified when transport is showing.

Change-Id: I790292fc39f4588f87adc9d9241706817ae6baab
 2011-11-14 14:09:05 -08:00
Adam Cohen
8e2e572224 Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241) 
Change-Id: I4646095f4cde9514425be8ab2dbf805d9788aa5c
 2011-11-14 13:28:50 -08:00
Daisuke Miyakawa
19352e0852 Allow ContactsProvider to remove dulicates 
Bug: 5484956
Change-Id: Ie88af0c3d21919ca201f4fcdd46ca09e9f8d94c0
 2011-11-14 13:16:07 -08:00
Jean-Michel Trivi
258576a82c Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 2011-11-14 12:31:10 -08:00
Dave Burke
3d151e1966 am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1 
* commit '9d66da8ae61a8520f46ee7df3cbb374852d9da91':
  Revert "Discard framebuffer rendering queues when discarding layers"
 2011-11-14 12:28:09 -08:00
Dave Burke
9d66da8ae6 Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1 2011-11-14 12:25:53 -08:00
John Wang
425ad73fe6 am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1 
* commit '72a31ab98f8687aa48fce028d54e79929780a302':
  [maguro] Fix STK issues
 2011-11-14 12:11:43 -08:00
John Wang
72a31ab98f Merge "[maguro] Fix STK issues" into ics-mr1 2011-11-14 12:10:16 -08:00
Mathias Agopian
d52e8636dc am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1 
* commit 'c93a151fde7d616c22b86ae458b3d015e3820d5e':
  Define, document, and test the behavior of very large SurfaceTextures
 2011-11-14 11:51:36 -08:00
Mathias Agopian
c93a151fde Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1 2011-11-14 11:49:42 -08:00
Dave Burke
7077506f99 Revert "Discard framebuffer rendering queues when discarding layers" 
This reverts commit da96f8ac2c1c35a54f3f36e6d776cb386a251d03.
 2011-11-14 11:39:30 -08:00
dujin.cha
e81932e92a [maguro] Fix STK issues 
1. Fix Bug 5574160 (Abnormal Setup menu)
2. Fix Bug 5558273 (GetInkey issue)
3. Fix BUg 5558612 (No default alpha id)
4. Fix Vodafone UK ALS issue.

Bug : 5574160, 5558273, 5558612

Change-Id: Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf
Signed-off-by: dujin.cha <dujin.cha@samsung.com>
 2011-11-14 10:46:19 -08:00
Alex Sakhartchouk
82bdba93a8 am cde433c5: Merge "Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1 
* commit 'cde433c5f75fd4ac2ab31e9fc34654750d1e83f8':
  Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.
 2011-11-14 10:37:12 -08:00
Alex Sakhartchouk
cde433c5f7 Merge "Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1 2011-11-14 10:35:08 -08:00
Eric Laurent
4fbd43f7ef am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 
* commit '030bb99814157b6424c0bf290bd2ede217b5ba77':
  audioflinger: fix noise when skipping to next song
 2011-11-14 08:40:13 -08:00
Eric Laurent
030bb99814 Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 2011-11-14 08:38:05 -08:00
Mathias Agopian
7c112d1bfb am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1 
* commit '2858749704ea7b130499cf2ac7b3e1c3331f1582':
  Discard framebuffer rendering queues when discarding layers Bug #5581817
 2011-11-14 00:54:30 -08:00
Mathias Agopian
2858749704 Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1 2011-11-14 00:52:09 -08:00
Scott Main
9be7b88d7b am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '2af9f21c664d4579b5f51283a320a7d1fba13a75':
  Docs: update state list drawable with state_activated and revise selected/focused
 2011-11-11 20:34:41 -08:00
Jeff Brown
9f26b5aee6 am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit '6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
 2011-11-11 20:34:39 -08:00
Adam Powell
2f61efa736 am 771d0c99: am 6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0 
* commit '771d0c99f6433c3ad7063cdfa847c9476ef0453c':
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-11-11 20:34:36 -08:00
Robert Ly
beafb0fc63 am 632f072b: am 5f8b7269: docs: fix typo 
* commit '632f072b223f5f682f4152551a61cec2456b2186':
  docs: fix typo
 2011-11-11 20:34:34 -08:00
Robert Ly
a61bed7292 am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit '83c16e2577705b577d2c74d45b0e55a50a0806e2':
  docs: ndk r7 rel notes
 2011-11-11 20:34:33 -08:00
Adam Powell
4b620213b7 am a8743f15: Fix bug 5425280 - Two ActionBar icons show up 
* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
  Fix bug 5425280 - Two ActionBar icons show up
 2011-11-11 20:34:31 -08:00
Scott Main
2af9f21c66 am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '19b1c12b5eb3417e9f56810cc08ee1e560da0a99':
  Docs: update state list drawable with state_activated and revise selected/focused
 2011-11-11 19:22:07 -08:00
Jeff Brown
6f0464e79d am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
 2011-11-11 19:22:04 -08:00
Adam Powell
771d0c99f6 am 6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0 
* commit '6200a4b7eb07507055af93ec1a054640a39b9751':
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-11-11 19:22:02 -08:00
Robert Ly
632f072b22 am 5f8b7269: docs: fix typo 
* commit '5f8b7269d66acb45dcb74a1eb38102cb1d1431df':
  docs: fix typo
 2011-11-11 19:22:01 -08:00
Robert Ly
83c16e2577 am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit '5ad6f646fbe692b94961df6472bec2b8bd1ea382':
  docs: ndk r7 rel notes
 2011-11-11 19:17:23 -08:00
Mathias Agopian
b89d88f531 Define, document, and test the behavior of very large SurfaceTextures 
updateTexImage() now throws a runtime exception when its native
counterpart fails

Bug: 5506633

Change-Id: I151a6f685d465966e7df4df624412ab2da62e95f
 2011-11-11 18:44:35 -08:00
Adam Powell
a8743f152a Fix bug 5425280 - Two ActionBar icons show up 
Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b
 2011-11-11 18:35:53 -08:00
Scott Main
19b1c12b5e Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 2011-11-11 17:17:23 -08:00
Eric Laurent
f9c361dec4 audioflinger: fix noise when skipping to next song 
When audio effects are enabled, a noise can be heard at the
beginning of the new song when skipping to next song in music app.

This is because some effects (especially virtualizer) have a tail.
This tail was not played when previous song was stopped because effects were
not processed when no tracks were present on a given session. This is to
reduce CPU load when effects are enabled but no audio is playing.
The tail was then rendered when the new song was started.

Added a delay before stopping effect process after all tracks have been removed from a session.

Issue 5584880.

Change-Id: I815e0f7441f9302e8dfe413dc269a94e4cc6fd95
 2011-11-11 16:33:24 -08:00
Christopher Tate
432c210fe3 am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1 
* commit 'c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
  XML parsing optimizations
 2011-11-11 16:21:52 -08:00
Christopher Tate
c51bb4d394 Merge "XML parsing optimizations" into ics-mr1 2011-11-11 16:19:29 -08:00