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

27294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
8138e841a5 Merge "Support finer seek control on MediaSources." into gingerbread 2010-07-21 10:36:08 -07:00
Eric Laurent
0119ba5bd3 am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer. 
Merge commit '34161132030254bac7dd64c9713832e2f961a061'

* commit '34161132030254bac7dd64c9713832e2f961a061':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
 2010-07-21 09:52:17 -07:00
Eric Laurent
3416113203 am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer. 
Merge commit '7070b36549d511d6627538c73dfbab23fbae5b43' into gingerbread-plus-aosp

* commit '7070b36549d511d6627538c73dfbab23fbae5b43':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
 2010-07-21 09:49:27 -07:00
jsh
921ec6f554 Merge "Add support for PSC of serving cell." 2010-07-21 09:27:04 -07:00
Andreas Huber
6624c9fd0b Support finer seek control on MediaSources. 
related-to-bug: 2858448

Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
 2010-07-21 08:51:29 -07:00
Maksymilian Osowski
650893b676 Build fix. 
Change-Id: Ie2baa3d7d32fd382e8ecb2a811669f50aa26fdc9
 2010-07-21 16:21:06 +01:00
The Android Open Source Project
63ae85f0e1 am 42ef77f3: merge from open-source master 
Merge commit '42ef77f3603ae54990d6718db79afae61e91dc61'

* commit '42ef77f3603ae54990d6718db79afae61e91dc61':
  Shoud specify the Resource class instance as an argument of the method
 2010-07-21 08:15:45 -07:00
The Android Open Source Project
57339e752c am e9e04673: merge from open-source master 
Merge commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530'

* commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530':
  replaced deprecated setButton Methods
 2010-07-21 08:13:02 -07:00
The Android Open Source Project
42ef77f360 merge from open-source master 
Change-Id: Ide1539b6777faf232d5360d6dc89a5d255982747
 2010-07-21 08:07:26 -07:00
The Android Open Source Project
e9e046733d merge from open-source master 
Change-Id: I5d220f16c319e95547f133ee9bcbd0b5caabc597
 2010-07-21 08:05:45 -07:00
Chet Haase
3dd207a6db Add keyframes to animation framework. 
Change-Id: I5c8c8037aeeedae1ce7a18200986caf57264772f
 2010-07-21 08:00:40 -07:00
Maksymilian Osowski
8dc9b86f81 Merge "LayoutTest class with supporting classes (AbstractResult, TextResult)." 2010-07-21 07:22:09 -07:00
Maksymilian Osowski
4ee7f4b194 LayoutTest class with supporting classes (AbstractResult, TextResult). 
These classes are responsible for actually running the tests, checking the results, generating visual diffs, etc.

Change-Id: I9b7f554409db1c97ac086c456db3aea3b993b5c6
 2010-07-21 15:20:47 +01:00
Eric Laurent
7070b36549 Added support for auxiliary audio effects to AudioTrack and MediaPlayer. 
Added methods to AudioTrack and MediaPlayer java classes to enable use of
auxiliary audio effects. The effect can be attached and detached by specifying its
ID and the send level controlled.

Change-Id: Ie74ff54a453096a742688476f612ce355543b6f3
 2010-07-21 06:28:01 -07:00
Adam Powell
e4e34965a6 Fix docs 
Change-Id: Ib96b693f6da716f87c5ce963ddc69f6bad3da6be
 2010-07-20 23:16:09 -07:00
Adam Powell
ccc626618f Merge "Refactored contextual modes out of action bar." 2010-07-20 20:28:31 -07:00
Jaikumar Ganesh
c3ee99d9eb Set initial HID profile preference. 
Change-Id: I804089cbea4ad25b87ade60fa8a905ddb167bff4
 2010-07-20 19:51:58 -07:00
Adam Powell
ac695c608b Refactored contextual modes out of action bar. 
Change-Id: I1fc1c9383e5ee90f135b92a5afa8eadbf1c13d20
 2010-07-20 18:56:59 -07:00
jsh
295d45bef4 Add support for PSC of serving cell. 
Bug: 2465036
Change-Id: Id4bc0a60463510d5fd89113af7815360e09d2125
 2010-07-20 17:01:45 -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