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

28592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yu Shan Emily Lau
e381c4bc39 am 1ded9f95: am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread 
Merge commit '1ded9f95636a83298658bfcd840ae8e51127c714'

* commit '1ded9f95636a83298658bfcd840ae8e51127c714':
  Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
 2010-08-10 21:53:54 -07:00
Konstantin Lopyrev
12fb5a3573 am 8279c754: am 91a7f5fe: Making sure that the prefix is handled properly. 
Merge commit '8279c754d176d5c2aa23f6f7ad16fcea03278788'

* commit '8279c754d176d5c2aa23f6f7ad16fcea03278788':
  Making sure that the prefix is handled properly.
 2010-08-10 21:53:49 -07:00
Adam Powell
f98d3e3047 am e8fa85d7: am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 
Merge commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085'

* commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
 2010-08-10 21:53:40 -07:00
Konstantin Lopyrev
ea5282cf90 Merge "resolved conflicts for merge of f00ee0f7 to master" 2010-08-10 21:49:04 -07:00
Konstantin Lopyrev
ecb1d5ded9 resolved conflicts for merge of f00ee0f7 to master 
Change-Id: I13b968bde37fad8fffdaa9bb94a0f1da9b2e6e0c
 2010-08-10 21:47:34 -07:00
Romain Guy
9e187ed821 Merge "Add extra blending modes." 2010-08-10 21:43:09 -07:00
Romain Guy
48daa54d31 Add extra blending modes. 
This change adds the following blending modes for shaders and color filters:
Add
Multiply
Screen
Overlay
Darken
Lighten

Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
 2010-08-10 21:42:40 -07:00
Hung-ying Tyan
9a025349dc am 091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread 
Merge commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077' into gingerbread-plus-aosp

* commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077':
  SipAudioCall: perform local ops before network op in endCall()
 2010-08-10 20:50:40 -07:00
Hung-ying Tyan
091c5238a0 Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread 2010-08-10 20:48:18 -07:00
Chung-yih Wang
2c9de2b9e5 am f57324cf: Add getSipUri() for identification. 
Merge commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e' into gingerbread-plus-aosp

* commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e':
  Add getSipUri() for identification.
 2010-08-10 20:47:18 -07:00
Chung-yih Wang
f57324cf4f Add getSipUri() for identification. 
Change-Id: Iabffd38ad554c34a34977c833e6699747cbf0f63
 2010-08-11 11:13:49 +08:00
Yu Shan Emily Lau
1ded9f9563 am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread 
Merge commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp

* commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54':
  Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
 2010-08-10 20:09:24 -07:00
Yu Shan Emily Lau
fbb936bfab Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread 2010-08-10 20:06:39 -07:00
Yu Shan Emily Lau
fd4a7c83b2 Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application. 
Change-Id: I51008ffdbe60e7e0b298091eb914b74f2d6731f8
 2010-08-10 20:02:07 -07:00
James Dong
afe5305855 Handle large audio lost 
Change-Id: I2687ad855aac758946954d0b3fe7aff9f7b5ae7c
 2010-08-10 19:59:04 -07:00
Konstantin Lopyrev
8279c754d1 am 91a7f5fe: Making sure that the prefix is handled properly. 
Merge commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5' into gingerbread-plus-aosp

* commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5':
  Making sure that the prefix is handled properly.
 2010-08-10 19:02:51 -07:00
Nipun Kwatra
c44cf62703 Call startPreview after stopping for mUseStillCameraForTimeLapse=true case. 
In the case when stop is pressed after takePicture has been called
but the CAMERA_MSG_COMPRESSED_IMAGE message from camera has not yet
been received, preview was not getting restarted. The reason was that
CameraSource::stop sets the camera listener to NULL and hence the
dataCallback() function which handles the CAMERA_MSG_COMPRESSED_IMAGE
message and restarts preview never got called.

Change-Id: Ib8f3bb77d9eab1ed5a67798569025ea0d63d7fd4
 2010-08-10 18:57:09 -07:00
Konstantin Lopyrev
91a7f5fef8 Making sure that the prefix is handled properly. 
Change-Id: Ic50327b1ed4d6b54753b5b3887508a53cd7a3497
 2010-08-10 18:54:54 -07:00
Jason Sams
7d73206ab2 Merge "Refcounting in allocations." 2010-08-10 18:46:50 -07:00
Jason Sams
cc6e6c9f13 Merge "Update image processing to cleaup code by not inlining functions that should be handled by the runtime." 2010-08-10 18:45:41 -07:00
Adam Powell
e8fa85d7a1 am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 
Merge commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7' into gingerbread-plus-aosp

* commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
 2010-08-10 17:54:58 -07:00
Konstantin Lopyrev
f00ee0f762 am f39d5987: Merge "Categorizing exported view properties." into gingerbread 
Merge commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3' into gingerbread-plus-aosp

* commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3':
  Categorizing exported view properties.
 2010-08-10 17:52:32 -07:00
Adam Powell
224ab9a5c6 Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 2010-08-10 17:52:15 -07:00
Adam Powell
9bccdb7d5c Fix public bug http://code.google.com/p/android/issues/detail?id=10067 
Change-Id: I7b7a9a32e82fc7541beabe286b20b01f39406cc8
 2010-08-10 17:50:11 -07:00
