33610 Commits

Author SHA1 Message Date
Chung-yih Wang
dc2e5208e2 Merge "Do not release the wifi lock if the screen is off." into gingerbread 2010-10-08 23:25:11 -07:00
Romain Guy
c4e43d80b3 Merge "Move GenerationCache to the utils directory." 2010-10-08 18:47:45 -07:00
Romain Guy
21b028a44f Move GenerationCache to the utils directory.
Change-Id: I210ffa8f1d76a102bb7d971c649c20a74d03fbe6
2010-10-08 18:44:56 -07:00
James Dong
7ea6ebe73a Merge "Move Camera specific logic out from StagefrightRecorder to CameraSource" 2010-10-08 18:39:13 -07:00
Romain Guy
b154dfe757 Merge "Don't update 9patches on every frame." 2010-10-08 18:39:04 -07:00
Romain Guy
2728f96161 Don't update 9patches on every frame.
Change-Id: I7ffb2365f83e0453e7d0a0cdcb3fc9308b305238
2010-10-08 18:36:57 -07:00
James Dong
0c128b67f0 Move Camera specific logic out from StagefrightRecorder to CameraSource
o updated comments and streamlined the logic in
  checkVideoSize() and checkFrameRate() as suggested

Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
2010-10-08 18:32:43 -07:00
Wu-cheng Li
e1199e382f am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread
Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'

* commit '9df140851375a977ad99390d71edf8b4a8382fd4':
  Add javadoc for display orientation.
2010-10-08 18:28:38 -07:00
Hung-ying Tyan
c7e4b2d5bb am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread
Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32'

* commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
2010-10-08 18:28:20 -07:00
Gilles Debunne
f8d8149501 Made paste work in ExtractEditText
Bug 3064925

Instead of always passing the menu item to the original TextView, do that only
for the 'Select word' option. More ExtractEditText magic, but this ZBB so...

Change-Id: Ic4cb0526dbb9711e2f13a916b997f480307dcad1
2010-10-08 18:23:49 -07:00
Adam Powell
d856b1ce92 resolved conflicts for merge of 86b50028 to master
Change-Id: I3468e67ac17f861c5491717337c27cd49bd5287e
2010-10-08 18:23:49 -07:00
Stephen Hines
5a6d7ac2bd Remove pragma for RS export variables.
Change-Id: Icfd958e8212843f4f1a6b64dd43ce63e09d00d7c
2010-10-08 18:12:51 -07:00
Dianne Hackborn
ca33268ef8 am 18e225b4: am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
Merge commit '18e225b42b77c48efa63f245a4137c5f74302e26'

* commit '18e225b42b77c48efa63f245a4137c5f74302e26':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
2010-10-08 17:59:52 -07:00
Eric Fischer
c400cbb45d am 7778173a: (-s ours) am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '7778173a32edcfccdcc31407169d2ec40916ca2f'

* commit '7778173a32edcfccdcc31407169d2ec40916ca2f':
  Import revised translations.  DO NOT MERGE
2010-10-08 17:59:33 -07:00
Xavier Ducrohet
79d433dd87 am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread
Merge commit '556866a2ea1f4758a79fe4f207153b71815ed400'

* commit '556866a2ea1f4758a79fe4f207153b71815ed400':
  Parser is optional in obtainStyledAttributes.
2010-10-08 17:59:13 -07:00
Hung-ying Tyan
1d8db8a0a8 am 909a974f: am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread
Merge commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e'

* commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e':
  SIP: Fix busy authentication loop.
2010-10-08 17:58:55 -07:00
Dianne Hackborn
d7dccd2611 am 55f1b0b8: am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f'

* commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f':
  Make Activity.removeDialog() less strict.
2010-10-08 17:58:35 -07:00
Kenny Root
682d143dec am 6ed0cfd3: am 5919ac6b: OBB: track binder death observers
Merge commit '6ed0cfd3e798e3014c9f1099631249463d25140c'

