Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,308 Commits 3 Branches 0 Tags
cc071ff7dcdcc4b50765893b8df2fef2bd466efd
Commit Graph

16039 Commits

Author SHA1 Message Date
Derek Sollenberger
8f9fb94741 Merge "Add Plugin API for controling the device power states" into honeycomb 2011-01-27 15:26:53 -08:00
Dianne Hackborn
e79b55482e Fix issue #3398767: Need translucent holo theme 
Change-Id: I2ce87798ff58315cb96968ab06e5a52da9f35ef8
 2011-01-27 15:18:46 -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
Nick Pelly
32f7d50df1 am 21d0a173: Fix build - javadoc. 
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
 2011-01-27 14:12:49 -08:00
Nick Pelly
21d0a173f1 Fix build - javadoc. 
Change-Id: I0168fb4a75f4dff88e347c0dfd1f0b39e2dba0d6
 2011-01-27 14:07:50 -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
Joe Malin
32736f085b sdk doc change: Copy/Paste/Drag/Drop 
Change-Id: Ifb9ed554ae1a72ce6badff1c79d95c02f30525e9
 2011-01-27 13:40:04 -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
Nick Pelly
55e124c448 am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread 
* commit 'eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
  Clean up MifareUltralight API.
 2011-01-27 13:25:52 -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
Nick Pelly
eab0e97bf0 Merge "Clean up MifareUltralight API." into gingerbread 2011-01-27 12:23:53 -08:00
Nick Pelly
4a5e253220 Clean up MifareUltralight API. 
o Some javadoc updates
o writeBlock -> writePages  (Block means something else in NFC Forum).
o validate page offset

Change-Id: Icae54db3397d57aaa451caaa86d56e8ba82507f2
 2011-01-27 12:22:56 -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
Jeff Hamilton
fb69e0c0ff resolved conflicts for merge of 0716ea14 to honeycomb-merge 
Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421
 2011-01-27 12:29:27 -06:00
Robert Greenwalt
b27ce98451 am 89a54408: Merge "Update networktype before sending state change." into gingerbread 
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
  Update networktype before sending state change.
 2011-01-27 10:20:33 -08:00
Robert Greenwalt
89a544088f Merge "Update networktype before sending state change." into gingerbread 2011-01-27 10:17:33 -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
Jeff Hamilton
5e2113ff27 resolved conflicts for merge of 3a223404 to honeycomb-merge 
Change-Id: I0eb1f3a271797c78d9ec5b2528a221c89973a83c
 2011-01-27 11:27:58 -06:00
Jeff Hamilton
992f75bcd0 resolved conflicts for merge of 6687ecb4 to honeycomb-merge 
Change-Id: Id9677d2ef1c03191cf73a7d90e80b57ea686afec
 2011-01-27 10:44:21 -06:00
Nick Pelly
56d39d1e03 am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread 
* commit 'b73203ab7e308b747819de2b2400afe971ef3bff':
  Make sure service handles are live before passing to other objects.
 2011-01-27 08:13:03 -08:00
Ben Murdoch
811ba6c6a2 Implement the double tap to zoom animation with HW accleration. 
Bug: 3164010

Change-Id: I6d3b5973ee0aa95dd810755263e615e226cc965b
 2011-01-27 15:41:48 +00: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
Jeff Brown
a21e75c97a am b43610f8: am f02853f2: Merge "Fix down arrow in AutoCompleteTextView." into honeycomb 
* commit 'b43610f8c9994163a1b69d23ac893de3f80a5355':
  Fix down arrow in AutoCompleteTextView.
 2011-01-26 23:51:36 -08:00
Jeff Brown
b43610f8c9 am f02853f2: Merge "Fix down arrow in AutoCompleteTextView." into honeycomb 
* commit 'f02853f211f0b7f698f82305e30c23e527192584':
  Fix down arrow in AutoCompleteTextView.
 2011-01-26 23:49:41 -08:00
Chet Haase
a45c056e62 Merge "Fix display List bugs" into honeycomb 2011-01-26 23:49:23 -08:00
Vasu Nori
c0e48b7e8a am 7489a470: am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb 
* commit '7489a4709daf39aff61a17818de282d9ca4dc7c8':
  bug:3396894  (HC branch) remove STOPSHIP code
 2011-01-26 23:47:22 -08:00