Commit Graph

18215 Commits

Author SHA1 Message Date
Dmitri Plotnikov
28bf32d50f Merge "Adding more feature declarations to Directory API." 2010-07-16 10:45:18 -07:00
Jeff Brown
cfa6d98278 resolved conflicts for merge of f7adbe10 to master
Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7
2010-07-16 10:06:33 -07:00
Gilles Debunne
348d63c4c5 Merge "Fixed bug in BitmapFactory.decodeStream" 2010-07-16 09:54:30 -07:00
Eric Laurent
5058ff4746 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
bda9bedf28 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
a2c4654c2f 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
d400fe7dc9 resolved conflicts for merge of 181bb0ab to master
Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
2010-07-16 09:04:09 -07:00
Daniel Sandler
29e92c02b7 Merge "Move more of the system bar to the layout." 2010-07-16 07:38:52 -07:00
Jeff Brown
e2cefe54f4 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
9e2d6e976b Merge "Fix bug with phantom input windows." into gingerbread 2010-07-16 00:14:38 -07:00
Eric Laurent
1716d82d50 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
8849c6f648 Merge "Several improvements in audio effects volume control." into gingerbread 2010-07-16 00:08:50 -07:00
Jeff Brown
0a128e3cbe 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
1a15c6eaff resolved conflicts for merge of aca672ba to master
Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08
2010-07-15 23:47:29 -07:00
Shih-wei Liao
8bbeeaa331 Merge "Fix include path problem." 2010-07-15 23:40:05 -07:00
Christopher Tate
cc2781b5ed 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
969573159e 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
0cccee3b6c 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
76014b2fe6 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
da65ac5753 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
5b051c40d8 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
e9f1a6478f 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
721c4162c3 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
ba57d1b9a5 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
e52c769000 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
26b3d0bb33 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
1bb3fead84 Merge "Preparing for build system change. Fix the build error in http://b/issue?id=2781522." 2010-07-15 22:35:31 -07:00
Dianne Hackborn
960259f456 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
Dianne Hackborn
9c48c34ebe Merge "Implement native key pre-dispatching to IMEs." into gingerbread 2010-07-15 22:22:42 -07:00
Dianne Hackborn
0e8852766d 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
36930c2234 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
Dmitri Plotnikov
faf28bd572 Merge "Fixing NPE in CursorLoader" 2010-07-15 18:56:11 -07:00
Jeff Brown
5197d17bf6 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
5c1ed84a2d 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
Christopher Tate
e2798f272c 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
a1989140b9 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
854f9810f1 Merge "Fix jni registration typo" into gingerbread 2010-07-15 18:19:17 -07:00
Scott Main
7ab14f87e7 am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread

* commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c':
  docs: update notepad tutorial to change EditNote activity title and update codelab zip
2010-07-15 18:17:16 -07:00
Scott Main
9457041ee6 Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo 2010-07-15 18:14:16 -07:00
Scott Main
c77f40a3ae am b8f4a84a: am 80fa5c86: docs: dashboard update
Merge commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e' into gingerbread-plus-aosp

* commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e':
  docs: dashboard update
2010-07-15 18:14:07 -07:00
Scott Main
3b1d921f94 am 80fa5c86: docs: dashboard update
Merge commit '80fa5c866eaf323c39bef4159a351950f0ea527a' into gingerbread

* commit '80fa5c866eaf323c39bef4159a351950f0ea527a':
  docs: dashboard update
2010-07-15 18:10:39 -07:00
Katie McCormick
370e004113 am a6a134d4: am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
Merge commit 'a6a134d42df5fde04f2cc379175c756aff333cb3' into gingerbread-plus-aosp

* commit 'a6a134d42df5fde04f2cc379175c756aff333cb3':
  Doc change: Update AVD create instructions.
2010-07-15 17:32:04 -07:00
Katie McCormick
1524d11c6d am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
Merge commit '28da8e5e4aefd919064e3c33a311edf1af5a958e' into gingerbread

* commit '28da8e5e4aefd919064e3c33a311edf1af5a958e':
  Doc change: Update AVD create instructions.
2010-07-15 17:28:57 -07:00
Katie McCormick
9db8431e87 Merge "Doc change: Update AVD create instructions." into froyo 2010-07-15 17:25:10 -07:00
Jason Sams
99e468a5c9 Merge "1st cut of ForEach and test." 2010-07-15 17:12:10 -07:00
Fred Quintana
55b1e0b5ff Merge "fix a bug where some accounts changed listeners don't see the new version of the accounts because the accounts changed broadcast is sent from within the transaction try block, thus before db.endTransaction() is called." 2010-07-15 16:35:03 -07:00
Robert Greenwalt
733a2f8ab4 Merge "Fix Emulator boot." 2010-07-15 16:01:25 -07:00
Jaikumar Ganesh
7ff0daafbe Merge "Handle Input and network signal changes for HID and tethering." 2010-07-15 16:00:02 -07:00
Brad Fitzpatrick
6c3d7ce4f9 am 703e5d3c: StrictMode: avoid an allocation in common case
Merge commit '703e5d3c7fbeb8ca0978045db01d40318f838612' into gingerbread-plus-aosp

* commit '703e5d3c7fbeb8ca0978045db01d40318f838612':
  StrictMode: avoid an allocation in common case
2010-07-15 15:52:48 -07:00
Brad Fitzpatrick
017823f67e am 0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into gingerbread
Merge commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002' into gingerbread-plus-aosp

* commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002':
  StrictMode: batch drop box writes for system apps
2010-07-15 15:47:05 -07:00