Konstantin Lopyrev
f39d5987b9 Merge "Categorizing exported view properties." into gingerbread 2010-08-10 17:48:27 -07:00
Konstantin Lopyrev
bea95162ca Categorizing exported view properties. 
Change-Id: I79c42019836973d80662c21d195d088ae01537a0
 2010-08-10 17:45:03 -07:00
Alex Sakhartchouk
facd6fc4be Adding quaternion functions to math library. 
Change-Id: I692214648892120943ca7d3b00034e27d1c330cf
 2010-08-10 17:34:39 -07:00
Romain Guy
f79ad0c205 Merge "Add support for text underline and strikethru." 2010-08-10 17:27:21 -07:00
Romain Guy
a674ab74e3 Add support for text underline and strikethru. 
Change-Id: I3a0e6643d7cafbdd06d9a908c8cf9347dcaba146
 2010-08-10 17:26:42 -07:00
Adam Powell
42c0fe8652 Fix bug 2908851 - ActionBar does not get initialized if 
set/addContentView is never called.

Fix bugs around lazy initialization of ActionBar in Activities.

Change-Id: I39a4216a7f6b0051adc4a669b8f921f94148e1db
 2010-08-10 17:08:30 -07:00
Adam Powell
368f384377 Merge "Fix bug 2908822 - open/closePanel should do the right thing with ActionBars" 2010-08-10 16:58:44 -07:00
Adam Powell
4c9073a9a4 Merge "Fix bug 2908823" 2010-08-10 16:58:37 -07:00
Adam Cohen
eeca7df892 Merge "Fixing StackView crash associated with DataSetObserver" 2010-08-10 16:55:15 -07:00
Daniel Sandler
139f8f7ec3 Merge "Incremental system bar improvements." 2010-08-10 16:50:57 -07:00
Omprakash Dhyade
92bd90de14 frameworks/base: Swap width and height of temporary buffer only with 
orientation change

Current code swaps the width and height by assuming that aspect
ratio of the buffer width and height will be same as that of the
layout clip width and height. That is not always true.
Change the check to orientation change.

Change-Id: Ie387f3a7369025427484e4173cbde7a08df2b9d7
 2010-08-10 16:49:48 -07:00
Adam Cohen
8322834a25 Fixing StackView crash associated with DataSetObserver 
Change-Id: Idbc8ed09ee8a58757b7383d6331a4c0357a6fb1f
 2010-08-10 16:48:33 -07:00
Jeff Brown
ea48ff4ba4 am 95105f3c: am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 
Merge commit '95105f3c25110f28b236cfa71e9ad74533eef854'

* commit '95105f3c25110f28b236cfa71e9ad74533eef854':
  Fix safe mode and KeyEvent.getMaxKeyCode().
 2010-08-10 16:39:10 -07:00
Jeff Brown
fb8e05b154 am d3cf0544: am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread 
Merge commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab'

* commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab':
  Optimize VelocityTracker to run in linear time.
 2010-08-10 16:38:58 -07:00
Jeff Brown
95105f3c25 am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 
Merge commit 'c3fc2d03d58a258c53c9265a70143d4af076b764' into gingerbread-plus-aosp

* commit 'c3fc2d03d58a258c53c9265a70143d4af076b764':
  Fix safe mode and KeyEvent.getMaxKeyCode().
 2010-08-10 16:33:47 -07:00
Jeff Brown
d3cf0544cc am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread 
Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp

* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
  Optimize VelocityTracker to run in linear time.
 2010-08-10 16:31:04 -07:00
Jeff Brown
c3fc2d03d5 Fix safe mode and KeyEvent.getMaxKeyCode(). 
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
 2010-08-10 16:28:03 -07:00
Jeff Brown
d98d0fc6e9 Merge "Optimize VelocityTracker to run in linear time." into gingerbread 2010-08-10 16:26:56 -07:00
Adam Powell
f75eeb28de Fix bug 2908822 - open/closePanel should do the right thing with ActionBars 
Change-Id: Ic77f9dee864d17046f69c78a1e6d96a49b5c6180
 2010-08-10 15:59:40 -07:00
Kenny Root
ffc29498f2 am a27484f0: am 6061af11: Merge "Sort the IME list before showing to user" 
Merge commit 'a27484f068047453af6345f2c2c58fcc1db899a5'

* commit 'a27484f068047453af6345f2c2c58fcc1db899a5':
  Sort the IME list before showing to user
 2010-08-10 15:47:27 -07:00
Kenny Root
a27484f068 am 6061af11: Merge "Sort the IME list before showing to user" 
Merge commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp

* commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
  Sort the IME list before showing to user
 2010-08-10 15:38:41 -07:00
Adam Powell
9b4c804b98 Fix bug 2908823 
Change-Id: Ia20d47ff4e2a09cc0e1ac47cd02a5f152f57073c
 2010-08-10 15:36:44 -07:00
Adam Powell
7c312bbd53 Merge "Fix bug 2888333" 2010-08-10 15:35:10 -07:00
Adam Powell
749b0eb2c9 Fix bug 2888333 
Change-Id: I2e9053e9c68cef447f47d181bfe0ddacc5f7167a
 2010-08-10 15:31:02 -07:00
Kenny Root
6061af11cb Merge "Sort the IME list before showing to user" 2010-08-10 15:22:13 -07:00
Irfan Sheriff
0d25534fed Split WifiStateMachine from WifiStateTracker 
Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service

Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053
 2010-08-10 15:18:25 -07:00