* commit '6ed0cfd3e798e3014c9f1099631249463d25140c':
  OBB: track binder death observers
2010-10-08 17:58:15 -07:00
Kenny Root
06f89ca9b1 am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
Merge commit '36455d03256024981b1bf21557722a010b5e092a'

* commit '36455d03256024981b1bf21557722a010b5e092a':
  Add MountService tests and fix a bug it found
2010-10-08 17:57:55 -07:00
Dianne Hackborn
fa9921e4bc am e89bf502: am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
Merge commit 'e89bf50261902bf263887923bf95595ec8eae069'

* commit 'e89bf50261902bf263887923bf95595ec8eae069':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
2010-10-08 17:57:35 -07:00
Gilles Debunne
82c52ee738 am f960718c: (-s ours) am 1ae32bfe: New assets for buttons and notification
Merge commit 'f960718c1c02186746873ec4a669028bb8ea9d94'

* commit 'f960718c1c02186746873ec4a669028bb8ea9d94':
  New assets for buttons and notification
2010-10-08 17:57:16 -07:00
Dianne Hackborn
13d31e0162 am cef38339: am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread
Merge commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37'

* commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37':
  Make USB mass storage hide keyguard when shown.
2010-10-08 17:45:08 -07:00
Chung-yih Wang
c7fda188ae Do not release the wifi lock if the screen is off.
We need to be able to receive calls if the device is able to
reassociate with any AP later on.

Change-Id: Ib7aafb98386bf250ed9b5ec0a5b519594efa1649
2010-10-09 08:37:40 +08:00
Scott Main
4c2c62fe08 am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp

* commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-08 17:36:00 -07:00
Scott Main
bed5af7ebc am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread

* commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-08 17:27:28 -07:00
Gilles Debunne
42dd7ec9f0 am a827d7bc: Merge "Other improvements to text cursor movement." into gingerbread
Merge commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9' into gingerbread-plus-aosp

* commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9':
  Other improvements to text cursor movement.
2010-10-08 17:21:42 -07:00
Mindy Pereira
37c8ad779f am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
Merge commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd' into gingerbread-plus-aosp

* commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd':
  DO NOT MERGE Limit the height of the pull glow.
2010-10-08 17:14:56 -07:00
Gilles Debunne
a827d7bc34 Merge "Other improvements to text cursor movement." into gingerbread 2010-10-08 17:14:45 -07:00
Adam Powell
54ca811b29 Merge "Fix alert dialog layout size in landscape" 2010-10-08 17:10:24 -07:00
Mindy Pereira
13a81aad3d Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread 2010-10-08 17:10:21 -07:00
Chung-yih Wang
7ff6f97f84 resolved conflicts for merge of 4790a2e2 to master
Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
2010-10-09 08:07:55 +08:00
Scott Main
456fe3b337 add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Change-Id: If1a33d5f5ee1f3b39c5592748e3d584e060b7278
2010-10-08 17:06:29 -07:00
Adam Powell
4fb17b0490 Fix alert dialog layout size in landscape
Change-Id: Iff5c388655c357e78c0c0e98d718fb7601c2d543
2010-10-08 17:04:39 -07:00
Mindy Pereira
f6859c3da7 DO NOT MERGE Limit the height of the pull glow.
Event when the user keeps pulling, should NEVER get bigger than
the max height (~2list items tall).
Fixes b/3074337  Overscroll glow can be stretched indefinitely

Change-Id: Ifc30d4c907d432faf9ee10ddc20bcc8f50b21f81
2010-10-08 17:04:04 -07:00
Scott Main
59d5d96666 am 3d265b57: am 50f86c65: docs: a few style adjustments to admin doc
Merge commit '3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp

* commit '3d265b5775a74b1d5eb726238f13cf63e8465594':
  docs: a few style adjustments to admin doc
2010-10-08 16:43:06 -07:00
Scott Main
3d265b5775 am 50f86c65: docs: a few style adjustments to admin doc
Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread

* commit '50f86c65206072be0ca924f03b8d460365199bcd':
  docs: a few style adjustments to admin doc
2010-10-08 16:39:08 -07:00
Scott Main
1d58e52a59 am 72552887: am 2e5a22aa: docs: remove old "new" tags from side nav
Merge commit '7255288755661587958d384338d4808e76959d86' into gingerbread-plus-aosp

* commit '7255288755661587958d384338d4808e76959d86':
  docs: remove old "new" tags from side nav
2010-10-08 16:37:51 -07:00
Scott Main
7255288755 am 2e5a22aa: docs: remove old "new" tags from side nav
Merge commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d' into gingerbread

* commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d':
  docs: remove old "new" tags from side nav
2010-10-08 16:30:47 -07:00
Jason Chen
39b4867d48 Revert "Merge "Allow notifications to not specify a contentIntent.""
This reverts commit 8885321046622d6a8c0a4214af98dc27eecd48a0, reversing
changes made to 61b8aaadd742f0be708cd37971d2c9e822bf778a.
2010-10-08 16:22:53 -07:00
Scott Main
50f86c6520 docs: a few style adjustments to admin doc
Change-Id: I1ea2416f1f26835b1111aad65cc519dd8d56e099
2010-10-08 16:12:32 -07:00
Gilles Debunne
380b604a03 Other improvements to text cursor movement.
Paste happened on pressed position instead of current cursor location
when triggered by a long touch.

Change-Id: I86900f2bbb93390d3efa756aeebb424c4ae7e19b
2010-10-08 16:12:11 -07:00
Andreas Huber
cac43e8a2c am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread
Merge commit 'beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp

* commit 'beffefa24f398b610d58dd583d9f5613dc529c28':
  RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
2010-10-08 15:55:44 -07:00
Scott Main
7bfac24dcb am d7170b2a: am 65e62f4f: docs: new web apps dev guides
Merge commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4' into gingerbread-plus-aosp

* commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4':
  docs: new web apps dev guides
2010-10-08 15:55:40 -07:00
Romain Guy
1cb9465372 Merge "Better cache for layers, reduce memory usage and increase framerate." 2010-10-08 15:52:02 -07:00
Brad Fitzpatrick
4216c3c3f7 am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread
Merge commit 'a4682ed7547e895605d102ab17fc5c134b4ab38f' into gingerbread-plus-aosp

* commit 'a4682ed7547e895605d102ab17fc5c134b4ab38f':
  Minor SharedPreference clean-up.
2010-10-08 15:51:32 -07:00
Romain Guy
8550c4c7b5 Better cache for layers, reduce memory usage and increase framerate.
Change-Id: I5ff864a361db4791bd5ff6be716f7ce692ef572d
2010-10-08 15:49:53 -07:00
Andreas Huber
beffefa24f Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread 2010-10-08 15:49:48 -07:00
Amith Yamasani
0594476ffa SearchView: Add some more listeners, IME dismiss improvements and focus control.
Addresses following bugs:
3067611 : Submit button incorrectly displayed
3064371 : Callback to report suggestion click
3008580 : Setting initial focus

The SearchView will take initial focus now, reverting an earlier change. If
you don't want it to take initial focus, then you must requestFocus on a
different view on launching the activity, since the initial focus is desirable
in other cases. This is normal behavior for all EditText widgets and SearchView
shouldn't have a different behavior.
2010-10-08 15:49:37 -07:00
Scott Main
d7170b2a68 am 65e62f4f: docs: new web apps dev guides
Merge commit '65e62f4f908394fc469cf535fef7c16035a428a2' into gingerbread

* commit '65e62f4f908394fc469cf535fef7c16035a428a2':
  docs: new web apps dev guides
2010-10-08 15:43:44 -07:00
Brad Fitzpatrick
a4682ed754 Merge "Minor SharedPreference clean-up." into gingerbread 2010-10-08 15:35:45 -07:00