drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,247 Commits 1 Branch 0 Tags
Commit Graph

30247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
482948bd94 Merge "Correctly apply alpha on TextView. Bug #2969691" 2010-09-02 11:47:48 -07:00
Romain Guy
9b34d45c8f Correctly apply alpha on TextView. 
Bug #2969691

Change-Id: Ied46e9a38718cb37df10f9dc79b48fbc3a8bd237
 2010-09-02 11:47:30 -07:00
Eric Rowe
52948d383e am 6aa717e4: (-s ours) am 97e58ef4: Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 
Merge commit '6aa717e4a190cc23f61b93770ee1f80243c0f8e7'

* commit '6aa717e4a190cc23f61b93770ee1f80243c0f8e7':
  DO NOT MERGE Separate utility methods into utility class.
 2010-09-02 11:44:24 -07:00
Jaikumar Ganesh
33570c8bf6 Merge "Use the new signals sent by Bluez for PAN." 2010-09-02 11:40:36 -07:00
Eric Rowe
6aa717e4a1 am 97e58ef4: Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 
Merge commit '97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp

* commit '97e58ef444da53165caab2a7be4fe44c154d5a0e':
  DO NOT MERGE Separate utility methods into utility class.
 2010-09-02 11:37:51 -07:00
Daniel Sandler
abe46415d7 Merge "Shrink status bar by 2dip to match designs." 2010-09-02 11:37:13 -07:00
Jaikumar Ganesh
c1520ecb41 Use the new signals sent by Bluez for PAN. 
Change-Id: I092b5d6b23bacb37a5bc2ca6d8c47bc6a99467ec
 2010-09-02 11:36:58 -07:00
Eric Rowe
27a912a393 Merge "Separate utility methods into utility class." 2010-09-02 11:35:29 -07:00
Eric Rowe
97e58ef444 Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 2010-09-02 11:35:20 -07:00
Daniel Sandler
79a8bf071e Shrink status bar by 2dip to match designs. 
Change-Id: Ib25b827d97d05f91ba8b494d49d3be410537cb80
 2010-09-02 14:35:09 -04:00
Eric Rowe
13438b0205 DO NOT MERGE Separate utility methods into utility class. 
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close().  The constructor
is derived from setUp() and close() from tearDown().

Change-Id: Ifce16346f30eccdcc10ab846800e8a6fd2a24361
 2010-09-02 11:29:59 -07:00
Xavier Ducrohet
bd6abed3c8 Merge "Add a --debug-mode option to aapt." 2010-09-02 11:08:03 -07:00
Dmitri Plotnikov
1ecf551b80 Contacts API clean-up (mostly documentation) 
- Fixing column list for the Photo table.
- Fixing column list for the AggregationSuggestions table.
- Allowing CONTENT_LOOKUP_URI to be used with directories:
Data, AggregationSuggestions and Photo.

Change-Id: I3dbcc28df0029e1fcb2140efd2047707a0cdd947
 2010-09-02 11:00:04 -07:00
Alex Sakhartchouk
8e95466b5a Adding ability to dirty the allocation and notify shaders using it. 
Change-Id: Id5ac8dbba5185cb1f43bedcf4098fcef9f477c51
 2010-09-02 10:45:39 -07:00
Daisuke Miyakawa
69831d9dc1 VCard refactoring backport. 
Change-Id: Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
 2010-09-02 10:39:00 -07:00
Jeff Hamilton
6d8fe9b40b Merge "Move the searches helpers over to the new provider." 2010-09-02 10:37:28 -07:00
Jeff Hamilton
88697b5a33 Move the searches helpers over to the new provider. 
Change-Id: I92030a50193a66edc4364345c9411c0f2d7c2d43
 2010-09-02 12:36:04 -05:00
Cyrus Master
dcfd5d784c Merge "Adds creation and last-modified timestamps to the bookmarks contract for the browser provider." 2010-09-02 10:12:45 -07:00
Leon Scroggins III
71d17e4071 Only close the IME if it is Active on the WebView. 
Bug: 2955391

Some applications want to leave the IME open even though
the WebView is loading a page.  Only hide the IME if it
is Active on the WebView or the WebTextView.

Change-Id: I1e7f973f649d78561bd8585c628a83c9b18a66ad
 2010-09-02 12:53:08 -04:00
Vasu Nori
8eb1bfe0f6 Merge "fix isIntegrityCheck() & add a sample impl class and test for DatabaseErrorHandler" 2010-09-02 09:42:11 -07:00
Maksymilian Osowski
fddedbf999 Merge "Updated Summarizer to parse CRASH instead of SKIP." 2010-09-02 09:33:08 -07:00
Daniel Sandler
7e04056ca9 Merge "Lights out." 2010-09-02 09:31:19 -07:00
Daniel Sandler
ce70d91844 Lights out. 
Not yet wired up to FLAG_FULLSCREEN; right now you must
invoke it manually by longpressing on the clock area.

Bug: 2905073
Change-Id: I43a005f2e4c08edb3673aef523bcaa1e088e8a71
 2010-09-02 12:29:26 -04:00
Maksymilian Osowski
2ca8acdb56 Adds webkit revision to the summary and details. 
The revision number is taken from external/webkit/WEBKIT_MERGE_REVISION and is served to the java code by apache server. To be able to do that, the new alias directive had to be
added to the run_apache2.py script.

Bug: 2889572
Change-Id: Ie3d147e4d8ea9edd0144b819152121563b8bd759
 2010-09-02 17:27:35 +01:00
repo sync
eaa511fd03 Merge "resolved conflicts for merge of 12eaf9d5 to master" 2010-09-02 09:26:24 -07:00
Dmitri Plotnikov
0525f95bb1 Merge "Fixing an issue with convert... utility methods." 2010-09-02 09:24:37 -07:00
repo sync
3d67c5688f resolved conflicts for merge of 12eaf9d5 to master 
Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d
 2010-09-03 00:24:26 +08:00
