74150 Commits

Author SHA1 Message Date
Jamie Gennis
c6d9930777 SurfaceTexture: add GL context attach & detach
This change adds Java API support for detaching a SurfaceTexture from one GLES
context and then attaching it to a different one.

Change-Id: I8eed4b0d0e339c11598cb0408d9f4f2d99b3aa06
2012-04-05 16:11:43 -07:00
Adam Powell
9828830611 Merge "TaskStackBuilder and Activity navigation features for framework" 2012-04-05 11:55:06 -07:00
Dianne Hackborn
5459c43b83 Merge "Clean up status bar, system bar, navigation bar management." 2012-04-05 11:47:02 -07:00
Adam Powell
dd8fab2629 TaskStackBuilder and Activity navigation features for framework
Promote navigation helpers from the support library to the core
platform.

The support library's meta-data element has been replaced with a
first-class parentActivityName attribute. This attribute is valid
on both activity and activity-alias elements. An activity-alias
will inherit the target activity's parentActivityName if one is
not explicitly specified.

Automatic Up navigation for Activities

Add the public method onNavigateUp() to Activity. The default
implementation will use the metadata supplied in the manifest about an
activity's hierarchical parent (parentActivityName) to do the right
thing.

If any activities in the parent chain require special Intent
arguments, the Activity subclass should override onNavigateUp() to
properly implement Up navigation for the app, supplying such arguments
as needed.

If automatic Up navigation within the same task can't find an activity
matching the supplied intent in the current task stack, it will act as
an in-app "home" and return to the root activity (presumably the app's
front page) in that task. (From this state, pressing "back" with
default behavior will return to the launcher.)

Change-Id: If163e27e59587f7af36975a09c986cb117ec3bc6
2012-04-05 11:45:10 -07:00
Martijn Coenen
5b4a57973c Merge "Make sure initial activity state is correct." 2012-04-05 11:17:03 -07:00
Martijn Coenen
20fe5378d7 Make sure initial activity state is correct.
Change-Id: Ic6199b42e59afa06a0f38f866e2924b84cd234b3
2012-04-05 11:10:29 -07:00
Justin Koh
1c35d117f0 am db9b114b: Merge "Adds flag argument to setMasterMute." into ics-aah
* commit 'db9b114b2e1f9c2034c3cd6df00245b039d90c28':
  Adds flag argument to setMasterMute.
2012-04-05 10:43:06 -07:00
Justin Koh
db9b114b2e Merge "Adds flag argument to setMasterMute." into ics-aah 2012-04-05 10:40:29 -07:00
Martijn Coenen
d9966c4c21 Merge "Patch to support MIFARE with SAK 0x01" 2012-04-05 09:37:11 -07:00
Yu Shan Emily Lau
8fa23393e9 Merge "Insert the 2 seconds before test start to workaround the race conditon for requesting the surface." 2012-04-04 21:20:54 -07:00
Yu Shan Emily Lau
a79edb7233 Insert the 2 seconds before test start to
workaround the race conditon for requesting
the surface.

Change-Id: Ic8ba358400492860b0d38fc71468ea4bb4d3d7bd
2012-04-04 21:17:04 -07:00
Daniel Sandler
cde8aae955 Fix crash in legacy notification construction path.
Bug: 6293584
Change-Id: I8c1c5162a2e9e3ebc5a6d3fed045c6c6a64b9bfd
2012-04-04 23:46:19 -04:00
Romain Guy
5ab92c0316 Merge "Make sure we clean up after ourselves" 2012-04-04 19:47:34 -07:00
Bart Sears
837d321290 Merge "Update WebSettings.PREVIOUS_VERSION" 2012-04-04 19:36:54 -07:00
Svetoslav Ganov
b39e509f43 Merge "Fixing broken clear focus behavior." 2012-04-04 19:01:13 -07:00
Justin Koh
0273af55cf Adds flag argument to setMasterMute.
Adds flag argument to setMasterMute. This allows third parties to edit it
without showing the UI, for example.

TESTED = runs on Tungsten.

