drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,066 Commits 1 Branch 0 Tags
Commit Graph

27066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaikumar Ganesh
05a1863ceb Allow multiple HID devices to be connected. 
Change-Id: I40d9820b756c1e3bb4e773fbb78212e2716e99bf
 2010-07-21 12:08:12 -07:00
Jaikumar Ganesh
de07503a38 Add HID to the state machine and add native call backs. 
Change-Id: Ib9f3e476d4176bc04e23e7674dc54aa5a6417308
 2010-07-21 10:43:02 -07:00
Jaikumar Ganesh
c3ee99d9eb Set initial HID profile preference. 
Change-Id: I804089cbea4ad25b87ade60fa8a905ddb167bff4
 2010-07-20 19:51:58 -07:00
Yu Shan Emily Lau
d1f4a17ea5 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-07-20 16:55:33 -07:00
Adam Powell
f20d6cf100 Merge "Fix a bug with closing action bar context modes" 2010-07-20 16:55:15 -07:00
James Dong
c5eeedc93d am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbread 
Merge commit '9049fe60c20640bd606741c8f45f3f781a1684f5'

* commit '9049fe60c20640bd606741c8f45f3f781a1684f5':
  Progress status notification
 2010-07-20 16:55:12 -07:00
Jason Parks
ed38cf9089 am bc4fcec7: am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7'

* commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 16:55:01 -07:00
Dan Egnor
43b237bd95 am c78f9a0e: am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67'

* commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 16:54:57 -07:00
Scott Main
25f79d9972 am 3b3e368c: am 60a20061: am 2316d626: docs: add information about using color resources as drawables 
Merge commit '3b3e368c73f4224b055635e6e79f57cc702d8938'

* commit '3b3e368c73f4224b055635e6e79f57cc702d8938':
  docs: add information about using color resources as drawables
 2010-07-20 16:54:52 -07:00
Dan Egnor
02b77f81cf am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit '79102ad0f56135335bccc935bbaeb4c5d8115214'

* commit '79102ad0f56135335bccc935bbaeb4c5d8115214':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 16:54:38 -07:00
Adam Powell
269b8bb0cb Fix a bug with closing action bar context modes 
Change-Id: I4f11549664f11cdc02d135288e05459007dbf0c8
 2010-07-20 16:46:42 -07:00
Shih-wei Liao
19a25c1be9 Merge "Use bccGetExportVars to get mFieldCount, instead of hardwiring "100" in calloc." 2010-07-20 16:44:29 -07:00
Romain Guy
2a0a47892d Merge "Add preliminary support for text rendering." 2010-07-20 16:43:31 -07:00
Shih-wei Liao
0787646755 Use bccGetExportVars to get mFieldCount, instead of hardwiring "100" in calloc. 
Change-Id: I6023b93865f785779b966acf03bf120078ac3c74
 2010-07-20 16:43:25 -07:00
Romain Guy
a1db574036 Add preliminary support for text rendering. 
Change-Id: I547eb631dbda24d13960d54b4144fb8908fd8a49
 2010-07-20 16:37:27 -07:00
Jason Sams
af8976e5b7 Merge "Attempt to fix build '<>' works on mac but does not appear to work on linux yet." 2010-07-20 15:44:55 -07:00
Jason Sams
3b7fd8abe7 Attempt to fix build '<>' works on mac but does not appear to work on linux yet. 
Change-Id: Ic0bfaf3cf052e9be43320aa2cdd89ca4d0f48fc6
 2010-07-20 15:43:22 -07:00
Vasu Nori
487fab6837 Merge "make disableWriteAheadLogging method public so apps can disable WAL" 2010-07-20 15:36:31 -07:00
Jason Sams
61b6df5263 Merge "Update imageprocessing to remove generated files. Fix thread launch race condition." 2010-07-20 15:10:44 -07:00
Jason Sams
c7f4e41ecd Update imageprocessing to remove generated files. 
Fix thread launch race condition.

Change-Id: I24d7f87ac87db6f9e3418d6a429471a71d2c9e9d
 2010-07-20 15:09:00 -07:00
Mike Lockwood
ce726478e9 Merge "Add resource configuration flag to indicate whether USB host support exists." 2010-07-20 15:04:01 -07:00
James Dong
9049fe60c2 am d7514ec6: Merge "Progress status notification" into gingerbread 
Merge commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9' into gingerbread-plus-aosp

* commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9':
  Progress status notification
 2010-07-20 14:32:39 -07:00
