Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,405 Commits 3 Branches 0 Tags
ff74ecd8dbcf6014380f2cabc7a5c5136dabd140
Commit Graph

1321 Commits

Author SHA1 Message Date
Glenn Kasten
98bf25269d Merge "Protected surface API" 2011-01-28 15:18:43 -08:00
Romain Guy
489c8960b6 am 571a2c97: am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 
* commit '571a2c971b9691f3ace247bf2110efccc782f3ba':
  Prevent crash when detaching a SurfaceView. Bug #3400461
 2011-01-28 14:22:29 -08:00
Romain Guy
571a2c971b am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 
* commit 'b0c939adfa339c5cbb7f458072119269368b3ba5':
  Prevent crash when detaching a SurfaceView. Bug #3400461
 2011-01-28 14:20:01 -08:00
Romain Guy
b0c939adfa Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 2011-01-28 14:17:45 -08:00
Joe Onorato
bafa3a31f5 am d6874a10: am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb 
* commit 'd6874a105ee584b1dc60aae2f2af7c78ee875114':
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
 2011-01-28 13:45:51 -08:00
Joe Onorato
8b16ebd0e8 am b940659f: am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb 
* commit 'b940659f415d536966f1bb8af4d5281efa3a7f7a':
  Plumb whether an input view is actually visible or not through from the IME to the status bar.
 2011-01-28 13:45:42 -08:00
Joe Onorato
d6874a105e am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb 
* commit 'cfd0bafdebf1fccd3f5a0baed5cad8a539546e9b':
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
 2011-01-28 13:43:22 -08:00
Joe Onorato
b940659f41 am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb 
* commit '94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
  Plumb whether an input view is actually visible or not through from the IME to the status bar.
 2011-01-28 13:43:17 -08:00
Joe Onorato
cfd0bafdeb Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb 
* changes:
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
 2011-01-28 13:40:45 -08:00
Joe Onorato
94eb3d0f7e Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb 2011-01-28 13:40:28 -08:00
Dianne Hackborn
f2a8b3c450 am 8691b724: am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb 
* commit '8691b7243d40d5ef0ab94b8d5f204635d36bf1c4':
  Fix issue #3291173: Problem report for NewsRoom - RSS News Reader
 2011-01-28 12:48:15 -08:00
Dianne Hackborn
8691b7243d am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb 
* commit '10e4148b62c9bfed945c1bcea9dd5eea2a17b0d0':
  Fix issue #3291173: Problem report for NewsRoom - RSS News Reader
 2011-01-28 12:46:51 -08:00
Dianne Hackborn
420829ef78 Fix issue #3291173: Problem report for NewsRoom - RSS News Reader 
The framework had started using the LayoutInflator's factory
for itself, which breaks apps that want to use it.  Add a hack for
the framework to insert its own private factory.

Also fix a deadlock in the system process.

Change-Id: Iaf80186a5d7e4029faf89e968e184abdaabe514a
 2011-01-28 12:21:54 -08:00
Romain Guy
01d5edc49a Prevent crash when detaching a SurfaceView. 
Bug #3400461

Change-Id: I837d9d47b12bc5a8798b6dbb720de43b7539c3bc
 2011-01-28 11:28:53 -08:00
Glenn Kasten
d6f5bde96b Protected surface API 
To be used by DRM framework, implemented by display HAL

Change-Id: I054a07a94f4d5dbe792f3a597e2e49a100d90eb2
 2011-01-28 08:04:00 -08:00
Dianne Hackborn
75afc6bfe2 am f1a9ab26: am d23316bc: Merge "Maybe fix issue #3358322: Status and nav bar died while watching youtube" into honeycomb 
* commit 'f1a9ab2673a2b5e6f684f7ceced177e3fc749ee7':
  Maybe fix issue #3358322: Status and nav bar died while watching youtube
 2011-01-27 22:53:13 -08:00
Dianne Hackborn
f1a9ab2673 am d23316bc: Merge "Maybe fix issue #3358322: Status and nav bar died while watching youtube" into honeycomb 
* commit 'd23316bc8b49f269e5adcc91eae5698549faa0a3':
  Maybe fix issue #3358322: Status and nav bar died while watching youtube
 2011-01-27 22:50:52 -08:00
Dianne Hackborn
d23316bc8b Merge "Maybe fix issue #3358322: Status and nav bar died while watching youtube" into honeycomb 2011-01-27 22:47:50 -08:00
Joe Onorato
6478adc6b4 Allow independent control of the back and the other navigation buttons. 
Bug: 3363046
Change-Id: Icc312fc9ffbf2f584dc541489c9769b07ed50315
 2011-01-27 21:41:30 -08:00
