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

19582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
e09c4c710e am d25f0aea: am 99401b29: Merge "Add support for throttling motion events." into gingerbread 
Merge commit 'd25f0aea1cebe93aff55a75374e172f87115f1b3'

* commit 'd25f0aea1cebe93aff55a75374e172f87115f1b3':
  Add support for throttling motion events.
 2010-08-21 09:35:13 -07:00
Dianne Hackborn
0c8a229641 am d172594e: am cf6d2a1d: Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread 
Merge commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b'

* commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b':
  Fix issue #2845673: android:exported="false" is not obeyed
 2010-08-21 09:34:43 -07:00
Mathias Agopian
c3fb41b1db am 43647129: am 17da0663: Merge "fix [2931161] crash in labyritnth when completing a level" into gingerbread 
Merge commit '43647129d676e8c802850ca493f2ebc6064a4a1a'

* commit '43647129d676e8c802850ca493f2ebc6064a4a1a':
  fix [2931161] crash in labyritnth when completing a level
 2010-08-21 09:34:22 -07:00
Robert Greenwalt
8e24c43e23 am 46001391: (-s ours) am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread 
Merge commit '4600139173c80db4ebfb70e2417231e9678d37f9'

* commit '4600139173c80db4ebfb70e2417231e9678d37f9':
  DO NOT MERGE Do not kill sockets going default->hipri
 2010-08-21 09:33:42 -07:00
Romain Guy
84f62aeb61 Merge "Add support for textScaleX." 2010-08-20 18:42:54 -07:00
Romain Guy
7557ff40d8 Merge "Test setTextScaleX()" 2010-08-20 18:42:49 -07:00
Danica Chang
07200e5a66 Merge "Wait for bluetooth to turn on before Bluetooth Tethering is enabled" 2010-08-20 17:42:28 -07:00
Adam Powell
b784b2b8d4 Merge "Make ActionBar menus handle configuration changes gracefully." 2010-08-20 15:48:04 -07:00
Jim Miller
044fac4d2f Merge "Make sure we have a native Surface in nContextSetSurface." 2010-08-20 15:14:56 -07:00
Gilles Debunne
76c043ad04 Merge "New UI theme for EditText." 2010-08-20 12:35:31 -07:00
Romain Guy
2342cbd06e Merge "GridView's pageScroll() would be offset by one item." 2010-08-20 11:40:42 -07:00
Nipun Kwatra
6e8dd16e67 Merge "Added downsample()" 2010-08-20 11:35:38 -07:00
Nipun Kwatra
c928f98559 Merge "const correctness, validPixel test." 2010-08-20 10:41:08 -07:00
Daniel Sandler
8f11bc9e28 Merge "Notification.fullScreenIntent support." 2010-08-20 09:15:53 -07:00
Daniel Sandler
0eb812b683 Merge "Fix incorrect usage text for am." 2010-08-20 06:31:24 -07:00
Brad Fitzpatrick
86a2e32d52 am cf2c68c9: am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread 
Merge commit 'cf2c68c9c21b8af62e95374312355d22ed55e586'

* commit 'cf2c68c9c21b8af62e95374312355d22ed55e586':
  Avoid unnecessary SharedPrefences disk writes.
 2010-08-20 06:28:08 -07:00
Jean-Baptiste Queru
b3635a449b am 6d5bb884: am aac6a748: Merge "Only monitor recognized uevent devices." into gingerbread 
Merge commit '6d5bb88454db2fc798a07ec1085ef55572dbe670'

* commit '6d5bb88454db2fc798a07ec1085ef55572dbe670':
  Only monitor recognized uevent devices.
 2010-08-20 06:27:55 -07:00
Mathias Agopian
18e4c5554d am 4195d097: am 8ad86fef: Merge "Improve documentation of getAltitude" into gingerbread 
Merge commit '4195d097c535acf9e1c60b323134fcb5609c18b7'

* commit '4195d097c535acf9e1c60b323134fcb5609c18b7':
  Improve documentation of getAltitude
 2010-08-20 06:27:37 -07:00
Mathias Agopian
f1aedc3197 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-08-20 06:27:27 -07:00
Mathias Agopian
569cf07b29 am 8e13ce52: (-s ours) am 26bcc7b4: Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread 
Merge commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c'

* commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c':
  revert hwcomposer HAL changes. DO NOT MERGE.
 2010-08-20 06:27:15 -07:00
Chet Haase
26ab891f86 Merge "multiple-property animations" 2010-08-20 06:27:11 -07:00
Jean-Baptiste Queru
86d92827a6 resolved conflicts for merge of 34df5ccc to master 
Change-Id: I55558b2ab9452b2a819a1fce5b3ee5af29688e98
 2010-08-20 06:18:50 -07:00
