Commit Graph

10594 Commits

Author SHA1 Message Date
Mike Lockwood
48114f72fd Merge "MTP: work in progress on expanded property support" 2010-08-25 15:44:03 -07:00
Mike Lockwood
828d19dd96 MTP: work in progress on expanded property support
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.

Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-25 18:42:22 -04:00
Romain Guy
dc9e486e0a Merge "Only destroy the GL Canvas when necessary." 2010-08-25 14:46:24 -07:00
Romain Guy
4caa4ed120 Only destroy the GL Canvas when necessary.
Change-Id: I6caf4873b02dc4a6d7c8c91925d2447b3b0e0593
2010-08-25 14:46:24 -07:00
Cary Clark
7462fc738f Merge "simplify cursor ring draw state; fix null check" 2010-08-25 14:03:36 -07:00
Adam Cohen
9b073948cf Cleanup and bug fixes in StackView
-> pushed functionality from AdapterViewAnimator to StackView
-> only modifying clipping flags as far up the view
   hierarchy as needed
-> still need framework level solution for drawing outside bounds

ViewGroup touch dispatch temp fix
-> Touch event was being modified and not reset in some
   code paths.

Change-Id: I8135b62e2d73f239b9df407b0fa93bc434796989
2010-08-25 13:16:14 -07:00
Cary Clark
e60cb7f914 simplify cursor ring draw state; fix null check
Rename jni call to note that, when pressing the dpad, the
cursor ring is to shown for a short time. The old name suggested
that this was tracking whether the link was followed.

Fix an unrelated change (from gingerbread, automated
merge unlikely to succeed) to check for a null
WebChromeClient.

Requires a companion change in external/webkit

http://b/2135321 (rename jni call)
http://b/2945171 (null check)

Change-Id: I9d4a92dbba1f92da8dc8cde755a2066de59514f9
2010-08-25 16:12:03 -04:00
Steve Block
976190d21a Merge "In ActionBarImpl, only use mActionView after we've checked that it's non-null" 2010-08-25 10:30:20 -07:00
Gilles Debunne
7e2fb17391 Merge "Fixed typo in View id documentation" 2010-08-25 10:28:50 -07:00
Jeff Hamilton
1a2b30cd73 Merge "Fix the documentation of ContentValues." 2010-08-25 08:23:24 -07:00
Jeff Hamilton
f924a513da Fix the documentation of ContentValues.
Bug: 2172562
Change-Id: If7752b937dabc7238723787bb0aa5c348406e28b
2010-08-25 10:19:36 -05:00
Chet Haase
71fcc470eb Merge "Change animator xml importing to use new inflater class" 2010-08-25 08:17:26 -07:00
Steve Block
08f194bc01 In ActionBarImpl, only use mActionView after we've checked that it's non-null
See https://android-git.corp.google.com/g/#change,61251

Change-Id: Ie11f446c10c096916642a34558a350512495234e
2010-08-25 11:56:55 +01:00
Chih-Chung Chang
9439241d35 resolved conflicts for merge of 20afae51 to master
Change-Id: Ief637e412e4d716526de68c7761bdb8cbf436333
2010-08-25 15:54:51 +08:00
Chih-Chung Chang
20afae5150 am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread
Merge commit '231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp

* commit '231a0005654d23284ab58a2d9ea892b995988c34':
  Avoid allocating buffer every time getThumbnail is called.
2010-08-25 00:09:22 -07:00
Chih-Chung Chang
2ca36196ea Avoid allocating buffer every time getThumbnail is called.
Change-Id: Ia088539463e26a1242064ed7e79b0b2c12d64ced
2010-08-25 14:52:30 +08:00
Gilles Debunne
0243caff24 Fixed typo in View id documentation
Change-Id: I2df4f0ff9dc0b229349c8accbd6ef962f1d345bb
2010-08-24 23:08:44 -07:00
Chet Haase
d51d368f2d Change animator xml importing to use new inflater class
Change-Id: I97225ee9868f4dcce5e4c1ba55e16414eb6c0464
2010-08-24 19:37:19 -07:00
Dianne Hackborn
cf44040d93 resolved conflicts for merge of d3cd2596 to master
Change-Id: I61a37a3be8b8115b225da272903ca917c33ae4a6
2010-08-24 17:47:42 -07:00
Romain Guy
a84e02ce3c Merge "Use only one GL context per process, share chaches." 2010-08-24 17:20:20 -07:00
Romain Guy
fb8b763f76 Use only one GL context per process, share chaches.
Change-Id: Ieabaa25338d2f4b8d4fd90e7401ad6e7452eae11
2010-08-24 17:18:14 -07:00
Brad Fitzpatrick
7f9106fb1f am 6cf1a8bf: am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
Merge commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca'

* commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca':
  Some StrictMode API changes.
2010-08-24 16:58:27 -07:00
Gilles Debunne
925f2f9096 resolved conflicts for merge of 9765b2a0 to master
Change-Id: Ic37a443fff0425e9d7c8395f71665d56c38d7e53
2010-08-24 15:14:12 -07:00
Dianne Hackborn
d3cd259675 am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp

* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
  Verify that onPause() calls its superclass.
2010-08-24 14:47:46 -07:00
Dianne Hackborn
4af0cfad53 Merge "Verify that onPause() calls its superclass." into gingerbread 2010-08-24 14:44:42 -07:00
Wink Saville
c28227d443 Merge "Allow reliable detection of a message that is in use." 2010-08-24 14:33:29 -07:00
Adam Powell
a3715c151b Merge "Disable FEATURE_ACTION_BAR on windows with incompatible feature sets." 2010-08-24 14:29:48 -07:00
Gilles Debunne
b32d0f23a8 am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp

* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
  Fix for an NPE in TextView.
2010-08-24 14:25:57 -07:00
Gilles Debunne
e2978c8dca Merge "Fix for an NPE in TextView." into gingerbread 2010-08-24 14:23:37 -07:00
Gilles Debunne
4e765e002f Fix for an NPE in TextView.
Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
2010-08-24 14:21:13 -07:00
Brad Fitzpatrick
6cf1a8bfb0 am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp

* commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
  Some StrictMode API changes.
2010-08-24 14:18:26 -07:00
Adam Powell
f4a6ec4e93 Disable FEATURE_ACTION_BAR on windows with incompatible feature sets.
Change-Id: I70c860c72eb9e1f1f123764202334ab714f4f830
2010-08-24 14:18:10 -07:00
Brad Fitzpatrick
b1bbe99aaa Merge "Some StrictMode API changes." into gingerbread 2010-08-24 14:15:30 -07:00
Daisuke Miyakawa
ff547a5949 am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread
Merge commit '88bff62c35e570a0c86eb55ded79d4600730226b' into gingerbread-plus-aosp

* commit '88bff62c35e570a0c86eb55ded79d4600730226b':
  Fix vCard so that it looks at IM correctly.
2010-08-24 13:39:42 -07:00
Daisuke Miyakawa
88bff62c35 Merge "Fix vCard so that it looks at IM correctly." into gingerbread 2010-08-24 13:37:02 -07:00
Daisuke Miyakawa
4a2a2eb4cb Fix vCard so that it looks at IM correctly.
Change-Id: I3afc01e2e5f55c254606379f353b030ea297ee36
2010-08-24 13:33:25 -07:00
Chet Haase
49afa5bc10 Add facilities for layout transitions
Change-Id: I5c73ce6c6ba3bc9e3b57fcfbbcab37d511db6132
2010-08-24 13:09:20 -07:00
Brad Fitzpatrick
5107ef6825 Merge "resolved conflicts for merge of 0b7b9807 to master" 2010-08-24 12:55:43 -07:00
Brad Fitzpatrick
96fd5af681 resolved conflicts for merge of 0b7b9807 to master
Change-Id: If60aeeb47cd06dcc76b88506688c7e4b58cf2208
2010-08-24 12:40:13 -07:00
Cary Clark
75796bbef7 communicate drawing pause to webkit to pause gif animation
Gif frames continue even if the webkit changes aren't drawn.
When we suspend drawing, suspend the gif animation as well.
This is accomplished by fooling webkit into thinking the
browser window is offscreen. When the webkit drawing is
resumed, invalidate the entire content so the gif animations
start up once more.

