ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
20,979 Commits 2 Branches 0 Tags 54 MiB
4d66069f0f
Commit Graph

20979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
425981524a Merge "Fixed a copy and paste error" into gingerbread 2010-09-10 11:21:42 -07:00
Eric Laurent
10eea1e277 am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread 
Merge commit '2814ad25578d1a52826464477da16217247c04e0' into gingerbread-plus-aosp

* commit '2814ad25578d1a52826464477da16217247c04e0':
  LVM release 1.09 delivery
 2010-09-10 10:26:51 -07:00
Eric Laurent
215af644b3 Merge "LVM release 1.09 delivery" into gingerbread 2010-09-10 10:24:02 -07:00
Erik
057da22c30 Merge branch 'gingerbread-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp 2010-09-10 10:07:25 -07:00
Robert Greenwalt
778f695119 am 34763928: Merge "add ART for inet connection condition" into gingerbread 
Merge commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea' into gingerbread-plus-aosp

* commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea':
  add ART for inet connection condition
 2010-09-10 10:06:54 -07:00
Robert Greenwalt
64c9bb57d9 Merge "add ART for inet connection condition" into gingerbread 2010-09-10 09:58:05 -07:00
Jean-Baptiste Queru
57cbf0857f resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp 
Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617
 2010-09-10 09:53:43 -07:00
Shimeng (Simon) Wang
0d1598c927 Merge "Use the default scale for text input." 2010-09-10 09:39:34 -07:00
Joseph Wen
9fbf20b48c am 94db0238: am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread 
Merge commit '94db0238a3b6cba3cbf0e037af74e898a4741204'

* commit '94db0238a3b6cba3cbf0e037af74e898a4741204':
  Fix bug in JNI BitmapFactory
 2010-09-10 02:39:10 -07:00
Joseph Wen
1205c8be1b am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread 
Merge commit '219eb7ec8403ef9b98125f2b58cc27669ae69712' into gingerbread-plus-aosp

* commit '219eb7ec8403ef9b98125f2b58cc27669ae69712':
  Fix bug in JNI BitmapFactory
 2010-09-10 02:35:50 -07:00
Joseph Wen
2e6dedaa6d Merge "Fix bug in JNI BitmapFactory" into gingerbread 2010-09-10 02:32:05 -07:00
Hung-ying Tyan
3d5502e662 am 5f93c39c: am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread 
Merge commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74'

* commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74':
  SIP: add SipErrorCode for error feedback.
 2010-09-10 02:31:05 -07:00
Hung-ying Tyan
1444db6448 am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread 
Merge commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680' into gingerbread-plus-aosp

* commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680':
  SIP: add SipErrorCode for error feedback.
 2010-09-10 02:23:04 -07:00
Hung-ying Tyan
0d93a6efbc Merge "SIP: add SipErrorCode for error feedback." into gingerbread 2010-09-10 02:19:22 -07:00
Dianne Hackborn
9e8d35c518 am 8615fdc1: (-s ours) am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread 
Merge commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb'

* commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
 2010-09-09 23:17:14 -07:00
Dianne Hackborn
eb7a4298e6 am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread 
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp

* commit '506d724cc356a7ba73995ef2929c65062277c83d':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
 2010-09-09 23:14:46 -07:00
Dianne Hackborn
f1481181ed Merge "DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!" into gingerbread 2010-09-09 23:12:24 -07:00
Dianne Hackborn
4181bd66fc am 510951e9: am a8512a71: Always set the scheduling group when starting a new thread. 
Merge commit '510951e98bdb861130f38c087956cd05e0b41dcd'

* commit '510951e98bdb861130f38c087956cd05e0b41dcd':
  Always set the scheduling group when starting a new thread.
 2010-09-09 23:11:22 -07:00
Dianne Hackborn
98805c8f6d resolved conflicts for merge of 62d005ec to master 
Change-Id: I552d7adffe70a2bd94113ffb70cdc3e625fca0bd
 2010-09-09 23:06:27 -07:00
Dianne Hackborn
06c725e551 am a8512a71: Always set the scheduling group when starting a new thread. 
Merge commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25' into gingerbread-plus-aosp

* commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25':
  Always set the scheduling group when starting a new thread.
 2010-09-09 23:05:42 -07:00
Dianne Hackborn
9c82c48d52 Always set the scheduling group when starting a new thread. 
Change-Id: Ia33acf13fc3752707f3819928c36315e223fa1bd
 2010-09-09 22:12:25 -07:00
Dianne Hackborn
903c235897 am 033b381b: am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread 
Merge commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2'

* commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2':
  Fix doc of fullScreenIntent.
 2010-09-09 21:39:22 -07:00
Dianne Hackborn
f1a54de9b1 am 195dc210: am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 
Merge commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c'

* commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c':
  Small fixes to battery stats.
 2010-09-09 21:39:13 -07:00
Dianne Hackborn
87005bc57f am a7d868d4: Merge "Add toast when an app intercepts the launch of another app." into gingerbread 
Merge commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859' into gingerbread-plus-aosp

* commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859':
  Add toast when an app intercepts the launch of another app.
 2010-09-09 21:34:44 -07:00
Dianne Hackborn
ca5b069671 am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread 
Merge commit '7f07f842c9c375648b52de5d8a84c080e9394d71' into gingerbread-plus-aosp