James Dong
d7514ec6eb Merge "Progress status notification" into gingerbread 2010-07-20 14:29:39 -07:00
Adam Powell
1e06193c2e Merge "Make sure action bar context modes reserve space for overflow menus on all devices." 2010-07-20 14:28:19 -07:00
Adam Powell
b366bbae2b Make sure action bar context modes reserve space for overflow menus on all devices. 
Change-Id: I393f041efef3852b7f3ee57c6a4c26ba176b2702
 2010-07-20 14:26:46 -07:00
Danica Chang
ab60d48023 Merge "delete ScoSocket" 2010-07-20 14:25:52 -07:00
Danica Chang
c242a5aa93 delete ScoSocket 
Change-Id: Ib941ca2d817e0a788638a5e72f1eb2e1fc4739e9
 2010-07-20 14:22:45 -07:00
Mike Lockwood
7c72182daa Add resource configuration flag to indicate whether USB host support exists. 
Change-Id: I2456904afd2528f572c4323d538bce6dcf4204cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-20 17:19:55 -04:00
Nipun Kwatra
87419a2b3d Merge "Restart preview after each takePicture is done." 2010-07-20 14:15:59 -07:00
Jason Parks
bc4fcec70f am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp

* commit '29e25bd3418b04e395119bf99abe92898830a796':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 14:04:41 -07:00
Dan Egnor
c78f9a0e1b am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp

* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 14:04:33 -07:00
Jason Parks
29e25bd341 Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 2010-07-20 14:01:39 -07:00
Scott Main
3b3e368c73 am 60a20061: am 2316d626: docs: add information about using color resources as drawables 
Merge commit '60a200617791cf4dd3660c514ac6bf17dfcb85de' into gingerbread-plus-aosp

* commit '60a200617791cf4dd3660c514ac6bf17dfcb85de':
  docs: add information about using color resources as drawables
 2010-07-20 14:01:33 -07:00
Dan Egnor
3c1363beec am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread

* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 13:59:43 -07:00
Dan Egnor
79102ad0f5 am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp

* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 13:58:57 -07:00
Dan Egnor
2f0dc6d9f5 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 2010-07-20 13:57:08 -07:00
Danica Chang
bcfdb32839 Merge "deleted android_bluetooth_ScoSocket.cpp from makefile" 2010-07-20 13:55:18 -07:00
Scott Main
60a2006177 am 2316d626: docs: add information about using color resources as drawables 
Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread

* commit '2316d6260862230af10d8ca3ff446ad3f560f712':
  docs: add information about using color resources as drawables
 2010-07-20 13:53:55 -07:00
Danica Chang
72a6b1c389 deleted android_bluetooth_ScoSocket.cpp from makefile 
Change-Id: I40d107c9efa415de29977fa0998a746d9c24240e
 2010-07-20 13:53:21 -07:00
Eric Laurent
240677ec68 resolved conflicts for merge of dd206093 to master 
Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
 2010-07-20 13:37:19 -07:00
Dan Egnor
fb1c0fe7fd Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 2010-07-20 13:23:09 -07:00
Danica Chang
eaeffac5fc Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp" 2010-07-20 12:47:45 -07:00
Nipun Kwatra
4cd8672662 Restart preview after each takePicture is done. 
Preview is called when CAMERA_MSG_COMPRESSED_IMAGE is recieved by
dataCallback(). It needs to be started as a new thread so that the
callback can return, and the camera can know that takePicture() is
done.

Change-Id: I4d0febbc993aac43b37f9f4a824e9c7b8785f19e
 2010-07-20 12:42:29 -07:00
Nipun Kwatra
97a2566395 Merge "Use software encoder for time lapse capture." 2010-07-20 12:33:11 -07:00
Adam Powell
7bb66f3245 Merge "Action bar context mode support for overflow, submenus" 2010-07-20 12:15:08 -07:00
Adam Powell
2c9c9fe806 Action bar context mode support for overflow, submenus 
Change-Id: I951ae179698b08b6aba5b174b3d47f0cf847352e
 2010-07-20 12:08:07 -07:00
Nipun Kwatra
077cba41c1 Use software encoder for time lapse capture. 
Change-Id: I7f60eb1af95590c84b0cd98134f5a5a8963338dd
 2010-07-20 11:37:17 -07:00
Dan Egnor
341ff13689 resolved conflicts for merge of 9bc4039a to gingerbread 
Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
 2010-07-20 11:30:17 -07:00
Eric Laurent
dd2060932a am 22a2d718: Merge "Audio policy manager changes for audio effects" into gingerbread 
Merge commit '22a2d7186d015efcd648dff99500f8467463be82' into gingerbread-plus-aosp

* commit '22a2d7186d015efcd648dff99500f8467463be82':
  Audio policy manager changes for audio effects
 2010-07-20 11:28:26 -07:00
Eric Laurent
22a2d7186d Merge "Audio policy manager changes for audio effects" into gingerbread 2010-07-20 11:25:35 -07:00