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

336 Commits

Author SHA1 Message Date
Ying Wang
1590077905 am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair 
Merge commit '6efe03b19e0734361b262f9a0be4d225088d7f9e'

* commit '6efe03b19e0734361b262f9a0be4d225088d7f9e':
  Find layout classes in all "layout-*" dirs.
 2010-01-27 15:53:20 -08:00
Xavier Ducrohet
264ce38258 am 3bd6dc65: am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair 
Merge commit '3bd6dc653521281db25df77f055b3ec0b4659454'

* commit '3bd6dc653521281db25df77f055b3ec0b4659454':
  ADT/Layoutlib: implement sweep gradient.
 2010-01-22 12:36:26 -08:00
Xavier Ducrohet
28d9c60ee2 am 60e3c09e: am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair 
Merge commit '60e3c09ec0fa73a3e650f4aec89c763599c2e0b7'

* commit '60e3c09ec0fa73a3e650f4aec89c763599c2e0b7':
  ADT/Layoutlib: implement radial gradient.
 2010-01-22 09:45:49 -08:00
Ying Wang
b70efcbbb1 am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair 
Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c'

* commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c':
  Add instrumentation as a source tag for proguard keep options.
 2010-01-22 09:45:31 -08:00
Xavier Ducrohet
c22b3ca198 am da84d6a1: am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair 
Merge commit 'da84d6a1b1c37376d48f92ae59b76f1c891772f6'

* commit 'da84d6a1b1c37376d48f92ae59b76f1c891772f6':
  ADT/Layoutlib: Add dash support to stroke.
 2010-01-21 17:55:40 -08:00
Xavier Ducrohet
4e8e87d905 am c0ea805c: am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair 
Merge commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3'

* commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3':
  ADT/Layoutlib: properly handle stroke information.
 2010-01-21 17:55:17 -08:00
Doug Zongker
37f3ddb60b Merge "relocate GoogleLoginService" 2010-01-21 16:10:58 -08:00
Doug Zongker
0a2fb2174e relocate GoogleLoginService 
Change-Id: I79f4ff658ab136adcc54c432db76f34d2de5f6ac
 2010-01-21 14:36:17 -08:00
Xavier Ducrohet
18d21ef83e am 20cc5570: am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair 
Merge commit '20cc55703348827fbd80ff0410777a537f01e10e'

* commit '20cc55703348827fbd80ff0410777a537f01e10e':
  ADT/Layoutlib: improved gradient drawing for perf.
 2010-01-21 14:31:11 -08:00
Xavier Ducrohet
beb0993c6a am 38fa9eee: am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that. 
Merge commit '38fa9eee9324b2355f28372e80dba12c1d7cc105'

* commit '38fa9eee9324b2355f28372e80dba12c1d7cc105':
  ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
 2010-01-21 14:30:48 -08:00
Xavier Ducrohet
900399f3e8 am 895c92a4: am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair 
Merge commit '895c92a44b8bcf0aec7066c061293cafe12a76c2'

* commit '895c92a44b8bcf0aec7066c061293cafe12a76c2':
  ADT/Layoutlib: always use custom gradient (java) Paint.
 2010-01-21 14:30:17 -08:00
Xavier Ducrohet
7fa53aa5df am 31ef2e77: am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair 
Merge commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1'

* commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1':
  ADT/Layout: support for 3+ color in linear gradients
 2010-01-21 14:29:02 -08:00
Ying Wang
6efe03b19e am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair 
Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp

* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
  Find layout classes in all "layout-*" dirs.
 2010-01-21 11:12:29 -08:00
Ying Wang
c111296b97 Find layout classes in all "layout-*" dirs. 
Before this CL, the generated keep flags for layout classes are incomplete,
such as layout classes in res/layout-port/ and res/layout-land and so on.
 2010-01-20 22:12:46 -08:00
Xavier Ducrohet
3bd6dc6535 am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair 
Merge commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678' into eclair-plus-aosp

* commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678':
  ADT/Layoutlib: implement sweep gradient.
 2010-01-20 09:47:06 -08:00
Xavier Ducrohet
3330927bdd ADT/Layoutlib: implement sweep gradient. 
Change-Id: I2d460decff82f5f64b0a5cfeaa68156aad4fb3e6
 2010-01-19 18:51:06 -08:00
Xavier Ducrohet
ef5506c817 am f95e3dd2: am 5e083024: ADT/Layoutlib: shader clean-up. 
Merge commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a'

* commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a':
  ADT/Layoutlib: shader clean-up.
 2010-01-19 16:34:48 -08:00