* commit '7f07f842c9c375648b52de5d8a84c080e9394d71':
  Fix doc of fullScreenIntent.
 2010-09-09 21:34:38 -07:00
Dianne Hackborn
4b9adfdb29 am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp

* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
  Small fixes to battery stats.
 2010-09-09 21:34:33 -07:00
Dianne Hackborn
ad70b5ab4b Merge "Add toast when an app intercepts the launch of another app." into gingerbread 2010-09-09 21:31:34 -07:00
Dianne Hackborn
a632141971 Merge "Fix doc of fullScreenIntent." into gingerbread 2010-09-09 21:31:08 -07:00
Dianne Hackborn
faa2348d30 Merge "Small fixes to battery stats." into gingerbread 2010-09-09 21:30:52 -07:00
Dirk Dougherty
8c494ed250 am 621c6adc: am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release date. 
Merge commit '621c6adcb765ab348eb0daf770d4c0eca65fd632'

* commit '621c6adcb765ab348eb0daf770d4c0eca65fd632':
  Doc change: Fixes for toggle image and adt release date.
 2010-09-09 19:05:39 -07:00
Dirk Dougherty
09eec2e869 am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release date. 
Merge commit 'a71d69947d4a74730b17021b4c809d054d66c741' into gingerbread-plus-aosp

* commit 'a71d69947d4a74730b17021b4c809d054d66c741':
  Doc change: Fixes for toggle image and adt release date.
 2010-09-09 18:59:57 -07:00
Dirk Dougherty
3a58916ce2 am 74a74d3c: Doc change: Fixes for toggle image and adt release date. 
Merge commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48' into gingerbread

* commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48':
  Doc change: Fixes for toggle image and adt release date.
 2010-09-09 18:53:36 -07:00
Adam Cohen
6ef01729e6 Merge "Fixing a bug where StackView wasn't always laid out correctly upon loading" 2010-09-09 18:48:09 -07:00
Xavier Ducrohet
41ba2a7c93 Merge "Avoid pre-processing images when they won't be used" 2010-09-09 18:30:59 -07:00
Winson Chung
4cf6c6d489 Merge "Adding some error handling to RemoteViewsAdapter, removing artificial loading delay." 2010-09-09 17:53:36 -07:00
Rich Cannings
ec36038605 am 73698457: am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread 
Merge commit '736984573a1975d69d1c6efd87e4af9ca16e505f'

* commit '736984573a1975d69d1c6efd87e4af9ca16e505f':
  Remove the use of FileInputStream.available()
 2010-09-09 16:51:53 -07:00
Andreas Huber
ffb374dc84 am 0d661b5e: am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread 
Merge commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055'

* commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055':
  TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
 2010-09-09 16:48:58 -07:00
Rich Cannings
a48f498d18 am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread 
Merge commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0' into gingerbread-plus-aosp

* commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0':
  Remove the use of FileInputStream.available()
 2010-09-09 16:45:34 -07:00
Andreas Huber
a4ca36f9d5 am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread 
Merge commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1' into gingerbread-plus-aosp

* commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1':
  TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
 2010-09-09 16:42:17 -07:00
Rich Cannings
a13697f701 Merge "Remove the use of FileInputStream.available()" into gingerbread 2010-09-09 16:41:29 -07:00
Andreas Huber
8c423e61be Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread 2010-09-09 16:39:09 -07:00
Wu-cheng Li
8adcfa4929 Merge "Only enable CAMERA_MSG_PREVIEW_FRAME when necessary." 2010-09-09 16:31:13 -07:00
Jaikumar Ganesh
a67ba6ec84 am 41506304: (-s ours) am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread 
Merge commit '41506304b86a9c9a605e8b96318e61f0f8f6a235'

* commit '41506304b86a9c9a605e8b96318e61f0f8f6a235':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
 2010-09-09 16:10:12 -07:00
Mike Lockwood
9507eda268 am 91cf049f: am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread 
Merge commit '91cf049f34b4f3d53d39e868104f11156a332b65'

* commit '91cf049f34b4f3d53d39e868104f11156a332b65':
  Only pulse notification light if a new notification has been received since the screen was last turned off
 2010-09-09 16:10:00 -07:00
Henrik Backlund
743c89a066 am f49b052d: am a79c8291: Fix to get A2DP to connect after unpairing 
Merge commit 'f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e'

* commit 'f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e':
  Fix to get A2DP to connect after unpairing
 2010-09-09 16:09:54 -07:00
Jaikumar Ganesh
e35258f379 am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread 
Merge commit '166aeb290be234531ba049b6702f558a02317393' into gingerbread-plus-aosp

* commit '166aeb290be234531ba049b6702f558a02317393':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
 2010-09-09 16:05:43 -07:00
Mike Lockwood
d4225c0e57 am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread 
Merge commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458' into gingerbread-plus-aosp

* commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458':
  Only pulse notification light if a new notification has been received since the screen was last turned off
 2010-09-09 16:05:38 -07:00
Gilles Debunne
93b06f4457 Merge "Revert "update-api step missing from 65349"" 2010-09-09 15:58:51 -07:00
Christopher Tate
93b739a48c Merge "Don't crash in batterystats" 2010-09-09 15:53:09 -07:00
Chet Haase
d2a7ec7933 Merge "Fix bug with pivot point not including translationXY factors" 2010-09-09 15:39:46 -07:00