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

1033 Commits

Author SHA1 Message Date
Dianne Hackborn
cb581bbe2e resolved conflicts for merge of 34706a4c to master 
Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8
 2012-02-24 16:37:35 -08:00
Dianne Hackborn
34706a4c81 am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit 'e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
  Fix build.
 2012-02-24 16:26:57 -08:00
Dianne Hackborn
e65a9ab1ea am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:24:40 -08:00
Dianne Hackborn
5786f5cf1b Merge "Fix build." into ics-mr1 2012-02-24 16:23:07 -08:00
Dianne Hackborn
b69b2c01b4 Fix build. 
Change-Id: Id3262bff0df598ecc81a4346dee9febd3aaa60c9
 2012-02-24 16:10:26 -08:00
Xavier Ducrohet
54c8c3d920 am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. 
* commit 'b3c780f16c37d2fb41a4eb211ea062b4c0b4e366':
  Move the automatic namespace outside of the res namespace. do not merge.
 2012-02-23 18:44:16 -08:00
Xavier Ducrohet
b3c780f16c am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. 
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.
 2012-02-23 18:42:01 -08:00
Xavier Ducrohet
816b873df1 Move the automatic namespace outside of the res namespace. do not merge. 
(cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225)

Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
 2012-02-23 18:10:20 -08:00
inazaruk
eed8d0b3af Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge. 
Added support for predefined namespace http://schemas.android.com/apk/res/auto
that aapt tool recognizes and treats as namespace with package name
taken from current application's AndroidManifest.xml, //manifest/package attribute.

Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com>

(cherry picked from commit e348909c1966c3d192841cc131a32be6ed90da18)

Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
 2012-02-23 18:09:31 -08:00
Xavier Ducrohet
d9fe8018ff Move the automatic namespace outside of the res namespace. 
Change-Id: I107ee94af0a13f008ef4a8844a9038b84f97a247
 2012-02-23 16:59:27 -08:00
Jean-Baptiste Queru
111a7a107c am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit '0842a2262d03fc98e42541cb38f51a341d346ae0':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 13:04:24 -08:00
Jean-Baptiste Queru
0842a2262d am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit 'fe99051c78994e0cc5153468eeba6f75f3e04b8e':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 13:01:59 -08:00
Jean-Baptiste Queru
fe99051c78 am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit '0e25e4cd292dbc6bce330a876dedb7154e5cd847':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 12:59:22 -08:00
Jean-Baptiste Queru
0e25e4cd29 am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 12:57:03 -08:00
Jean-Baptiste Queru
63e43ba56a Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 2012-02-23 12:38:14 -08:00
Xavier Ducrohet
5e6c219477 am f8e737cb: am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit 'f8e737cb61ab86b90ec318591fbcfec40fac63cf':
  Make sure resource references are resolved.
 2012-02-23 12:22:40 -08:00
Xavier Ducrohet
f8e737cb61 am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit '22701ec5b11f6138e6298814fff5f09da82df144':
  Make sure resource references are resolved.
 2012-02-22 10:52:16 -08:00
Xavier Ducrohet
22701ec5b1 am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
  Make sure resource references are resolved.
 2012-02-22 10:49:15 -08:00
Mathias Agopian
cbc69718cb another attempt at fixing the linux build 
Change-Id: Iac20439fd6eea4682859112e72f051294bc87ef6
 2012-02-21 14:34:47 -08:00
Xavier Ducrohet
c3f979f6fe Make sure resource references are resolved. 
XmlPullAttribute can query for attributes and return them in a given
format. We need to make sure they are first resolved before
trying to convert them to int/float/boolean/...

Change-Id: I2aaced022a0382e501978c396e49d6191d53bdc8
 2012-02-21 14:33:37 -08:00
Mathias Agopian
83c64e6b62 frameworks/base refactoring 
create the new libandroidfw from parts of libui and libutils

Change-Id: I1584995616fff5d527a2aba63921b682a6194d58
 2012-02-20 22:38:43 -08:00
Mathias Agopian
b13b9bdad2 frameworks/base refactoring. 
step 2: move libutils headers to their new home: androidfw

Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
 2012-02-17 19:01:26 -08:00
Jeff Brown
5bf842b22e Fix build break. 
Change-Id: I0bc8ac6e76ff28bd4c3585afbd6b3aa1930bf710
 2012-02-17 16:56:59 -08:00
Jeff Brown
4a7571bc0b Merge "frameworks/base refactoring." 2012-02-17 16:28:20 -08:00
Mathias Agopian
b93a03f841 frameworks/base refactoring. 
First step. Move libui includes to their new home: androidfw.

Change-Id: Ic042b52fdba72f30edc3cc6339bf30b4c1b99662
 2012-02-17 15:36:10 -08:00
