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

20603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Rowe
66498e7181 am 4ca550a1: am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests. 
Merge commit '4ca550a17b8becdf6b5a32909fb5c70ef7579f4e'

* commit '4ca550a17b8becdf6b5a32909fb5c70ef7579f4e':
  Add BT test instrumentation for reboot tests.
 2010-09-02 15:03:12 -07:00
Dan Morrill
bfff65d762 Merge "Adding features for new hardware, and creating a baseline list of required hardware for the Tablet profile. This is very much subject to change." 2010-09-02 15:01:31 -07:00
Gilles Debunne
0c5a61556c am 5402c34b: am 26d708d9: Merge "InputMethodManager showSoftInput return documentation." into gingerbread 
Merge commit '5402c34b2717fd4885782a8fc631b3b66162d140'

* commit '5402c34b2717fd4885782a8fc631b3b66162d140':
  InputMethodManager showSoftInput return documentation.
 2010-09-02 14:59:58 -07:00
Eric Rowe
5f5cfede11 am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests. 
Merge commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2' into gingerbread-plus-aosp

* commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2':
  Add BT test instrumentation for reboot tests.
 2010-09-02 14:59:00 -07:00
Kenny Root
45162448b3 Add better debug output for ResourceType errors 
An error code is returned as -ESOMETHING, but the debug code was
printing out 0x%08x for these codes making -74 print out as 0xffffffb5
which is kind of silly.

Change-Id: I7d77fb3da2e146845949f121404f662b47288e61
 2010-09-02 14:58:47 -07:00
Gilles Debunne
e18c6ab92a am 26d708d9: Merge "InputMethodManager showSoftInput return documentation." into gingerbread 
Merge commit '26d708d93624d2d060529b7e33e0a20172e85efd' into gingerbread-plus-aosp

* commit '26d708d93624d2d060529b7e33e0a20172e85efd':
  InputMethodManager showSoftInput return documentation.
 2010-09-02 14:55:51 -07:00
Eric Rowe
2c3659c42a am ac3c1f55: Add BT test instrumentation for reboot tests. 
Merge commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread

* commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
  Add BT test instrumentation for reboot tests.
 2010-09-02 14:55:47 -07:00
Gilles Debunne
3d71a05eb6 Merge "InputMethodManager showSoftInput return documentation." into gingerbread 2010-09-02 14:50:25 -07:00
Jaikumar Ganesh
f0b0ccb692 Merge "Decouple Tethering UI with registering of SDP records." 2010-09-02 14:36:18 -07:00
Dmitri Plotnikov
36ad208450 Merge "Contacts API clean-up (mostly documentation)" 2010-09-02 14:35:11 -07:00
Eric Rowe
9cfb23bc48 am 78495f8c: (-s ours) am 3ac85d31: am 1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class. 
Merge commit '78495f8ccfb63594cdc8fbba76372d5361c028e1'

* commit '78495f8ccfb63594cdc8fbba76372d5361c028e1':
  DO NOT MERGE Separate utility methods into utility class.
 2010-09-02 14:34:17 -07:00
Eric Rowe
e31a4bd4b4 am 3ac85d31: am 1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class. 
Merge commit '3ac85d31de6cab5a468b7728b3340cf1b57bc8fe' into gingerbread-plus-aosp

* commit '3ac85d31de6cab5a468b7728b3340cf1b57bc8fe':
  DO NOT MERGE Separate utility methods into utility class.
 2010-09-02 14:30:45 -07:00
Eric Rowe
1ff3da4341 am 1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class. 
Merge commit '1314219a37403594f833c2c71744040ebd8d9b04' into gingerbread

* commit '1314219a37403594f833c2c71744040ebd8d9b04':
  DO NOT MERGE Separate utility methods into utility class.
 2010-09-02 14:26:12 -07:00
Daisuke Miyakawa
0129ba40d7 am fa5a46a0: (-s ours) am 3010713f: Fix again. 
Merge commit 'fa5a46a08ebcf856bf6f0f894cb82763353d87d5'

* commit 'fa5a46a08ebcf856bf6f0f894cb82763353d87d5':
  Fix again.
 2010-09-02 14:01:26 -07:00
Adam Powell
aca1a12521 Merge "Handle disabled state for action menu items" 2010-09-02 13:59:52 -07:00
Daisuke Miyakawa
1a6530864a am b2b973d1: (-s ours) am 3bd9b8f0: Fix build breakage. 
Merge commit 'b2b973d13edb0a043a0288838f41eb84e9c78f76'

* commit 'b2b973d13edb0a043a0288838f41eb84e9c78f76':
  Fix build breakage.
 2010-09-02 13:58:25 -07:00
Daisuke Miyakawa
d2629f01af am 3010713f: Fix again. 
Merge commit '3010713f50aa6ac189b1990421cfab1d426bc601' into gingerbread-plus-aosp

* commit '3010713f50aa6ac189b1990421cfab1d426bc601':
  Fix again.
 2010-09-02 13:54:48 -07:00
Daisuke Miyakawa
31dddb8af6 am 3bd9b8f0: Fix build breakage. 
Merge commit '3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp

* commit '3bd9b8f04cece37ab4405abc382e2810006b9f97':
  Fix build breakage.
 2010-09-02 13:46:55 -07:00
Daisuke Miyakawa
df904933d7 am 22a17ce6: (-s ours) am b1f5a54a: Merge "VCard refactoring backport." into gingerbread 
Merge commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879'

* commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879':
  VCard refactoring backport.
 2010-09-02 13:15:18 -07:00
Leon Scroggins III
1597860767 Merge "Only close the IME if it is Active on the WebView." 2010-09-02 13:10:30 -07:00
Daisuke Miyakawa
cf437e4ef1 am b1f5a54a: Merge "VCard refactoring backport." into gingerbread 
Merge commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7' into gingerbread-plus-aosp

* commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7':
  VCard refactoring backport.
 2010-09-02 12:59:36 -07:00
Daisuke Miyakawa
3fb3a4fbd0 Merge "VCard refactoring backport." into gingerbread 2010-09-02 12:56:15 -07:00
Eric Laurent
7a50642ec6 am 937056c1: am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status." into gingerbread 
Merge commit '937056c1a7ce71e6881305a31f76e62a76685f24'

* commit '937056c1a7ce71e6881305a31f76e62a76685f24':
  Fix problem in AudioEffect::command() status.
 2010-09-02 12:51:11 -07:00
Eric Laurent
fac8332612 am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status." into gingerbread 
Merge commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56' into gingerbread-plus-aosp

* commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56':
  Fix problem in AudioEffect::command() status.
 2010-09-02 12:48:40 -07:00
Eric Laurent
a92ce71cf9 Merge "Fix problem in AudioEffect::command() status." into gingerbread 2010-09-02 12:46:24 -07:00
Jean-Baptiste Queru
ed0666e0dc am d0743dfb: resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp 
Merge commit 'd0743dfbeeb1fb5d63a6be2631e9aa2107233291'

* commit 'd0743dfbeeb1fb5d63a6be2631e9aa2107233291':
  Add a --debug-mode option to aapt.
 2010-09-02 12:08:37 -07:00
Jean-Baptiste Queru
10f091ece5 resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp 
Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d
 2010-09-02 12:05:33 -07:00
Mike Lockwood
a3613f4deb Merge "MTP: Implement support for getting/setting device properties" 2010-09-02 12:03:25 -07:00
Romain Guy
048af6235d Merge "Correctly apply alpha on TextView. Bug #2969691" 2010-09-02 11:47:48 -07:00
Eric Rowe
0c168ea04d 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
87f406b1de Merge "Use the new signals sent by Bluez for PAN." 2010-09-02 11:40:36 -07:00
Eric Rowe
571c37bb7a 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
c775ec017c Merge "Shrink status bar by 2dip to match designs." 2010-09-02 11:37:13 -07:00
Eric Rowe
7c5c05004f Merge "Separate utility methods into utility class." 2010-09-02 11:35:29 -07:00
Eric Rowe
a9e23b3b62 Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 2010-09-02 11:35:20 -07:00
Xavier Ducrohet
1a7df62c01 Merge "Add a --debug-mode option to aapt." 2010-09-02 11:08:03 -07:00
Jeff Hamilton
1a78bad2a2 Merge "Move the searches helpers over to the new provider." 2010-09-02 10:37:28 -07:00
Cyrus Master
134d325604 Merge "Adds creation and last-modified timestamps to the bookmarks contract for the browser provider." 2010-09-02 10:12:45 -07:00
Vasu Nori
cef83093dc Merge "fix isIntegrityCheck() & add a sample impl class and test for DatabaseErrorHandler" 2010-09-02 09:42:11 -07:00
Maksymilian Osowski
c457c428fb Merge "Updated Summarizer to parse CRASH instead of SKIP." 2010-09-02 09:33:08 -07:00
Daniel Sandler
781765b524 Merge "Lights out." 2010-09-02 09:31:19 -07:00
repo sync
95bd428d79 Merge "resolved conflicts for merge of 12eaf9d5 to master" 2010-09-02 09:26:24 -07:00
Dmitri Plotnikov
5351c38f9a Merge "Fixing an issue with convert... utility methods." 2010-09-02 09:24:37 -07:00
repo sync
fa0adc72d6 resolved conflicts for merge of 12eaf9d5 to master 
Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d
 2010-09-03 00:24:26 +08:00
Daniel Sandler
90aa8ffda1 Merge "Redesigned system bar and quick settings panel." 2010-09-02 08:36:03 -07:00
Chia-chi Yeh
d764bb7a4b 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
d4d7550d22 Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread 2010-09-02 08:13:01 -07:00
Mike Lockwood
d216f6eeeb Merge "MTP: try to fix sim build" 2010-09-02 07:14:50 -07:00
Maksymilian Osowski
d5b5e48aad Merge "Shows the details when all the tests finish and fixes the orientation issue." 2010-09-02 06:57:50 -07:00
Maksymilian Osowski
0f2db064af Merge "Fixed and slightly improved crash detection mechanism." 2010-09-02 06:55:13 -07:00