Xavier Ducrohet
691b47e154 am e1a99147: am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair 
Merge commit 'e1a991476365cf1a8249c842e2b936db6940b0a7'

* commit 'e1a991476365cf1a8249c842e2b936db6940b0a7':
  ADT/Layoutlib: 2 color, linear gradient support.
 2010-01-19 16:34:32 -08:00
Xavier Ducrohet
60e3c09ec0 am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair 
Merge commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0' into eclair-plus-aosp

* commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0':
  ADT/Layoutlib: implement radial gradient.
 2010-01-19 14:53:52 -08:00
Ying Wang
3c05f1fbac am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair 
Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp

* commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace':
  Add instrumentation as a source tag for proguard keep options.
 2010-01-19 14:53:47 -08:00
Xavier Ducrohet
6866daee6a Merge "ADT/Layoutlib: implement radial gradient." into eclair 2010-01-19 14:48:58 -08:00
Xavier Ducrohet
45a7c28598 ADT/Layoutlib: implement radial gradient. 
Also refactored some parts of LinearGradient to reuse them
in the radial gradient

Change-Id: I2ec69bd60190bd014217d989177dcc7269188dea
 2010-01-19 14:03:31 -08:00
Ying Wang
b5fb50a133 Merge "Add instrumentation as a source tag for proguard keep options." into eclair 2010-01-19 11:55:12 -08:00
Xavier Ducrohet
28039a6f74 am 1da2735c: am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair 
Merge commit '1da2735c5862d48712706c2052a34e10e3dea43b'

* commit '1da2735c5862d48712706c2052a34e10e3dea43b':
  ADT/Layoutlib: implement Canvas.concat(Matrix)
 2010-01-19 00:02:15 -08:00
Xavier Ducrohet
05bc8d7397 am cff6c845: am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactory 
Merge commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c'

* commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c':
  ADT/Layoutlib: Reimplement parts of BitmapFactory
 2010-01-19 00:01:32 -08:00
Xavier Ducrohet
da84d6a1b1 am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair 
Merge commit '908a81119061092468067789acbec9b99d79ad5f' into eclair-plus-aosp

* commit '908a81119061092468067789acbec9b99d79ad5f':
  ADT/Layoutlib: Add dash support to stroke.
 2010-01-18 23:42:55 -08:00
Xavier Ducrohet
c0ea805c64 am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair 
Merge commit '2b30a4a50e24080fdd8b796e4a64447f223d4522' into eclair-plus-aosp

* commit '2b30a4a50e24080fdd8b796e4a64447f223d4522':
  ADT/Layoutlib: properly handle stroke information.
 2010-01-18 23:42:28 -08:00
Xavier Ducrohet
36ab1284d8 ADT/Layoutlib: Add dash support to stroke. 
Change-Id: I09a7e84948be013cbb11f6d9774ab81df897b424
 2010-01-15 11:24:44 -08:00
Xavier Ducrohet
5ac8f409f5 ADT/Layoutlib: properly handle stroke information. 
Change-Id: Iec9284d0e65d1313739e361d1fd5a522646fd1fd
 2010-01-14 19:43:54 -08:00
Xavier Ducrohet
20cc557033 am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair 
Merge commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5' into eclair-plus-aosp

* commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5':
  ADT/Layoutlib: improved gradient drawing for perf.
 2010-01-14 19:15:28 -08:00
Xavier Ducrohet
38fa9eee93 am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that. 
Merge commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be' into eclair-plus-aosp

* commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be':
  ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
 2010-01-14 19:15:22 -08:00
Xavier Ducrohet
79f05bb4a5 Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair 2010-01-14 19:10:44 -08:00
Xavier Ducrohet
e8f4d7deab ADT/Layoutlib: improved gradient drawing for perf. 
Change-Id: I79b909d7787e4442e7cfdf196de1ac0c077da7f8
 2010-01-14 18:45:04 -08:00
Xavier Ducrohet
895c92a44b am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair 
Merge commit '240298f9e4542c487edd0337e84b50c493cbeecd' into eclair-plus-aosp

* commit '240298f9e4542c487edd0337e84b50c493cbeecd':
  ADT/Layoutlib: always use custom gradient (java) Paint.
 2010-01-14 18:39:48 -08:00
Xavier Ducrohet
89d538dcca ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that. 
Change-Id: I298d00208ace2421478c5864cc5a66a508b2b411
 2010-01-14 18:38:06 -08:00
Xavier Ducrohet
31ef2e77c5 am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair 
Merge commit 'b847fbf2098acc8c5854bbbfa1453431128c720e' into eclair-plus-aosp

