OSDN Git Service

android-x86/frameworks-native.git
13 years agoMerge "Don't send pause again when coming back from full screen"
Teng-Hui Zhu [Fri, 8 Apr 2011 16:19:01 +0000 (09:19 -0700)]
Merge "Don't send pause again when coming back from full screen"

13 years agoMerge "Add camera focus area API."
Wu-cheng Li [Fri, 8 Apr 2011 09:47:39 +0000 (02:47 -0700)]
Merge "Add camera focus area API."

13 years agoMerge "Improve activity manager debug dumps."
Dianne Hackborn [Fri, 8 Apr 2011 01:46:54 +0000 (18:46 -0700)]
Merge "Improve activity manager debug dumps."

13 years agoam 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counte...
Nicolas Roard [Fri, 8 Apr 2011 00:27:53 +0000 (17:27 -0700)]
am 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

* commit '16d8de7a293e5d626823a59f2d8b74e0d4a75cbd':
  Remove uncalled function -- java counterpart of the fix for bug:4183801

13 years agoam 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of...
Nicolas Roard [Fri, 8 Apr 2011 00:25:56 +0000 (17:25 -0700)]
am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

* commit '3e37a2f3ae3e3a777bf479a6562063922a7e44c6':
  Remove uncalled function -- java counterpart of the fix for bug:4183801

13 years agoam fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug...
Nicolas Roard [Fri, 8 Apr 2011 00:24:05 +0000 (17:24 -0700)]
am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

* commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
  Remove uncalled function -- java counterpart of the fix for bug:4183801

13 years agoMerge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into...
Nicolas Roard [Fri, 8 Apr 2011 00:21:53 +0000 (17:21 -0700)]
Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

13 years agoMerge "Fix crash in bug 4259574"
Adam Cohen [Fri, 8 Apr 2011 00:12:19 +0000 (17:12 -0700)]
Merge "Fix crash in bug 4259574"

13 years agoMerge "Add params for primary account to ContactsContract"
Daisuke Miyakawa [Fri, 8 Apr 2011 00:03:18 +0000 (17:03 -0700)]
Merge "Add params for primary account to ContactsContract"

13 years agoam 5f66c953: am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technolog...
Wink Saville [Thu, 7 Apr 2011 23:53:34 +0000 (16:53 -0700)]
am 5f66c953: am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE

* commit '5f66c953a7ebf5dd6dc2ce1c79f2c2ee324dd13b':
  Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.

13 years agoam 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to...
Wink Saville [Thu, 7 Apr 2011 23:51:50 +0000 (16:51 -0700)]
am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE

* commit '7183a7a584397142ab7347d6f721011d743fb699':
  Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.

13 years agoMerge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall...
Wink Saville [Thu, 7 Apr 2011 23:49:02 +0000 (16:49 -0700)]
Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE

13 years agoMerge "Fix build."
Robert Greenwalt [Thu, 7 Apr 2011 23:01:46 +0000 (16:01 -0700)]
Merge "Fix build."

13 years agoam 60bfa4d0: am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug...
Bill Gruber [Thu, 7 Apr 2011 22:20:16 +0000 (15:20 -0700)]
am 60bfa4d0: am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit '60bfa4d0f5d55eb474146330be7f5404521b1c67':
  IAB docs--status codes fix Bug: 4208641

13 years agoam 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641
Bill Gruber [Thu, 7 Apr 2011 22:17:26 +0000 (15:17 -0700)]
am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit '216d98949ddeb84359836594ab00be158d69545e':
  IAB docs--status codes fix Bug: 4208641

13 years agoam 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641
Bill Gruber [Thu, 7 Apr 2011 22:14:54 +0000 (15:14 -0700)]
am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit '6bb8b0ecb558373ba99e44ad5c351e1d7bb410d6':
  IAB docs--status codes fix Bug: 4208641

13 years agoam afecd1e9: IAB docs--status codes fix Bug: 4208641
Bill Gruber [Thu, 7 Apr 2011 22:09:33 +0000 (15:09 -0700)]
am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit 'afecd1e99284dc386f07571c69edfed8c12f1cef':
  IAB docs--status codes fix Bug: 4208641