Mike Lockwood
17a452f00c Revert "Revert "The com.android.athome api classes are moving android.support.place."" 
This reverts commit 9dede89795a88268ab735a1b28e628f2a77922fe.
 2012-02-17 10:38:00 -08:00
Mike Lockwood
abfac6a559 Merge "Revert "The com.android.athome api classes are moving android.support.place."" 2012-02-17 09:53:30 -08:00
Mike Lockwood
9dede89795 Revert "The com.android.athome api classes are moving android.support.place." 
to fix the build

This reverts commit 1aeecce8e9fe2749d1ad7ec86e40fe5a892f8f05
 2012-02-17 09:53:17 -08:00
Mike Lockwood
20e1907beb Merge "The com.android.athome api classes are moving android.support.place." 2012-02-17 09:20:12 -08:00
Joe Onorato
1aeecce8e9 The com.android.athome api classes are moving android.support.place. 
Change-Id: Ibb9b8cfc8e7d0676df43359f5abaaed5e9e1112d
 2012-02-16 17:59:30 -08:00
Jeff Brown
a175a5b7ea Encapsulate the ViewRootImpl's handler. 
This change makes it much easier to make sense of the messages that
get posted to the ViewRootImpl's handler by encapsulating their point
of dispatch within the ViewRootImpl itself.

As part of this change, the View.AttachInfo now carries a reference
to the ViewRootImpl itself, which simplifies some code that used
to try to find the ViewRootImpl by getting the root view's parent.

In principle, it might have been nice to hide the ViewRootImpl from
the View hierarchy but in practice the two were coupled in many ways.

Change-Id: I51ebccdf5f8c8c505cd6f17cdf594174d041dc54
 2012-02-15 19:32:16 -08:00
Ramanan Rajeswaran
68de7f5439 DO NOT MERGE 
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
 2012-02-13 15:21:04 -08:00
Dianne Hackborn
84affb8ae6 Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-02-13 14:39:45 -08:00
Ramanan Rajeswaran
352b8d03c6 am 8046e294: Merge "DO NOT MERGE" into ics-scoop 
* commit '8046e294c545b8e3712bff7925b024639936d5bf':
  DO NOT MERGE
 2012-02-13 14:24:38 -08:00
Ramanan Rajeswaran
9d29031417 DO NOT MERGE 
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
 2012-02-13 14:17:06 -08:00
Dianne Hackborn
d1f88de2c4 am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
* commit 'c1496d2d9a496e4aba817a58ecb9e07fe55cdba5':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
 2012-02-13 12:38:37 -08:00
Dianne Hackborn
c1496d2d9a Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-02-13 12:01:56 -08:00
Manuel Roman
01060b08fb Modified the constructor of EndpointBase 
We introduced changes to the Endpoint lifecycle.
Modified the AIDL compiler to take into account the
changes. Just affected the constructor, which needs
now an extra parameter: placeInfo
 2012-02-10 14:44:07 -08:00
Jason Simmons
7dc2973951 Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes 2012-02-10 14:44:07 -08:00
Joe Onorato
c3a7bb6563 Use the new get/putFlattenable methods on RpcData. 
They handle null correctly.
 2012-02-10 14:44:05 -08:00
Joe Onorato
0a7eaecf64 Don't try to unmarshal void return types when there are out parameters being returned. 2012-02-10 14:44:05 -08:00
Joe Onorato
fcb310f936 For events, require that the parameters be marked in. 
(because they won't work otherwise)
 2012-02-10 14:44:04 -08:00
Joe Onorato
79824179b8 Support putting Flattenables in Lists. 2012-02-10 14:44:04 -08:00
Joe Onorato
6e0f981e86 Was generating code that uses the wrong RpcData. 2012-02-10 14:44:04 -08:00
Joe Onorato
28087c63d8 Update aidl for new Broker API. 2012-02-10 10:51:23 -08:00
Joe Onorato
a1c6d909c2 aidl: All flattenable types now must also be parcelable. 
This is more a limitation of the grammar than anything else triggering laziness on my part.
 2012-02-10 10:51:23 -08:00
Joe Onorato
95a766ddcd Update aidl to new APIs. 2012-02-10 10:51:23 -08:00
Joe Onorato
6c0236c53a Suport RpcData as a parcelable type. 2012-02-10 10:51:22 -08:00
Manuel Roman
b71287f42e Modified AIDL to support authentication 
We need to pass an RpcContext with information
such as the caller's certificate. I also modified
the compiler so it does not use Container anymore
and uses Context
 2012-02-10 10:51:22 -08:00
Tim Kilbourn
22a7cb8d49 Fix PresenterClass by adding a _listener field 2012-02-10 10:51:22 -08:00