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

42780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
7f6d1f2dd3 am e2f32bc9: am 71353f36: Merge "Update input method panel when packages are changed." into honeycomb 
* commit 'e2f32bc938efeebb4c8b34c2e610b65de3c43a34':
  Update input method panel when packages are changed.
 2011-01-26 02:12:55 -08:00
satok
e2f32bc938 am 71353f36: Merge "Update input method panel when packages are changed." into honeycomb 
* commit '71353f367185a254238ffa56c1e158a48d3b28cb':
  Update input method panel when packages are changed.
 2011-01-26 02:10:32 -08:00
satok
71353f3671 Merge "Update input method panel when packages are changed." into honeycomb 2011-01-26 02:08:48 -08:00
satok
0ee6613d09 Update input method panel when packages are changed. 
Change-Id: I1edad2a11fd40c8f1f7fbb42f37e0538b1e245eb
 2011-01-26 19:01:08 +09:00
Romain Guy
e9a7d0dfb9 am 5742a277: am b6110a1e: Merge "Make sure the opaque bitmap is opaque. GL doesn\'t like being lied to. Bug #3382992" into honeycomb 
* commit '5742a2771025fc40f00777b5b4aa02765317f5f9':
  Make sure the opaque bitmap is opaque. GL doesn't like being lied to. Bug #3382992
 2011-01-25 22:58:24 -08:00
Romain Guy
5742a27710 am b6110a1e: Merge "Make sure the opaque bitmap is opaque. GL doesn\'t like being lied to. Bug #3382992" into honeycomb 
* commit 'b6110a1ef41337a5f3042c7e08b63274cee4faf6':
  Make sure the opaque bitmap is opaque. GL doesn't like being lied to. Bug #3382992
 2011-01-25 22:56:10 -08:00
Romain Guy
b6110a1ef4 Merge "Make sure the opaque bitmap is opaque. GL doesn't like being lied to. Bug #3382992" into honeycomb 2011-01-25 22:54:06 -08:00
Romain Guy
f90f8171e6 Make sure the opaque bitmap is opaque. GL doesn't like being lied to. 
Bug #3382992

The result still looks wrong but it works as designed, unfortunately.

Change-Id: I6108e199fa336cb01faaabf6c75faa3b71c2339b
 2011-01-25 22:53:24 -08:00
Santosh Madhava
ae27549f83 am c4132eb2: am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb 
* commit 'c4132eb299d52575c3a5f4a9361f62f1737ad64e':
  Review rework for issue 3385068 : Play gets out of sync
 2011-01-25 22:48:57 -08:00
Santosh Madhava
c4132eb299 am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb 
* commit '4991a00b28ea17941681396ec5dfc62a53408158':
  Review rework for issue 3385068 : Play gets out of sync
 2011-01-25 22:46:41 -08:00
Santosh Madhava
4991a00b28 Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 22:44:07 -08:00
Santosh Madhava
3cf1554b76 am 7196a266: am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb 
* commit '7196a266c5967f64a858519c5fe71f0964035390':
  Fix for issue 3366265 : Native crash exporting movie
 2011-01-25 22:24:21 -08:00
Santosh Madhava
7196a266c5 am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb 
* commit 'b38ed1af92c6af03249a50fed0530d20de5cd14d':
  Fix for issue 3366265 : Native crash exporting movie
 2011-01-25 22:21:42 -08:00
Santosh Madhava
b38ed1af92 Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb 2011-01-25 22:19:21 -08:00
Dianne Hackborn
0793749661 am b8fc8c26: am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 
* commit 'b8fc8c26cba829225469a65bf8e35b06de54588e':
  Change AsyncTask.execute() back to using a thread pool...
 2011-01-25 22:09:50 -08:00
Dianne Hackborn
b8fc8c26cb am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 
* commit '4fbca2b6138c52405fd7fb241bbf3c21fddd04bb':
  Change AsyncTask.execute() back to using a thread pool...
 2011-01-25 22:08:16 -08:00
