26977 Commits

Author SHA1 Message Date
Dmitri Plotnikov
11811612e8 Merge "Resolving a field naming conflict caused by the table join." 2010-07-16 11:21:00 -07:00
Dmitri Plotnikov
86fe839284 Resolving a field naming conflict caused by the table join.
Change-Id: I6f3293fb9aceebea7df9677eb1e6ebc199383e99
2010-07-16 11:19:46 -07:00
Dmitri Plotnikov
6b477fe452 Merge "Hiding new API" 2010-07-16 10:46:40 -07:00
Dmitri Plotnikov
e270c51ea4 Hiding new API
Change-Id: Ie6a108442416fdb27229ff274b631e6f4a6c2370
2010-07-16 10:46:00 -07:00
Dmitri Plotnikov
393e4801d8 Merge "Adding more feature declarations to Directory API." 2010-07-16 10:45:18 -07:00
Dmitri Plotnikov
30b7be333f Adding more feature declarations to Directory API.
Change-Id: Iabec8c4dcbd69212285a6eb9be9db7ebb1b712ed
2010-07-16 10:43:40 -07:00
Adam Powell
8028dd32a4 Overflow menu for action bars.
The overflow menu replaces the normal options menu panel for
activities with an action bar. It always appears as the rightmost
action button and is displayed as a dropdown menu. The menu key
summons and dismisses the overflow menu instead of the options panel
where applicable.

Change-Id: I0b4fa7e36f35ab12e2f0c1d12bec79ccab8cc4b1
2010-07-16 10:22:31 -07:00
Jeff Brown
eb857f12d6 resolved conflicts for merge of f7adbe10 to master
Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7
2010-07-16 10:06:33 -07:00
Gilles Debunne
c0eb6d6388 Merge "Fixed bug in BitmapFactory.decodeStream" 2010-07-16 09:54:30 -07:00
Eric Laurent
2469e40924 am f16b3f10: am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread
Merge commit 'f16b3f104f60738447db60bcf2c44c7610e17199'

* commit 'f16b3f104f60738447db60bcf2c44c7610e17199':
  Several improvements in audio effects volume control.
2010-07-16 09:12:40 -07:00
Kenny Root
94919a170f am f97b21b5: am bd623daf: Undo IMediaContainerService changes
Merge commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e'

* commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e':
  Undo IMediaContainerService changes
2010-07-16 09:12:36 -07:00
Dianne Hackborn
781d347479 am 9c37e5ad: am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread
Merge commit '9c37e5add9d7678a29b4e0d1e178fe78a13db961'

* commit '9c37e5add9d7678a29b4e0d1e178fe78a13db961':
  Implement native key pre-dispatching to IMEs.
2010-07-16 09:12:29 -07:00
Kenny Root
fb4e1e24a9 resolved conflicts for merge of 181bb0ab to master
Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
2010-07-16 09:04:09 -07:00
Daniel Sandler
a2b78e21b0 Merge "Move more of the system bar to the layout." 2010-07-16 07:38:52 -07:00
Maksymilian Osowski
3c8ccb3845 Added the LayoutTestsRunner class that is responsible for running the tests. Also, added some methods to FileFilter.
It preloads the tests from the given path, runs them and asks for dumps and diffs. It will also prepare summaries in the future. It delegates
most of the work of actually running the individual tests to LayoutTest class and AbstractResult (and its subclasses in the future).

Change-Id: I483bf26a380b539e4769e61b4a09fa270ab0e8e9
2010-07-16 14:32:12 +01:00
Jeff Brown
f7adbe10c2 am eec69d29: Merge "Fix bug with phantom input windows." into gingerbread
Merge commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736' into gingerbread-plus-aosp

* commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736':
  Fix bug with phantom input windows.
2010-07-16 00:16:09 -07:00
Jeff Brown
eec69d2923 Merge "Fix bug with phantom input windows." into gingerbread 2010-07-16 00:14:38 -07:00
Eric Laurent
f16b3f104f am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread
Merge commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384' into gingerbread-plus-aosp

* commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384':
  Several improvements in audio effects volume control.
2010-07-16 00:12:02 -07:00
Eric Laurent
b0374a0e22 Merge "Several improvements in audio effects volume control." into gingerbread 2010-07-16 00:08:50 -07:00
Jeff Brown
e33348ba54 Fix bug with phantom input windows.
Add dumpsys integration for the native input dispatcher.
Add some InputDevice API stubs.
Add an appendFormat helper method to String8 for printf style
string formatting mainly for debugging purposes.
Use generic ArrayList<WindowState> everywhere in WindowManagerService
to eliminate unnecessary casts all over.