Change-Id: Idfd99a2476e60059cd93c9dfe07d03a389c3f5f5
2012-04-04 18:40:36 -07:00
Romain Guy
edbca1285e Make sure we clean up after ourselves
Because of the mAdded=false statement a few lines above, a large section
of doDie() was not executed. Things would eventually get cleaned up
but it seems better to do it at the right time.

Change-Id: I1a2f3a8e05057dd7cd7205b6d3f9c145d6c0241d
2012-04-04 18:25:53 -07:00
Romain Guy
a393bedb6d Merge "Add a new OnDrawListener to ViewRoot" 2012-04-04 18:16:38 -07:00
Romain Guy
25eba5c502 Add a new OnDrawListener to ViewRoot
This can be used by app to efficiently listen for draw passes. This listener
is guaranteed to not generate any garbage unlike OnPreDrawListener.

Change-Id: Ida40d11a3f8a5d2617bafe722906ee5c9af48602
2012-04-04 17:59:11 -07:00
Scott Main
7bf1ebd139 am 31361742: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '31361742b7a971f2998feac854e181dc100d5bf1':
  docs: Android U: Displaying Bitmaps Efficiently
2012-04-04 17:54:19 -07:00
Scott Main
31361742b7 am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '153f8fe420506a7e1b7a8f6b4d07db798867746e':
  docs: Android U: Displaying Bitmaps Efficiently
2012-04-04 17:51:08 -07:00
Daniel Sandler
48200b6f3f Merge "Chronometer support in Notifications." 2012-04-04 17:49:24 -07:00
Scott Main
153f8fe420 docs: Android U: Displaying Bitmaps Efficiently
Change-Id: I749f6dd82438fc0902b892e9b918243fc0a826d3
2012-04-04 17:45:24 -07:00
Svetoslav Ganov
57cadf2a97 Fixing broken clear focus behavior.
1. In a prevous patch I fixed the issues when on clearing
   focus of the first focusable view the callback for
   gaining focus were called before the ones for losing
   focus. Since it cause some issues the patch was reverted
   and resubmitted. In this chaos some code was missed so
   tests are failing. Added the missing logic to give focus
   to the first focusable in the current touch mode when
   a view loses focus.

2. Removed clear focusForRemoval methid since it is a dup
   of unFocus();

Note: All focus tests now pass.

Change-Id: I06881d4b5a66fc5a33efca16a96f20207a7220d3
2012-04-04 17:24:09 -07:00
Trevor Johns
1f393b96cf am 655aff22: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit '655aff22aad883131b72ad879ed18f1a11380dbe':
  Docs: Fixing typo in "Testing from Other IDEs" article
2012-04-04 16:55:57 -07:00
Trevor Johns
655aff22aa am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit 'e07b58506579085b62fde0771b74111b24aa27a0':
  Docs: Fixing typo in "Testing from Other IDEs" article
2012-04-04 16:52:53 -07:00
Martijn Coenen
f47fcf702c Merge "First cut at Bluetooth Beam" 2012-04-04 16:51:40 -07:00
Trevor Johns
e07b585065 Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1 2012-04-04 16:51:18 -07:00
Trevor Johns
41e6f351c6 Docs: Fixing typo in "Testing from Other IDEs" article
Fixing typo in Dev Guide article: 'android update-test-project'
should be 'android update test-project'.

Change-Id: Ie42a0b627d30d2a72fa081ca13bceaacdfd5aa03
http://developer.android.com/guide/developing/testing/testing_otheride.html
2012-04-04 16:38:28 -07:00
Bart Sears
4e2032b5fe Update WebSettings.PREVIOUS_VERSION
Now that we have released ICS MR1.1, update the PREVIOUS_VERSION
to 4.0.4.

Change-Id: I3c4d6abfa679f20776d2676c57af4c0347e41c7b
2012-04-04 16:13:26 -07:00
Chris Craik
7c8fd157da Merge "remove toast from animation benchmark" 2012-04-04 16:09:21 -07:00
Brian Muramatsu
72a9d3f449 Merge "Try Alternate Constructor for Single Method Tests" 2012-04-04 16:03:34 -07:00
Dianne Hackborn
f87d19621d Clean up status bar, system bar, navigation bar management.
The status bar and navigation bar are two completely separate
elements, with their own semantics.  The system bar now classifies
itself as a navigation bar, since that is really how it behaves.

