Commit Graph

27900 Commits

Author SHA1 Message Date
Romain Guy
a3cc20fff0 Merge "Initialize egl_cache with an app writeable file" into ics-mr1 2011-11-10 15:02:07 -08:00
Peter Ng
56f73a149b am f52df796: am 15843aa5: Merge "lock pattern width spec set to max" into ics-mr1
* commit 'f52df7961f29a2f508fb7421f8cd9c95b9b409aa':
  lock pattern width spec set to max
2011-11-10 22:50:16 +00:00
Peter Ng
2a1e56867c am 15843aa5: Merge "lock pattern width spec set to max" into ics-mr1
* commit '15843aa5f66fee8eee5e634508dbf83a4e5ab55d':
  lock pattern width spec set to max
2011-11-10 22:49:10 +00: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
Svetoslav Ganov
06f938e8aa PopupWindow dismiss() can get into a recursive loop.
1. The dismiss method in a PopupWindow is first removing the
   popup View from the WindowManager and then if the content
   View differs from the popup View the former is removed from
   the latter. Then dismiss() clears the dismissed flag so a
   subsequent call to dismiss() is a NOP. However, removing
   a View both from the WindowManager and from its parent
   ViewGroup triggers stuff wich may lead to a subsequent call
   to dismiss(). This leads to a stack overflow exception.

bug:5598944

Change-Id: I2aeeda591be3e9aa98fec1ee17ea8f0e746e6992
2011-11-10 14:31:41 -08:00
Peter Ng
15843aa5f6 Merge "lock pattern width spec set to max" into ics-mr1 2011-11-10 14:31:09 -08:00
Jason Simmons
f0b82d61f5 resolved conflicts for merge of faa81c82 to ics-aah
Change-Id: I7464f16940058cc9b5a3dba5cb839bc67129009e
2011-11-10 14:29:46 -08:00
Adam Powell
9e71bb0b2f am aa771ceb: am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1
* commit 'aa771ceb0919f2a66ba9c927e5617d15471d70e2':
  Fix access modifiers on ImageView overrides
2011-11-10 22:20:48 +00: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
5d35fd79a7 am ba44080d: am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t start as expected" into ics-mr1
* commit 'ba44080d834d23d0bc7d118a4950f837eeaca96a':
  Fix bug 5581874 - Animated drawables don't start as expected
2011-11-10 22:01:58 +00: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
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
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
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
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
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
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
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
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
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
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
Jim Miller
524a0adeb5 am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
* commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
2011-11-10 16:15:14 +00:00
Jeff Brown
fe2d4abdd9 am 698d3de6: am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1
* commit '698d3de681bf85047675baa61f9b28961f3d6862':
  Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
2011-11-10 16:14:43 +00:00
Gilles Debunne
d1cd3e7b76 Merge "Fix bug #5544127 TextView regression in ICS when setting TextSize dynamically" 2011-11-10 08:13:55 -08:00
Gilles Debunne
33c25e4933 Merge "Bug 5575396: close spell session on language change" 2011-11-10 02:10:45 -08:00
Gilles Debunne
771d64b1e0 Clean-up in TextView
Removed some variables that are no longer needed after the
removal of context menu in TextView.

Change-Id: I6d98bb356bd7b409a5230756849aef0f2896d4c5
2011-11-10 10:15:27 +01:00
Gilles Debunne
39ba6d9c4c Extracted text problems
Bug 5557258: recent text editing changed in ExtractedText mode is
broken. The modifications of the text performed by:
- drag and drop
- text suggestions, deletion
- voice IME's delete button

all change the ExtractEditText itself, while they should affect the underlying
EditText (and the change will be forwarded to the ExtractEditText). As a results,
changes are not actually modifying the underlying text.

Created new protected methods in TextView, overloaded in ExtractTextView to
affect the underlying text instead.

Changes to spans should also be forwarded to the original TV (see the 2 TODOs),
this is tracked in bug 5589158.

Change-Id: Ibfec272469e8db191b3875e7576e32481a9dc1bd
2011-11-10 10:00:08 +01: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
John Reck
e9a291e781 am 0e17f653: am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1
* commit '0e17f65312e57c7f1489010284987c505142b778':
  Fix determining find on page overlap
2011-11-10 05:42:49 +00: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
Fabrice Di Meglio
d4c3b8e106 Fix bug #5544127 TextView regression in ICS when setting TextSize dynamically
- nullify cached font metrics when we are nullifying the layouts as a result of changing text size

Change-Id: I372e4fad336de4aac89e1344c3e8d34c4e914f2f
2011-11-09 18:12:38 -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
Marco Nelissen
567354474f Bug 5575396: close spell session on language change
Cherry pick change 8b67db17ec from ics-mr1

Change-Id: I8166859e435f034535510a36772644cde3923cd9
2011-11-09 16:07:33 -08:00
Peter Ng
7bc60abc97 lock pattern width spec set to max
Change-Id: If5853d3c7ee2d2330c06f5c802f66249ab3f2694
2011-11-09 15:46:04 -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