Change-Id: I9d1e3bd90eb7222d10620200477f11b7bfd25e44
2010-07-16 00:02:48 -07:00
Jeff Brown
b75fa30aaf resolved conflicts for merge of aca672ba to master
Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08
2010-07-15 23:47:29 -07:00
Shih-wei Liao
3fdab65f24 Merge "Fix include path problem." 2010-07-15 23:40:05 -07:00
Shih-wei Liao
28b40e6426 Fix include path problem.
Change-Id: Ic1abbce767b9895e95e0a24e6f76150b31a6c75a
2010-07-15 23:38:36 -07:00
Christopher Tate
ffb0cef2a8 am 2c43b6ce: am d9452ecd: Merge "Fix jni registration typo" into gingerbread
Merge commit '2c43b6cee14cde6721689239e47d32319dbbf6ee'

* commit '2c43b6cee14cde6721689239e47d32319dbbf6ee':
  Fix jni registration typo
2010-07-15 23:27:47 -07:00
Scott Main
eb5d86f9d9 am 7ccdfbee: am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit '7ccdfbee63ee482f294becbc5b5e5e1807fbda43'

* commit '7ccdfbee63ee482f294becbc5b5e5e1807fbda43':
  docs: update notepad tutorial to change EditNote activity title and update codelab zip
2010-07-15 23:27:40 -07:00
Scott Main
5d66290d78 am c9659424: am b8f4a84a: am 80fa5c86: docs: dashboard update
Merge commit 'c9659424cfa971f202f1bee44f7acb6873b0954b'

* commit 'c9659424cfa971f202f1bee44f7acb6873b0954b':
  docs: dashboard update
2010-07-15 23:27:36 -07:00
Katie McCormick
ac29089ffc am 3f50035c: am a6a134d4: am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
Merge commit '3f50035c3db3cd38653d8e212c8caf77c4c3200e'

* commit '3f50035c3db3cd38653d8e212c8caf77c4c3200e':
  Doc change: Update AVD create instructions.
2010-07-15 23:24:16 -07:00
Brad Fitzpatrick
a1079337af am 527e9c8f: am 703e5d3c: StrictMode: avoid an allocation in common case
Merge commit '527e9c8f0471666b5b1c461f1a8a710192208e70'

* commit '527e9c8f0471666b5b1c461f1a8a710192208e70':
  StrictMode: avoid an allocation in common case
2010-07-15 23:05:48 -07:00
Brad Fitzpatrick
74446cef55 am f96c2719: am 0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into gingerbread
Merge commit 'f96c2719c3cb4878e899b6fe0753b4f4b8aea8b7'

* commit 'f96c2719c3cb4878e899b6fe0753b4f4b8aea8b7':
  StrictMode: batch drop box writes for system apps
2010-07-15 23:05:44 -07:00
Brad Fitzpatrick
d2f6c7fe73 am 3e5e21d4: am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
Merge commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d'

* commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d':
  StrictMode: gather and return violating stacks in Binder replies
2010-07-15 23:05:39 -07:00
Brad Fitzpatrick
9555a1323e am cc52121c: am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread
Merge commit 'cc52121c4f88e9feb8404937bcbfff6e73084666'

* commit 'cc52121c4f88e9feb8404937bcbfff6e73084666':
  More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
2010-07-15 23:05:35 -07:00
Christopher Tate
6ba776ad34 am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread
Merge commit '078ccbdbb98c118aa87cab2fef61ff90dd128358'

* commit '078ccbdbb98c118aa87cab2fef61ff90dd128358':
  Add native C APIs for working with the Asset Manager
2010-07-15 23:05:27 -07:00
James Dong
085d0f55e6 am 10f8baa4: am 42ef0c71: Initial check-in for software m4v_h263 encoder
Merge commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd'

* commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd':
  Initial check-in for software m4v_h263 encoder
2010-07-15 23:04:48 -07:00
Kenny Root
f97b21b54e am bd623daf: Undo IMediaContainerService changes
Merge commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a' into gingerbread-plus-aosp

* commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a':
  Undo IMediaContainerService changes
2010-07-15 22:37:06 -07:00
Shih-wei Liao
ebd6f94dbd Merge "Preparing for build system change. Fix the build error in http://b/issue?id=2781522." 2010-07-15 22:35:31 -07:00
Shih-wei Liao
a560d7a2fd Preparing for build system change. Fix the build error in http://b/issue?id=2781522.
Change-Id: I4513504bb05de9bb82cd12d40045a7e4090edb3c
2010-07-15 22:30:48 -07:00
Dianne Hackborn
9c37e5add9 am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread
Merge commit '75a91389f1938214397aaee262f4136e6bb6b094' into gingerbread-plus-aosp