Jeff Brown
297f493405 am 33992d41: am 72e0b2ab: Merge "Fix some input device mapping bugs with certain drivers." into gingerbread 
Merge commit '33992d4195fe55f42ba6919f5a07707a51a12d5d'

* commit '33992d4195fe55f42ba6919f5a07707a51a12d5d':
  Fix some input device mapping bugs with certain drivers.
 2010-08-19 23:43:19 -07:00
Irfan Sheriff
d2b8190687 Merge "clean up scanresults on exit from driver start state" 2010-08-19 16:40:49 -07:00
Dmitri Plotnikov
427e954bfe Merge "Fixing the SDK build" 2010-08-19 16:32:31 -07:00
Romain Guy
23e7646e62 Merge "Update FrameLayout documentation." 2010-08-19 15:16:32 -07:00
Romain Guy
ebcb809b09 Merge "Update OpenGLRenderer test to test opaque ARGB8888 bitmaps." 2010-08-19 14:46:45 -07:00
Romain Guy
8e34b6b0d1 Merge "Load assets in place instead of deferring until draw." 2010-08-19 14:44:52 -07:00
Irfan Sheriff
93a61abc73 Merge "asynchronous driver commands" 2010-08-19 12:34:41 -07:00
Eric Fischer
549661a843 Merge "Import Romansh translations." 2010-08-19 12:00:34 -07:00
Steve Block
86f7671942 Merge "Implement DeviceOrientation" 2010-08-19 11:03:57 -07:00
Alex Sakhartchouk
88db75e80c Merge "Should fix the build." 2010-08-19 10:54:25 -07:00
Alex Sakhartchouk
77ed103384 Merge "Hopefully this fixes the build." 2010-08-19 10:48:35 -07:00
Romain Guy
2efe93e506 Merge "Load opaque assets in RGB-565 until Bitmap.hasAlpha() works properly." 2010-08-19 10:47:41 -07:00
Shimeng (Simon) Wang
9dd962d1bb Merge "Set the scale to be at least overview zoom scale." 2010-08-19 10:17:29 -07:00
Irfan Sheriff
b27af98e27 Merge "Fix divide-by-zero when calculating signal level over a large output range." 2010-08-19 09:23:16 -07:00
Alex Sakhartchouk
d39b238ae4 Merge "Renderscript samples. Merged two model related projects. Cleanup." 2010-08-19 09:15:48 -07:00
Daniel Sandler
b68505f20b Merge "Wi-Fi signal strength and status in the system bar & panel." 2010-08-19 06:13:04 -07:00
Adam Cohen
4583d2ade5 Merge "-> Added edge behaviour for StackView (what to do at the beginning and end of the stack) -> Wrapping children of AdapterViewAnimator in a FrameLayout to uphold the Adapter contract (ie. don't modify the Adapter's views.) -> Fixed clipping problem in StackViews with padding" 2010-08-18 22:20:31 -07:00
Romain Guy
d413853a7e Merge "Speedup TextView fades (no more layers required.)" 2010-08-18 20:50:12 -07:00
Jim Miller
ff10490457 Merge "Fix 2797185: Integrate Carousel widget into framework." 2010-08-18 19:30:53 -07:00
Jeff Brown
379b5a69d4 am 99401b29: Merge "Add support for throttling motion events." into gingerbread 
Merge commit '99401b29c3f39488a058d3eb616009b751879a77' into gingerbread-plus-aosp

* commit '99401b29c3f39488a058d3eb616009b751879a77':
  Add support for throttling motion events.
 2010-08-18 17:42:47 -07:00
Jeff Brown
6b5e70b701 Merge "Add support for throttling motion events." into gingerbread 2010-08-18 17:40:44 -07:00
Romain Guy
cd21ae2e9b Merge "Fix drawing issues with layers." 2010-08-18 17:11:11 -07:00
Dianne Hackborn
7b94832a30 am cf6d2a1d: Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread 
Merge commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab' into gingerbread-plus-aosp

* commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab':
  Fix issue #2845673: android:exported="false" is not obeyed
 2010-08-18 17:08:36 -07:00
Dianne Hackborn
c278f33a21 Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread 2010-08-18 17:05:40 -07:00
Danica Chang
f1b09a3b21 Merge "fixed bug in stringToIpAddr, which was returning the ip address in reverse" 2010-08-18 16:58:45 -07:00
Danica Chang
0d4bfbadec Merge "bluetooth tethering" 2010-08-18 16:58:37 -07:00
Jeff Brown
542412c8c9 Add support for throttling motion events. 
Change-Id: I24b3a17753e91ecda60a60fe5cd2e6b3260e033d
 2010-08-18 16:58:27 -07:00
Irfan Sheriff
48170ed5af Merge "Fix WRITE_SECURE_SETTINGS permission issue" 2010-08-18 16:54:45 -07:00