drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,436 Commits 1 Branch 0 Tags
Commit Graph

66436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
8fea0266cc am c7d75153: am 827a597d: Reconcile with ics-mr1-release 
* commit 'c7d7515325e9ef827feb094dbf42f1c920ad7936':
  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:42:59 -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
58687efd54 am a8217330: Merge "Remove onPreDrawListeners earlier in TextView" 
* commit 'a82173305991a24bc1400149b41bb998a6f50b38':
  Remove onPreDrawListeners earlier in TextView
 2012-01-30 13:01:18 -08:00
Dianne Hackborn
adc39dee13 am a6989484: am 25fe8ef1: am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1 
* commit 'a69894846c0e34228da71dccf4e8ef5ae95a45a3':
  Update documentation to reflect the old approach not working.
 2012-01-30 12:58:56 -08:00
Gilles Debunne
a821733059 Merge "Remove onPreDrawListeners earlier in TextView" 2012-01-30 12:58:53 -08:00
Alex Sakhartchouk
4be5f45f2e Merge "Making the SceneGraph more robust to make sure data is propagated to RS. Caching RS name allocations." into graphics-dev 2012-01-30 12:57:40 -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
91b480d114 am e372593c: Merge "Instantiate software codecs locally whenever possible." 
* commit 'e372593cfb973c8f8bdc46858dece9fcae9e178c':
  Instantiate software codecs locally whenever possible.
 2012-01-30 12:35:36 -08:00
Andreas Huber
e372593cfb Merge "Instantiate software codecs locally whenever possible." 2012-01-30 12:32:58 -08:00
Stephen Hines
bc19591c1f am 855eadf9: Merge "Fix potential bug with reordered size/offset arguments." 
* commit '855eadf942c8ff5c2665d7dc3b6d4b5ba630419a':
  Fix potential bug with reordered size/offset arguments.
 2012-01-30 12:23:21 -08:00
Stephen Hines
855eadf942 Merge "Fix potential bug with reordered size/offset arguments." 2012-01-30 12:22:10 -08:00
Romain Guy
cb3fbbd037 am 69726597: Merge "Add stencil buffer to the EGL config" 
* commit '69726597b300ec32f2d2c489cd3f312efd3077c2':
  Add stencil buffer to the EGL config
 2012-01-30 12:07:07 -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
Alex Sakhartchouk
e93db17a14 Making the SceneGraph more robust to make sure data is propagated to RS. 
Caching RS name allocations.

Change-Id: I5e7a17a9ac76f81548145ae78665da322ec51271
 2012-01-30 12:03:06 -08:00
Jeff Sharkey
a360f1ccfb am 4d6da864: Merge "Move away from deprecated NetworkInfo extra." 
* commit '4d6da8649afc43022a156bffca6cd2c9127cefe1':
  Move away from deprecated NetworkInfo extra.
 2012-01-30 11:55:31 -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
a8daa7ebb8 am 7a41c701: am 136704a8: am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1 
* commit '7a41c7013d0ed319fcb4384cc4b5cf26b22d3580':
  Adjust the LTE signal bar mapping.
 2012-01-30 11:28:14 -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
8d3af0926c am d53da8ef: Merge "Fixing broken unittests." 
* commit 'd53da8efa7a618562615df35ffc674620cbe2b26':
  Fixing broken unittests.
 2012-01-30 11:18:36 -08:00
Makoto Onuki
d53da8efa7 Merge "Fixing broken unittests." 2012-01-30 11:16:58 -08:00
Scott Main
3f284c7aa9 am f10d69f3: am fb300fb2: am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1 
* commit 'f10d69f30107f27465684630460615443783f2bc':
  docs: add G+ page announcement to homepage
 2012-01-30 10:10:43 -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
67590f0d48 am b0931673: Merge "gltrace: Use Unix Domain Socket rather than INET Socket" 
* commit 'b09316736fe7b721d92900ad901894fd5ce2b854':
  gltrace: Use Unix Domain Socket rather than INET Socket
 2012-01-30 09:09:33 -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
4efb0920e1 am c7685d6d: Merge "Fix bug in LayoutTransition for INVISIBLE views" 
* commit 'c7685d6d6e4a7e3fe5b00d2420a66d1560a911dc':
  Fix bug in LayoutTransition for INVISIBLE views
 2012-01-30 08:30:13 -08:00
Marco Nelissen
d9cd8fe132 am f3a3b9ec: Merge "Handle adding/removing/renaming nomedia paths" 
* commit 'f3a3b9ec9ce6cb087dd3f4358684c00be23feec1':
  Handle adding/removing/renaming nomedia paths
 2012-01-30 08:30:10 -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
7bc45c743f am acabf488: remove unneeded code 
* commit 'acabf488674e0f5a6d0fa6d1da5e36b417a681a0':
  remove unneeded code
 2012-01-29 23:17:04 -08:00
Mathias Agopian
acabf48867 remove unneeded code 
Change-Id: I07e2fca7274d2e12bf5b4aee0050794bdb97a8b3
 2012-01-29 23:11:06 -08:00
Mathias Agopian
be124027db am dfbcee6c: fix build 
* commit 'dfbcee6cb8ab9cf89b9052eb7498e453afdb1463':
  fix build
 2012-01-29 22:24:52 -08:00
Mathias Agopian
dfbcee6cb8 fix build 
Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa
 2012-01-29 22:22:08 -08:00
Mathias Agopian
a03b13c8b0 am 0589e582: Merge "update GLES headers and add support for corresponding new extensions." 
* commit '0589e582361432f12848fdd59f8c408b7a31c35b':
  update GLES headers and add support for corresponding new extensions.
 2012-01-29 22:06:23 -08:00
Mathias Agopian
b74ab37a4c am c0e32a47: Merge "added a few more commands to SF\'s dumpsys" 
* commit 'c0e32a47d5e31b81df5731952656be02d2dd8758':
  added a few more commands to SF's dumpsys
 2012-01-29 22:04:22 -08:00
Mathias Agopian
e582b2bb08 am b19e06f3: Merge "remove unused code" 
* commit 'b19e06f3e53cf011a04d9e0f0529c2a94a7c3780':
  remove unused code
 2012-01-29 22:04:19 -08:00