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

50628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
71fcc865e3 Merge "Code cleanup." 2011-05-19 16:16:43 -07:00
Romain Guy
88b4f153e2 Code cleanup. 
Change-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3
 2011-05-19 16:15:46 -07:00
Mathias Agopian
c23774baad Merge changes Id3a4a573,I7adf4ef0 
* changes:
  eglTerminate() now actually frees up all active egl objects
  refactor EGL source code
 2011-05-19 15:47:43 -07:00
John Reck
9414b04178 Merge "expandGroup can now animate" 2011-05-19 15:23:58 -07:00
Irfan Sheriff
e526cfb490 am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 
* commit '5b9ceebafd36db4491a49c1f00750ce50c4d4433':
  Move softap config handling to WifiConfigStore
 2011-05-19 15:17:33 -07:00
Chet Haase
ead8b50da6 am 7189d571: (-s ours) am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit '7189d571e2748972e1599ead3d503a9b185fdd3c':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 15:17:14 -07:00
Kenny Root
a51b6fd6f8 resolved conflicts for merge of b2d0ee16 to master 
Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4
 2011-05-19 15:02:18 -07:00
Irfan Sheriff
5b9ceebafd am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 
* commit 'a4815c0ec06c293ea9f50b2b925d5a98d11f1143':
  Move softap config handling to WifiConfigStore
 2011-05-19 15:01:48 -07:00
Irfan Sheriff
a4815c0ec0 am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 
* commit '9c9088a54f6dee7a13dcc7a12297137147b01baa':
  Move softap config handling to WifiConfigStore
 2011-05-19 14:57:54 -07:00
Irfan Sheriff
9c9088a54f Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 2011-05-19 14:54:25 -07:00
Chet Haase
7189d571e2 am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit 'f0c6ddd99b6770ee4de74ce42134f9f56b8ebc5d':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 14:03:04 -07:00
Chet Haase
f0c6ddd99b am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit '51fb97031f62b1181fc9eb6c636d09a68987d939':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 13:59:06 -07:00
Chet Haase
51fb97031f Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 2011-05-19 13:57:03 -07:00
Chet Haase
19e748a3d1 DO NOT MERGE: Add custom fragment anims for popping backstack 
The previous fragment implementation allowed for animations
during fragment transitions, but did not account for the
different behavior of fragments when popping the back stack.
In general, you probably don't want to run the same animation
for putting a fragment on the stack as for popping it off, which
is what happens now. For example, you might fade a fragment out when
putting it on the stack. But when popping ot off, fading it out
is probably not the behavior you want.

The new API (setCustomAnimations() overload with two additional
parameters) allows developers to specify animations to be run
in the popping operation. Otherwise, the animations are null and
the operation will not be animated.

Change-Id: I53bbc6e6ec4e953b7ecdd99e2452d81857917de2
 2011-05-19 13:44:40 -07:00
Kenny Root
b2d0ee164a Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-05-19 12:48:41 -07:00
Kenny Root
e6cd0c747e resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp 
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
 2011-05-19 12:48:14 -07:00
Jason Sams
3a9e712aca Merge "Move context and device creation out of the spec file." 2011-05-19 12:27:22 -07:00
James Dong
3c707256cf Merge "Publish setLocation() method as a public Java API" 2011-05-19 11:51:37 -07:00
Wink Saville
b568b51255 am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE 
* commit '09ded82b784b9f6e01d4cd4298097fd2b459560b':
  Reset connection while data state changed.
 2011-05-19 11:32:27 -07:00
Wink Saville
09ded82b78 am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE 
* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
  Reset connection while data state changed.
 2011-05-19 11:28:36 -07:00
Wink Saville
ab5baa1d5f Merge "Reset connection while data state changed." into honeycomb-LTE 2011-05-19 11:25:45 -07:00
Gloria Wang
612956c914 Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463059." 2011-05-19 11:15:16 -07:00
Joe Fernandez
36cca79ca7 am 0a36cec6: am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit '0a36cec642fb58e295d0608026890d95d0ae3cc0':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 11:13:41 -07:00
Joe Fernandez
0a36cec642 am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit '605be31c4a80e03dc0af76a73aaa33316ca4a635':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 11:06:04 -07:00
Kenny Root
2433c443bb am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread 
* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
  Break apart queries to getInstalled* API
 2011-05-19 11:04:01 -07:00
