66408 Commits

Author SHA1 Message Date
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
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
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
Mathias Agopian
34e0491313 remove unused code
Change-Id: If900fcc50f9ffc424e270cb6063b16a2d7bc04d3
2012-01-28 18:47:13 -08:00
Jean-Baptiste Queru
eecc515d91 am 0e1ad89c: am 27d2ab8b: am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '0e1ad89ca5487babb39c52abcff9da41e0b84462':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 21:12:24 -08:00
Roman Nurik
52adbe026b am d28ce214: am 5525a43a: am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit 'd28ce2140f060f020712efe687b1183b1e1c47ca':
  docs: add NOTICE to action bar icon pack and sprinkle download links
2012-01-27 21:12:20 -08:00
Roman Nurik
120ba9a927 am 479c96c5: am 9d9c7189: am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '479c96c5758ddd4bb92473bc22b6e366fdfc3114':
  docs: Update designing-navigation training class to link to Android Design
2012-01-27 21:12:17 -08:00
Jean-Baptiste Queru
0e1ad89ca5 am 27d2ab8b: am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '27d2ab8b27e7e1927e18869e898fa556e5da3d43':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 21:09:20 -08:00
Roman Nurik
d28ce2140f am 5525a43a: am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '5525a43a9c814faba22adfafc6517fb64259966f':
  docs: add NOTICE to action bar icon pack and sprinkle download links
2012-01-27 21:08:59 -08:00
Roman Nurik
479c96c575 am 9d9c7189: am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '9d9c718925e8ec189ba4615f93c2fe8e7d0ab23d':
  docs: Update designing-navigation training class to link to Android Design
2012-01-27 21:08:50 -08:00
Jim Miller
c131e9e9a9 am 118bb2bd: Fix 5906830: Don\'t crash on lock screens that lack a clock.
* commit '118bb2bd86194454452655345846c85ec59ba547':
  Fix 5906830: Don't crash on lock screens that lack a clock.
2012-01-27 18:13:06 -08:00
Jim Miller
118bb2bd86 Fix 5906830: Don't crash on lock screens that lack a clock.
This fixes a crash seen in SIM unlock screen where the
layout doesn't have a clock to update.

Change-Id: Ic1473b60f6d32f3feae9e7aa4510f6e435fa9a73
2012-01-27 17:59:49 -08:00
Jim Miller
479cb61760 am b90559a6: Merge "Fix 5906830: Update the clock earlier when lock screen comes back from suspend."
* commit 'b90559a6066965debe173e2ea94bbffb87ad2d6a':
  Fix 5906830: Update the clock earlier when lock screen comes back from suspend.
2012-01-27 17:43:57 -08:00
Jim Miller
b90559a606 Merge "Fix 5906830: Update the clock earlier when lock screen comes back from suspend." 2012-01-27 17:42:26 -08:00
Jeff Brown
25d2fc2ca9 am cb0af4f1: Merge "Improve watchdog monitor for InputReader and InputDispatcher."
* commit 'cb0af4f1b0709b236a030f41c75edd97cf0bf1fd':
  Improve watchdog monitor for InputReader and InputDispatcher.
2012-01-27 17:38:56 -08:00
Jeff Brown
40d4036adb am 2d2d7d6f: Merge "Implement a cancelation mechanism for queries."
* commit '2d2d7d6f42fe22ecc2b1dc8bb96a19e503a61a20':
  Implement a cancelation mechanism for queries.
2012-01-27 17:38:53 -08:00
Jeff Brown
cb0af4f1b0 Merge "Improve watchdog monitor for InputReader and InputDispatcher." 2012-01-27 17:37:31 -08:00
Jeff Brown
2d2d7d6f42 Merge "Implement a cancelation mechanism for queries." 2012-01-27 17:37:24 -08:00
Jeff Brown
112b5f52c5 Improve watchdog monitor for InputReader and InputDispatcher.
Try harder to test for liveness.  There are situations where
the lock might not be held but the input system is stuck in
a callback into the window manager policy that has hung.

Bug: 5094994
Change-Id: Iff88655512a5dc8bbb4615be65f4115e975c020b
2012-01-27 17:33:42 -08:00