62282 Commits

Author SHA1 Message Date
Dianne Hackborn
717a25dc2a Add new ManagedEGLContext class to help apps participate in memory trimming.
This class provides an API for an application to know when it is time to
destroy its EGL context when memory is being trimmed.  By having this in
the framework, we can still detect whether it will be useful to destroy
any EGL contexts (because we know if doing so will destroy all of them).

Change-Id: I1eac8d640052778052926b875c7928008f752182
2011-11-16 14:04:53 -08:00
Dianne Hackborn
4c6a65bc31 Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1 2011-11-16 14:03:09 -08:00
Marco Nelissen
cbd4bcaa71 Change MediaController look
b/5584613

Change-Id: I6799753ffff3202e354039b85fdca72e48e6be5d
2011-11-16 13:43:11 -08:00
Mangesh Ghiware
e832b63c97 Revert change to setInitialScale() to take display density into account.
Updated WebView documentation to clarify this behavior.

Additionally, if target-densityDpi is specified in the meta viewport
tag, update the display density in ZoomManager.

Bug: 5477652
Bug: 5327492
Change-Id: I176e87489f76a2ee6595d76a006e302b07595de1
2011-11-16 13:31:56 -08:00
Dianne Hackborn
ee9aef0b42 Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
...through setup wizard after wipe data

Deal with finish() being called when there are no running activities
on the stack.

Also some improved debugging output.

Change-Id: Ia1d3f3f7e7b79c06ca95c738081322fc80282e0d
2011-11-16 13:21:46 -08:00
Robert Greenwalt
795fcd0794 am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '33fe4a36b7d1ef84b13447f2a765db465ef96e56':
  Fix TelephonyManager to grab the best context
2011-11-16 12:46:23 -08:00
Fred Quintana
9a8f2b1057 Merge "When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display." 2011-11-16 12:45:14 -08:00
Alex Sakhartchouk
2d8ef49914 Fixing FBO font rendering bug that resulted from using old surface size.
Change-Id: I31d0967bb36ca6ffb6a4c8194597d3c523cfe954
2011-11-16 12:22:10 -08:00
Robert Greenwalt
33fe4a36b7 Merge "Fix TelephonyManager to grab the best context" into ics-mr1 2011-11-16 12:06:53 -08:00
Kristian Monsen
9a77be5dac Fix fix for bug 2816327
Remove native methods define for ANDROID_INSTRUMENT calls.

Need to that after the native registering is done in CL:
https://android-git.corp.google.com/g/#/c/148917/

Change-Id: Ic91aec54cb052c29aa06aee028cf8023cd69ed15
2011-11-16 19:59:27 +00:00
Jamie Gennis
7765fc651a am fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit 'fd6b64f6ad040b4d550a5219a2576997e2c0e85d':
  SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
2011-11-16 11:36:17 -08:00
Robert Greenwalt
8f4f814beb Fix TelephonyManager to grab the best context
It may not be called from an app so the app context may not exist.
Check and grab the best one.
Also remove the log that nobody paid attention to if the constructor
is called again from the same process.  One context seems to be as
useful as another.

bug:5572369
bug:5622514
Change-Id: Iad23b30c7c8fe5b8d1f81a1e060eaf0cd0e3019d
2011-11-16 11:36:08 -08:00
Jamie Gennis
fd6b64f6ad Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1 2011-11-16 11:34:30 -08:00
Eric Fischer
02ed923da9 am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '7dc81e06e4d0554683595e8d2e318837548e249a':
  Import revised translations.  DO NOT MERGE
2011-11-16 11:02:20 -08:00
Eric Fischer
7dc81e06e4 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-16 10:57:45 -08:00
Gilles Debunne
b3272d297b am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit 'de8c5ec88982b836b2c50d4f685f4e05b29bdd0d':
  IME action (done, next...) correctly handled
2011-11-16 10:37:23 -08:00
Alex Sakhartchouk
5a47181833 Merge "Expand RS vector3 types to vector4." 2011-11-16 10:36:02 -08:00
Gilles Debunne
de8c5ec889 Merge "IME action (done, next...) correctly handled" into ics-mr1 2011-11-16 10:31:40 -08:00
Eric Fischer
2f8e2e805d Import revised translations. DO NOT MERGE
Change-Id: I4ef67d81f61028da84c51ed0e48231f9cdc62679
2011-11-16 09:55:52 -08:00
Alex Sakhartchouk
a962ef2993 am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
* commit '4c593010dddc6d2972bab87b30bd1b11987a09e1':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
2011-11-16 09:48:26 -08:00
Fred Chung
d592714d9a am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '15fe377c7cb57c4d758edcfc1d1e53bcf5a0a8bc':
  Bluetooth HDP sample.
2011-11-16 09:48:20 -08:00
The Android Open Source Project
4dce941ece am 816e68e2: No-op merge from ics-mr0
* commit '816e68e2fddd56c34f864dc5647801117a51720b':
2011-11-16 09:48:16 -08:00
Alex Sakhartchouk
4c593010dd Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 2011-11-16 09:40:11 -08:00
Fred Chung
15fe377c7c Merge "Bluetooth HDP sample." into ics-mr1 2011-11-16 09:31:54 -08:00
The Android Open Source Project
816e68e2fd No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
2011-11-16 09:28:00 -08:00
The Android Open Source Project
d28bb28e08 Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
2011-11-16 08:55:43 -08:00
Gilles Debunne
efbad5fb90 IME action (done, next...) correctly handled
Bugs 5599728 and 5319237.

mInputContentType should be set for a "modern" cupcake
environment says a comment in TextView.

