ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24,032 Commits 2 Branches 0 Tags 54 MiB
76c5fcd809
Commit Graph

24032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
49bcf3e8b6 resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp 
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
 2010-11-02 14:02:59 -07:00
Roy West
bd6a73630a Merge "Fix bug 2248975, edits to load error HTML pages." 2010-11-02 13:54:30 -07:00
Jean-Baptiste Queru
d1089d117e Merge "Document per-implementation behaviors of native get* methods" 2010-11-02 13:27:36 -07:00
Joe Malin
dc6805745f am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread 
* commit 'c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d':
  DOC CHANGE: Add entry for monkeyrunner to tools index page.
 2010-11-02 13:18:47 -07:00
Joe Malin
65b842595d Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread 2010-11-02 13:17:16 -07:00
Jean-Baptiste Queru
b664bdce42 Merge "Clarify documentation of Cursor get* methods." 2010-11-02 13:11:56 -07:00
Raphael
8acbc9d954 am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread 
* commit '46468dde8d7f9bd42ad180c2882bff6ef98685cd':
  Support for <compatible-screens><screen> in ADT.
 2010-11-02 11:45:07 -07:00
Raphael
1dfaaa7368 Merge "Support for <compatible-screens><screen> in ADT." into gingerbread 2010-11-02 11:43:11 -07:00
Kenny Root
3fa3666a2d Merge "Fix default return code for getResource" 2010-11-02 11:40:27 -07:00
Kenny Root
ec033c57b6 Fix default return code for getResource 
Reorganization of getResource to allow for other densities accidentally
overrode the default return code for getResource from BAD_VALUE to
BAD_INDEX. This corrects the default return to BAD_VALUE which restores
other things to working.

Bug: 3155824
Change-Id: I13dafff85bc6978c5f5435fc09ab0474c7885c4d
 2010-11-02 11:27:31 -07:00
Vasu Nori
71054a7c34 Merge "deperecate Cursor requery() and sa, Loader should be used instead" 2010-11-02 11:27:29 -07:00
Joe Onorato
8c6bd3d023 Merge "Put back the back button" 2010-11-02 10:11:25 -07:00
Gilles Debunne
3166db0994 am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread 
* commit '18149c47bfc87c88798e6820d7153e588b374ed3':
  Rescaled/updated mdpi assets added.
 2010-11-02 10:08:27 -07:00
Gilles Debunne
ba3328cd2a Merge "Made paste window nicer: asset and padding" 2010-11-02 10:06:56 -07:00
Gilles Debunne
27d7d3eda1 am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread 
* commit '94da7f983cc33d10bf1560bb32ec19400437a42a':
  Rescaled/updated mdpi assets added.
 2010-11-02 10:05:55 -07:00
Gilles Debunne
b14d942ae5 Merge "Rescaled/updated mdpi assets added." into gingerbread 2010-11-02 10:05:52 -07:00
Gilles Debunne
3c65ce2dc3 Merge "Rescaled/updated mdpi assets added." into gingerbread 2010-11-02 10:04:40 -07:00
satok
28f6f366ef Merge "Update the subtype icon properly." 2010-11-02 04:14:17 -07:00
Jeff Brown
2d283a68e4 am 7ab5d2d9: am a87ea46c: Fix bugs related to cheek event suppression. 
* commit '7ab5d2d951792c9b1a1e7cfb279280c2d076506f':
  Fix bugs related to cheek event suppression.
 2010-11-02 02:34:15 -07:00
Jeff Brown
5d0a9b474b am a87ea46c: Fix bugs related to cheek event suppression. 
* commit 'a87ea46cb023763e0a9b0222da20b0a354f79d8d':
  Fix bugs related to cheek event suppression.
 2010-11-01 21:02:05 -07:00
Jeff Brown
f6149c3229 Fix bugs related to cheek event suppression. 
Two issues:

1. First, due to an inverted conditional in the input dispatcher, we were
   reporting touches as long touches and vice-versa to the power manager.

2. Power manager user activity cheek event suppression also suppresses touch
   events (but not long touch or up events).  As a result, if cheek event
   suppression was enabled, touches would not poke the user activity timer.
   However due to the above logic inversion, this actually affected long
   touches.  Net result, if cheek suppression was enabled in the power manager
   and you held your thumb on the screen long enough, the phone would
   go to sleep!

Cheek event suppression is commonly turned on when making a phone call.
Interestingly, it does not seem to get turned off afterward...

This change fixes the logic inversion and exempts touches from the cheek
suppression.  The reason we do the latter is because the old behavior
was actually harmful in other ways too: a touch down would be suppressed
but not a long touch or the touch up.  This would cause bizarre behavior
if you touched the screen while it was dimmed.  Instead of brightening
immediately, it would brighten either when you lifted your finger or
300ms later, whichever came first.

Bug: 3154895
Change-Id: Ied9ccec6718fbe86506322ff47a4e3eb58f81834
 2010-11-01 20:51:58 -07:00
Gloria Wang
1e04f5b26c Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled." 2010-11-01 20:38:51 -07:00
Daniel Lehmann
d6a3cddba5 Merge "Added missing label and char limits" 2010-11-01 20:25:31 -07:00
Neal Nguyen
8feb41267e am 424963ef: am 5dda76a7: Adding some StorageManager integration test infrastructure and some basic tests. 
* commit '424963ef8d46c34d67ea24d25735944c0d87409c':
  Adding some StorageManager integration test infrastructure and some basic tests.
 2010-11-01 19:44:50 -07:00