* commit 'b847fbf2098acc8c5854bbbfa1453431128c720e':
  ADT/Layout: support for 3+ color in linear gradients
 2010-01-14 17:20:04 -08:00
Xavier Ducrohet
2dbb923aa0 ADT/Layoutlib: always use custom gradient (java) Paint. 
The normal linear paint from AWT does not support our TileModes.

Change-Id: I24667671dabdf1a5dffa342e4de9cc69487db0b6
 2010-01-14 17:17:25 -08:00
Xavier Ducrohet
374abf0b95 ADT/Layout: support for 3+ color in linear gradients 
Change-Id: I14c6a5a1de41470c6f1c66d490492ecc727302f2
 2010-01-14 15:15:35 -08:00
Xavier Ducrohet
f95e3dd23c am 5e083024: ADT/Layoutlib: shader clean-up. 
Merge commit '5e083024269e7c5bf904301a98fa6eade6fec094' into eclair-plus-aosp

* commit '5e083024269e7c5bf904301a98fa6eade6fec094':
  ADT/Layoutlib: shader clean-up.
 2010-01-14 11:36:50 -08:00
Xavier Ducrohet
5e08302426 ADT/Layoutlib: shader clean-up. 
Change-Id: I0a200f438b7ccde2bfc19fd23614a647cb19d312
 2010-01-14 10:37:13 -08:00
Xavier Ducrohet
e1a9914763 am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair 
Merge commit 'd3026e1618d893db55c2131d66b08bc4a6e7aaf4' into eclair-plus-aosp

* commit 'd3026e1618d893db55c2131d66b08bc4a6e7aaf4':
  ADT/Layoutlib: 2 color, linear gradient support.
 2010-01-14 10:08:37 -08:00
Xavier Ducrohet
63b2e61627 ADT/Layoutlib: 2 color, linear gradient support. 
Change-Id: Ifaafa4fc42a22f4851449a7c35a5b82e211aafe7
 2010-01-13 20:30:26 -08:00
Xavier Ducrohet
1da2735c58 am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair 
Merge commit 'f73bd14a8d5932b34a0e6e4d2de78b74705276b8' into eclair-plus-aosp

* commit 'f73bd14a8d5932b34a0e6e4d2de78b74705276b8':
  ADT/Layoutlib: implement Canvas.concat(Matrix)
 2010-01-13 19:17:07 -08:00
Xavier Ducrohet
608cd11cdc ADT/Layoutlib: implement Canvas.concat(Matrix) 
This prevented ImageView from making proper use of ScaleType.

Also fixed Canvas.getSaveCount() that returned the wrong
value and Matrix.getTransform() which used the wrong order
for the AffineTransform constructor!!

Bug: 2364564

Change-Id: I78babf4aa6689440e52ad06b1473f75b20eb66da
 2010-01-13 18:17:59 -08:00
Xavier Ducrohet
cff6c8459c am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactory 
Merge commit 'ae4bd059caa71aa4652c0f07fde7c2687169906e' into eclair-plus-aosp

* commit 'ae4bd059caa71aa4652c0f07fde7c2687169906e':
  ADT/Layoutlib: Reimplement parts of BitmapFactory
 2010-01-13 17:09:52 -08:00
Ying Wang
46f4b9827e Add instrumentation as a source tag for proguard keep options. 2010-01-13 16:53:07 -08:00
Xavier Ducrohet
ae4bd059ca ADT/Layoutlib: Reimplement parts of BitmapFactory 
The original bitmap factory is mostly done in native and deals
with the normal android Bitmap class which has been replaced
in the layoutlib by a bitmap that is merely a wrapper around
an AWT BufferedImage.

This new BitmapFactory creates the layoutlib version of
Bitmap all in Java.

Change-Id: Ice8b5d19141a9a43f83349c159201bf85604b3b0
 2010-01-13 16:43:07 -08:00
Ying Wang
ffebd7c2cc am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair 
Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d'

* commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
 2010-01-12 16:37:31 -08:00
Ying Wang
b4f4111904 am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair 
Merge commit 'a1d08886ec8549878ad16c19754a3239706fb61b' into eclair-plus-aosp

* commit 'a1d08886ec8549878ad16c19754a3239706fb61b':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
 2010-01-12 16:34:13 -08:00
Ying Wang
4199528aab Only output proguard keep for nonempty attribute name in the AndroidManifest.xml. 
Before this change, aapt generates proguard keep flags like
"-keep class com.android.somepackage.", which proguard doesn't recognize.
 2010-01-12 16:08:23 -08:00