ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
34,154 Commits 2 Branches 0 Tags 54 MiB
0eda070fda
Commit Graph

34154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
0eda070fda Merge "RefBase subclasses can now decide how they want to be destroyed." 2011-05-19 19:41:37 -07:00
Mathias Agopian
20aeb1caa4 RefBase subclasses can now decide how they want to be destroyed. 
This adds a destroy() virtual on RefBase which
sublasses can implement. destroy() is called
in lieu of the destructor whenthe last strong
ref goes away.
 2011-05-19 19:40:01 -07:00
Svetoslav Ganov
4cbec3b729 Merge "TouchExplorer - refactoring and a couple of bug fixes" 2011-05-19 18:29:45 -07:00
Adam Powell
b253c2d1d7 am 90177e59: (-s ours) am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit '90177e59e5211dd9ab33761ce800e8a86a49d1e2':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:21:09 -07:00
Adam Powell
40b97c0b7f am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'd40575eb983eb7a1d383acc1f30f467374acd085':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:17:30 -07:00
Adam Powell
87c442a9b7 am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:06:09 -07:00
Mathias Agopian
376121f4dc Merge "Fix a crasher in SensorService" 2011-05-19 16:23:25 -07:00
Romain Guy
26f146f6fe Merge "Code cleanup." 2011-05-19 16:16:43 -07:00
Adam Powell
3da5b00cf0 Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 2011-05-19 15:48:38 -07:00
Mathias Agopian
53198709e9 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
3012339184 Merge "expandGroup can now animate" 2011-05-19 15:23:58 -07:00
Irfan Sheriff
ad5dfbcb91 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
0311aab91d 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
920a196eb5 resolved conflicts for merge of b2d0ee16 to master 
Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4
 2011-05-19 15:02:18 -07:00
Irfan Sheriff
b4371390b0 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
a0bda8e5fc 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
5cd336e4d9 Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 2011-05-19 14:54:25 -07:00
Chet Haase
27699f0b77 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
5f953706cb 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
31808fa85d Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 2011-05-19 13:57:03 -07:00
Kenny Root
f9fa770f38 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
77123ca552 resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp 
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
 2011-05-19 12:48:14 -07:00
Jason Sams
31ff2eeaf4 Merge "Move context and device creation out of the spec file." 2011-05-19 12:27:22 -07:00
James Dong
ed9c8ce22e Merge "Publish setLocation() method as a public Java API" 2011-05-19 11:51:37 -07:00
Wink Saville
6022a5967b 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
2a88c9e891 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
fe0380f2e6 Merge "Reset connection while data state changed." into honeycomb-LTE 2011-05-19 11:25:45 -07:00
Gloria Wang
986ba2c02a 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
b9091dd2c2 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
46be04f085 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
e5c511391b 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
ecaf66a1b9 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
46eb8c2d2d Merge "Break apart queries to getInstalled* API" into gingerbread 2011-05-19 10:55:00 -07:00
Joe Fernandez
10f5d9880b 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
9979ca5833 Merge "resolved conflicts for merge of c1730dcf to master" 2011-05-19 10:52:43 -07:00
Joe Fernandez
5986a9eb56 Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 2011-05-19 10:49:45 -07:00
Mike Lockwood
893ace604d resolved conflicts for merge of c1730dcf to master 
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
 2011-05-19 13:34:44 -04:00
Mike Lockwood
069efd877f 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
ff0662ead6 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
Adam Powell
02aad4811a 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
85f059a82d 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
aeae5d43c8 resolved conflicts for merge of a8939e0d to master 
Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
 2011-05-19 08:49:09 -07:00
Jean-Baptiste Queru
8021fd3bcc Merge c41aefe1 
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
 2011-05-19 07:54:53 -07:00
Jean-Baptiste Queru
d2478c73a5 Merge 111d17ce 
Change-Id: I2e0aa4328bc78eb5bcd987e7bf74b0889d2fae7f
 2011-05-19 07:17:00 -07:00
Dianne Hackborn
e67a889693 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
63fb4c2881 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
11b95c60f0 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
Adam Powell
62de6cdcb8 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
c14243ec52 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
ff661a6e78 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