13 years agoam de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for...
Wink Saville [Thu, 7 Apr 2011 21:31:20 +0000 (14:31 -0700)]
am de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

* commit 'de1b950d2b07737e3d284ed2ada361737d8a5a1a':
  ConnectivityService needs to use the new names for the NetConfig vars.

13 years agoam 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig...
Wink Saville [Thu, 7 Apr 2011 21:29:17 +0000 (14:29 -0700)]
am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
  ConnectivityService needs to use the new names for the NetConfig vars.

13 years agoMerge "ConnectivityService needs to use the new names for the NetConfig vars." into...
Wink Saville [Thu, 7 Apr 2011 21:28:06 +0000 (14:28 -0700)]
Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

13 years agoam 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24...
Teng-Hui Zhu [Thu, 7 Apr 2011 21:27:03 +0000 (14:27 -0700)]
am 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit '4e790ee1894118a1ab2032d09e5016fa9414dae7':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master

13 years agoam 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 21:24:22 +0000 (14:24 -0700)]
am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master

13 years agoam 65ef6e86: (-s ours) am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not...
Xavier Ducrohet [Thu, 7 Apr 2011 21:24:00 +0000 (14:24 -0700)]
am 65ef6e86: (-s ours) am 96ac8560: am 515a08b0: Merge 59aad78e from  do not merge.

* commit '65ef6e8690cc13e9e20582fd0236b18eaae204b9':
  Merge 59aad78e from master. do not merge.

13 years agoam bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 21:22:33 +0000 (14:22 -0700)]
am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit 'bb55777be1a3231d187205dc378ca35b01e8bc65':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master

13 years agoam f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
Robert Greenwalt [Thu, 7 Apr 2011 21:22:03 +0000 (14:22 -0700)]
am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp

* commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21':
  Add external dependency API.

13 years agoam 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge.
Xavier Ducrohet [Thu, 7 Apr 2011 21:18:20 +0000 (14:18 -0700)]
am 96ac8560: am 515a08b0: Merge 59aad78e from  do not merge.

* commit '96ac85607b1462508981936b1be29ae5f9e4271d':
  Merge 59aad78e from master. do not merge.

13 years agoMerge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 21:17:52 +0000 (14:17 -0700)]
Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* changes:
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master

13 years agoresolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
Robert Greenwalt [Thu, 7 Apr 2011 21:13:52 +0000 (14:13 -0700)]
resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp

Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f

13 years agoMerge "Import revised translations."
Eric Fischer [Thu, 7 Apr 2011 21:08:55 +0000 (14:08 -0700)]
Merge "Import revised translations."

13 years agoam 515a08b0: Merge 59aad78e from master. do not merge.
Xavier Ducrohet [Thu, 7 Apr 2011 20:38:13 +0000 (13:38 -0700)]
am 515a08b0: Merge 59aad78e from  do not merge.

* commit '515a08b01851a1ab9386f85dee6d9fd7b65ee7ad':
  Merge 59aad78e from master. do not merge.

13 years agoMerge "Coalesce input events that arrive faster than 333Hz."
Jeff Brown [Thu, 7 Apr 2011 20:18:38 +0000 (13:18 -0700)]
Merge "Coalesce input events that arrive faster than 333Hz."

13 years agoCoalesce input events that arrive faster than 333Hz.
Jeff Brown [Thu, 7 Apr 2011 18:38:09 +0000 (11:38 -0700)]
Coalesce input events that arrive faster than 333Hz.

Some drivers report individual finger updates one at a time
instead of all at once.  When 10 fingers are down, this can
cause the framework to have to handle 10 times as many events
each with 10 times as much data.  Applications like
PointerLocation would get significantly bogged down by all
of the redundant samples.

This change coalesces samples that are closely spaced in time,
before they are dispatched, as part of the motion event batching
protocol.

Increased the size of the InputChannel shared memory buffer so
that applications can catch up faster if they accumulate a
backlog of samples.

Added logging code to help measure input dispatch and drawing
latency issues in the view hierarchy.  See ViewDebug.DEBUG_LATENCY.

Change-Id: Ia5898f781f19901d2225c529a910c32bdf4f504f