Dianne Hackborn
4fbca2b613 Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 2011-01-25 22:05:38 -08:00
Dianne Hackborn
96438cd658 Change AsyncTask.execute() back to using a thread pool... 
...for now.

Change-Id: I1fe64f3e3a575f85add11dfe4d405f0c3a4a49de
 2011-01-25 21:42:37 -08:00
Mike Lockwood
8a9cf92520 Merge "usb: correct return type of android_hardware_UsbDevice_claim_interface" 2011-01-25 21:35:44 -08:00
Erik Gilling
215532c579 usb: correct return type of android_hardware_UsbDevice_claim_interface 
Change-Id: I1e8bfb8d52b5bb87e5bb7249ab439740f57e63f3
 2011-01-25 21:13:11 -08:00
Santosh Madhava
1abe0050fa Fix for issue 3366265 : Native crash exporting movie 
Change-Id: I04195198031eeb7d34d4249b49a1092321a2eb0a
 2011-01-25 20:41:55 -08:00
Dheeraj Sharma
53df92d84e am d28bb6e2: am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb 
* commit 'd28bb6e279c17224e843101199d228fe5aad459d':
  VideoEditor:Fix for 3369908
 2011-01-25 20:38:58 -08:00
Dheeraj Sharma
d28bb6e279 am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb 
* commit '2aaa776429f58069e25c8160a9e5b9a969f6e993':
  VideoEditor:Fix for 3369908
 2011-01-25 20:36:26 -08:00
Dheeraj Sharma
2aaa776429 Merge "VideoEditor:Fix for 3369908" into honeycomb 2011-01-25 20:34:15 -08:00
Adam Cohen
27d209f94a am 7975d8c0: am 0f16477b: Merge "Cleaning up StackView" into honeycomb 
* commit '7975d8c0fec80cb39365cf5cbad4223c5847384f':
  Cleaning up StackView
 2011-01-25 20:23:22 -08:00
Santosh Madhava
de412d277c Review rework for issue 3385068 : Play gets out of sync 
Change-Id: I7f7435bd898a72302500cdc15874e469922cbebe
 2011-01-25 20:22:41 -08:00
Adam Cohen
7975d8c0fe am 0f16477b: Merge "Cleaning up StackView" into honeycomb 
* commit '0f16477b2d2432a294801a12ac513cd41b00d03c':
  Cleaning up StackView
 2011-01-25 20:20:45 -08:00
Adam Cohen
0f16477b2d Merge "Cleaning up StackView" into honeycomb 2011-01-25 20:19:17 -08:00
Daniel Sandler
11d43082c5 am c88b19fc: am 34430260: Merge "Fit and finish on status bar:" into honeycomb 
* commit 'c88b19fcc847cc5249e88672337ae5879b0af338':
  Fit and finish on status bar:
 2011-01-25 19:01:33 -08:00
Daniel Sandler
c88b19fcc8 am 34430260: Merge "Fit and finish on status bar:" into honeycomb 
* commit '344302600a87175a9fd2bdfbf38708b1d1759731':
  Fit and finish on status bar:
 2011-01-25 18:58:50 -08:00
Daniel Sandler
344302600a Merge "Fit and finish on status bar:" into honeycomb 2011-01-25 18:56:32 -08:00
Jeff Brown
3ae881ffc7 Merge "Fix build." 2011-01-25 18:53:14 -08:00
Jeff Brown
0a9f335e70 Fix build. 
Change-Id: Id08f3ccced1281f1c6840cc67713bcedcf9a53c0
 2011-01-25 18:52:34 -08:00
Jaikumar Ganesh
2332bb4e4f am 4c2e07d2: (-s ours) am 7f5d652b: Merge "Do Not Merge. Don\'t connect to non keyboard HID devices." into honeycomb 
* commit '4c2e07d2faa8ad2c369d9a2bbab00b5e0b86e00b':
  Do Not Merge. Don't connect to non keyboard HID devices.
 2011-01-25 18:46:53 -08:00