Neal Nguyen
fbadab9066 am 5dda76a7: Adding some StorageManager integration test infrastructure and some basic tests. 
* commit '5dda76a72e8bb4630fb5fd38a42e7bceb5b9c954':
  Adding some StorageManager integration test infrastructure and some basic tests.
 2010-11-01 19:42:22 -07:00
satok
8a219246f3 Merge "Fix a bug that enabled Subtype ID can't be saved propery." 2010-11-01 19:41:44 -07:00
Neal Nguyen
9c0a63107f am af35b8f4: am bd06f02d: Cleaning up some more flakiness in DownloadManager tests. 
* commit 'af35b8f43262a27c941c396186501a9695954cd8':
  Cleaning up some more flakiness in DownloadManager tests.
 2010-11-01 17:44:13 -07:00
Neal Nguyen
815a6bc0cf am bd06f02d: Cleaning up some more flakiness in DownloadManager tests. 
* commit 'bd06f02d02e07ca15e420ee9e50e35253646ba64':
  Cleaning up some more flakiness in DownloadManager tests.
 2010-11-01 17:41:24 -07:00
Jamie Gennis
d17f110351 Merge "Stop using OMX_COLOR_FormatAndroidPrivateStart." 2010-11-01 17:16:50 -07:00
Nicolas Roard
7061c2493e Merge "Update layers only" 2010-11-01 16:58:01 -07:00
Chet Haase
407da3556e Merge "Fixed null deref when view parent null during invalidation" 2010-11-01 16:56:15 -07:00
Joe Malin
91d1744529 am ea8400b4: (-s ours) am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool 
* commit 'ea8400b448a01e417e583ef554fc2b3f3072deec':
  DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
 2010-11-01 16:33:56 -07:00
Joe Malin
d9f82fa280 am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool 
* commit 'a7fda21c8298d8f316564280d702206147207005':
  DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
 2010-11-01 16:30:59 -07:00
Andreas Huber
bfe3783833 Merge "Notify surfaceflinger about (changes to) the crop rectangle output by the decoder." 2010-11-01 16:25:08 -07:00
Mike Lockwood
403aa9f679 Merge "MTP: Changes to support /mnt/sdcard paths from MediaProvider." 2010-11-01 16:18:29 -07:00
Xavier Ducrohet
38d0d0d110 Merge "Layoutlib Canvas and Paint implementation through native delegates" 2010-11-01 16:17:06 -07:00
Jason Sams
2be7921a43 Merge "Fix race condition in resize that was created when GetType for allocation and Types became async." 2010-11-01 16:13:55 -07:00
Dan Bornstein
8b7046eee8 am ab1b304b: am ccb75a88: Merge "Update the API file." into gingerbread 
* commit 'ab1b304bd4cf0bb6473b21d5604596105b794362':
  Update the API file.
 2010-11-01 16:12:38 -07:00
Dan Bornstein
4c5bcb1892 am ccb75a88: Merge "Update the API file." into gingerbread 
* commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3':
  Update the API file.
 2010-11-01 16:09:44 -07:00
Dan Bornstein
6a91efdb87 Merge "Update the API file." into gingerbread 2010-11-01 16:08:14 -07:00
Joe Malin
95ad9ac961 Merge "Doc Change: Documentation for MonkeyRunner tool" 2010-11-01 16:06:19 -07:00
Scott Main
72b14a9101 am e06bdead: am fea07c60: am eda78cea: docs: update dashboard 
* commit 'e06bdead5decc26c7fd7ed9b10ad0f009e14d274':
  docs: update dashboard
 2010-11-01 16:03:14 -07:00
Scott Main
10c5f8f100 am fea07c60: am eda78cea: docs: update dashboard 
* commit 'fea07c60963abc5caaf5a59b99936d79aa9fc1b9':
  docs: update dashboard
 2010-11-01 16:00:43 -07:00
Gloria Wang
1c0a8c314f Merge "Media scanner support for FL(Forward Lock) DRM file types" 2010-11-01 15:57:47 -07:00
Scott Main
663217c6d0 am eda78cea: docs: update dashboard 
* commit 'eda78ceaffb234c37b11e69602d020e4bb28ca83':
  docs: update dashboard
 2010-11-01 15:57:38 -07:00
Chris Tate
8c2a2bbc7a Merge "Don't crash bmgr if there are no available restore sets" 2010-11-01 15:53:45 -07:00
Leon Scroggins
fbb0691d77 Merge "Merge commit '55381217' into manualmerge" 2010-11-01 15:16:24 -07:00
Jeff Brown
6bb0e226b5 Merge "Fix policy issues when screen is off." 2010-11-01 15:13:10 -07:00
Jason Sams
40492421bd Merge "Add code to mark functions rather than whole files as threadable." 2010-11-01 15:10:09 -07:00
Jaikumar Ganesh
6d91ce50e8 Merge "Disconnect PAN and Input devices on BT disable." 2010-11-01 15:06:05 -07:00