13 years agoMerge "Add external dependency API." into honeycomb-LTE
Robert Greenwalt [Thu, 7 Apr 2011 20:02:28 +0000 (13:02 -0700)]
Merge "Add external dependency API." into honeycomb-LTE

13 years agoam 91bc0f81: am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:48:22 +0000 (12:48 -0700)]
am 91bc0f81: am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE

* commit '91bc0f818c9e4cfdffc09f6edecfd11a1ce1806e':
  Refactor onSetupConnectionCompleted.

13 years agoam c343c183: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:48:17 +0000 (12:48 -0700)]
am c343c183: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE

* commit 'c343c18376b8fd7d27a07adc5bb617d0260a8cdc':
  Make LinkProperties comparable.

13 years agoam 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:46:21 +0000 (12:46 -0700)]
am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE

* commit '574d3c4b2cb120314b68bffa34aed2545d1b1158':
  Refactor onSetupConnectionCompleted.

13 years agoam 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:46:18 +0000 (12:46 -0700)]
am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE

* commit '5d6f1167039e22889545212ce18192460f9b503e':
  Make LinkProperties comparable.

13 years agoMerge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:44:14 +0000 (12:44 -0700)]
Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE

13 years agoMerge "Make LinkProperties comparable." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:44:04 +0000 (12:44 -0700)]
Merge "Make LinkProperties comparable." into honeycomb-LTE

13 years agoMerge "Migrate most GL from context to driver."
Jason Sams [Thu, 7 Apr 2011 18:33:11 +0000 (11:33 -0700)]
Merge "Migrate most GL from context to driver."

13 years agoMerge "Media JNI code cleanup"
James Dong [Thu, 7 Apr 2011 18:16:49 +0000 (11:16 -0700)]
Merge "Media JNI code cleanup"

13 years agoMerge "Do not disable effect in AudioEffect destructor."
Eric Laurent [Thu, 7 Apr 2011 17:31:11 +0000 (10:31 -0700)]
Merge "Do not disable effect in AudioEffect destructor."

13 years agoam 7ff3c410: am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 16:38:41 +0000 (09:38 -0700)]
am 7ff3c410: am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE

* commit '7ff3c410be00776159ff7a433ce218fabf3f44c4':
  Add a 4G icon for LTE.

13 years agoam add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 16:37:06 +0000 (09:37 -0700)]
am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE

* commit 'add31091785c3de8df1555163cca9ee9d22c9968':
  Add a 4G icon for LTE.

13 years agoMerge "Add a 4G icon for LTE." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 16:35:18 +0000 (09:35 -0700)]
Merge "Add a 4G icon for LTE." into honeycomb-LTE

13 years agoam d4e8e4bb: am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start...
Teng-Hui Zhu [Thu, 7 Apr 2011 16:24:02 +0000 (09:24 -0700)]
am d4e8e4bb: am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1

* commit 'd4e8e4bb3c2921ae9e15ef012bafc504b48c7efe':
  Fix the issue the video can't start to play

13 years agoam b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into...
Teng-Hui Zhu [Thu, 7 Apr 2011 16:14:50 +0000 (09:14 -0700)]
am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1

* commit 'b3bb6fd5e3050b6d17bc1a58906ea04e97a29e20':
  Fix the issue the video can't start to play

13 years agoam b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 16:07:52 +0000 (09:07 -0700)]
am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1

* commit 'b25181aaccb00fee405251bf3575ce1d40badf46':
  Fix the issue the video can't start to play

13 years agoMerge "Fix the issue the video can't start to play" into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 15:52:45 +0000 (08:52 -0700)]
Merge "Fix the issue the video can't start to play" into honeycomb-mr1

13 years agoMerge changes I4011db5c,I622bc5fa
Joe Onorato [Thu, 7 Apr 2011 01:45:14 +0000 (18:45 -0700)]
Merge changes I4011db5c,I622bc5fa

* changes:
  less logging
  A system setting for "advanced settings."

13 years agoam 004da7e2: am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface...
Wink Saville [Thu, 7 Apr 2011 00:56:55 +0000 (17:56 -0700)]
am 004da7e2: am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

