65070 Commits

Author SHA1 Message Date
Scott Main
f68af846d4 am 6e4f886d: am b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
* commit '6e4f886db034b954a305611cc71a10ff7d1c75ae':
  docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
2012-01-30 16:18:54 -08:00
Scott Main
6e4f886db0 am b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
* commit 'b2d37b39a1bb48d9f9c5b45255c5df769b85d6ae':
  docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
2012-01-30 16:15:29 -08:00
Scott Main
b2d37b39a1 Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1 2012-01-30 16:13:28 -08:00
Scott Main
275345b087 am a76ddf92: am 6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit 'a76ddf927278ec36f5a4589dbba85bb06bb1ae19':
  docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
2012-01-30 15:28:36 -08:00
Scott Main
a21ac88b10 docs: update sidenav to use <span> instead of <h2> for headings,
under suspicion that the h2s are causing poor snippet extraction in search results

Change-Id: I35f414fbb104984408b087db1366535cb18d4718
2012-01-30 15:27:37 -08:00
Mathias Agopian
7ff542c1ae Merge "SF now synchronizes to VSYNC" 2012-01-30 15:24:46 -08:00
Eric Fischer
478485678a Merge "Import translations. DO NOT MERGE" 2012-01-30 15:24:41 -08:00
Mathias Agopian
818b423658 Merge "add support for GL_EXT_debug_marker" 2012-01-30 15:23:47 -08:00
Mathias Agopian
e02f7b3fa8 SF now synchronizes to VSYNC
Change-Id: Ic5e4f2ea9927ce133eef9499c03161325e9d02c5
2012-01-30 15:21:23 -08:00
Eric Fischer
b61712bde1 Import translations. DO NOT MERGE
Change-Id: I2395f99e947c1b75df55216e9b0246eac63f0d8f
2012-01-30 15:21:00 -08:00
Scott Main
a76ddf9272 am 6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '6507df8b78d80403d66d321748ad47290a611e3f':
  docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
2012-01-30 15:14:53 -08:00
Romain Guy
a585e8dbcf Merge "Always initialize AsyncTask on the main thread." 2012-01-30 14:12:37 -08:00
Romain Guy
5e9120d4ad Always initialize AsyncTask on the main thread.
Change-Id: I039e5d6cb7157a0c8873e0d29161daf1cbda5577
2012-01-30 14:11:44 -08:00
Scott Main
6507df8b78 docs: add meta descriptions for home and sdk
also revise the G+ widget to make fit

Change-Id: Iadc8858bec2524fa9ed905534949885c7130ccc2
2012-01-30 14:04:22 -08:00
The Android Open Source Project
c7d7515325 am 827a597d: Reconcile with ics-mr1-release
* commit '827a597df70a51c6cccad52fae2be2c469f58b77':
  Revert "Fix 5797764: Increase lock screen's thread priority"
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
2012-01-30 13:38:52 -08:00
The Android Open Source Project
827a597df7 Reconcile with ics-mr1-release
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
2012-01-30 13:36:34 -08:00
The Android Automerger
10d6e70a1b merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:23:32 -08:00
Gilles Debunne
a821733059 Merge "Remove onPreDrawListeners earlier in TextView" 2012-01-30 12:58:53 -08:00
Dianne Hackborn
a69894846c am 25fe8ef1: am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '25fe8ef1b51b4a36e08b3fea35c0799f3d0840e2':
  Update documentation to reflect the old approach not working.
2012-01-30 12:56:42 -08:00
Dianne Hackborn
25fe8ef1b5 am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit 'e22f4748565915948c8af2961ac74fe81a417e3b':
  Update documentation to reflect the old approach not working.
2012-01-30 12:54:02 -08:00
Dianne Hackborn
e22f474856 Merge "Update documentation to reflect the old approach not working." into ics-mr1 2012-01-30 12:52:11 -08:00
Andreas Huber
e372593cfb Merge "Instantiate software codecs locally whenever possible." 2012-01-30 12:32:58 -08:00
Stephen Hines
855eadf942 Merge "Fix potential bug with reordered size/offset arguments." 2012-01-30 12:22:10 -08:00
Romain Guy
69726597b3 Merge "Add stencil buffer to the EGL config" 2012-01-30 12:05:28 -08:00
Romain Guy
530041d319 Add stencil buffer to the EGL config
Change-Id: If76c0cd6127534d90f9526b75c0f8e56259c6722
2012-01-30 12:04:17 -08:00
Jeff Sharkey
4d6da8649a Merge "Move away from deprecated NetworkInfo extra." 2012-01-30 11:53:32 -08:00
Andreas Huber
18ffe40289 Instantiate software codecs locally whenever possible.
Change-Id: I58d5c30b9de9873a239e91955a8900e2c72518a7
2012-01-30 11:48:02 -08:00
Dianne Hackborn
fa9b5cae64 Update documentation to reflect the old approach not working.
The old approach has a problem with the original application's
recent tasks entry disappearing (this is probably a bug in the
platform).  Update to an alternative approach that does work.

Change-Id: I15e582eff8c77cc22628f7b099e9f04eb5bfbce7
2012-01-30 11:45:00 -08:00
John Wang
7a41c7013d am 136704a8: am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
* commit '136704a803ed7dd419a452315d1c0fe4885ce441':
  Adjust the LTE signal bar mapping.
2012-01-30 11:25:48 -08:00
John Wang
136704a803 am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
* commit 'b069833e63f711a6b140385003d67b3ff68fe66b':
  Adjust the LTE signal bar mapping.