Joe Fernandez
605be31c4a am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit '146a0b4522db2d782953a464fe63adcd7e1569c2':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 10:59:16 -07:00
Kenny Root
f2006f3123 Merge "Break apart queries to getInstalled* API" into gingerbread 2011-05-19 10:55:00 -07:00
Joe Fernandez
146a0b4522 am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 10:53:04 -07:00
Mike Lockwood
44bcfcae3b Merge "resolved conflicts for merge of c1730dcf to master" 2011-05-19 10:52:43 -07:00
Joe Fernandez
fde9ac7266 Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 2011-05-19 10:49:45 -07:00
Gloria Wang
f9cf277cda Add one more MIME type (audio/aac-adts) for aac file. 
Fix for bug 4463059.

Change-Id: Ie2125349667e65b41871a228d87e4dce6b513398
 2011-05-19 10:45:45 -07:00
Mike Lockwood
90f902afde resolved conflicts for merge of c1730dcf to master 
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
 2011-05-19 13:34:44 -04:00
Cibu Johny
1714c21c15 View horizontalDirection public attribute resolution to an internal var. 
- add more comment

Change-Id: I514c6ace3a98d56aa0b5c52221dee3045656071f
 2011-05-19 10:18:16 -07:00
John Reck
63f46e7145 expandGroup can now animate 
Add a boolean to have expandGroup animate the same as
 performItemClick does

Change-Id: I652c6fa8f9a7b527572337b11900d653b5285352
 2011-05-19 10:10:51 -07:00
Mike Lockwood
c1730dcf89 am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors 
* commit 'ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
  USB: Add method to access raw USB device descriptors
 2011-05-19 10:06:44 -07:00
Mike Lockwood
ae448e2c90 am a88b42d5: USB: Add method to access raw USB device descriptors 
* commit 'a88b42d569a91290477d8f5731a2ee43931271da':
  USB: Add method to access raw USB device descriptors
 2011-05-19 10:01:53 -07:00
Mike Lockwood
a88b42d569 USB: Add method to access raw USB device descriptors 
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-19 12:57:41 -04:00
Adam Powell
191c1fbb74 am c8f045b8: (-s ours) am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 
* commit 'c8f045b8a4cc83bc40ee999cb03a446f986d445c':
  DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
 2011-05-19 08:58:42 -07:00
Xavier Ducrohet
9f23e60b20 am a13462a9: am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 
* commit 'a13462a947e634a6893119146a7271369e509586':
  LayoutLib: support the new baseline/margin query API.
 2011-05-19 08:58:18 -07:00
James Dong
ba43d4282c resolved conflicts for merge of a8939e0d to master 
Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
 2011-05-19 08:49:09 -07:00
Jean-Baptiste Queru
5c3816f2ff Merge c41aefe1 
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
 2011-05-19 07:54:53 -07:00
Jean-Baptiste Queru
c6b7a0131e Merge 111d17ce 
Change-Id: I2e0aa4328bc78eb5bcd987e7bf74b0889d2fae7f
 2011-05-19 07:17:00 -07:00
Dianne Hackborn
d37b84edf5 am ba8fc5b0: am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2 
* commit 'ba8fc5b059228402afa965e175d5f6655e3fe555':
  Fix fake display size when rotated.
 2011-05-19 03:46:24 -07:00
Jean-Baptiste Queru
f74782f6a1 am a49b2dbd: am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files." 
* commit 'a49b2dbdde52e20b6d590b35e209033229f5d82d':
  MOTOYA changed two kinds of Japanese font files.
 2011-05-19 03:44:45 -07:00
Gloria Wang
4809d48f6f am 8d161fe1: (-s ours) am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 
* commit '8d161fe1eafe80e01d84d2be55ae47314f944721':
  DO NOT MERGE For bug 4422428 Squashed commit of the following:
 2011-05-19 03:44:31 -07:00
Svetoslav Ganov
d36a699410 Fixing my build fix 
Change-Id: I8393e0172367de730123b2fa9d743b1ecb2eb087
 2011-05-18 20:50:03 -07:00
Svetoslav Ganov
5459781b83 Fixing the build 
1. Updated the 14.txt with the new methods in Accessibility record
   since I made a mistake duing that. I had to do this because
   I have factored out some stuff from AccessibilityEvent to
   AccessibilityRecord and the API check does not detect that the
   APIs have not changed.

Change-Id: Ieed504634e0af909eada16f58f922cb78cb841ba
 2011-05-18 20:09:24 -07:00
Adam Powell
c8f045b8a4 am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 
* commit 'd466a4631f3e4f482dd658f42c277d6ad281a9d1':
  DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
 2011-05-18 19:16:31 -07:00
Adam Powell
d466a4631f am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 
* commit 'b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d':
  DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
 2011-05-18 19:14:44 -07:00
Adam Powell
b7ec3e41a6 Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 2011-05-18 19:13:22 -07:00