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

30173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
25962adc73 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
Gilles Debunne
5402c34b27 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
Gilles Debunne
26d708d936 Merge "InputMethodManager showSoftInput return documentation." into gingerbread 2010-09-02 14:50:25 -07:00
Andrew Stadler
aa904f48cf Add startPreferenceFragment() 
This allows sub-fragments to be started directly via API

Change-Id: I6c8b86a911c8731068459eb9cdd3d37970fc9d0e
 2010-09-02 14:50:08 -07:00
Jaikumar Ganesh
d63760c1e9 Merge "Decouple Tethering UI with registering of SDP records." 2010-09-02 14:36:18 -07:00
Dmitri Plotnikov
57ca82ddb1 Merge "Contacts API clean-up (mostly documentation)" 2010-09-02 14:35:11 -07:00
Jaikumar Ganesh
b70765cc27 Decouple Tethering UI with registering of SDP records. 
This can lead to usability issues, since the SDP record
will get registered later on.

Change-Id: Ifda78a3831572f1b9955bf06da9a8b0e949942aa
 2010-09-02 14:34:40 -07:00
Eric Rowe
bfdebed08d 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
78495f8ccf 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
3ac85d31de 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
be881a3db6 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
c96dde5d37 Merge "Handle disabled state for action menu items" 2010-09-02 13:59:52 -07:00
Adam Powell
00df32d439 Handle disabled state for action menu items 
Change-Id: Id80926aef5f8f2f47703a7b1e3da38e6117edb30
 2010-09-02 13:58:35 -07:00
Daisuke Miyakawa
1f11fdc2e9 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
fa5a46a08e 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
3010713f50 Fix again. 
Change-Id: I7393e1e9e9aa3f8612d143840109f1c5193f692f
 2010-09-02 13:48:09 -07:00
Daisuke Miyakawa
b2b973d13e 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
3bd9b8f04c Fix build breakage. 
Change-Id: If519f1730266f10a7852af209127aa4754a7ef9d
 2010-09-02 13:42:22 -07:00
Daisuke Miyakawa
c172979fcf 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
6366248017 Merge "Only close the IME if it is Active on the WebView." 2010-09-02 13:10:30 -07:00
Daisuke Miyakawa
22a17ce60b 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
b1f5a54a2a Merge "VCard refactoring backport." into gingerbread 2010-09-02 12:56:15 -07:00
Eric Laurent
6874bd0bec 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
937056c1a7 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
32ec1ad17f Merge "Fix problem in AudioEffect::command() status." into gingerbread 2010-09-02 12:46:24 -07:00
Jean-Baptiste Queru
f623c29080 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
d0743dfbee resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp 
Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d
 2010-09-02 12:05:33 -07:00
Mike Lockwood
db16e5a673 Merge "MTP: Implement support for getting/setting device properties" 2010-09-02 12:03:25 -07:00
Mike Lockwood
59e3f0db08 MTP: Implement support for getting/setting device properties 
Added support for the "device friendly name" and "synchonization partner"
properties, which are required by Microsoft.

Change-Id: Ic0443333d75f7d98a2d902a790b9d505a56d4eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-02 14:59:26 -04:00
Eric Laurent
e65280c552 Fix problem in AudioEffect::command() status. 
The *pReplyData argument of the command() function was left unitialized by EffectHandle::command()
when command was EFFECT_CMD_ENABLE, EFFECT_CMD_DISABLE and EFFECT_CMD_SET_PARAM_COMMIT.

Change-Id: I91a19817ead2a8cfbdd8e2d77ca270c7ce9d5bd4
 2010-09-02 11:56:55 -07:00
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