2012-01-30 11:23:24 -08:00
Jeff Sharkey
5e61331da5 Move away from deprecated NetworkInfo extra.
Because the NetworkInfo included in CONNECTIVITY_ACTION broadcast
extra does not reflect the state applicable to the calling UID, and
the last sticky broadcast may have stale state, transition to calling
ConnectivityManager.getActiveNetworkInfo() directly.

Change-Id: I86b316fbedd0273585ad5f1248b091bc3a3a5520
2012-01-30 11:21:35 -08:00
John Wang
b069833e63 Merge "Adjust the LTE signal bar mapping." into ics-mr1 2012-01-30 11:20:35 -08:00
Makoto Onuki
d53da8efa7 Merge "Fixing broken unittests." 2012-01-30 11:16:58 -08:00
Scott Main
f10d69f301 am fb300fb2: am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
* commit 'fb300fb2f0f253c94c14090256f9695bca1a1e4b':
  docs: add G+ page announcement to homepage
2012-01-30 10:08:14 -08:00
Scott Main
fb300fb2f0 am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
* commit '73790a53b580b8ec8eff88e25a19b5fcfa33392a':
  docs: add G+ page announcement to homepage
2012-01-30 10:05:59 -08:00
Scott Main
73790a53b5 Merge "docs: add G+ page announcement to homepage" into ics-mr1 2012-01-30 10:03:21 -08:00
Scott Main
b1560f2085 docs: add G+ page announcement to homepage
Change-Id: I400334fc1465b67ec34af2071a6cca5b6eda116f
2012-01-30 09:59:42 -08:00
Siva Velusamy
b09316736f Merge "gltrace: Use Unix Domain Socket rather than INET Socket" 2012-01-30 09:08:27 -08:00
Chet Haase
c7685d6d6e Merge "Fix bug in LayoutTransition for INVISIBLE views" 2012-01-30 08:28:18 -08:00
Marco Nelissen
f3a3b9ec9c Merge "Handle adding/removing/renaming nomedia paths" 2012-01-30 08:27:57 -08:00
Chet Haase
0d29936ec3 Fix bug in LayoutTransition for INVISIBLE views
When a view is becoming VISIBLE or INVISIBLE in a container with a
LayoutTransition, animations run to fade the view in and out and also
to run 'changing' animations on the view's other siblings. This logic
also cancels any running 'changin' animations to account for new ones
running.

However, in the specific case of INVISIBLE changes, there will be no
layout changes in the container - layout has already accounted for that
view (unlike in the case of GONE views); the visibility is just a matter of
drawing the view (or not). Therefore, we're canceling 'changing' animations
that should continue running and not replacing them with any other animations,
since new animations would only be started on layout chnages which are not
forthcoming.

One artifact seen from this bug is that the navigation bar buttons sometimes
disappear when changing orientation. This is because the menu button may
toggle between VISIBLE and INVISIBLE, causing animations on the other
buttons to get canceled, which leaves those views in a completely wrong
state.

The right thing to do is to avoid canceling in-process 'changing' animations
and to skip the logic of setting up new 'changing' animations which won't fire
anyway.

There is some minor API work in here because we did not previously have the
necessary information in LayoutTransition to know whether a view was being
hidden or shown to/from the INVISIBLE state.

Issue #5911213: LayoutTransitions ending in an odd state

Change-Id: I5c60c8583c8ea08965727b4ef17b550c40a3882c
2012-01-30 07:53:59 -08:00
Shaopeng Jia
def0346870 Fixing broken unittests.
The test here is partly fixed by Change I38c54265. However, the test
itself still needs to be fixed as local numbers in US never starts with
a '1'.

Bug: 5599741
Change-Id: I3a3961331961f4f535d30dec884babdb32e8b67b
2012-01-30 14:24:48 +01:00
Mathias Agopian
acabf48867 remove unneeded code
Change-Id: I07e2fca7274d2e12bf5b4aee0050794bdb97a8b3
2012-01-29 23:11:06 -08:00
Mathias Agopian
ea261a2e13 add support for GL_EXT_debug_marker
This extension is always added to the GL_EXTENSIONS
extension string for the current GL context, regardless
of if it's supported by the h/w driver.

The extension itself will be handled by GLES_trace (eventually),
when GLES_trace is not enabled, it'll result to a no-op.

If the h/w implementation has this extension, we'll call that version
instead of our dummy version.

Change-Id: Ie5dd3387c4d45cd5ed5f03b73bda6045620a96bc
2012-01-29 22:22:09 -08:00
Mathias Agopian
dfbcee6cb8 fix build
Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa
2012-01-29 22:22:08 -08:00
Mathias Agopian
0589e58236 Merge "update GLES headers and add support for corresponding new extensions." 2012-01-29 22:03:19 -08:00
Mathias Agopian
c0e32a47d5 Merge "added a few more commands to SF's dumpsys" 2012-01-29 22:02:36 -08:00
Mathias Agopian
b19e06f3e5 Merge "remove unused code" 2012-01-29 22:01:41 -08:00
Mathias Agopian
8d1b5e3c0b added a few more commands to SF's dumpsys
--latency-clear [name]
clears the latency data for the specified layer or for
all layers if none is specified

--list
prints the list of all layers regardless of their visibility

Change-Id: I7c07ae020f838c173b98ee50f3fb3e93da78acbb
2012-01-28 22:31:55 -08:00
Mathias Agopian
780018ded1 update GLES headers and add support for corresponding new extensions.
Change-Id: I554d9659113b4721b748ee5c1a3b1ca82b11d75e
2012-01-28 20:41:35 -08:00