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

30192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik
47c41e807e Added methods for getting the x and y span 
We would like to separate x and y for our pinch gestures. This
change adds methods for returning those independently instead of
only allowing access to the total span.

Change-Id: I2f54cd83602e447174a49035237da379a573b63e
 2010-09-02 17:10:02 -07:00
Adam Powell
18931f578e Merge "Fix bug 2957414 - Add Spinner constructor for selecting dialog/dropdown mode" 2010-09-02 16:00:41 -07:00
Adam Powell
fef364f75b Fix bug 2957414 - Add Spinner constructor for selecting dialog/dropdown mode 
Change-Id: I7ea2bbf7d387bdd3e0cb59a1b9b24406560680b7
 2010-09-02 15:56:04 -07:00
Kenny Root
8716030747 am 8d5250c6: am 2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread 
Merge commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf'

* commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf':
  Add better debug output for ResourceType errors
 2010-09-02 15:53:26 -07:00
Kenny Root
8d5250c601 am 2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread 
Merge commit '2e2465497c08061cccf4908e49095f2d19a35eea' into gingerbread-plus-aosp

* commit '2e2465497c08061cccf4908e49095f2d19a35eea':
  Add better debug output for ResourceType errors
 2010-09-02 15:48:49 -07:00
Kenny Root
2e2465497c Merge "Add better debug output for ResourceType errors" into gingerbread 2010-09-02 15:45:52 -07:00
Gilles Debunne
355a17c4f8 am ece9e194: am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread 
Merge commit 'ece9e1947831a46b5d67b1a3d3d8e0189e38d983'

* commit 'ece9e1947831a46b5d67b1a3d3d8e0189e38d983':
  Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
 2010-09-02 15:39:55 -07:00
Irfan Sheriff
ee923072eb Merge "Add set/get band in WifiNative" 2010-09-02 15:39:16 -07:00
Gilles Debunne
ece9e19478 am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread 
Merge commit 'd180232e92b78067beb7f84d7f3d1d21865f0594' into gingerbread-plus-aosp

* commit 'd180232e92b78067beb7f84d7f3d1d21865f0594':
  Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
 2010-09-02 15:34:24 -07:00
Gilles Debunne
d180232e92 Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread 2010-09-02 15:29:14 -07:00
Gilles Debunne
d4723bb415 Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread" 
This reverts commit 26d708d93624d2d060529b7e33e0a20172e85efd, reversing
changes made to 3ac85d31de6cab5a468b7728b3340cf1b57bc8fe.

Change-Id: Ifc19f837bee7437707ddddf0b19cb6bce53dd2c5
 2010-09-02 15:27:47 -07:00
Eric Rowe
572031747f 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
5e6e977c70 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
Dan Morrill
1675062342 Adding features for new hardware, and creating a baseline list of required 
hardware for the Tablet profile. This is very much subject to change.

Change-Id: Id0921b373cf610a7ec9ddd75dc020bf8b22a6911
 2010-09-02 15:00:19 -07:00
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
Eric Rowe
4ca550a17b 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
68c2e915fd 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
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
Eric Rowe
947e25e5ff 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
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
Irfan Sheriff
25c9bf2396 Add set/get band in WifiNative 
Add support for set and get band and set the default
to 2GHz for now till we get a fix on issues
with 11A

Change-Id: Icb9bddc353e4bf013bdb8a08d9b4ee3451c282f4
 2010-09-02 12:48:20 -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