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

22903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
48ea2ae901 Merge "Optimize layer clears." 2010-10-12 18:44:18 -07:00
Gil Dobjanschi
272f704c1f Merge "Test implementation bug fix." 2010-10-12 18:34:03 -07:00
Winson Chung
876aeabf16 Merge "Extracting default loading view definition into XML resource." 2010-10-12 18:25:25 -07:00
Jeff Brown
afa0ccd368 Merge "resolved conflicts for merge of f2e0681a to master" 2010-10-12 18:20:26 -07:00
Romain Guy
b64b6f067c Merge "Tweak layers caching for better performance in Launcher." 2010-10-12 18:20:06 -07:00
Jeff Brown
26dbf44c66 resolved conflicts for merge of f2e0681a to master 
Change-Id: I5ba9b1f16a29f73444123bcead4c53f09a79b0f6
 2010-10-12 18:19:08 -07:00
Joe Onorato
08d795291c am d965724f: (-s ours) am 44104df1: Merge "Fix status bar flashing after orientation change" into gingerbread 
Merge commit 'd965724fdcc63a070657518542559a8b1a35a70d'

* commit 'd965724fdcc63a070657518542559a8b1a35a70d':
  Fix status bar flashing after orientation change
 2010-10-12 18:05:09 -07:00
Romain Guy
4a77cb6bde Merge "Remove logging." 2010-10-12 17:50:32 -07:00
Chris Tate
f819d7a2a9 Merge "Don't stomp on the drag-focus bookkeeping inadvertently." 2010-10-12 17:42:15 -07:00
Justin Ho
5511fed2a4 am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 
Merge commit '45738f6700cff689eacda7c8192b76939ba20591' into gingerbread-plus-aosp

* commit '45738f6700cff689eacda7c8192b76939ba20591':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
 2010-10-12 17:40:47 -07:00
Justin Ho
c2dc99c3ca Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 2010-10-12 17:38:44 -07:00
Hung-ying Tyan
7225fff288 am 907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 
Merge commit '907f6f1d7d13531015b545861b93e1607d253cfd' into gingerbread-plus-aosp

* commit '907f6f1d7d13531015b545861b93e1607d253cfd':
  Fix SipSessionGroup from throwing ConcurrentModificationException
 2010-10-12 17:37:38 -07:00
Hung-ying Tyan
3874b18c1d Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 2010-10-12 17:33:27 -07:00
Adam Powell
d3b93334e8 am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 
Merge commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6' into gingerbread-plus-aosp

* commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
 2010-10-12 17:11:51 -07:00
Adam Powell
308ddf283c Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 2010-10-12 17:08:43 -07:00
Jaikumar Ganesh
d3a7abfb57 am 1bc3a407: Merge "Fix auto connection priority handling." into gingerbread 
Merge commit '1bc3a407ceb380e35e894f405f544b5b87e980d4' into gingerbread-plus-aosp

* commit '1bc3a407ceb380e35e894f405f544b5b87e980d4':
  Fix auto connection priority handling.
 2010-10-12 16:50:45 -07:00
Jaikumar Ganesh
6cd9eff46d Merge "Fix auto connection priority handling." into gingerbread 2010-10-12 16:46:50 -07:00
Kenny Root
5fc97fe955 am 1c67b7af: am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread 
Merge commit '1c67b7af0147080de807db3cc564899db85b43a8'

* commit '1c67b7af0147080de807db3cc564899db85b43a8':
  Grant URI permissions to the MCS
 2010-10-12 16:40:47 -07:00
Jean-Baptiste Queru
c64ef759ac am cf88cf87: (-s ours) am 15f7ff3c: Merge "Fix compile errors in telephony tests" 
Merge commit 'cf88cf878be96a564b38f428c161cc864dfad56d'

* commit 'cf88cf878be96a564b38f428c161cc864dfad56d':
  Fix compile errors in telephony tests
 2010-10-12 16:37:44 -07:00
Joe Onorato
8cbb1e7af4 am 14854820: am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread 
Merge commit '14854820eac895a925791fb41ccd330447fd4f02'

* commit '14854820eac895a925791fb41ccd330447fd4f02':
  Add a configuration option to turn on the screen when you unplug the device.
 2010-10-12 16:27:22 -07:00
Scott Main
3779d156ec am ad9a559c: (-s ours) am 3d90d11a: am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge. 
Merge commit 'ad9a559c611a2901a490c887f03d9622695beba2'

* commit 'ad9a559c611a2901a490c887f03d9622695beba2':
  Revert "docs: new web apps dev guides" Do not merge.
 2010-10-12 16:26:53 -07:00
Jeff Brown
5dadf31860 am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread 
Merge commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551' into gingerbread-plus-aosp

* commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551':
  Add text selection handles to preloaded drawables.
 2010-10-12 16:12:34 -07:00
Jeff Brown
5cbba469d9 Merge "Add text selection handles to preloaded drawables." into gingerbread 2010-10-12 16:08:59 -07:00
Romain Guy
55ae1bce3a Merge "Optimize 9patch rendering." 2010-10-12 16:01:41 -07:00
Andy Stadler
2641d5af3f am 8e2be267: Add versionCode and versionName to dumpsys packages 
Merge commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp

* commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58':
  Add versionCode and versionName to dumpsys packages
 2010-10-12 15:25:34 -07:00
Adam Powell
0ae526e447 am fb6431c0: Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 
Merge commit 'fb6431c0298747d240fcdc025575e5f46db95132' into gingerbread-plus-aosp

* commit 'fb6431c0298747d240fcdc025575e5f46db95132':
  Fix bug 3064135 - do not allow text handles on TextViews in sub windows.
 2010-10-12 15:03:29 -07:00
Adam Powell
4254081daf Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 2010-10-12 15:00:30 -07:00
Irfan Sheriff
38f3f5cd6e am e22eb863: Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 
Merge commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902' into gingerbread-plus-aosp

* commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902':
  fix start driver for corner cases DO NOT MERGE
 2010-10-12 14:59:20 -07:00
Irfan Sheriff
b7768f0fa5 Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 2010-10-12 14:55:52 -07:00
Joe Onorato
296b1d7764 am ba799098: Merge changes I76513387,I335fb671 into gingerbread 
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp

* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
  Remove dead code, and make the animation a setting.
  turn off the electron beam
 2010-10-12 14:46:23 -07:00
Joe Onorato
08f64b9e27 Merge changes I76513387,I335fb671 into gingerbread 
* changes:
  Remove dead code, and make the animation a setting.
  turn off the electron beam
 2010-10-12 14:43:24 -07:00
Wink Saville
27813b0a6b am a3100314: Merge "Remove some PII." into gingerbread 
Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
  Remove some PII.
 2010-10-12 14:21:10 -07:00
Dirk Dougherty
4187865cf2 am 354954a0: Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp

* commit '354954a01c533c6789536c141cf330ddf3976e8b':
  Doc change: cherrypick testing changes from master. Squashed commit of the following:
 2010-10-12 14:18:33 -07:00
Alex Sakhartchouk
1ef52f9a2c Merge "Fixing font bug, initialization was done in the wrong order." 2010-10-12 14:17:59 -07:00
Wink Saville
e5865c7c4c Merge "Remove some PII." into gingerbread 2010-10-12 14:17:00 -07:00
Mathias Agopian
59119e658a turn off the electron beam 
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
 2010-10-12 14:16:11 -07:00
Dirk Dougherty
05a1326c74 Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 2010-10-12 14:16:05 -07:00
Chris Tate
3e99865d79 Merge "Elide undelivered drag-location messages" 2010-10-12 14:05:14 -07:00
Chris Tate
45a22e5d6d am a75803e9: am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread 
Merge commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2'

* commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2':
  Temporarily turn on backup/restore debug logs
 2010-10-12 13:57:20 -07:00
Mathias Agopian
eb8f8980d4 am 5d477279: am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread 
Merge commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78'

* commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78':
  fix a bug where FLIP_H would do a 180 rotation
 2010-10-12 13:57:09 -07:00
Mathias Agopian
09e5687757 am 3754d0cc: am d0528b74: Merge "deliver invalidate messages AFTER other messages" into gingerbread 
Merge commit '3754d0ccc7ba07fd867d3d28e6493e84ce0a139d'

* commit '3754d0ccc7ba07fd867d3d28e6493e84ce0a139d':
  deliver invalidate messages AFTER other messages
 2010-10-12 13:56:58 -07:00
Joe Onorato
a66d342f17 am 5be893a7: am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread 
Merge commit '5be893a71aa72f54660496dd01cfad66adb86b8f'

* commit '5be893a71aa72f54660496dd01cfad66adb86b8f':
  Don't throw when userActivity fails because of the permission check.
 2010-10-12 13:22:41 -07:00
Brad Fitzpatrick
6e98906721 am 2af4c51e: am 6bb7a4a6: Go one day into 1970 for timezone code. 
Merge commit '2af4c51e9a82848e3efce4621559a69fda965665'

* commit '2af4c51e9a82848e3efce4621559a69fda965665':
  Go one day into 1970 for timezone code.
 2010-10-12 13:22:27 -07:00
Romain Guy
7d3d01000a Merge "Simplify black texture fragment shader." 2010-10-12 13:15:44 -07:00
Brad Fitzpatrick
987c90d7a1 resolved conflicts for merge of 14d151bf to master 
Change-Id: Ib1ac9acfd6dc71b5fa4e1456a056d1e9dee65fda
 2010-10-12 13:12:18 -07:00
Kenny Root
2eeec06971 Merge "Add API to check for emulated external storage" 2010-10-12 12:45:46 -07:00
Adam Powell
62b09b91d4 Merge "Holo fixes" 2010-10-12 12:02:11 -07:00
Romain Guy
360fac0ceb Merge "Fix invisible views issue in Launcher." 2010-10-12 11:55:50 -07:00
John Wang
b6be8d662f am 844a6b3c: Turn off additional debug. 
Merge commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e' into gingerbread-plus-aosp

* commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e':
  Turn off additional debug.
 2010-10-12 11:55:31 -07:00
Mathias Agopian
2669131aed am 8b8a8f65: am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread 
Merge commit '8b8a8f65b5306aa557028feba7317470222a73df'

* commit '8b8a8f65b5306aa557028feba7317470222a73df':
  fix a bug where timeouts would only be handled when a message was delivered
 2010-10-12 11:51:13 -07:00