Commit Graph

10205 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
ab0d65975e am beb1f40d: am 34baff19: am 99314f43: Merge "Fix old style edit text drawable display error."
* commit 'beb1f40d677166edbe98fdf1c0aabc34a1c8a6fb':
  Fix old style edit text drawable display error.
2012-05-23 15:09:59 -07:00
Jean-Baptiste Queru
beb1f40d67 am 34baff19: am 99314f43: Merge "Fix old style edit text drawable display error."
* commit '34baff19d88679254d82420f798387f92a7fb912':
  Fix old style edit text drawable display error.
2012-05-23 15:06:55 -07:00
Jean-Baptiste Queru
34baff19d8 am 99314f43: Merge "Fix old style edit text drawable display error."
* commit '99314f432e024720ffb88431ca8535cec5e4ff58':
  Fix old style edit text drawable display error.
2012-05-23 15:04:39 -07:00
Jean-Baptiste Queru
99314f432e Merge "Fix old style edit text drawable display error." 2012-05-23 14:58:09 -07:00
Eino-Ville Talvala
2e0eee2d05 Merge "EmulatedFakeCamera2: Add more static metadata" 2012-05-23 09:52:45 -07:00
The Android Automerger
422c4b33de merge in jb-release history after reset to jb-dev 2012-05-23 07:00:03 -07:00
Xavier Ducrohet
99dbb2b9a8 am 7dd2f15b: am 928c7d66: Add API 16 to the SDK API file.
* commit '7dd2f15b87945794eee35c0e688048e3eb298ef5':
  Add API 16 to the SDK API file.
2012-05-22 17:19:54 -07:00
Xavier Ducrohet
7dd2f15b87 am 928c7d66: Add API 16 to the SDK API file.
* commit '928c7d668e70ea66e21909918f68c509b6f26b5a':
  Add API 16 to the SDK API file.
2012-05-22 17:17:02 -07:00
Xavier Ducrohet
689ef782f0 am d9369bd7: am 9649bee7: Update API file with proper content.
* commit 'd9369bd771b8e46ff4fb7038517b2529fc8b0b1e':
  Update API file with proper content.
2012-05-22 16:01:22 -07:00
Xavier Ducrohet
d9369bd771 am 9649bee7: Update API file with proper content.
* commit '9649bee7b2482f7905f7e1ae33f3dc1052cee7f6':
  Update API file with proper content.
2012-05-22 15:59:06 -07:00
Xavier Ducrohet
928c7d668e Add API 16 to the SDK API file.
Change-Id: I4937aa793fed5efc51e0c4ce127b7193148baa5e
2012-05-22 15:57:58 -07:00
Xavier Ducrohet
9649bee7b2 Update API file with proper content.
This doesn't contain API 16 just yet. This is just a new version
based on reading all the android.jar instead of the text-based
files.

This new mechanism filters out all methods coming from super
classes as well as interfaces in an effort to make the file
smaller.

Change-Id: Ieefa7d01c29944b2b77b22e8cb81ee2e67afd555
2012-05-22 15:24:18 -07:00
The Android Open Source Project
390a4dff3b am 2455c491: Reconcile with jb-release
* commit '2455c4916eafad82e1fa3ccba1e4809e92d2bc64':
2012-05-22 14:20:59 -07:00
The Android Automerger
df56b2a246 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-22 13:22:24 -07:00
The Android Open Source Project
2455c4916e Reconcile with jb-release
Change-Id: Idb05db9a3cd879261a0ea9ed96a433531e0441b4
2012-05-22 13:04:57 -07:00
Eino-Ville Talvala
c7bb6cf132 EmulatedFakeCamera2: Add opaque stream output support
- Enables basic preview
- Opaque is RGBA for emulator
- Still only 1 stream max
- Preparations for YUV output support