* commit '004da7e2e0287cdad63a9009841309d45f038787':
  Add getCdmaSubscriptionSource to CommandsInterface.

13 years agoam 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeyco...
Wink Saville [Thu, 7 Apr 2011 00:54:11 +0000 (17:54 -0700)]
am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

* commit '1b87f1db89e82d00445a43c4593d8c5ea5d2633f':
  Add getCdmaSubscriptionSource to CommandsInterface.

13 years agoMerge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 00:52:22 +0000 (17:52 -0700)]
Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

13 years agoam 2059bdf3: am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift...
Roman Nurik [Thu, 7 Apr 2011 00:29:06 +0000 (17:29 -0700)]
am 2059bdf3: am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

* commit '2059bdf34793dc75448e5cb6201db6c49a3a8e18':
  Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.

13 years agoam e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendation...
Roman Nurik [Thu, 7 Apr 2011 00:25:08 +0000 (17:25 -0700)]
am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

* commit 'e2b81c3e886e47f00d54426ca82c66c6f56bc5b1':
  Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.

13 years agoMerge "Allow batching samples onto the pending motion event."
Jeff Brown [Thu, 7 Apr 2011 00:22:26 +0000 (17:22 -0700)]
Merge "Allow batching samples onto the pending motion event."

13 years agoam b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supporte...
Roman Nurik [Thu, 7 Apr 2011 00:21:21 +0000 (17:21 -0700)]
am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

* commit 'b17cc8a83fd819efcb79d78d005e16b3f04d08df':
  Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.

13 years agoMerge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Forma...
Roman Nurik [Thu, 7 Apr 2011 00:18:47 +0000 (17:18 -0700)]
Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

13 years agoMerge "Word suggestion popup added to EditText."
Gilles Debunne [Thu, 7 Apr 2011 00:07:27 +0000 (17:07 -0700)]
Merge "Word suggestion popup added to EditText."

13 years agoMerge "invalidate WebView after Title change"
Michael Kolb [Wed, 6 Apr 2011 23:47:34 +0000 (16:47 -0700)]
Merge "invalidate WebView after Title change"

13 years agoMerge "Minor Alt-TAB / Recent Apps Dialog improvements."
Jeff Brown [Wed, 6 Apr 2011 22:57:21 +0000 (15:57 -0700)]
Merge "Minor Alt-TAB / Recent Apps Dialog improvements."

13 years agoMerge "Check if BT is disabled or not when sending audio state."
Jaikumar Ganesh [Wed, 6 Apr 2011 22:39:20 +0000 (15:39 -0700)]
Merge "Check if BT is disabled or not when sending audio state."

13 years agoMerge "Handle the failure from GetStringUTFChars()"
James Dong [Wed, 6 Apr 2011 22:26:48 +0000 (15:26 -0700)]
Merge "Handle the failure from GetStringUTFChars()"

13 years agoMerge "Set service priority of A2DP and Headset from BluetoothService via IPC call"
Matthew Xie [Wed, 6 Apr 2011 22:26:23 +0000 (15:26 -0700)]
Merge "Set service priority of A2DP and Headset from BluetoothService via IPC call"

13 years agoMerge "Bug 4231349 fix error in javadoc for android.media.MediaPlayer"
Jean-Michel Trivi [Wed, 6 Apr 2011 21:46:17 +0000 (14:46 -0700)]
Merge "Bug 4231349 fix error in javadoc for android.media.MediaPlayer"

13 years agoam bef09dc0: (-s ours) am ad3bddab: am 9f2f650f: Merge "Import revised translations...
Eric Fischer [Wed, 6 Apr 2011 21:18:45 +0000 (14:18 -0700)]
am bef09dc0: (-s ours) am ad3bddab: am 9f2f650f: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'bef09dc022a57e535232890302ffb5e9c02b7a6a':
  Import revised translations.  DO NOT MERGE

13 years agoam ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into...
Eric Fischer [Wed, 6 Apr 2011 21:16:12 +0000 (14:16 -0700)]
am ad3bddab: am 9f2f650f: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'ad3bddab9246933971ff1b5360b0915e55579fe7':
  Import revised translations.  DO NOT MERGE

