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

14278 Commits

Author SHA1 Message Date
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
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
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
Mike Lockwood
dd8b64c0a5 Merge "Add support for synchronous bulk USB transfers" 2011-01-27 16:25:26 -08:00
Ashish Sharma
89316a2f2a Merge "TrafficStats: Include UDP stats and packet count to API" 2011-01-27 16:22:50 -08:00
Mike Lockwood
1fce24b241 Add support for synchronous bulk USB transfers 
Change-Id: Id5de49e4d728a702fa1583ecc24f83f36cc57d21
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-27 16:22:15 -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
Ashish Sharma
c39c1d4dee TrafficStats: Include UDP stats and packet count to API 
Change-Id: I70063e6033d3c181bcc5b9e401f9474900e25281
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
 2011-01-27 15:52:38 -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
0250bc2fac Merge "Catch exception when ViewRoot's surface is not valid. Bug #3399426" into honeycomb 2011-01-27 15:41:08 -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
Derek Sollenberger
fdc8757ac4 am f454cee0: am 8f9fb947: Merge "Add Plugin API for controling the device power states" into honeycomb 
* commit 'f454cee04456acf74871b02033e6972f71919e55':
  Add Plugin API for controling the device power states
 2011-01-27 15:31:23 -08:00
Derek Sollenberger
f454cee044 am 8f9fb947: Merge "Add Plugin API for controling the device power states" into honeycomb 
* commit '8f9fb94741b5032c8774f87130133ef14d9af4e2':
  Add Plugin API for controling the device power states
 2011-01-27 15:28:52 -08:00
Derek Sollenberger
8f9fb94741 Merge "Add Plugin API for controling the device power states" into honeycomb 2011-01-27 15:26:53 -08:00
Adam Powell
150b7ae97e am e4960883: am 43d7b83e: Merge "Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info" into honeycomb 
* commit 'e49608831178981a3de06019e15c5c8918734d62':
  Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info
 2011-01-27 15:12:12 -08:00
Gilles Debunne
6f1ef59eb4 am 1ad0fac2: am 6f7a6bc3: Merge "Soft keyboard is not shown when text selection mode is aborted." into honeycomb 
* commit '1ad0fac2f4ca502e66358cee11a46475690ead07':
  Soft keyboard is not shown when text selection mode is aborted.
 2011-01-27 15:12:03 -08:00
Huahui Wu
c9d6123521 am 491784f2: am cbcdc614: Merge "b/3347670 Support installing online certs to the system keystore." into honeycomb 
* commit '491784f2ecf617f787e11c2393d190b657b2ecde':
  b/3347670 Support installing online certs to the system keystore.
 2011-01-27 15:11:59 -08:00
Vasu Nori
2d73dcbbc5 am 242fa0eb: am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb 
* commit '242fa0eb73d555eb025c39cf212030f00cb53cb4':
  bug:3398527 return List insttead of ArrayList from public API
 2011-01-27 15:11:44 -08:00
Gilles Debunne
7191d6ec83 am 82ba0eca: am 315f3865: Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb 
* commit '82ba0ecaa72df892a34c279ac449e752e87f7ed8':
  CustomSelectionActionModeCallback can prevent selection mode from starting.
 2011-01-27 15:11:33 -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
Adam Powell
e496088311 am 43d7b83e: Merge "Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info" into honeycomb 
* commit '43d7b83ed92d54eeaf81e8e8b554daee1741df7b':
  Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info
 2011-01-27 15:03:22 -08:00
Gilles Debunne
1ad0fac2f4 am 6f7a6bc3: Merge "Soft keyboard is not shown when text selection mode is aborted." into honeycomb 
* commit '6f7a6bc3454fce5cfb86a0fc6a37022d24d1e465':
  Soft keyboard is not shown when text selection mode is aborted.
 2011-01-27 15:03:19 -08:00
Huahui Wu
491784f2ec am cbcdc614: Merge "b/3347670 Support installing online certs to the system keystore." into honeycomb 
* commit 'cbcdc6147aa7dd4bcfcdaae6fc673c68f9be5dcf':
  b/3347670 Support installing online certs to the system keystore.
 2011-01-27 15:02:09 -08:00
Vasu Nori
242fa0eb73 am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb 
* commit 'ce3b35a7b0b80061692d9fa1977cee68b365728c':
  bug:3398527 return List insttead of ArrayList from public API
 2011-01-27 15:00:38 -08:00
Gilles Debunne
82ba0ecaa7 am 315f3865: Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb 
* commit '315f3865983f59e5ad9f42602f443e8c42b6e5c4':
  CustomSelectionActionModeCallback can prevent selection mode from starting.
 2011-01-27 15:00:29 -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
Derek Sollenberger
f3196cd70a Add Plugin API for controling the device power states 
This is an initial API that will allow the plugin to request to
keep the screen on.

companion change is in external/webkit

bug: 3331493
Change-Id: Ic18787e7ecd705a5b2e31a34ea884fd39ad9d11a
 2011-01-27 18:00:14 -05: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
Adam Powell
43d7b83ed9 Merge "Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info" into honeycomb 2011-01-27 13:53:03 -08:00
Gilles Debunne
6f7a6bc345 Merge "Soft keyboard is not shown when text selection mode is aborted." into honeycomb 2011-01-27 13:51:48 -08:00
Adam Powell
6f5e934b96 Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in 
talk > Friend Info

Make spinner dropdowns cover the IME if present without being touched
first.

Change-Id: Ie47df1ad684649de73b102e2ecf5528a35301d93
 2011-01-27 13:30:55 -08:00
Huahui Wu
cbcdc6147a Merge "b/3347670 Support installing online certs to the system keystore." into honeycomb 2011-01-27 13:26:27 -08:00
Gilles Debunne
17d31decef Soft keyboard is not shown when text selection mode is aborted. 
Bug 3381317

Also generalized and uniformized the use of peekInstance. Added null
tests, and isActive tests before hiding.

Change-Id: Ifd1a053fd920841333e0ebab3e2a8d26b469a0f6
 2011-01-27 12:55:28 -08:00
Vasu Nori
ce3b35a7b0 Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb 2011-01-27 12:46:00 -08:00
Vasu Nori
a017edace7 bug:3398527 return List insttead of ArrayList from public API 
Change-Id: Idbdcb59fe860a9168c9ef6c00eb128b05fce84ff
 2011-01-27 11:47:28 -08:00
Gilles Debunne
315f386598 Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb 2011-01-27 11:07:16 -08:00
Robert Greenwalt
68e18d2329 Fix the build 
Check for null before trying to make InetAddresses.

Change-Id: I3228eea32eb455437dd76be2de56a913884f3f6e
 2011-01-27 10:49:27 -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
Huahui Wu
c7939b1750 b/3347670 Support installing online certs to the system keystore. 
Requires another CL in external/webkit.
    https://android-git.corp.google.com/g/#change,93328

Change-Id: I33d642d370ddf330199f2b296d5f8b08923e49cd
 2011-01-27 09:51:37 -08:00
Gilles Debunne
ddd6f39287 CustomSelectionActionModeCallback can prevent selection mode from starting. 
Bug 3381317

Change-Id: I9fb52077216ed56c101ed58f8897478343369528
 2011-01-27 09:49:41 -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