Joe Onorato
7bb8eeb90c Allow the status bar disable flags to be used as View's system ui visibility fields. 
Bug: 3363046
Change-Id: I50ba06ed9a4d2f5d0e0c807437aea9900f44fee9
 2011-01-27 21:41:24 -08:00
Joe Onorato
857fd9b856 Plumb whether an input view is actually visible or not through from the IME 
to the status bar.

Bug: 3391067
Change-Id: I049531155bf7ee0b29874916c0b5b0a45b73c09e
 2011-01-27 21:19:46 -08:00
Adam Powell
ed383e4d24 am 599814f1: am f95e8c5b: Merge "Fix bug 3400213 - MenuItem ignores String spannable colors" into honeycomb 
* commit '599814f16c6f25495cf05146e2760bf0ca46455d':
  Fix bug 3400213 - MenuItem ignores String spannable colors
 2011-01-27 17:22:11 -08:00
Adam Powell
599814f16c am f95e8c5b: Merge "Fix bug 3400213 - MenuItem ignores String spannable colors" into honeycomb 
* commit 'f95e8c5bb24b3e2ea217fb140077526bde5d6dcc':
  Fix bug 3400213 - MenuItem ignores String spannable colors
 2011-01-27 17:20:32 -08:00
Adam Powell
f95e8c5bb2 Merge "Fix bug 3400213 - MenuItem ignores String spannable colors" into honeycomb 2011-01-27 17:18:11 -08:00
Dianne Hackborn
83a6f450bd Maybe fix issue #3358322: Status and nav bar died while watching youtube 
Or at least make it better.  Now if we get a failure locking the surface,
we mark to do a full relayout pass later to try to get a new good surface.

Also fix some bugs in how activity manager was classifying processes for
their OOM adjustment to make better choices in what to kill.

Change-Id: I8e4aa86744211ba7693f9828291d8bbf2698274f
 2011-01-27 17:17:19 -08:00
Adam Powell
6650185cae Fix bug 3400213 - MenuItem ignores String spannable colors 
Make MenuInflater preserve spannable strings.

Change-Id: I1e01827def3a87ea7814078df53debcc35f245d2
 2011-01-27 17:10:40 -08:00
Adam Powell
4d7b10630a am e3ba5cfe: am d1f94e36: Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb 
* commit 'e3ba5cfe9b4f524d955f77f5fff53440d80f9464':
  Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag
 2011-01-27 16:02:33 -08:00
Adam Powell
e3ba5cfe9b am d1f94e36: Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb 
* commit 'd1f94e36da6276acc00d0a3267a505fd6a61702d':
  Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag
 2011-01-27 15:59:46 -08:00
Adam Powell
d1f94e36da Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb 2011-01-27 15:58:18 -08:00
Romain Guy
e90a8b06b7 am 01a58129: am 0250bc2f: Merge "Catch exception when ViewRoot\'s surface is not valid. Bug #3399426" into honeycomb 
* commit '01a5812902668d0dbba51cd0efe22bfba3711230':
  Catch exception when ViewRoot's surface is not valid. Bug #3399426
 2011-01-27 15:45:38 -08:00
Romain Guy
01a5812902 am 0250bc2f: Merge "Catch exception when ViewRoot\'s surface is not valid. Bug #3399426" into honeycomb 
* commit '0250bc2faca14a332155b9111e0ee5dfc8493d6a':
  Catch exception when ViewRoot's surface is not valid. Bug #3399426
 2011-01-27 15:43:03 -08:00
Romain Guy
fea12b87f2 Catch exception when ViewRoot's surface is not valid. 
Bug #3399426

Change-Id: Id4e0b8714c9520c4e84e81c2978752d46c912b6b
 2011-01-27 15:36:40 -08:00
Chet Haase
38d1f25308 am 19312cfe: am 246bf85a: Merge "Fix NPE with display lists when view not attached" into honeycomb 
* commit '19312cfef15608fca2c8403dc240e8ec4f54d6b7':
  Fix NPE with display lists when view not attached
 2011-01-27 15:11:20 -08:00
Chet Haase
19312cfef1 am 246bf85a: Merge "Fix NPE with display lists when view not attached" into honeycomb 
* commit '246bf85aaacbadf4e892270d714efcdb280a3de8':
  Fix NPE with display lists when view not attached
 2011-01-27 15:00:17 -08:00
Adam Powell
3ba6774263 Fix bug 3399725 - externally reported issue 14317: 
android:scrollbarSize attribute does not work in ScrollView tag

Change-Id: Ic2cc908936991f473ccfc60d9c2711edfd45c132
 2011-01-27 14:25:44 -08:00