13 years agoam 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Wed, 6 Apr 2011 21:12:31 +0000 (14:12 -0700)]
am 9f2f650f: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '9f2f650f26941a7cd4931afc66f39918e7c2817c':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Wed, 6 Apr 2011 21:09:32 +0000 (14:09 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

13 years agoam 3e46ee4b: am 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break...
Bill Gruber [Wed, 6 Apr 2011 21:09:01 +0000 (14:09 -0700)]
am 3e46ee4b: am 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb

* commit '3e46ee4b5cf6103f5d3fe59a486e82c7c6600bb8':
  IAB docs: fixes line break issues

13 years agoam 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues"...
Bill Gruber [Wed, 6 Apr 2011 21:04:47 +0000 (14:04 -0700)]
am 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb

* commit '2811358f68e6f31c44f483e196f1c91692febf50':
  IAB docs: fixes line break issues

13 years agoMerge "more targeted logging"
Joe Onorato [Wed, 6 Apr 2011 20:58:57 +0000 (13:58 -0700)]
Merge "more targeted logging"

13 years agoam 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
Bill Gruber [Wed, 6 Apr 2011 20:58:34 +0000 (13:58 -0700)]
am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb

* commit '3bd373079ed2599e5e07aa1cf702c7f8386765c3':
  IAB docs: fixes line break issues

13 years agoMerge "Fixing AdapterViewAnimator onItemClick compatibility"
Adam Cohen [Wed, 6 Apr 2011 20:40:24 +0000 (13:40 -0700)]
Merge "Fixing AdapterViewAnimator onItemClick compatibility"

13 years agoam 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
Bill Gruber [Wed, 6 Apr 2011 20:20:27 +0000 (13:20 -0700)]
am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb

* commit '48a1b52bc736acfe9c4723abf6db7c8befc5e43b':
  IAB docs: fixes line break issues

13 years agoam d7765e35: am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.
Xavier Ducrohet [Wed, 6 Apr 2011 20:19:57 +0000 (13:19 -0700)]
am d7765e35: am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.

* commit 'd7765e353cdc6f0bb4156841a8436ea28eb20eea':
  LayoutLib: Fix issue with rendering mode.

13 years agoMerge "Miscellaneous code cleanup in audio framework"
Glenn Kasten [Wed, 6 Apr 2011 20:03:11 +0000 (13:03 -0700)]
Merge "Miscellaneous code cleanup in audio framework"

13 years agoMerge "IAB docs: fixes line break issues" into honeycomb
Bill Gruber [Wed, 6 Apr 2011 19:52:41 +0000 (12:52 -0700)]
Merge "IAB docs: fixes line break issues" into honeycomb

13 years agoam 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.
Xavier Ducrohet [Wed, 6 Apr 2011 19:50:01 +0000 (12:50 -0700)]
am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.

* commit '73dc2602898a300306ad418ca5bec990f0de877f':
  LayoutLib: Fix issue with rendering mode.

13 years agoam c5aeac7f: LayoutLib: Fix issue with rendering mode.
Xavier Ducrohet [Wed, 6 Apr 2011 19:41:17 +0000 (12:41 -0700)]
am c5aeac7f: LayoutLib: Fix issue with rendering mode.

* commit 'c5aeac7f157e3cb9e29ab8c126f74e26493501f5':
  LayoutLib: Fix issue with rendering mode.

13 years agoMerge "remove more unused references to ISurface"
Mathias Agopian [Wed, 6 Apr 2011 19:22:29 +0000 (12:22 -0700)]
Merge "remove more unused references to ISurface"

13 years agoMerge "Remove unused references to ISurface"
Mathias Agopian [Wed, 6 Apr 2011 19:22:01 +0000 (12:22 -0700)]
Merge "Remove unused references to ISurface"

13 years agoMerge "turn off log spew"
Joe Onorato [Wed, 6 Apr 2011 19:04:35 +0000 (12:04 -0700)]
Merge "turn off log spew"

13 years agoMerge "Move around the HDMI switch detection so we don't try to get the status if...
Joe Onorato [Wed, 6 Apr 2011 19:04:24 +0000 (12:04 -0700)]
Merge "Move around the HDMI switch detection so we don't try to get the status if we can't listen to it."

13 years agoMerge "Cleanup character limits."
Jason Sams [Wed, 6 Apr 2011 18:45:42 +0000 (11:45 -0700)]
Merge "Cleanup character limits."

13 years agoMerge "Seperate ProgramRaster. Cleanup ProgramRaster and ProgramStore creation."
Jason Sams [Wed, 6 Apr 2011 18:40:33 +0000 (11:40 -0700)]
Merge "Seperate ProgramRaster. Cleanup ProgramRaster and ProgramStore creation."

13 years agoMerge "Seperate GL from RS program store."
Jason Sams [Wed, 6 Apr 2011 18:30:24 +0000 (11:30 -0700)]
Merge "Seperate GL from RS program store."

13 years agoAdd new resource configurations for screen width/height in "dp".
Dianne Hackborn [Wed, 30 Mar 2011 23:20:26 +0000 (16:20 -0700)]
Add new resource configurations for screen width/height in "dp".

You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I22f8afa136b4f274423978c570fa7c9855040496

13 years agoMerge "Don't use local ref for cached jclass reference in JNI code"
Brian Carlstrom [Wed, 6 Apr 2011 17:06:00 +0000 (10:06 -0700)]
Merge "Don't use local ref for cached jclass reference in JNI code"

13 years agoMerge "Add support for supplicant SCAN_INTERVAL"
Irfan Sheriff [Wed, 6 Apr 2011 16:16:26 +0000 (09:16 -0700)]
Merge "Add support for supplicant SCAN_INTERVAL"

13 years agoremove more unused references to ISurface
Mathias Agopian [Tue, 5 Apr 2011 22:44:20 +0000 (15:44 -0700)]
remove more unused references to ISurface

Change-Id: I2201f1ca2bb8f203a081d94a0134f798778dfbef

13 years agoMerge "TextLayoutCache - more code refactoring"
Fabrice Di Meglio [Tue, 5 Apr 2011 22:38:06 +0000 (15:38 -0700)]
Merge "TextLayoutCache - more code refactoring"

13 years agoMerge "Fix usages of PopLocalFrame to include returned local reference"
Brian Carlstrom [Tue, 5 Apr 2011 22:26:04 +0000 (15:26 -0700)]
Merge "Fix usages of PopLocalFrame to include returned local reference"

13 years agoam 6bb507e9: am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
Scott Main [Tue, 5 Apr 2011 21:35:37 +0000 (14:35 -0700)]
am 6bb507e9: am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs

* commit '6bb507e9ebdaff0370b2826f9a4a73156997c498':
  docs: fix the TOC in a few docs

13 years agoam c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
Scott Main [Tue, 5 Apr 2011 21:32:15 +0000 (14:32 -0700)]
am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs

* commit 'c70d483f4baffe5cb4ba09df3645aa6a1b351431':
  docs: fix the TOC in a few docs

13 years agoam e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
Scott Main [Tue, 5 Apr 2011 21:28:23 +0000 (14:28 -0700)]
am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs

* commit 'e4cafabbcc4b69479217d1a167926b79c37e5ded':
  docs: fix the TOC in a few docs

13 years agoMerge "Code refactoring for TextLayoutCache"
Fabrice Di Meglio [Tue, 5 Apr 2011 21:23:23 +0000 (14:23 -0700)]
Merge "Code refactoring for TextLayoutCache"

13 years agoam a90eb8fe: docs: fix the TOC in a few docs
Scott Main [Tue, 5 Apr 2011 21:21:36 +0000 (14:21 -0700)]
am a90eb8fe: docs: fix the TOC in a few docs

* commit 'a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
  docs: fix the TOC in a few docs

13 years agoMerge "Add EXTRA_ORIGIN to RecognizerIntent."
Mike LeBeau [Tue, 5 Apr 2011 21:03:55 +0000 (14:03 -0700)]
Merge "Add EXTRA_ORIGIN to RecognizerIntent."

13 years agoMerge "MTP and media provider support for multiple storage devices:"
Mike Lockwood [Tue, 5 Apr 2011 20:36:49 +0000 (13:36 -0700)]
Merge "MTP and media provider support for multiple storage devices:"