Bug: 6243944
Change-Id: I11cb494d72c7c2ec5f542c79f1aa15d9a3ce00bf
2012-05-22 10:38:56 -07:00
The Android Automerger
07e7a1f45c merge in jb-release history after reset to jb-dev 2012-05-22 07:00:23 -07:00
Svetoslav Ganov
235b521c3a am ef03d1ba: am 84710bb8: Merge "Updating the accessibility sample due to a security fix." into jb-dev
* commit 'ef03d1bae659e64278d82c78f202e00e4aef94cb':
  Updating the accessibility sample due to a security fix.
2012-05-21 14:32:25 -07:00
Dianne Hackborn
549caa9b49 am 03239663: am 7d7d2fb6: Merge "A few little tweaks to system ui flag demos." into jb-dev
* commit '03239663fc1dbeeda2c580b294917269454b65f3':
  A few little tweaks to system ui flag demos.
2012-05-21 14:29:23 -07:00
The Android Open Source Project
d3b438dd52 am 65e60904: Reconcile with jb-release nakasi-factoryrom-release
* commit '65e60904182c67802bb7f40cf943f81430a95ca8':
2012-05-21 14:28:04 -07:00
Xia Wang
4556eaea5f am 08eafbb0: am d699ad18: Merge "Remove the WaitEvent added in Tap and Drag." into jb-dev
* commit '08eafbb0cfdebfd5f946ca8b51851939142417ea':
  Remove the WaitEvent added in Tap and Drag.
2012-05-21 14:27:57 -07:00
Eino-Ville Talvala
7b906a7ca9 EmulatedFakeCamera2: Add more static metadata
- Add entries for all metadata
- Use better idiom for static metadata construction
- Revise dynamic and static metadata
  - New resolution reporting
  - Minor revision to some enums
- Quiet excess logging

Bug: 6243944
Change-Id: I0558d7d60ae97d2df9e209f24c1e04330737c220
2012-05-21 14:10:25 -07:00
Svetoslav Ganov
ef03d1bae6 am 84710bb8: Merge "Updating the accessibility sample due to a security fix." into jb-dev
* commit '84710bb8b0f3b149feb72d4c29dec35a4ccf327d':
  Updating the accessibility sample due to a security fix.
2012-05-21 13:17:13 -07:00
Svetoslav Ganov
84710bb8b0 Merge "Updating the accessibility sample due to a security fix." into jb-dev 2012-05-21 13:13:41 -07:00
Eino-Ville Talvala
486f74f33a Merge "EmulatedCamera2: Be more const, like the HAL." 2012-05-21 11:18:42 -07:00
The Android Automerger
7a68eb9bc1 merge in jb-release history after reset to jb-dev 2012-05-21 07:00:31 -07:00
Dianne Hackborn
03239663fc am 7d7d2fb6: Merge "A few little tweaks to system ui flag demos." into jb-dev
* commit '7d7d2fb6d6b8c30cd6549b9cb35e9a0d36f87981':
  A few little tweaks to system ui flag demos.
2012-05-20 21:53:24 -07:00
Eino-Ville Talvala
366eef524c EmulatedCamera2: Be more const, like the HAL.
Bug: 6243944
Change-Id: I01f67c22b6e54dc49f22c6bc2c665b1db4ff6680
2012-05-20 17:04:27 -07:00
Dianne Hackborn
7d7d2fb6d6 Merge "A few little tweaks to system ui flag demos." into jb-dev 2012-05-20 10:17:58 -07:00
The Android Automerger
66641b03ad merge in jb-release history after reset to jb-dev 2012-05-20 07:39:37 -07:00
The Android Automerger
091f5c3043 merge in jb-release history after reset to jb-dev 2012-05-19 11:42:46 -07:00
The Android Automerger
967d0604a3 merge in jb-release history after reset to jb-dev 2012-05-19 10:05:42 -07:00
Dianne Hackborn
58ce6f06a1 A few little tweaks to system ui flag demos.
Change-Id: Ib4c3b45e8d67200a2b4f3a8b0daee198b24bad0f
2012-05-18 19:43:57 -07:00
The Android Open Source Project
65e6090418 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I049767beb7309d00aca6793a9a67d5191c6c53bc
2012-05-18 18:42:01 -07:00
Xia Wang
08eafbb0cf am d699ad18: Merge "Remove the WaitEvent added in Tap and Drag." into jb-dev
* commit 'd699ad187756b1138e6c697c285dd476c2d0c449':
  Remove the WaitEvent added in Tap and Drag.
