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

61870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
67121fd7b2 Merge "Fix bug 5581874 - Animated drawables don't start as expected" into ics-mr1 2011-11-10 13:57:24 -08:00
Martijn Coenen
5a81e795cf am 7ee88289: (-s ours) am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1 
* commit '7ee88289091f8bc81dabeff62f215ba21baa8c0b':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
 2011-11-10 21:53:49 +00:00
Martijn Coenen
7ee8828909 am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1 
* commit 'c5f3fd6ef160c0f6072b14b97aa5c1d9759c682e':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
 2011-11-10 21:50:21 +00:00
Chet Haase
f458b3d39a am 68a15583: am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1 
* commit '68a15583f7438c687e3b029f83cf80ca7827ff31':
  increase the rate at which we dispatch events.
 2011-11-10 21:49:30 +00:00
Martijn Coenen
c5f3fd6ef1 Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1 2011-11-10 13:48:02 -08:00
Chet Haase
68a15583f7 am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1 
* commit '41ffab86d92622679d4d2ad8307806e8099f8170':
  increase the rate at which we dispatch events.
 2011-11-10 21:46:16 +00:00
Chet Haase
41ffab86d9 Merge "increase the rate at which we dispatch events." into ics-mr1 2011-11-10 13:44:34 -08:00
Kenny Root
0d1569c359 am f4db2fe5: am bc853c03: Merge "Close file on exception as well" into ics-mr1 
* commit 'f4db2fe56479635f8ec0a195e9e6b53a55216139':
  Close file on exception as well
 2011-11-10 21:23:24 +00:00
Martijn Coenen
0946fe5be3 Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE). 
This reverts commit 562dfff65ac79590c0b7c50019cd3d107e8b4e0e. These API's are still used
by GMM in the version that ships with MR1, so we need them to keep Beam working for
GMM. Note that these APIs are hidden.

From version 5.13 onwards GMM will use the new API's.

Change-Id: I316a9c9b7d0052a14f6c1df70f2ed463bca61800
 2011-11-10 13:22:27 -08:00
Kenny Root
f4db2fe564 am bc853c03: Merge "Close file on exception as well" into ics-mr1 
* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
  Close file on exception as well
 2011-11-10 21:20:28 +00:00
Kenny Root
bc853c0344 Merge "Close file on exception as well" into ics-mr1 2011-11-10 13:18:24 -08:00
Tom Taylor
fb894276b1 am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 
* commit '0bbd151e1dab043226725d23f0ca26f4d09ee76f':
  Revert "Add new secure setting for controlling Messaging notifications"
 2011-11-10 21:16:54 +00:00
Tom Taylor
0bbd151e1d am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 
* commit 'faa81c82103e89a3f2c86c4e737d9beb7e557402':
  Revert "Add new secure setting for controlling Messaging notifications"
 2011-11-10 21:13:42 +00:00
Tom Taylor
faa81c8210 Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 2011-11-10 13:11:16 -08:00
Andreas Huber
4d7dff1706 DO NOT MERGE: Instead of asserting, remove active streams if their sockets 
return failure

Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug: 5593654
 2011-11-10 12:41:51 -08:00
Eino-Ville Talvala
dce3af33a5 am 22c2d1d6: am c1c5d4fa: Merge "Add a sound-playing method to Camera API." into ics-mr1 
* commit '22c2d1d6ae48c348f4c331361a6e3f2c63b2aa8f':
  Add a sound-playing method to Camera API.
 2011-11-10 20:10:47 +00:00
Eino-Ville Talvala
22c2d1d6ae am c1c5d4fa: Merge "Add a sound-playing method to Camera API." into ics-mr1 
* commit 'c1c5d4faa22a7d22b8225b2bbf83206698b83763':
  Add a sound-playing method to Camera API.
 2011-11-10 20:08:29 +00:00
Eino-Ville Talvala
c1c5d4faa2 Merge "Add a sound-playing method to Camera API." into ics-mr1 2011-11-10 12:07:05 -08:00
James Dong
77c500c9a1 Add support for retrieving location information in mp4/3gpp files 
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug: 5560253
 2011-11-10 11:40:11 -08:00
