63127 Commits

Author SHA1 Message Date
Daniel Sandler
2e481b9146 Stop showing "No internet connection" when there is one.
In particular, even though the mobile data network isn't
routing packets (and therefore is not an internet
connection), we want to show the PLMN anyway:

  [MOBILE RSSI] Carrier  [WIFI RSSI] WiFi SSID

This change also improves the following cases:

 - Combines "No internet connection" from wifi and mobile
   into one single string in airplane mode:

     [AIRPLANE] No internet connection.

 - Removes "No internet connection" from the mobile string
   when wifi is on in airplane mode, making a nice compact
   display in this case:

     [AIRPLANE] [WIFI RSSI] WiFi SSID

Bug: 5903914
Change-Id: I477821d2c5e9922252dd6bcb3ed494c8c57d99b0
2012-01-24 14:45:40 -05:00
Robert Greenwalt
67cda1a0ec am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
* commit 'f449ea9e96162698f4ec6d62c70750eb50744da7':
  Use the carrier-given dns addrs for tethering.
2012-01-24 11:42:21 -08:00
Robert Greenwalt
f449ea9e96 Merge "Use the carrier-given dns addrs for tethering." into ics-mr1 2012-01-24 11:40:19 -08:00
Dianne Hackborn
a585359516 am 47163685: Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
  Another attempt at issue #5823276: home repaints after full-screen app is exited
2012-01-24 11:37:02 -08:00
Dianne Hackborn
29cd79c7b0 am c986d6f0: Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit 'c986d6f01b00dd760ba1650918baadd24a6dc838':
  Fix issue #5906017: Missing menu entries in portrait when in compatibility mode
2012-01-24 11:34:49 -08:00
Daniel Sandler
9dc211afbf am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit 'a4474ae02546d725686f9c08113c16a84aca912c':
  Detect and repair invalid layouts in the navigation bar.
2012-01-24 11:34:47 -08:00
Dianne Hackborn
47163685eb Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-24 11:33:15 -08:00
Dianne Hackborn
c986d6f01b Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1 2012-01-24 11:33:06 -08:00
Daniel Sandler
a4474ae025 Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1 2012-01-24 11:32:31 -08:00
Scott Main
e7dc2898c0 am 4809f09f: docs: update fujitsu id, capitalize
* commit '4809f09f55a6177bd69303630dc42cc738f71116':
  docs: update fujitsu id, capitalize
2012-01-24 11:01:49 -08:00
Scott Main
b790d1aa2f am cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit 'cdf14454326dcb2f43ae0da208a8ed65a38f2897':
  docs: add fujitsu/toshiba USB vendor id
2012-01-24 10:59:23 -08:00
Scott Main
4809f09f55 docs: update fujitsu id, capitalize
Change-Id: I776bdf0af37baa98b2b2dd70c5950ea1e98d36ec
2012-01-24 10:58:06 -08:00
Scott Main
cdf1445432 docs: add fujitsu/toshiba USB vendor id
Change-Id: I7917035d8c3f4b0fc80b7c992fcdf085aa984b4f
2012-01-24 10:54:50 -08:00
Jean-Baptiste Queru
d80cbb8c7b Merge "stagefright aacenc: Add missing newlines at the end of files" 2012-01-24 10:34:25 -08:00
Jean-Baptiste Queru
10c4641c2e am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
  stagefright aacenc: Properly terminate a comment
2012-01-24 08:43:14 -08:00
Jean-Baptiste Queru
2ae5805cf1 am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '164a984224f5d430757628028f2522329987350f':
  stagefright aacenc: Properly terminate a comment
2012-01-24 08:40:50 -08:00
Jean-Baptiste Queru
164a984224 Merge "stagefright aacenc: Properly terminate a comment" 2012-01-24 07:51:12 -08:00
Dianne Hackborn
b7ff51bde9 Another attempt at issue #5823276: home repaints after full-screen app is exited
This is between the two previous attempts.  I returned the part from the
original that was breaking gallery, but have some new code to detect when
something about the window params has changed that would require a
layout pass to make sure we still do a layout then, even if the window is
not currently visible.