2012-05-18 17:55:38 -07:00
Xia Wang
d699ad1877 Merge "Remove the WaitEvent added in Tap and Drag." into jb-dev 2012-05-18 17:52:58 -07:00
Xia Wang
5e20670c0b Remove the WaitEvent added in Tap and Drag.
As the delay is added as WaitEvent, throttle time is applied after
the WaitEvent. This cause problem for Tap and Drag. The thorrle time
is then inserted between ACTION_DOWN and ACTION_UP, or ACTION_DOWN
and ACTION_MOVE. This broke the two actions.

Change-Id: I5a122d6cb3d99e38d9442c3de50e0360652c4baf
2012-05-18 17:04:02 -07:00
Svetoslav Ganov
7947d9fb6a Updating the accessibility sample due to a security fix.
1. We have fixed a security issue in the framework and
   this patch is updating the sample.

Change-Id: Icc266ceaf0064cf8d9a00d7ad48746e1f0fbbbf1
2012-05-18 12:52:33 -07:00
The Android Automerger
2c57249f22 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-18 10:46:12 -07:00
Andy Stadler
2b61854e0c am 8eb23596: (-s ours) am 285ee4b3: Merge "Fix .classpath for eclipse. DO NOT MERGE" into jb-dev
* commit '8eb23596b76ba764711c226799e2b4022f7bd457':
  Fix .classpath for eclipse.  DO NOT MERGE
2012-05-17 15:33:43 -07:00
Jason Sams
867cad2c44 am edcc4754: am dd1b1981: Merge "Put the compute samples back in the SDK." into jb-dev
* commit 'edcc4754ee50d97baf15442e9f1ef10ea299aae5':
  Put the compute samples back in the SDK.
2012-05-17 15:33:14 -07:00
The Android Automerger
8e8838df34 merge in jb-release history after reset to jb-dev 2012-05-17 07:00:16 -07:00
Andy Stadler
8eb23596b7 am 285ee4b3: Merge "Fix .classpath for eclipse. DO NOT MERGE" into jb-dev
* commit '285ee4b3b009d80683a5188b71ba125dd94e6cf7':
  Fix .classpath for eclipse.  DO NOT MERGE
2012-05-16 16:12:02 -07:00
Andy Stadler
285ee4b3b0 Merge "Fix .classpath for eclipse. DO NOT MERGE" into jb-dev 2012-05-16 16:02:33 -07:00
Andy Stadler
c26d4211cc Fix .classpath for eclipse. DO NOT MERGE
I've marked this do-not-merge because Email/Exchange are different
in master and this will probably break 'em.

Change-Id: I9f10bd41e143d7b9b6c784d503e79ec28e9f56c3
2012-05-16 15:58:26 -07:00
Jason Sams
edcc4754ee am dd1b1981: Merge "Put the compute samples back in the SDK." into jb-dev
* commit 'dd1b1981c33fad38567d4d1e2d56f5ac89ad8101':
  Put the compute samples back in the SDK.
2012-05-16 15:12:56 -07:00
Jason Sams
dd1b1981c3 Merge "Put the compute samples back in the SDK." into jb-dev 2012-05-16 15:08:11 -07:00
Jason Sams
8cb9623c6d Put the compute samples back in the SDK.
Change-Id: Idda5b632750e52eecf3a16205a0ff14af17b2e1b
2012-05-16 13:00:38 -07:00
Eino-Ville Talvala
423e93e49d Merge "EmulatedFakeCamera2: Support construct_default_request HAL method." 2012-05-16 11:55:27 -07:00
Eino-Ville Talvala
6d9c46f3ea Merge "EmulatedFakeCamera2: Update to match camera_metadata changes" 2012-05-16 10:59:14 -07:00