Chet Haase
f4ac547f86 Fix NPE with display lists when view not attached 
There was logic in ViewGroup that assumed that an accelerated
view must always be able to get a display list for any child
that it was drawing. One situation occurred, however, that
caused a problem with this - a contacts activity was started
and not yet attached, but was being asked to render into an
accelerated canvas. We assumed that the child would have a display
list and simply called getDisplayList(). But since that call
returned null, we later deref'd the null object.

The fix is to check whether a child can have a display list
instead of assuming that it can just because the container view
is accelerated.

Change-Id: I7de62fd597ad50720c9585d621bec02e77c171df
 2011-01-27 10:30:25 -08:00
Chet Haase
75b8c858ab am cd88c39b: am e38ba4ac: Fix gmail crossfade artifacts. 
* commit 'cd88c39b989fc927016aa8d1c3794b872519d575':
  Fix gmail crossfade artifacts.
 2011-01-27 01:32:44 -08:00
Chet Haase
cd88c39b98 am e38ba4ac: Fix gmail crossfade artifacts. 
* commit 'e38ba4acbe6f1536997ffb98d662fc3eff07add8':
  Fix gmail crossfade artifacts.
 2011-01-27 01:30:09 -08:00
Chet Haase
e38ba4acbe Fix gmail crossfade artifacts. 
Display lists could not handle custom views that did their
own draw dispatching, as is the case with gmail. This fix makes that
possible and display lists handle this case robustly. Now the
crossfade works because the display lists contain the right content.

Change-Id: Iea7d6e99239b24f833701d546fe083aa00e2b31b
 2011-01-27 01:25:18 -08:00
Chet Haase
82782446cd am fcf51a67: am a45c056e: Merge "Fix display List bugs" into honeycomb 
* commit 'fcf51a67967a402bf2178c3d0e09828e8942cade':
  Fix display List bugs
 2011-01-26 23:55:50 -08:00
Chet Haase
fcf51a6796 am a45c056e: Merge "Fix display List bugs" into honeycomb 
* commit 'a45c056e62be0ca97edbdd6f6660822cf453c886':
  Fix display List bugs
 2011-01-26 23:51:58 -08:00
Chet Haase
a45c056e62 Merge "Fix display List bugs" into honeycomb 2011-01-26 23:49:23 -08:00
Romain Guy
a1eb2ff008 am 38f34ed2: am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197" into honeycomb 
* commit '38f34ed20a52d027cbf1b72fe22c6d616810613b':
  Don't draw the same triangles several times. Bug #3388197
 2011-01-26 22:49:13 -08:00
Romain Guy
38f34ed20a am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197" into honeycomb 
* commit '7c53a0d6078620df3abc4997acfe267ef903f5c6':
  Don't draw the same triangles several times. Bug #3388197
 2011-01-26 22:47:01 -08:00
Chet Haase
678e0adbdb Fix display List bugs 
Various property setters in View need to invalidate the parent's
cache to get redrawn properly when accelerated with display lists.

Also, fix logic around display lists and old-style Animations in
ViewGroup.

Change-Id: I70e1c2fa49e62228ee4a1301a006ce50bda4c305
 2011-01-26 22:44:52 -08:00
Romain Guy
4f09f5417b Don't draw the same triangles several times. 
Bug #3388197

Change-Id: Ief1dfd9447f144e9992340a173d2893e5e049129
 2011-01-26 22:45:16 -08:00
Dianne Hackborn
166f26e2c2 am f35d43f9: am 2dc9c784: Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb 
* commit 'f35d43f90b9e4553343a59b217430aaba91b0d1f':
  Fix issue #3382992: IME close animation stutters from URL bar
 2011-01-26 19:17:46 -08:00
Romain Guy
3a6b7be25d am 0d8f88b2: am ede54ce2: Merge "Fix crash in movie studio." into honeycomb 
* commit '0d8f88b272f80f2a3594d2d988faabed4e540631':
  Fix crash in movie studio.
 2011-01-26 19:13:50 -08:00
Romain Guy
b5fb99ff4d am 0518e7b5: am 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists. Bug #3395487" into honeycomb 
* commit '0518e7b5bddfdeb010591c736fb080009a99cd14':
  Make sure that we update SurfaceView's window with display lists. Bug #3395487
 2011-01-26 19:13:40 -08:00
Dianne Hackborn
f35d43f90b am 2dc9c784: Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb 
* commit '2dc9c784b2fab67a8233318f559e65f444bf0c97':
  Fix issue #3382992: IME close animation stutters from URL bar
 2011-01-26 19:08:20 -08:00