ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
20,824 Commits 2 Branches 0 Tags 54 MiB
04f0d9da29
Commit Graph

20824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
55946fa9b5 am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread 
Merge commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp

* commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50':
  People holding partial wake locks now get blamed for CPU usage.
 2010-09-08 14:34:41 -07:00
Jake Hamby
eded617eb4 am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread 
Merge commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp

* commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
  Allow incoming SMS until internal storage is almost full.
 2010-09-08 14:34:31 -07:00
Jeff Brown
a4caf30745 am b21fb104: Fix key repeat delay. 
Merge commit 'b21fb104cc95fe7e5daf3b3626241e525c39a3f1' into gingerbread-plus-aosp

* commit 'b21fb104cc95fe7e5daf3b3626241e525c39a3f1':
  Fix key repeat delay.
 2010-09-08 14:34:26 -07:00
Joe Onorato
ebccbe3094 Merge "move recent apps around, attempting to make it not crash." 2010-09-08 14:30:05 -07:00
Dianne Hackborn
955566417b Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread 2010-09-08 14:15:35 -07:00
Jeff Brown
98baa3cd18 am 6bb72458: (-s ours) am de2f3340: Update current.xml for touch filtering feature. 
Merge commit '6bb72458f934f00fdfee75323a7919a9f10eba03'

* commit '6bb72458f934f00fdfee75323a7919a9f10eba03':
  Update current.xml for touch filtering feature.
 2010-09-08 14:03:10 -07:00
Jeff Brown
6240634883 resolved conflicts for merge of a05088c1 to master 
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
 2010-09-08 13:02:55 -07:00
Jake Hamby
6cee99c76b Merge "Allow incoming SMS until internal storage is almost full." into gingerbread 2010-09-08 12:49:27 -07:00
Jeff Brown
8a8a4f52ee am de2f3340: Update current.xml for touch filtering feature. 
Merge commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0' into gingerbread-plus-aosp

* commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0':
  Update current.xml for touch filtering feature.
 2010-09-08 12:29:49 -07:00
Jeff Brown
61ce3982e1 Fix key repeat delay. 
Change-Id: I6216e082324ee29bf50e37acc673350ca5417c4d
 2010-09-08 12:28:43 -07:00
Joe Onorato
869c125c91 Merge "Fix build due to stubs errors on filename changes" 2010-09-08 12:11:55 -07:00
Jeff Brown
9c9021c2d4 am 85a31767: Add support for secure views. 
Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp

* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
  Add support for secure views.
 2010-09-08 11:55:24 -07:00
Jeff Brown
af30ff6020 Add support for secure views. 
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.

Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.

Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
 2010-09-08 11:50:55 -07:00
Jack Veenstra
8acbdc8ca9 Merge "Add support for giving arrays of ints and longs to the "am" command." 2010-09-08 11:44:05 -07:00
Jean-Baptiste Queru
8fe633bf57 am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp 
Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e'

* commit '6ffee9bbba53700d33456261b986ac8a3f333b9e':
  Revert "resolve conflicts"
 2010-09-08 11:07:30 -07:00
Erik
7c98e7640f am c4f628a1: am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread 
Merge commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123'

* commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123':
  Adds a time zone parameter to formatDateRange
 2010-09-08 11:04:41 -07:00
Jean-Baptiste Queru
0940dfb829 Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp 2010-09-08 11:03:22 -07:00
Erik
07b072ad2f am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread 
Merge commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe' into gingerbread-plus-aosp

* commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe':
  Adds a time zone parameter to formatDateRange
 2010-09-08 11:01:27 -07:00
Erik
d71a3160ae Merge "Adds a time zone parameter to formatDateRange" into gingerbread 2010-09-08 10:58:12 -07:00
Mike Lockwood
a2a66def70 Merge changes Ib18b93bf,I4c86d7e3 
* changes:
  MTP: Allow transfering arbitrary file types.
  Rename the media database's "objects" table to "files"
 2010-09-08 10:52:44 -07:00
Gilles Debunne
31af5348b0 am d4fd86d1: (-s ours) am 468394fc: Text Selection: smart word detection. DO NOT MERGE. 
Merge commit 'd4fd86d19a070a355255b51742075fbf8e69fa4a'

* commit 'd4fd86d19a070a355255b51742075fbf8e69fa4a':
  Text Selection: smart word detection. DO NOT MERGE.
 2010-09-08 10:38:45 -07:00
Elliott Hughes
fb3d25d917 am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread 
Merge commit '664c48e991a70d07646d54125e97f579f3a33be4'

* commit '664c48e991a70d07646d54125e97f579f3a33be4':
  Remove dead code: NIOBuffer.
 2010-09-08 10:38:41 -07:00
Chung-yih Wang
370ff2cd7f am 4f24aed2: am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread 
Merge commit '4f24aed2a13d9ba89e2402894353176e19571e6e'

* commit '4f24aed2a13d9ba89e2402894353176e19571e6e':
  Fix the dialing from contact for internet address.
 2010-09-08 10:38:35 -07:00
Chung-yih Wang
ca88a80015 am 576b492c: am 5de1d36d: Log outbound proxy address if exists for debugging. 
Merge commit '576b492c15a079c9d3d818f3f7fadc4408c2908a'