However, it is possible to call onEditorAction on a
TextView that didn't use any of the method that lazily
create that field. This is for instance achieved using
the extracted mode in landscape (Done, Next actions)
or in Contacts, that feature a Next/Done button in the
IME.

As a result, the action is ignored.

The patch is to force the creation of the mInputContentType
when the EditText is associated to the IME.

Change-Id: I5beec5a52e9eec0c209af37d68791bb6ff83d6f6
2011-11-16 17:38:48 +01:00
Steven Ross
c753a1865c Not showing facelock when plugging/unplugging fixes 5438524
This will close down or prevent the start of FaceUnlock if
the device is plugged in or unplugged,
unless FaceUnlock is currently active.

Change-Id: I216831964472da47fb24644070d1717dffe1b7f7
2011-11-16 11:15:56 -05:00
The Android Open Source Project
5cf2a1399e am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit 'c172688d5e9a1d26e2792297939cbb7bd93acaf2':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
2011-11-16 07:42:14 -08:00
The Android Open Source Project
c172688d5e am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit 'c7403258528a08ab74f7c29277d0c34ba6edc53d':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
2011-11-16 07:38:11 -08:00
The Android Open Source Project
c740325852 Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
2011-11-16 07:33:59 -08:00
Steve Block
862c2f5275 Merge changes I2c304952,Ic04bbd69,Ibbac2268
* changes:
  Update Java Bridge test for coercing JavaScript String to Java char in an array
  Add tests for multidimensional arrays in WebView's Java Bridge
  Fix tests for methods returning arrays in WebView's Java Bridge
2011-11-16 06:30:55 -08:00
Steve Block
286788c3aa Update Java Bridge test for coercing JavaScript String to Java char in an array
See https://android-git.corp.google.com/g/150052

Bug: 5619677
Change-Id: I2c3049529312b38bd3731dfc79b14edcb8cd6357
2011-11-16 14:28:24 +00:00
Steve Block
c353abba95 Add tests for multidimensional arrays in WebView's Java Bridge
Also add a test for objects with a non-numeric length property being passed to
a method expecting an array.

Change-Id: Ic04bbd691c55744472cab9fb732e504997c62434
2011-11-16 14:28:20 +00:00
Steve Block
908bc4a846 Fix tests for methods returning arrays in WebView's Java Bridge
Change-Id: Ibbac2268307fbfcff09a2d3b0f841ce420edc416
2011-11-16 14:26:37 +00:00
Steve Block
45047a11ae Merge "Add tests for invalid and static methods in the WebView's Java Bridge" 2011-11-16 06:24:14 -08:00
Mathias Agopian
f98ab8b140 remove hack that hardcoded the refresh rate
Change-Id: Ibdd40b337c547e80ef8541856015f1380c8d58ed
2011-11-16 00:08:08 -08:00
Daniel Sandler
c224f76303 Add a default Dreams component.
Currently set to DeskClock's screensaver, but since it's a
(private) string in f/b/c/r/r/values/config.xml any product
could overlay this.

Bug: 5611008
Change-Id: I7a4623c9c667a6cff8ed80ad600a8a4460bfafb7
2011-11-15 22:55:03 -08:00
Daniel Sandler
589f3624e0 Remove day of week from phone notification panel.
It was added to the tablet, but was never intended for use
on the phone, where it can cause the label to get too wide,
preventing access to settings / clear-all.

Bug: 5621955
Change-Id: Ic023391aa22d7ba3edd815f602afcb3357eb2501
2011-11-15 21:28:55 -08:00
Jake Hamby
ac62c901b7 am 0f2dec50: am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '0f2dec5033919fab77a2b52bb3cf33cf4975f2c9':
  Fix 3GPP SMS send failure for 7-bit national language tables.
2011-11-15 20:24:45 -08:00
Bill Gruber
566e594e7e am df1aba0a: am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
* commit 'df1aba0a9d25a0f9d38593d369ba963dfcd45866':
  IAB Doc Fix: Error in code snippet Bug 5221766
2011-11-15 20:24:42 -08:00
Adrian Ludwig
0ebffbc66d am 7456cf0a: am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '7456cf0a125b47860a43d9915bae69b5ef374703':
  Adding new "Security Best Practices" to the html docs.
2011-11-15 20:24:38 -08:00
James Dong
0e7d85fa93 am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '4e72e2bfc24afe053ca98c6de2591a4057cfd9fa':
  Document that release() should be called with onPause() and onStop() for media objects
2011-11-15 20:19:55 -08:00
Jake Hamby
0f2dec5033 am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit 'bd7836846c1e5d3610ba6c26686674d429a4316c':
  Fix 3GPP SMS send failure for 7-bit national language tables.
2011-11-15 20:19:34 -08:00
Bill Gruber
df1aba0a9d am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
* commit 'c7b354810e9caebe1d4c79d8a2e756f3c194e68f':
  IAB Doc Fix: Error in code snippet Bug 5221766
2011-11-15 20:19:33 -08:00
Adrian Ludwig
7456cf0a12 am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit 'cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
  Adding new "Security Best Practices" to the html docs.
2011-11-15 20:19:30 -08:00
James Dong
4e72e2bfc2 am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
  Document that release() should be called with onPause() and onStop() for media objects
2011-11-15 20:16:47 -08:00
Jake Hamby
bd7836846c am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
  Fix 3GPP SMS send failure for 7-bit national language tables.
2011-11-15 20:16:12 -08:00
Bill Gruber
c7b354810e am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
* commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
  IAB Doc Fix: Error in code snippet Bug 5221766
2011-11-15 20:16:02 -08:00
Adrian Ludwig
cbc96549c9 am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816':
  Adding new "Security Best Practices" to the html docs.
2011-11-15 20:15:57 -08:00