Change-Id: I07745e1f66022583e3076b84cc8bbe8bd2acd48f
2012-01-23 19:15:27 -08:00
Eric Laurent
0609231f4f AudioFlinger: refine mixer sleep time logic
When an AudioTrack is in underrun state, the AudioFlinger mixer will
sleep for a short period of time to give the app a chance to fill the
AudioTrack buffer. If the AudioTrack is still not ready during next mixing round,
the mixer will proceed with other tracks.

If an application keeps a steady underrun condition, the AudioFlinger mixer will
alternate between ready and not ready states. In the longer term this will cause the
audio HAL to underrun.
There is a mechanism to reduce the sleep period if the mixer is not ready several times in a
row but this mechanism is defeated by the alternating ready/not ready conditions.

The fix consists in only increasing sleep time if the mixer is ready for at least two
consecutive times.

Issue 5904527.

Change-Id: Id0139bca9be8c4e425ec6d428515c4d8f718e8c9
2012-01-23 18:56:59 -08:00
Eric Laurent
0b08965558 DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
This reverts commit b918035d34422a2041b6ec8c09c566bb93345b40.

Change-Id: I093bcfa56ad54a080b930208b6b79169d33581fb
2012-01-23 18:37:07 -08:00
Daniel Sandler
0b69b59877 Detect and repair invalid layouts in the navigation bar.
It seems that something (probably layout transitions)
occasionally leaves the navigation bar layout in a weird
state such that most of the buttons are offscreen. For
example, the portrait nav bar might have buttons with widths
matching the nav bar's old width from landscape; the
clickable regions will therefore be far off the right edge
of the display.

The navigation bar now looks for this situation when the
size of the view changes and corrects for it.

Bug: 5549288
Change-Id: I8464ac9fd64cb64ec18baf51478dd0f6564a2284
2012-01-23 21:14:37 -05:00
Dianne Hackborn
a486a53a02 Fix issue #5906017: Missing menu entries in portrait when in compatibility mode
This was a bug only when the status bar was hidden, the screen space for
the nav bar would not be correctly removed for all frames used in layout
computation.

This code really $*#&^!! needs to be cleaned up, the whole "status bar
is the system bar when on a tablet so it should take space from apps,
but status bar doesn't do that on phones but on phones there is a nav
bar that does the same thing" thing is whacked.

Proof that evolution DOESN'T WORK!!!!!!!!!!

Change-Id: I24e4994328480820cb638e7a40aa0b65b7ae2003
2012-01-23 18:02:46 -08:00
Jim Miller
30951c0d06 Revert "Fix 5797764: Increase lock screen's thread priority"
This reverts commit 6d6a70a33746ef5147ab146f1802f0db424dd2f1

This doesn't appear to have a measurable impact for this issue.
2012-01-23 16:55:47 -08:00
Justin Ho
a60483b313 DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
This reverts commit 71c4496a9757438afd30b4404824f296f6158a49.

Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
2012-01-23 16:55:47 -08:00
Jim Miller
9f080e2a5b am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '44760b106a4bafcf83fb356bf91683db40e0e5a2':
  Revert "Fix 5797764: Increase lock screen's thread priority"
2012-01-23 15:51:23 -08:00
Jim Miller
44760b106a Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ics-mr1 2012-01-23 15:49:32 -08:00
Jim Miller
54dbbce1c3 Revert "Fix 5797764: Increase lock screen's thread priority"
This reverts commit 6d6a70a33746ef5147ab146f1802f0db424dd2f1

This doesn't appear to have a measurable impact for this issue.
2012-01-23 15:24:42 -08:00
Justin Ho
feb1d988c8 am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
2012-01-23 15:13:19 -08:00
Justin Ho
fee5a860a8 Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 2012-01-23 15:11:00 -08:00
Justin Ho
b918035d34 DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
This reverts commit 71c4496a9757438afd30b4404824f296f6158a49.

Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
2012-01-23 15:02:41 -08:00
Joe Malin
a2a46f6294 DOC CHANGE: New Content Provider topics
Change-Id: Ib5507f4c9ecce3aea51cd39310e3f4990c9b3070
2012-01-23 14:18:24 -08:00
Robert Greenwalt
7df80fa4e8 Use the carrier-given dns addrs for tethering.
This fixes a complaint from carriers (that we used 8.8.8.8), but also
fixes the case where there is only room for one live radio
connection: the secondary connection (tethering) doesn't have a
default route to prevent on-device traffic from slipping out on the
tethering connection, but tethered dns is proxied through dnsmasq, so
it is appearing as on-device traffic and is unroutable.  By switching
to the carrier-indicated dns servers we can use the host-routes
already set for those and kill two bugs with one fix.

