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

62023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
43015443b4 am c38d40de: am 6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1 
* commit 'c38d40ded9810aa809489e080ee811bec86d546d':
  EGL: add the ANDROID suffix to the blob cache ext
 2011-11-15 11:29:47 -08:00
Jeff Brown
bf677de46a Merge "Clean up GenerationCache." 2011-11-14 18:28:59 -08:00
Jamie Gennis
c38d40ded9 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:41:20 -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
Steven Ross
a4e3fe2276 Merge "Making KeyguardView slippery fixes 5501105" 2011-11-14 16:56:46 -08:00
Jim Miller
6162960c1e am 3dd55677: am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 
* commit '3dd5567710168da330741cb4c4263cc03dd942f1':
  Fix 5579440: Add transport control view to tablet unlock screens
 2011-11-14 16:21:10 -08:00
Jim Miller
3dd5567710 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:28 -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
017d80c1f9 am 8340db9e: am 6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1 
* commit '8340db9e9b3363924b47f4d67d57ddb19a4c7702':
  Adding mobile microbenchmark tests.
 2011-11-14 14:41:05 -08:00
Tsu Chiang Chuang
8340db9e9b am 6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1 
* commit '6a54a997e3dc71c5b9c5a1c7829bc3eb35404e92':
  Adding mobile microbenchmark tests.
 2011-11-14 14:38:31 -08:00
Adam Cohen
e23a588eb5 am 621f9716: am 6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 
* commit '621f971691e3e819ddcd95898f4f93498e00c2ad':
  Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
 2011-11-14 14:38:30 -08:00
Jean-Michel Trivi
f1ec32db68 am 9d36a995: am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 
* commit '9d36a99582518ed1a7fb005382e0128479b43e18':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
 2011-11-14 14:38:30 -08:00
Adam Cohen
621f971691 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:35:57 -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
Steven Ross
229574c7f5 Making KeyguardView slippery fixes 5501105 
Setting the slippery flag keeps this window from processing
events occurring in places where another window is on top of it.
Specifically, if someone clicks above the pattern/FaceUnlock portion
of the window and then drags down onto FUL, this blocks the
underlying lockscreen from processing those touch events.

Change-Id: Ia7038841df0044f66220af8a00c7845b2293c2a4
 2011-11-14 15:40:37 -05:00
Jean-Michel Trivi
9d36a99582 am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 
* commit '258576a82c2293c3a988bf2dc6744fd8082421f9':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
 2011-11-14 12:33:20 -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
28a5ec9613 am 2cfb873c: am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1 
* commit '2cfb873c9f0b56f2c7d694a21c968511223933af':
  Revert "Discard framebuffer rendering queues when discarding layers"
 2011-11-14 12:30:04 -08:00
Dave Burke
2cfb873c9f 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:27:34 -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
196c215a8b am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1 
* commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34':
  [maguro] Fix STK issues
 2011-11-14 12:14:09 -08:00
John Wang
6504d74b8f am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1 
* commit '72a31ab98f8687aa48fce028d54e79929780a302':
  [maguro] Fix STK issues
 2011-11-14 12:11:35 -08:00
John Wang
72a31ab98f Merge "[maguro] Fix STK issues" into ics-mr1 2011-11-14 12:10:16 -08:00
Mathias Agopian
d8fa1ad452 am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1 
* commit '738d8cae2239d194429676f2889cfae3c8f7ba08':
  Define, document, and test the behavior of very large SurfaceTextures
 2011-11-14 11:54:38 -08:00
Mathias Agopian
738d8cae22 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:48 -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
Glenn Kasten
527c44e8a4 Merge "Don't check return value of new for being == null" 2011-11-14 10:50:33 -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
b14d771cf0 am f579bb92: 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 'f579bb92c2032cd27aef72a1654c006933b22bbd':
  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:39:08 -08:00
Alex Sakhartchouk
f579bb92c2 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:21 -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
02e1c6fe23 am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 
* commit '25924f8f6c0a4ca4a2eb257b72d9625f69d2525e':
  audioflinger: fix noise when skipping to next song
 2011-11-14 08:41:40 -08:00
Eric Laurent
25924f8f6c 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:39:33 -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
3f511aaf1c am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1 
* commit 'a16ee9390e1fcea8ff7cbefd253659c37f2999a3':
  Discard framebuffer rendering queues when discarding layers Bug #5581817
 2011-11-14 07:49:07 -08:00
Scott Main
e7a8aae0a6 am 807c07b5: am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '807c07b564564b6f5cf3711e4743de9c25a38175':
 2011-11-14 07:49:06 -08:00
Jeff Brown
91a0fb5af9 am ffa5d463: am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit 'ffa5d463c36e2127ff10a03ee49f0677567c02c1':
 2011-11-14 07:49:04 -08:00
Adam Powell
a53e431d6c am ec44bdaa: (-s ours) 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 'ec44bdaaadcceaae8ab6fe5c4bd17d59fc00d7e3':
 2011-11-14 07:49:03 -08:00
Robert Ly
3d0f1600b7 am 19aa78a4: am 632f072b: am 5f8b7269: docs: fix typo 
* commit '19aa78a40316b31531c57f1bf222e0bf2d1b5673':
 2011-11-14 07:49:01 -08:00
Robert Ly
e01affd0c9 am fafda521: am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit 'fafda5210f54705fdf36baeee0064d46e6e1994e':
 2011-11-14 07:49:00 -08:00
Adam Powell
cd6faca836 am b22eec57: am a8743f15: Fix bug 5425280 - Two ActionBar icons show up 
* commit 'b22eec57d559fc9dd5663abdc37d6b6e6a4f641f':
  Fix bug 5425280 - Two ActionBar icons show up
 2011-11-14 07:48:58 -08:00
Mathias Agopian
a16ee9390e 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 07:46:03 -08:00
Scott Main
807c07b564 am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '2af9f21c664d4579b5f51283a320a7d1fba13a75':
 2011-11-14 07:46:03 -08:00
Jeff Brown
ffa5d463c3 am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit '6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':
 2011-11-14 07:46:02 -08:00
Adam Powell
ec44bdaaad 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':
 2011-11-14 07:46:01 -08:00
Robert Ly
19aa78a403 am 632f072b: am 5f8b7269: docs: fix typo 
* commit '632f072b223f5f682f4152551a61cec2456b2186':
 2011-11-14 07:46:01 -08:00