Dmitri Plotnikov
9a9ce6067f Fixing an issue with convert... utility methods. 
All these methods promise to do nothing
if the requested column is not present,
but in fact throw exception.

Change-Id: I0e528d53a0425b831b0083ba82c75ba5b41bfdfd
 2010-09-02 09:21:28 -07:00
Maksymilian Osowski
01c1f9d9e9 The results now show which expected result was used. 
Bug: 2889857
Change-Id: If2b7e6e6a22ddb5db6c6a50a358e8f263914e6c0
 2010-09-02 17:18:48 +01:00
Maksymilian Osowski
5f21f5a4a9 Updated Summarizer to parse CRASH instead of SKIP. 
Bug: 2970575
Change-Id: Idc8b514f4878bcd62729a47d7fe681ade114497a
 2010-09-02 17:17:06 +01:00
Daniel Sandler
f61f75eb0f Merge "Redesigned system bar and quick settings panel." 2010-09-02 08:36:03 -07:00
Daniel Sandler
d39e388e6d Redesigned system bar and quick settings panel. 
Change-Id: Ie26767a8c25af64809cf2fd1d8364791cb7e55ed
 2010-09-02 11:34:20 -04:00
Chia-chi Yeh
12eaf9d50c am dc296b0d: Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread 
Merge commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6' into gingerbread-plus-aosp

* commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6':
  SipService: reduce the usage of javax.sdp.*.
 2010-09-02 08:17:11 -07:00
Chia-chi Yeh
dc296b0d4b Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread 2010-09-02 08:13:01 -07:00
Chia-chi Yeh
95b15c3560 SipService: reduce the usage of javax.sdp.*. 
After this change, SipAudioCallImpl is the only place still using it.

Change-Id: I5693bffa54f9e19cbfa70b45dfcf40fba04dedbb
 2010-09-02 22:15:26 +08:00
Mike Lockwood
7fdb2a4702 Merge "MTP: try to fix sim build" 2010-09-02 07:14:50 -07:00
Mike Lockwood
602bebd3fc MTP: try to fix sim build 
Change-Id: I25b7bbecf61043e326105c74b2244036beda7c43
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-02 09:58:48 -04:00
Maksymilian Osowski
cbba4ae260 Merge "Shows the details when all the tests finish and fixes the orientation issue." 2010-09-02 06:57:50 -07:00
Maksymilian Osowski
84daaf8b41 Merge "Fixed and slightly improved crash detection mechanism." 2010-09-02 06:55:13 -07:00
Maksymilian Osowski
1b034781f4 Shows the details when all the tests finish and fixes the orientation issue. 
The tests no longer restart when orientation changes.

Bug: 2904456
Change-Id: Ie1ee463dbd63fb1a2ad2e9c28bf5989002f22215
 2010-09-02 14:49:04 +01:00
Daniel Sandler
1770b87289 Merge "Fix longpress on Menu showing IME." 2010-09-02 06:38:35 -07:00
Hung-ying Tyan
e93a492166 am 18dfae22: am 60264b30: SipProfile: remove outgoingCallAllowed flag. 
Merge commit '18dfae226b0f9d3983226eb6cd377fc937b30730'

* commit '18dfae226b0f9d3983226eb6cd377fc937b30730':
  SipProfile: remove outgoingCallAllowed flag.
 2010-09-02 05:43:59 -07:00
Hung-ying Tyan
18dfae226b am 60264b30: SipProfile: remove outgoingCallAllowed flag. 
Merge commit '60264b306453a3043442719b970f2edb3f46f51b' into gingerbread-plus-aosp

* commit '60264b306453a3043442719b970f2edb3f46f51b':
  SipProfile: remove outgoingCallAllowed flag.
 2010-09-02 05:40:58 -07:00
Maksymilian Osowski
bcf114c2bb Fixed and slightly improved crash detection mechanism. 
Before, if a crash was detected, but the "Force quit" dialog remained on the screen, sending the intent to restart the executor would do nothing. It's fixed now with default
uncaught exception handler. Also, when we catch the uncaught exception, we can restart the executor straight away, without waiting for the time-out.

Change-Id: I2f0b4b5f2abd180ff518f1a40ad1294bed2f7f67
 2010-09-02 13:39:11 +01:00
Hung-ying Tyan
60264b3064 SipProfile: remove outgoingCallAllowed flag. 
Change-Id: I37a215bafce57adf6911c81fd38db324bac686ec
 2010-09-02 20:34:17 +08:00
Maksymilian Osowski
f072bced91 Merge "Updated Summarizer to report tests under all 4 possible categories now." 2010-09-02 04:55:24 -07:00
Maksymilian Osowski
6ae5ce4b40 Updated Summarizer to report tests under all 4 possible categories now. 
Categories: ((un)expected passes/failures).
Also, FileFilter uses FAIL instead of IGNORE_RESULTS now.

Bug: 2899965
Change-Id: I06835b3d5cea84cbc92225a940bf7361cf832f59
 2010-09-02 12:53:26 +01:00
Maksymilian Osowski
15116bcc76 Merge "Fixed a bug when there are too many open sockets." 2010-09-02 03:36:57 -07:00
Maksymilian Osowski
5926723f82 Fixed a bug when there are too many open sockets. 
Also, some minor corrections to shutdown() in ConnectionHandler.

Change-Id: I937f200c14c185b0867f997645d8b288a19b9889
 2010-09-02 11:34:03 +01:00
Maksymilian Osowski
4cf63e57ac Merge "Added "run all tests in the current directory" menu option." 2010-09-02 03:19:37 -07:00