requires companion change in external/webkit

http://b/2621902

Change-Id: I1814aa41630820872d62752b75ae94383fdcc5fc
2010-08-24 15:36:08 -04:00
Dianne Hackborn
e794e9f9b7 Verify that onPause() calls its superclass.
Change-Id: Ibf48992b4445bfc726ade307aad26f3e9577c5fb
2010-08-24 12:32:10 -07:00
Kenny Root
8db59adccf resolved conflicts for merge of b037da40 to master
Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121
2010-08-24 11:48:37 -07:00
Brad Fitzpatrick
97461bd25c Some StrictMode API changes.
* rename setThreadBlockingPolicy to setThreadPolicy (opens the way to
  using StrictMode for non-blocking-related things in the future?)

* add allowThreadDiskWrites() and allowThreadDiskReads() to modify the
  current policy mask and return the old one.  this will allow turning
  off part of StrictMode during certain regions of code.  (for
  instance, writing to disk in Activity onPause...)

Change-Id: Ia1878153713f79299971fdab567fa15b3cb9d56c
2010-08-24 11:47:19 -07:00
Jean-Baptiste Queru
46089bd1cb am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp
Merge commit '026231284c44ca8cf789e0d5045c5ae6a91d7766'

* commit '026231284c44ca8cf789e0d5045c5ae6a91d7766':
  Crash when powering off.
2010-08-24 11:22:05 -07:00
Steve Howard
15a4a2cb8e am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit '6d895fdbc023743f3870042e73a5614764e4165b'

* commit '6d895fdbc023743f3870042e73a5614764e4165b':
  Make ProgressBar.setVisibility() remotable.
2010-08-24 11:01:14 -07:00
Wink Saville
a334e7c724 Allow reliable detection of a message that is in use.
Because the standard Looper.loop code calls Message#recycle it is
imperative that Handler#handleMessage code not attempt to resue
a message it receives. If allowed to do so it will cause bugs that
could be difficult to diagnois.

This change adds Message#flags and uses one bit to reliably detect
a message is in use and throws an error in MessageQueue#enqueueMessage.
This allows early detection of this bug.

Note: This is not new functionality, but the current implementation does
not detect messages that are in use because it uses Message#when != 0
as the detection mechanism. The problem is that a Message#when value of 0
is valid value used to place a message at the front of the queue and is
thus unreliable.

Another option is to change the setting of Message#when in Message#enqueueMessage
so that it is never 0, although that does change subtly a publicly accessible
field.

Yet another option would be to use other fields but all candidates have
similar problems as when in that they are publicly accessible or even
settable such as Message#target.

Change-Id: I040d6e546376f7b1ed1e4daa0d5644cce8bf333a
2010-08-24 10:56:30 -07:00
Jean-Baptiste Queru
a4ddf42673 resolved conflicts for merge of c64b916e to master
Change-Id: I31b84d72186a918f19e0c9dee8fdebc83f661cc1
2010-08-24 10:45:16 -07:00
Gilles Debunne
9765b2a01d am 2703a42d: When an EditText gains focus by tapping, move the insertion point where tapped.
Merge commit '2703a42d16af0e62da1bba02b6c935d98debf936' into gingerbread-plus-aosp

* commit '2703a42d16af0e62da1bba02b6c935d98debf936':
  When an EditText gains focus by tapping, move the insertion point where tapped.
2010-08-24 10:30:09 -07:00
Jean-Baptiste Queru
0a5699654f am f235a519: am ec58dff0: Fix build - remove dead doc link
Merge commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f'

* commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f':
  Fix build - remove dead doc link
2010-08-24 10:25:00 -07:00
Gilles Debunne
2703a42d16 When an EditText gains focus by tapping, move the insertion point where tapped.
The previous behavior was to move cursor at the end of the first line,
which feels weird.

Change-Id: I5a72f9871ed79ee2c521698ea642ba126537f4f9
2010-08-24 10:18:31 -07:00