OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into...
2011-06-07
Xavier Ducrohet
am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9...
commit
|
commitdiff
|
tree
2011-06-07
Xavier Ducrohet
am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib...
commit
|
commitdiff
|
tree
2011-06-07
Xavier Ducrohet
am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6...
commit
|
commitdiff
|
tree
2011-06-06
Xavier Ducrohet
am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1...
commit
|
commitdiff
|
tree
2011-06-06
Xavier Ducrohet
Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
commit
|
commitdiff
|
tree
2011-06-04
Xavier Ducrohet
Import the Layoutlib from hc-mr1.
commit
|
commitdiff
|
tree
2011-06-04
Xavier Ducrohet
Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
commit
|
commitdiff
|
tree
2011-06-03
Xavier Ducrohet
Cherrypick 5b61ea6b from hc-mr1
commit
|
commitdiff
|
tree
2011-06-02
Xavier Ducrohet
LayoutLib: enable the LAYOUT_ONLY capability.
commit
|
commitdiff
|
tree
2011-06-02
Xavier Ducrohet
Merge dba35f1b from honeycomb-mr1. do not merge.
commit
|
commitdiff
|
tree
2011-05-29
Xavier Ducrohet
am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c...
commit
|
commitdiff
|
tree
2011-05-29
Xavier Ducrohet
am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60...
commit
|
commitdiff
|
tree
2011-05-24
Xavier Ducrohet
am 34f5991e: Merge 6103e22c from honeycomb-mr1. do...
commit
|
commitdiff
|
tree
2011-05-24
Xavier Ducrohet
Merge 6103e22c from honeycomb-mr1. do not merge.
commit
|
commitdiff
|
tree
2011-05-24
Xavier Ducrohet
am c7b87766: Merge 2402ad60 from honeycomb-mr1. do...
commit
|
commitdiff
|
tree
2011-05-24
Xavier Ducrohet
Merge 2402ad60 from honeycomb-mr1. do not merge.
commit
|
commitdiff
|
tree
2011-05-23
Xavier Ducrohet
am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434...
commit
|
commitdiff
|
tree
2011-05-23
Xavier Ducrohet
am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c...
commit
|
commitdiff
|
tree
2011-05-23
Xavier Ducrohet
am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d...
commit
|
commitdiff
|
tree
2011-05-23
Xavier Ducrohet
am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do...
commit
|
commitdiff
|
tree
2011-05-23
Xavier Ducrohet
am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1...
commit
|
commitdiff
|
tree
2011-05-23
Xavier Ducrohet
am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1...
commit
|
commitdiff
|
tree
2011-05-20
Xavier Ducrohet
Merge e57aa434 from honeycomb-mr1. do not merge.
commit
|
commitdiff
|
tree
2011-05-20
Xavier Ducrohet
Merge "Merge 05b7b69c from honeycomb-mr1. do not merge...
commit
|
commitdiff
|
tree
2011-05-20
Xavier Ducrohet
Merge "Merge 2fae858d from Honeycomb-mr1. do not merge...
commit
|
commitdiff
|
tree
2011-05-19
Xavier Ducrohet
Merge 05b7b69c from honeycomb-mr1. do not merge.
commit
|
commitdiff
|
tree
2011-05-19
Xavier Ducrohet
Merge 2fae858d from Honeycomb-mr1. do not merge.
commit
|
commitdiff
|
tree
2011-05-19
Xavier Ducrohet
am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib...
commit
|
commitdiff
|
tree
2011-05-19
Xavier Ducrohet
am b18e700c: am aa0834e3: Merge "LayoutLib: support...
commit
|
commitdiff
|
tree
2011-05-19
Xavier Ducrohet
am aa0834e3: Merge "LayoutLib: support the new baseline...
commit
|
commitdiff
|
tree
2011-05-19
Xavier Ducrohet
Merge "LayoutLib: support the new baseline/margin query...
commit
|
commitdiff
|
tree
2011-05-16
Xavier Ducrohet
LayoutLib: support the new baseline/margin query API.
commit
|
commitdiff
|
tree
2011-05-13
Xavier Ducrohet
am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement...
commit
|
commitdiff
|
tree
2011-05-13
Xavier Ducrohet
am 738c5e60: am 2fae858d: LayoutLib: implement data...
commit
|
commitdiff
|
tree
2011-05-13
Xavier Ducrohet
am 2fae858d: LayoutLib: implement data binding for...
commit
|
commitdiff
|
tree
2011-05-13
Xavier Ducrohet
LayoutLib: implement data binding for most AdapterView
commit
|
commitdiff
|
tree
2011-04-12
Xavier Ducrohet
resolved conflicts for merge of 4754c79a to honeycomb...
commit
|
commitdiff
|
tree
2011-04-11
Xavier Ducrohet
resolved conflicts for merge of efa98a29 to honeycomb...
commit
|
commitdiff
|
tree
2011-04-07
Xavier Ducrohet
am 96ac8560: am 515a08b0: Merge 59aad78e from master...
commit
|
commitdiff
|
tree
2011-04-07
Xavier Ducrohet
am 515a08b0: Merge 59aad78e from master. do not merge.
commit
|
commitdiff
|
tree
2011-04-07
Xavier Ducrohet
Merge 59aad78e from master. do not merge.
commit
|
commitdiff
|
tree
2011-04-07
Xavier Ducrohet
am 59aad78e: LayoutLib: don\'t render when shader\...
commit
|
commitdiff
|
tree
2011-04-07
Xavier Ducrohet
am 8a18dba4: Merge c5aeac7f from honeycomb.
commit
|
commitdiff
|
tree
2011-04-07
Xavier Ducrohet
LayoutLib: don't render when shader's local matrix...
commit
|
commitdiff
|
tree
2011-04-06
Xavier Ducrohet
Merge c5aeac7f from honeycomb.
commit
|
commitdiff
|
tree
2011-04-06
Xavier Ducrohet
am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with...
commit
|
commitdiff
|
tree
2011-04-06
Xavier Ducrohet
am c5aeac7f: LayoutLib: Fix issue with rendering mode.
commit
|
commitdiff
|
tree
2011-04-06
Xavier Ducrohet
LayoutLib: Fix issue with rendering mode.
commit
|
commitdiff
|
tree
2011-03-17
Xavier Ducrohet
am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0...
commit
|
commitdiff
|
tree
2011-03-17
Xavier Ducrohet
am c7c8c599: Merge 67450db0 from honeycomb. Do not...
commit
|
commitdiff
|
tree
2011-03-17
Xavier Ducrohet
Merge 67450db0 from honeycomb. Do not merge.
commit
|
commitdiff
|
tree
2011-03-17
Xavier Ducrohet
am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray...
commit
|
commitdiff
|
tree
2011-03-17
Xavier Ducrohet
am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelS...
commit
|
commitdiff
|
tree
2011-03-17
Xavier Ducrohet
Merge "LayoutLib: TypedArray.getDimensionPixelSize...
commit
|
commitdiff
|
tree
2011-03-17
Xavier Ducrohet
LayoutLib: TypedArray.getDimensionPixelSize can actually...
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f...
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
am a82a219a: (-s ours) am b243aabd: Merge adaa12cd...
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570...
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093...
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
am 0a98226e: Merge 9d76581f from honeycomb. do not...
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
am b243aabd: Merge adaa12cd from honeycomb. do not...
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb....
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
am 14e1f523: Merge "Merge c12b4093 from honeycomb....
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
Merge 9d76581f from honeycomb. do not merge.
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
Merge adaa12cd from honeycomb. do not merge.
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
Merge "Merge 6f2fb570 from honeycomb. do not merge...
commit
|
commitdiff
|
tree
2011-03-15
Xavier Ducrohet
Merge "Merge c12b4093 from honeycomb. do not merge...
commit
|
commitdiff
|
tree
2011-03-14
Xavier Ducrohet
am 7608181c: am 491ef0c6: Merge "LayoutLib: Fix Arc...
commit
|
commitdiff
|
tree
2011-03-14
Xavier Ducrohet
Merge 6f2fb570 from honeycomb. do not merge.
commit
|
commitdiff
|
tree
2011-03-14
Xavier Ducrohet
Merge c12b4093 from honeycomb. do not merge.
commit
|
commitdiff
|
tree
2011-03-14
Xavier Ducrohet
am 491ef0c6: Merge "LayoutLib: Fix Arc rendering."...
commit
|
commitdiff
|
tree
2011-03-14
Xavier Ducrohet
Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1
commit
|
commitdiff
|
tree
2011-03-14
Xavier Ducrohet
LayoutLib: Fix Arc rendering.
commit
|
commitdiff
|
tree
2011-03-08
Xavier Ducrohet
am f596d697: Merge "LayoutLib: fix Capabilities and...
commit
|
commitdiff
|
tree
2011-03-08
Xavier Ducrohet
Merge "LayoutLib: fix Capabilities and getDimensionPixelSize...
commit
|
commitdiff
|
tree
2011-03-08
Xavier Ducrohet
LayoutLib: fix Capabilities and getDimensionPixelSize
commit
|
commitdiff
|
tree
2011-03-08
Xavier Ducrohet
am c040eb20: Merge "LayoutLib: Fix dimension parsing...
commit
|
commitdiff
|
tree
2011-03-08
Xavier Ducrohet
Merge "LayoutLib: Fix dimension parsing to handle negative...
commit
|
commitdiff
|
tree
2011-03-08
Xavier Ducrohet
am 687fe203: Merge "LayoutLib: Implement some missing...
commit
|
commitdiff
|
tree
2011-03-08
Xavier Ducrohet
Merge "LayoutLib: Implement some missing add###() method...
commit
|
commitdiff
|
tree
2011-03-08
Xavier Ducrohet
LayoutLib: Fix dimension parsing to handle negative...
commit
|
commitdiff
|
tree
2011-03-08
Xavier Ducrohet
LayoutLib: Implement some missing add###() method in...
commit
|
commitdiff
|
tree
2011-03-01
Xavier Ducrohet
am 2d5ed079: (-s ours) am 7b972755: (-s ours) am edbd6139...
commit
|
commitdiff
|
tree
2011-03-01
Xavier Ducrohet
am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7...
commit
|
commitdiff
|
tree
2011-03-01
Xavier Ducrohet
Merge "Add notice files for aapt and aidl."
commit
|
commitdiff
|
tree
2011-03-01
Xavier Ducrohet
Add notice files for aapt and aidl.
commit
|
commitdiff
|
tree
2011-02-28
Xavier Ducrohet
am edbd6139: Merge "Merge 1911a6f7 into gingerbread...
commit
|
commitdiff
|
tree
2011-02-28
Xavier Ducrohet
Merge "Merge 1911a6f7 into gingerbread. do not merge...
commit
|
commitdiff
|
tree
2011-02-28
Xavier Ducrohet
am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7...
commit
|
commitdiff
|
tree
2011-02-28
Xavier Ducrohet
am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add ...
commit
|
commitdiff
|
tree
2011-02-28
Xavier Ducrohet
am 6504490c: am dff6b8e7: Merge "Add --non-constant...
commit
|
commitdiff
|
tree
2011-02-28
Xavier Ducrohet
am dff6b8e7: Merge "Add --non-constant-id to aapt."
commit
|
commitdiff
|
tree
2011-02-25
Xavier Ducrohet
Merge 1911a6f7 into gingerbread. do not merge.
commit
|
commitdiff
|
tree
2011-02-25
Xavier Ducrohet
Merge "LayoutLib: fix incorrect indices in one of the...
commit
|
commitdiff
|
tree
2011-02-25
Xavier Ducrohet
am b84c678a: (-s ours) am db1acf52: (-s ours) am 1175ef7e...
commit
|
commitdiff
|
tree
2011-02-25
Xavier Ducrohet
am b052ecaa: resolved conflicts for merge of 86e43034...
commit
|
commitdiff
|
tree
2011-02-25
Xavier Ducrohet
LayoutLib: fix incorrect indices in one of the 2 native_draw...
commit
|
commitdiff
|
tree
2011-02-25
Xavier Ducrohet
am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib...
commit
|
commitdiff
|
tree
2011-02-25
Xavier Ducrohet
resolved conflicts for merge of 86e43034 to honeycomb...
commit
|
commitdiff
|
tree
2011-02-25
Xavier Ducrohet
am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib...
commit
|
commitdiff
|
tree
next