Mathias Agopian
c925a654b1 am e1d50e0c: am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1 
* commit 'e1d50e0ccb95f06d1d60aa83822b486828148483':
  handle EINTR when calling sensor HAL's poll function
 2011-11-10 19:39:53 +00:00
John Reck
2c7db013bc am 0f077739: am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1 
* commit '0f0777399defe6bca965d9c33e9dfe256eb56fee':
  Pause drawing when not visible
 2011-11-10 19:39:46 +00:00
Andreas Huber
62c0c3215d am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1 
* commit '9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
  Send RTSP control connection keep-alive requests
 2011-11-10 19:39:38 +00:00
Andreas Huber
58941d8dcb am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1 
* commit '2dff5cdc362ff6026e71d4b96faea8f2d7bd7063':
  Don't believe the PV decoder's lies...
 2011-11-10 19:39:36 +00:00
Andreas Huber
2276b1774a am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1 
* commit 'ec04f4ac23e5fe8f90267d09ddda8c0aa684c147':
  There's no point in trying to continue to decode after an error was signalled.
 2011-11-10 19:39:34 +00:00
George Mount
021d33817b am 8645ff3d: (-s ours) am c60baec7: Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 
* commit '8645ff3d00d22abaf74b5985a036bffc7843825e':
  DO NOT MERGE Set the initial scroll position for RTL.
 2011-11-10 19:39:31 +00:00
Eric Laurent
7707cd9920 am 58f3a712: am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1 
* commit '58f3a7123d0da6d35424429f3c0bbfbd32c00117':
  Fix problems in tablet silent mode.
 2011-11-10 19:39:29 +00:00
Wink Saville
2f87ca01c7 am 99d858b0: am a092ba56: am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0 
* commit '99d858b04b27b51e346fb5d3860e6953cee64ecd':
  [maguro] Update COMPREHENSION-TLV parser in CAT
 2011-11-10 19:39:27 +00:00
Gilles Debunne
9704a14eeb am 2e97db49: am e5504ba1: Merge "Visual glitches when starting extracted text" into ics-mr1 
* commit '2e97db4981e7773e84deee37c394748076b1aafd':
  Visual glitches when starting extracted text
 2011-11-10 19:39:16 +00:00
Dave Burke
071f1ca094 am 26c84db4: (-s ours) am b5dbf66c: am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0 
* commit '26c84db47da032a3fc1a56aa6bd82d610dde2dca':
  Actually 59 fps DO NOT MERGE
 2011-11-10 19:39:12 +00:00
Dave Burke
fe9f00bcf4 am 65a9ac43: am ab22f862: Merge "Back to 59fps" into ics-mr1 
* commit '65a9ac43c687d9011279c09210adaa04eb4a5502':
  Back to 59fps
 2011-11-10 19:39:11 +00:00
satok
e60e3e2b38 am 3869eac4: am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 
* commit '3869eac42b3d6fc0ecef8f096fbb4b5ddafca6f7':
  Introduce an API to cancel pending/running spell check tasks
 2011-11-10 19:39:08 +00:00
Adam Powell
37419d7321 Fix bug 5581874 - Animated drawables don't start as expected 
Fix a bug that caused animated drawables to not schedule properly when
a view has not yet been attached. Also make ImageViews update their
drawable visibility state properly, which will handle scheduling
concerns as ImageViews are attached and detached from their windows.

This should also fix the bug where animated notification icons in the
status bar do not animate until the posting app posts an update to the
notification.

Change-Id: I24c403182831258d1f251736e920c9efe1d38299
 2011-11-10 11:35:12 -08:00
Eric Fischer
334f691fa3 Import revised translations. 
Change-Id: Iac6e1ff785d898d65934cdfdaf3d92a56324282c
 2011-11-10 11:20:21 -08:00
Dianne Hackborn
56b53b597f Fix issue #5470311: Activity with android:configChanges defined... 
...should not be restarted when rotating screen on xoom

This was a side-effect of a previous fix to compute the screen layout
config class based on the actual space available to the application, not
the raw display size.  On a device like Xoom, the system bar causes us
to switch between LONG and NOTLONG depending on whether the system bar
is on the short or long side of the screen.

To fix this, we now compute the screen layout class the same way
"smallest width" is computed: looking at all of the possible rotations
and using the smallest of them all.  In addition to preventing the device
from toggling between long and notlong on a Xoom-like screen, this will
also avoid other possible undersireable behavior like changing screen
layout size when rotating.