bug:5898904
Change-Id: Ida8777687994f353b2d4f2c7db5d6ea4b6ac3882
2012-01-23 11:29:37 -08:00
Bill Gruber
add87f99d9 am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '5e5b57aef29b33d03965b4dc370cde9a39220adc':
  DevDocs update: Publishing on Market
2012-01-23 10:23:10 -08:00
Bill Gruber
5e5b57aef2 Merge "DevDocs update: Publishing on Market" into ics-mr1 2012-01-23 10:21:16 -08:00
The Android Open Source Project
961b1df3fc Reconcile with ics-mr1-release
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
2012-01-23 10:15:41 -08:00
Jim Miller
f65b53132b Fix 5797764: Increase lock screen's thread priority
This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND
to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that
might stall lock screen when the screen turns on.

Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
2012-01-20 16:31:05 -08:00
The Android Automerger
dafa237fb9 merge in ics-mr1-release history after reset to ics-mr1 2012-01-20 16:12:47 -08:00
Jim Miller
b1c7785c11 am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit 'eaa11a723150f1ea79446d7ba4bf77eb47b73337':
  Fix 5797764: Increase lock screen's thread priority
2012-01-20 15:26:42 -08:00
Jim Miller
eaa11a7231 Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1 2012-01-20 15:24:20 -08:00
Justin Ho
e46f869629 am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1
* commit 'b09f6f96e3583da320b69486869bc98fd463735e':
  Update WiMAX assets to match new style Bug: 5724605
2012-01-20 14:50:30 -08:00
Justin Ho
b09f6f96e3 Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 2012-01-20 14:48:51 -08:00
Justin Ho
f87da6e846 Update WiMAX assets to match new style
Bug: 5724605

Change-Id: Iab24c3e5aad3af38d5ba3a5a8f383c79270bdea3
2012-01-20 14:47:26 -08:00
Jim Miller
6d6a70a337 Fix 5797764: Increase lock screen's thread priority
This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND
to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that
might stall lock screen when the screen turns on.

Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
2012-01-20 14:41:55 -08:00
Daniel Sandler
aaa7b7728f am 639ed754: Hide mobile RSSI on devices without mobile data.
* commit '639ed754bba866d2a47ef7ca58e56806b546b149':
  Hide mobile RSSI on devices without mobile data.
2012-01-20 14:40:26 -08:00
Daniel Sandler
639ed754bb Hide mobile RSSI on devices without mobile data.
Also fixes some minor layout glitches along that row of
icons (Bluetooth vertical alignment & spacing, battery text
width, inter-icon padding).

Bug: 5895226
Change-Id: I303c2899bf21ddb7e28914d8fb36efd7090ac5e2
2012-01-20 14:37:54 -08:00
Justin Ho
ffb0c0b3ca am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1
* commit '70e21c927afeff05d8f26e9df2f36785ca19fdfd':
  New out-of-service RSSI.
2012-01-20 14:35:09 -08:00
Justin Ho
70e21c927a Merge "New out-of-service RSSI." into ics-mr1 2012-01-20 14:33:07 -08:00
Daniel Sandler
e3b86f2137 New out-of-service RSSI.
This creates (well, restores, since we had this until
Honeycomb) a user-visible state for "no service" that is
distinguishable from "very very weak service" (less than one
bar).

Bug: 5775939
Change-Id: Idd08b1a9411d5d94e4d7a97fa7f3ffd92b8113a6
2012-01-20 14:06:40 -08:00
Dianne Hackborn
892d11f492 am 1bae8066: Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1
* commit '1bae80668cc1d12bb4a4b93bce1960b2601de131':
  Fix issue #5823276 again: home repaints after full-screen app is exited
2012-01-20 12:03:47 -08:00
Dianne Hackborn
1bae80668c Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1 2012-01-20 12:01:51 -08:00