Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,896 Commits 3 Branches 0 Tags
85ab135b2bb586c5a111d7a3b5c71cb9fcebb0b6
Commit Graph

19606 Commits

Author SHA1 Message Date
Romain Guy
85ab135b2b am 50a66f0e: Merge "Terminate EGL when an app goes in the background" into ics-mr1 
* commit '50a66f0e9c5a85a6af4a99eb66656a69eba24572':
  Terminate EGL when an app goes in the background
 2011-11-11 11:49:42 -08:00
Romain Guy
50a66f0e9c Merge "Terminate EGL when an app goes in the background" into ics-mr1 2011-11-10 17:10:41 -08:00
Romain Guy
8ff6b9ebee Terminate EGL when an app goes in the background 
This does not happen on high end gfx devices. This happens
only if only one EGL context is initialized in the current
process.

Change-Id: Ibd1737efdf84eef8a84108b05795440d1ae9964e
 2011-11-10 16:44:49 -08:00
Romain Guy
ed68299b99 am a3cc20ff: Merge "Initialize egl_cache with an app writeable file" into ics-mr1 
* commit 'a3cc20fff073bd3ca588f1e61f0f7034aecf3ebb':
  Initialize egl_cache with an app writeable file
 2011-11-10 23:04:19 +00:00
Romain Guy
a3cc20fff0 Merge "Initialize egl_cache with an app writeable file" into ics-mr1 2011-11-10 15:02:07 -08:00
Adam Powell
6a5d96af5a am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1 
* commit '71282a476ad57ec398f0a8d33cf67bfd469c8c55':
  Fix access modifiers on ImageView overrides
 2011-11-10 22:49:03 +00:00
Adam Powell
558f4f6bd4 am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t start as expected" into ics-mr1 
* commit '67121fd7b241ceafe7339f5f154781572819f87b':
  Fix bug 5581874 - Animated drawables don't start as expected
 2011-11-10 22:49:00 +00:00
Martijn Coenen
236a62302c 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 22:48:56 +00:00
Jason Simmons
f0b82d61f5 resolved conflicts for merge of faa81c82 to ics-aah 
Change-Id: I7464f16940058cc9b5a3dba5cb839bc67129009e
 2011-11-10 14:29:46 -08:00
Romain Guy
a958265827 Initialize egl_cache with an app writeable file 
Change-Id: I5dda234feab0fedd6e4179a80715ae20dee1c833
 2011-11-10 14:20:10 -08:00
Adam Powell
6a939ae6fd Fix access modifiers on ImageView overrides 
Change-Id: I64cc10c877ac4adc4b79abcd7c7617480bd82906
 2011-11-10 14:11:51 -08:00
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
c5f3fd6ef1 Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1 2011-11-10 13:48:02 -08:00
Martijn Coenen
0946fe5be3 Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE). 
This reverts commit 562dfff65a. 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
Tom Taylor
faa81c8210 Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 2011-11-10 13:11:16 -08:00
Eino-Ville Talvala
8d9c011eeb 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:32 +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
Tom Taylor
994da2ad32 Revert "Add new secure setting for controlling Messaging notifications" 
This reverts commit 03da2f00aa.

 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
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
John Reck
f0d1965134 am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1 
* commit '843e04d977fd348ed474da1d3c6a62e7dc837444':
  Pause drawing when not visible
 2011-11-10 17:22:03 +00:00
John Reck
843e04d977 Merge "Pause drawing when not visible" into ics-mr1 2011-11-10 09:19:55 -08:00
George Mount
047945013e am c60baec7: Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 
* commit 'c60baec7a737d3c3cd596c5c4378a6e12450da3d':
  DO NOT MERGE Set the initial scroll position for RTL.
 2011-11-10 16:33:23 +00:00
George Mount
c60baec7a7 Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 2011-11-10 08:32:18 -08:00
Gilles Debunne
5a3327d75b am e5504ba1: Merge "Visual glitches when starting extracted text" into ics-mr1 
* commit 'e5504ba1a279fc58eac74bda8d9c5c29cae235a9':
  Visual glitches when starting extracted text
 2011-11-10 08:50:01 +00:00
Gilles Debunne
e5504ba1a2 Merge "Visual glitches when starting extracted text" into ics-mr1 2011-11-10 00:48:10 -08:00
satok
b199d4fada am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 
* commit '114c4d3843758a2a1ffb32eb2719d65cdee637f8':
  Introduce an API to cancel pending/running spell check tasks
 2011-11-10 05:28:09 +00:00
