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

7637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Kloba
7bd3a10bca am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair 
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp

* commit 'd79d1c72991e587294432e80d091e3ae26a0c103':
  If ZoomButttonsController detects more than one pointer,
 2010-01-18 23:43:20 -08:00
Grace Kloba
12813fd3b7 am f080a5ad: Merge "DO NOT MERGE" into eclair 
Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp

* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
  DO NOT MERGE
 2010-01-18 23:43:14 -08:00
Jim Miller
3665ec2e86 am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair 
Merge commit '813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp

* commit '813d2d86789d1c2e705c4d11d052ad649e6bac84':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
 2010-01-18 23:43:01 -08:00
Xavier Ducrohet
cdbcb8441a 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
7dbb68e405 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
Grace Kloba
90f5995ffd Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair 2010-01-18 15:21:38 -08:00
Grace Kloba
d0e837b13a Merge "DO NOT MERGE" into eclair 2010-01-18 15:21:31 -08:00
Jim Miller
02e8622ef1 Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair 2010-01-15 17:20:29 -08:00
Xavier Ducrohet
7dfc1deefe Merge "ADT/Layoutlib: Add dash support to stroke." into eclair 2010-01-15 14:27:34 -08:00
Xavier Ducrohet
783eade582 Merge "ADT/Layoutlib: properly handle stroke information." into eclair 2010-01-15 10:30:52 -08:00
Grace Kloba
9e29d82925 am 4d69ac66: Merge "DO NOT MERGE" into eclair 
Merge commit '4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp

* commit '4d69ac6695246b8df06a6583044dc4712d81a956':
  DO NOT MERGE
 2010-01-14 19:32:45 -08:00
Grace Kloba
ee697f3571 am d1019a99: Merge "DO NOT MERGE" into eclair 
Merge commit 'd1019a99f9b458a4129e047c96de7192a61e5e99' into eclair-plus-aosp

* commit 'd1019a99f9b458a4129e047c96de7192a61e5e99':
  DO NOT MERGE
 2010-01-14 19:32:39 -08:00
Grace Kloba
b1796e407e Merge "DO NOT MERGE" into eclair 2010-01-14 19:29:09 -08:00
Grace Kloba
33f00cc68c Merge "DO NOT MERGE" into eclair 2010-01-14 19:28:55 -08:00
Xavier Ducrohet
bb1ea13390 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
98f1cfc214 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
bff9299731 Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair 2010-01-14 19:10:44 -08:00
Xavier Ducrohet
73bd84a35f 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
03d8ad606d Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair 2010-01-14 18:36:26 -08:00
Roman Nurik
fb8bbefbb2 am 6a739ea8: Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair 
Merge commit '6a739ea88d33f901172d60b0de0f442f2dc485cc' into eclair-plus-aosp

* commit '6a739ea88d33f901172d60b0de0f442f2dc485cc':
  Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
 2010-01-14 17:20:09 -08:00
Xavier Ducrohet
17220bc36a 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
Roman Nurik
699cabccdc Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair 2010-01-14 17:18:31 -08:00
Xavier Ducrohet
e6e89de8e8 Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair 2010-01-14 17:15:56 -08:00
John Wang
827d2d8067 am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair 
Merge commit '99f2a4bb519e390eacc9807443c74ca05f176242' into eclair-plus-aosp

* commit '99f2a4bb519e390eacc9807443c74ca05f176242':
  Add Event log for RAT switch.
 2010-01-14 17:07:30 -08:00
John Wang
119d63dc7b Merge "Add Event log for RAT switch." into eclair 2010-01-14 16:43:38 -08:00
Joe Onorato
95b7c51af8 am 836e1666: Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair 
Merge commit '836e16666ec31dfe7559bcbe5710a97700c383f9' into eclair-plus-aosp

* commit '836e16666ec31dfe7559bcbe5710a97700c383f9':
  add drawSpriteScreenspaceCropped to renderscript
 2010-01-14 15:58:37 -08:00
Joe Onorato
e95e028590 Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair 2010-01-14 15:53:45 -08:00
Scott Main
31b0321547 am 0409b1ba: Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair 
Merge commit '0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb' into eclair-plus-aosp

* commit '0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb':
  docs: remove dev guide link from download confirmation content
 2010-01-14 13:05:46 -08:00
Scott Main
c3b986ed7b Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair 2010-01-14 13:01:30 -08:00
Xavier Ducrohet
0de875213c 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
1bc69085f8 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
88fb80dfcf Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair 2010-01-14 10:03:56 -08:00
Grace Kloba
4c02bb6274 am 196926b9: Merge "DO NOT MERGE" into eclair 
Merge commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c' into eclair-plus-aosp

* commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c':
  DO NOT MERGE
 2010-01-14 09:41:36 -08:00
Grace Kloba
328b26836a Merge "DO NOT MERGE" into eclair 2010-01-14 09:29:52 -08:00
Xavier Ducrohet
6f3c82e880 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
cabecba7d1 Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair 2010-01-13 19:14:28 -08:00
Adam Powell
48aab956d7 am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair 
Merge commit '56a17690b0b9dc2a2e15ef38a37cc4c403c614fe' into eclair-plus-aosp

* commit '56a17690b0b9dc2a2e15ef38a37cc4c403c614fe':
  TransformGestureDetector is now ScaleGestureDetector - scope reduced.
 2010-01-13 18:04:39 -08:00
Adam Powell
8a53faaa35 Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can't reliably handle translation and scaling at the same time." into eclair 2010-01-13 18:00:35 -08:00
Xavier Ducrohet
01bf8d0175 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
Robert Greenwalt
40e8f84f05 am 1193ae4e: Backport l53e91db7 from master. 
Merge commit '1193ae4e824c66b75083c444ce0f250594e138ee' into eclair-plus-aosp

* commit '1193ae4e824c66b75083c444ce0f250594e138ee':
  Backport l53e91db7 from master.
 2010-01-13 17:09:40 -08:00
Ying Wang
4be913e4a8 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
63673439f0 Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair 2010-01-12 16:31:14 -08:00
The Android Open Source Project
4655f85689 android-2.1_r1 snapshot 2010-01-12 15:18:53 -08:00
Adam Powell
6f1c63dfbe am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest 
Merge commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164' into eclair-plus-aosp

* commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164':
  Added TransformGestureDetector (still in progress)
 2010-01-12 15:15:43 -08:00
Grace Kloba
060d4f411e am ce63c639: Merge "DO NOT MERGE." into eclair 
Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp

* commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0':
  DO NOT MERGE.
 2010-01-12 10:02:48 -08:00
San Mehat
c4284d5f90 am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair 
Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp

* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
  framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
 2010-01-12 10:02:40 -08:00
Grace Kloba
378a16f1b9 Merge "DO NOT MERGE." into eclair 2010-01-12 10:00:03 -08:00
San Mehat
7ee1a4e444 Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair 2010-01-12 09:59:35 -08:00
Xavier Ducrohet
f9c5c8ca43 am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair 
Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp

* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
  LayoutLib: support for custom styles.
 2010-01-11 15:28:07 -08:00
Xavier Ducrohet
94ff01104b Merge "LayoutLib: support for custom styles." into eclair 2010-01-11 15:25:16 -08:00