Jaikumar Ganesh
4c2e07d2fa am 7f5d652b: Merge "Do Not Merge. Don\'t connect to non keyboard HID devices." into honeycomb 
* commit '7f5d652b9c92950170f12f0e5a4641076ed75c20':
  Do Not Merge. Don't connect to non keyboard HID devices.
 2011-01-25 18:44:22 -08:00
Jaikumar Ganesh
7f5d652b9c Merge "Do Not Merge. Don't connect to non keyboard HID devices." into honeycomb 2011-01-25 18:42:12 -08:00
Adam Powell
8722fba3a3 am 5a6bb13a: am c5573a5a: Merge "Fix button assets and styles." into honeycomb 
* commit '5a6bb13a7ac58a0f4a77e588c0bb8b8465f212fe':
  Fix button assets and styles.
 2011-01-25 18:34:21 -08:00
Adam Powell
5a6bb13a7a am c5573a5a: Merge "Fix button assets and styles." into honeycomb 
* commit 'c5573a5ac40d93b4b74608ee1858d04f74cb24f5':
  Fix button assets and styles.
 2011-01-25 18:32:00 -08:00
Adam Powell
c5573a5ac4 Merge "Fix button assets and styles." into honeycomb 2011-01-25 18:29:09 -08:00
Adam Powell
4f0d85c0cc Fix button assets and styles. 
This fixes some padding issues that broke apps during the last update.

Change-Id: Icdce5231f4497f8f0be0ab842a03cbfdfc501c5a
 2011-01-25 18:25:20 -08:00
Jeff Brown
41632b9f7d am 707bf521: (-s ours) am 1b0cee36: Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb 
* commit '707bf521a4afc71d594c3e433f030bce896834ad':
  Disable mouse support.  (DO NOT MERGE)
 2011-01-25 18:22:55 -08:00
Jeff Brown
ab2f096030 am 12b2dc90: am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb 
* commit '12b2dc90883ef4f930a17907acdef3677b0598a5':
  Fix crashes caused by some input devices.
 2011-01-25 18:22:50 -08:00
Jeff Brown
707bf521a4 am 1b0cee36: Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb 
* commit '1b0cee368b35262a8de49c7a3c28e12195817533':
  Disable mouse support.  (DO NOT MERGE)
 2011-01-25 18:20:40 -08:00
Jeff Brown
12b2dc9088 am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb 
* commit 'b1e0a870e4099490127bb917bb4fc7a8f48db893':
  Fix crashes caused by some input devices.
 2011-01-25 18:20:35 -08:00
Jeff Brown
1b0cee368b Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb 2011-01-25 18:18:10 -08:00
Jeff Brown
b1e0a870e4 Merge "Fix crashes caused by some input devices." into honeycomb 2011-01-25 18:18:05 -08:00
Mathias Agopian
e1ec077497 am a2852d1f: am f6926a63: Merge "egl: clear error on function entry" into honeycomb 
* commit 'a2852d1f20f2948dc5cad6a4323836c7f8e1d79b':
  egl: clear error on function entry
 2011-01-25 18:05:06 -08:00
Mathias Agopian
a2852d1f20 am f6926a63: Merge "egl: clear error on function entry" into honeycomb 
* commit 'f6926a63dfdc114789a6acc06396ca826eb64418':
  egl: clear error on function entry
 2011-01-25 18:02:49 -08:00
Mathias Agopian
f6926a63df Merge "egl: clear error on function entry" into honeycomb 2011-01-25 18:01:03 -08:00
Arnaud Berry
5563104ec8 am 254605c1: am 40f13039: Merge "Fixed the display of the brightness controls in the system panel" into honeycomb 
* commit '254605c1b02c1fed7470c07bc81a64c89bbdc51d':
  Fixed the display of the brightness controls in the system panel
 2011-01-25 17:57:21 -08:00