* commit '576b492c15a079c9d3d818f3f7fadc4408c2908a':
  Log outbound proxy address if exists for debugging.
 2010-09-08 10:35:11 -07:00
Gilles Debunne
486d70d27a am 468394fc: Text Selection: smart word detection. DO NOT MERGE. 
Merge commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743' into gingerbread-plus-aosp

* commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743':
  Text Selection: smart word detection. DO NOT MERGE.
 2010-09-08 10:32:42 -07:00
Elliott Hughes
3077e21d2b am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread 
Merge commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp

* commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
  Remove dead code: NIOBuffer.
 2010-09-08 10:32:38 -07:00
Chung-yih Wang
fd857d1589 am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread 
Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp

* commit '669070787cc10377c2e5c3fa187babc728d96245':
  Fix the dialing from contact for internet address.
 2010-09-08 10:32:13 -07:00
Jean-Baptiste Queru
f3c06fd804 am 84f992a2: resolve conflicts 
Merge commit '84f992a249491b9f755e879bf096baac3f9472f5'

* commit '84f992a249491b9f755e879bf096baac3f9472f5':
  Adding Download Manager Integration, stress, and hosts-based tests.
 2010-09-08 10:28:41 -07:00
Chung-yih Wang
205b84897c am 5de1d36d: Log outbound proxy address if exists for debugging. 
Merge commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770' into gingerbread-plus-aosp

* commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770':
  Log outbound proxy address if exists for debugging.
 2010-09-08 10:28:09 -07:00
Chet Haase
398143d919 Merge "Rename several animation classes" 2010-09-08 10:25:19 -07:00
Makoto Onuki
fb4ccaf69c Merge "Added "Memory observability" to javadoc." 2010-09-08 10:14:01 -07:00
Jean-Baptiste Queru
0e1ce57218 resolve conflicts 
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
 2010-09-08 10:02:35 -07:00
Gilles Debunne
ba67e34566 Merge "Made text selection work in ExtractEditText. Manual merge of Gingerbread 64947." 2010-09-08 10:01:46 -07:00
Lorenzo Colitti
c823988f3f Merge "Framework changes for IPv6 / IPv4v6 data calls." 2010-09-08 09:30:45 -07:00
Elliott Hughes
1edbc7e431 Merge "Remove dead code: NIOBuffer." into gingerbread 2010-09-08 09:30:41 -07:00
Mike Lockwood
93ab4fac68 Merge "Fix Intent.ACTION_REBOOT" 2010-09-08 06:52:51 -07:00
Chung-yih Wang
0f55fb95d4 Merge "Fix the dialing from contact for internet address." into gingerbread 2010-09-08 03:32:01 -07:00
Steve Block
fdbf9a788a Merge "Update DumpRenderTree2 to reflect removal of WEBKIT_MERGE_REVISION" 2010-09-08 03:20:13 -07:00
Ying Wang
c9956d9d9c Merge "Reflected class name and bc file name changes." 2010-09-07 22:28:20 -07:00
Wei-Ta Chen
d267df27cd am 8fc6f8b2: am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 
Merge commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16'

* commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16':
  Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
 2010-09-07 22:10:58 -07:00
Gilles Debunne
db607de4cc am e0974284: am d6e56895: update-api step missing from 64963. 
Merge commit 'e0974284a8983524c8719a47e57395f0030c3128'

* commit 'e0974284a8983524c8719a47e57395f0030c3128':
  update-api step missing from 64963.
 2010-09-07 22:10:45 -07:00
Brad Fitzpatrick
e84e02ec59 am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp 
Merge commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d'

* commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d':
  Fix a race between requesting/loading/writing SharedPreferences.
 2010-09-07 22:10:41 -07:00
Wei-Ta Chen
8b0de0ee31 am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 
Merge commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp

* commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49':
  Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
 2010-09-07 21:48:48 -07:00
Gilles Debunne
0dfd31013b am d6e56895: update-api step missing from 64963. 
Merge commit 'd6e56895f647d3c6ea33cea15fdb7b1e9ff3f537' into gingerbread-plus-aosp

* commit 'd6e56895f647d3c6ea33cea15fdb7b1e9ff3f537':
  update-api step missing from 64963.
 2010-09-07 21:48:39 -07:00
Brad Fitzpatrick
6eba882d83 resolved conflicts for merge of 64591009 to gingerbread-plus-aosp 
Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e
 2010-09-07 21:41:09 -07:00
Adam Powell
f6eb6915ad Merge "Reworking the ActionBar tab API" 2010-09-07 21:04:54 -07:00
Guang Zhu
988e3190d5 Merge "temporarily skip simple-cross-origin-progress-events.html for now" 2010-09-07 21:00:32 -07:00
Neal Nguyen
e1446fa12e Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread 2010-09-07 20:55:22 -07:00
Wei-Ta Chen
731e3428fb Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 2010-09-07 20:36:13 -07:00
Brad Fitzpatrick
9a994a0796 Merge "Fix a race between requesting/loading/writing SharedPreferences." into gingerbread 2010-09-07 20:06:26 -07:00