* commit '75a91389f1938214397aaee262f4136e6bb6b094':
  Implement native key pre-dispatching to IMEs.
2010-07-15 22:24:53 -07:00
Kenny Root
bd623daff1 Undo IMediaContainerService changes
These should be in the next commit and not the previous one.

Change-Id: I8d13fecf3b978ae2e796dc6e10ef3f969b27a0f4
2010-07-15 22:22:57 -07:00
Dianne Hackborn
75a91389f1 Merge "Implement native key pre-dispatching to IMEs." into gingerbread 2010-07-15 22:22:42 -07:00
Dianne Hackborn
2c6081ce35 Implement native key pre-dispatching to IMEs.
This significantly re-works the native key dispatching code to
allow events to be pre-dispatched to the current IME before
being processed by native code.  It introduces one new public
API, which must be called after retrieving an event if the app
wishes for it to be pre-dispatched.

Currently the native code will only do pre-dispatching of
system keys, to avoid significant overhead for gaming input.
This should be improved to be smarted, filtering for only
keys that the IME is interested in.  Unfortunately IMEs don't
currently provide this information. :p

Change-Id: Ic1c7aeec8b348164957f2cd88119eb5bd85c2a9f
2010-07-15 22:05:33 -07:00
Kenny Root
181bb0ab46 am 02c8730c: Add API to call to vold for mounting OBBs
Merge commit '02c8730c1bf19daf48bec8c6995df676a00a73b1' into gingerbread-plus-aosp

* commit '02c8730c1bf19daf48bec8c6995df676a00a73b1':
  Add API to call to vold for mounting OBBs
2010-07-15 21:35:53 -07:00
Kenny Root
02c8730c1b Add API to call to vold for mounting OBBs
* Unhide StorageService class; hide all the USB-related items

* Add application-visible API to StorageManager for OBB files

* Add class for parceling OBB info across binders (ObbInfo)

* Add a JNI glue class to libutils/ObbFile (ObbScanner)

* Add API to MountService to deal with calling into vold and checking
  permissions

Change-Id: I33ecf9606b8ff535f3a2ada83931da6bbef41cfd
2010-07-15 21:31:58 -07:00
Dmitri Plotnikov
90c50c4d7d Merge "Fixing NPE in CursorLoader" 2010-07-15 18:56:11 -07:00
Jeff Brown
aca672ba2e am c5ed5910: Add support for new input sources.
Merge commit 'c5ed5910c9ef066cec6a13bbb404ec57b1e92637' into gingerbread-plus-aosp

* commit 'c5ed5910c9ef066cec6a13bbb404ec57b1e92637':
  Add support for new input sources.
2010-07-15 18:47:24 -07:00
Jeff Brown
c5ed5910c9 Add support for new input sources.
Added several new coordinate values to MotionEvents to capture
touch major/minor area, tool major/minor area and orientation.

Renamed NDK input constants per convention.

Added InputDevice class in Java which will eventually provide
useful information about available input devices.

Added APIs for manufacturing new MotionEvent objects with multiple
pointers and all necessary coordinate data.

Fixed a bug in the input dispatcher where it could get stuck with
a pointer down forever.

Fixed a bug in the WindowManager where the input window list could
end up containing stale removed windows.

Fixed a bug in the WindowManager where the input channel was being
removed only after the final animation transition had taken place
which caused spurious WINDOW DIED log messages to be printed.

Change-Id: Ie55084da319b20aad29b28a0499b8dd98bb5da68
2010-07-15 18:32:33 -07:00
Dmitri Plotnikov
4565d52bdd Fixing NPE in CursorLoader
Change-Id: I8d005473166f43dd018ac304ff9ec606e90483a3
2010-07-15 18:24:07 -07:00
Romain Guy
1726cf285f Merge "Fix the problem that color drawable cache key conflicts another drawable one. The cache key of a color drawable resource may be the same as another drawable resource's value." 2010-07-15 18:24:02 -07:00
Christopher Tate
2c43b6cee1 am d9452ecd: Merge "Fix jni registration typo" into gingerbread
Merge commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405' into gingerbread-plus-aosp

* commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405':
  Fix jni registration typo
2010-07-15 18:21:33 -07:00
Scott Main
7ccdfbee63 am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f' into gingerbread-plus-aosp

* commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f':
  docs: update notepad tutorial to change EditNote activity title and update codelab zip
2010-07-15 18:19:27 -07:00
Christopher Tate
d9452ecd0c Merge "Fix jni registration typo" into gingerbread 2010-07-15 18:19:17 -07:00