This required rewriting the HDMI resizing code, so that it is
all done by PhoneWindowManager since that is what is responsible
for the size of the navigation bar (and thus now system bar).  This
actually gets rid of a fair amount of code, and means we can also
do the same thing for a pure navigation bar.

Likewise the system bar now has the navigation bar ability to be
hidden when requested by system UI flags.  To get the behavior
we want on Xoom, we only allow the nav bar to be hidden when it
will help provide a better aspect ratio for showing widescreen
videos.

Finally the nav/system bar now animates when hidden and shown.

Change-Id: Ie927154b68376a0b61802f99171ff56b8da92e7a
2012-04-04 16:00:45 -07:00
Justin Koh
75cf9e19a5 Fix the build.
Change-Id: Ibe818df8f360837688f12533cf0ac22ef89a8439
2012-04-04 15:27:37 -07:00
Fred Chung
b96785c197 am 37d51784: am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit '37d51784850bd6cd34c0291dcac7d3a06cf77407':
2012-04-04 14:56:40 -07:00
Roman Nurik
353befe29f am 8659a2d1: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '8659a2d190acd1226ca8076681831963b169c963':
2012-04-04 14:56:37 -07:00
Justin Koh
5ac69a23e0 Merge "resolved conflicts for merge of bff6a514 to master" 2012-04-04 14:54:19 -07:00
Philip Milne
24fea55ebb Merge "Fix for bug 6104272." 2012-04-04 14:51:35 -07:00
Justin Koh
6a8096d7d5 resolved conflicts for merge of bff6a514 to master
Change-Id: I741d5ab8ed0ce25a27330ffb55ba210534d11c3d
2012-04-04 14:50:32 -07:00
Marco Nelissen
e313f721ad Store video width/height when scanning
b/5820120

Change-Id: If2faf554bbf49b341d2634915ba98c1efd70574e
2012-04-04 14:27:00 -07:00
Andreas Huber
038d1663e6 Merge "New Crypto JAVA class to facilitate decryption via MediaCodec." 2012-04-04 14:21:18 -07:00
Fabrice Di Meglio
d779412c58 Merge "Add View textAlignment" 2012-04-04 14:17:22 -07:00
Chris Craik
dc419d79fc remove toast from animation benchmark
Change-Id: I9ec2aa57fafbde5875c2f070fe4a33e4d33ee2ae
2012-04-04 14:15:59 -07:00
Nick Pelly
1d7e906233 First cut at Bluetooth Beam
Change-Id: I37e5759515ff8779095b6d8adf5ad9c456fa8529
2012-04-04 14:08:23 -07:00
Andreas Huber
8240d9239d New Crypto JAVA class to facilitate decryption via MediaCodec.
Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034
related-to-bug: 6275919
2012-04-04 14:06:32 -07:00
Amith Yamasani
1da8f00a4c Merge "Embed layout padding in nine patch images" 2012-04-04 13:49:05 -07:00
Irfan Sheriff
5b86de1e6b Merge "Fix build" 2012-04-04 13:22:19 -07:00
Irfan Sheriff
fa291e6691 Fix build
Add missing file

Change-Id: I5ed1827e1183c37741675ce4d198d3e200c5fb94
2012-04-04 13:20:20 -07:00
Chia-chi Yeh
870085cce0 Merge "SIP: push the logic of finding local address down to SipSessionGroup." 2012-04-04 13:13:57 -07:00
Chia-chi Yeh
2dd9134c6b SIP: push the logic of finding local address down to SipSessionGroup.
This allows different accounts binding on different IP addresses,
such as one on IPv4 and another on IPv6.

Bug: 4169057
Change-Id: I0bb36669394c281330091673fa338adea8f782cd
2012-04-04 13:04:26 -07:00