satok
114c4d3843 Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 2011-11-09 21:26:46 -08:00
satok
b4aff97c85 Introduce an API to cancel pending/running spell check tasks 
Bug: 5554629

Change-Id: Ifd840ea13976813639a2ee259124a21d9bb56893
 2011-11-10 11:50:45 +09:00
satok
acf8357f30 am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 
* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
  Respect user settings for spell checking language if explicitly set
 2011-11-10 02:44:03 +00:00
satok
34bd596935 Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 2011-11-09 18:42:48 -08:00
John Reck
5f1c549132 Pause drawing when not visible 
Bug: 5594608
 If onPause is called or if the view or view's window is no longer
 visible, pause webview drawing. Calls to onDraw will continue to work,
 but animations and other continual drawing will stop

Change-Id: I11640f087852d1a9a33b945ff72297fab1d25b94
 2011-11-09 17:19:43 -08:00
George Mount
331493085d DO NOT MERGE Set the initial scroll position for RTL. 
Bug 5268793
 Webkit knows about the correct initial position for web pages.
 On initial show, scroll to the webkit position.

 Cherry-picked from master CL: I2537b84a

 External WebKit CL: I6a91b97f

Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
 2011-11-09 15:37:26 -08:00
satok
05f2470061 Respect user settings for spell checking language if explicitly set 
Bug: 5554116
Change-Id: I8c16d732af1fe713d30d97dfe829ff16653c7f34
 2011-11-10 07:54:52 +09:00
Jeff Brown
6e1c362a21 am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1 
* commit 'e7de36e605e0ccf4552c8ee1db40cb9af3227cf4':
  Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
 2011-11-09 19:22:14 +00:00
Jeff Brown
e7de36e605 Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1 2011-11-09 11:20:24 -08:00
John Reck
22a073f073 am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1 
* commit '36a7f2a9adfa21ec31f00d496fef82e68931c860':
  Fix determining find on page overlap
 2011-11-09 19:00:49 +00:00
Gilles Debunne
4eddb9356a am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1 
* commit '76bb11ca642556673249a6ef8b84ab2813deaa87':
  Bug 5575396: close spell session on language change
 2011-11-09 18:59:45 +00:00
Jeff Sharkey
ba83524338 am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1 
* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
  Bootstrap stats before registering listeners.
 2011-11-09 18:59:40 +00:00
Jeff Sharkey
3c865c0a51 am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
  Make operation counts monotonically increase.
 2011-11-09 18:59:38 +00:00
Dianne Hackborn
0126a4a7f2 am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1 
* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
  Don't crash if there is no connectivity service.
 2011-11-09 18:59:19 +00:00
Svetoslav Ganov
f32985381c am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 
* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
  NumberPicker incorectly enforcing minimal width and height.
 2011-11-09 18:59:14 +00:00
Jason Simmons
f981686779 resolved conflicts for merge of 3af8b88d to ics-aah 
Change-Id: I2b68cd7c904e68a16565b7274560e7105c643c87
 2011-11-09 10:08:21 -08:00
John Reck
36a7f2a9ad Merge "Fix determining find on page overlap" into ics-mr1 2011-11-09 09:28:11 -08:00
Michael Kolb
d8883f5129 am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1 
* commit 'a4293ba1a0f1129d5879ae9eda45292ff357e20c':
  Remove flicker from WebTextView
 2011-11-09 14:37:36 +00:00
Dave Santoro
b7a262cdc1 am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
  Unhide social stream APIs for Contacts.
 2011-11-09 14:37:19 +00:00
Matthew Xie
afb3fa6c96 am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 14:37:11 +00:00
Adam Cohen
87ce25a772 am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
  Making default widget padding public API
 2011-11-09 14:36:57 +00:00
Gilles Debunne
61ddbbae71 Visual glitches when starting extracted text 
Partially addresses Bug 5547923

In landscape, tapping on the text
1. starts extracted text mode
2. displays the cursor handle or the selection popup window.

As a result, some ghost effects and race conditions create an
unpleasing visual experience.

Fixed this by not doing 2. in case extracted mode will start.

The drawback of this quicl fix is that the user will have to
tap again to get the handle/suggestion. That can be fixed later
if needed.

Change-Id: I10e1d8399bb35e5b2cd5cba1295f7d29d051cae0
 2011-11-09 09:48:43 +01:00
Gilles Debunne
76bb11ca64 Merge "Bug 5575396: close spell session on language change" into ics-mr1 2011-11-09 00:26:46 -08:00
Jeff Sharkey
630a13bdd8 Merge "Bootstrap stats before registering listeners." into ics-mr1 2011-11-08 23:43:58 -08:00