This does mean that Xoom is no longer considered a long screen even when
in landscape, because it is not a long screen in portrait.

Change-Id: I85f90a16294ef5a7de94d5b9231abbc6f914fe90
 2011-11-10 11:19:57 -08:00
Tom Taylor
994da2ad32 Revert "Add new secure setting for controlling Messaging notifications" 
This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930.

 Committer: Tom Taylor <tomtaylor@google.com>

 On branch revertsetting
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   api/current.txt
	modified:   core/java/android/provider/Settings.java
	modified:   core/java/android/provider/Telephony.java
	modified:   packages/SettingsProvider/res/values/defaults.xml
	modified:   packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

We've decided not to disable messaging notifications with a secure setting.
Instead, all the work will be done within the messaging app itself.

Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06
 2011-11-10 11:17:38 -08:00
Katie McCormick
921afe39d6 Doc change: new Calendar content provider doc 
Change-Id: I9493b6b0cd17ddf8fda07c32aed9b4fa2b8c1489
 2011-11-10 10:56:34 -08:00
Daniel Sandler
4e637a9fa5 am 9cc4efb3: am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1 
* commit '9cc4efb39054557cfac11e0c7ba5887f102579d3':
  Use platform assets for brightness scrubber.
 2011-11-10 18:51:15 +00:00
Wink Saville
407f8973bd am f1633291: am 08b3ffe6: am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 
* commit 'f1633291aa13ee1bd210a38e007b9e133c178f37':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
 2011-11-10 18:51:11 +00:00
Mathias Agopian
e1d50e0ccb am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1 
* commit '785fd3685a69e5b3ef9c0958dcf4ae85f818e78d':
  handle EINTR when calling sensor HAL's poll function
 2011-11-10 18:35:48 +00:00
satok
c95b7412c2 am 3628dafe: am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 
* commit '3628dafe22aeeb2fca09b49d82c8d7289baf68ad':
  Respect user settings for spell checking language if explicitly set
 2011-11-10 18:34:45 +00:00
Mathias Agopian
9a2c95f0fc am c2e3b33b: (-s ours) am 42694dc4: am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE 
* commit 'c2e3b33b1f2399a9165b94b42dda46535bb857bf':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
 2011-11-10 18:34:41 +00:00
Mathias Agopian
785fd3685a Merge "handle EINTR when calling sensor HAL's poll function" into ics-mr1 2011-11-10 10:33:55 -08:00
Eino-Ville Talvala
e0cc55ac72 Add a sound-playing method to Camera API. 
To allow applications with non-standard Camera use cases to use the
platform sound files and routing, add a method to play any of the
standard Camera sounds (shutter, autofocus, record start/stop) using a
background thread.

Bug: 5447107
Change-Id: I2524853a626e3ce334a7aad2f7de061d5c04abd0
 2011-11-10 10:23:49 -08:00
Kenny Root
62539e9efa Close file on exception as well 
Bug: 5458045
Change-Id: I4c79b9c273ff69dda292e5cc7b2b60f8db2edbd9
 2011-11-10 09:40:53 -08:00
John Reck
0f0777399d am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1 
* commit '843e04d977fd348ed474da1d3c6a62e7dc837444':
  Pause drawing when not visible
 2011-11-10 17:21:43 +00:00
John Reck
843e04d977 Merge "Pause drawing when not visible" into ics-mr1 2011-11-10 09:19:55 -08:00
Andreas Huber
9e2949c6ab am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1 
* commit '2375d16378e6f8b7694c5a2cd9e0622e382e6049':
  Send RTSP control connection keep-alive requests
 2011-11-10 16:51:59 +00:00
Andreas Huber
2dff5cdc36 am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1 
* commit 'b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
  Don't believe the PV decoder's lies...
 2011-11-10 16:51:58 +00:00
Andreas Huber
ec04f4ac23 am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1 
* commit '7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
  There's no point in trying to continue to decode after an error was signalled.
 2011-11-10 16:48:53 +00:00
Andreas Huber
2375d16378 Merge "Send RTSP control connection keep-alive requests" into ics-mr1 2011-11-10 08:48:44 -08:00