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

65671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
15d07aded4 am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1 
* commit '639b25ea289481da6cfd4229649b51ffc6ce3406':
  docs: add NOTICE to action bar icon pack and sprinkle download links
 2012-01-26 16:35:36 -08:00
Roman Nurik
639b25ea28 Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1 2012-01-26 16:32:56 -08:00
Roman Nurik
bb9bffb6b9 docs: add NOTICE to action bar icon pack and sprinkle download links 
Change-Id: I1437ce64908c28621e86fff54767ddbd2b1fcb3a
 2012-01-26 15:57:34 -08:00
Roman Nurik
b6b7ba09fc am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1 
* commit '00b3ceb48b5e23daa8101db6080bee46d6518f43':
  docs: Update designing-navigation training class to link to Android Design
 2012-01-26 15:35:47 -08:00
Roman Nurik
00b3ceb48b Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1 2012-01-26 15:33:57 -08:00
Roman Nurik
3ba792c7f4 docs: Update designing-navigation training class to link to Android Design 
Change-Id: I1cdda032f31798f9a32b7bec583dcfaa6eafb8c2
 2012-01-26 13:12:22 -08:00
Daniel Sandler
0382a787ad am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 
* commit '5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
  Suppress mobile-out-of-service label if wifi connected.
 2012-01-26 13:05:00 -08:00
Daniel Sandler
5b08738a62 Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 2012-01-26 13:02:32 -08:00
Daniel Sandler
62a1eb8972 Suppress mobile-out-of-service label if wifi connected. 
Carrier name is shown if
 - in service and connected to mobile data
 - in service and connected to wifi

Carrier name is blanked if out of service and connected to
wifi.

"No internet connection" is shown if out of service without
any other route.

Bug: 5903914
Change-Id: I59d4d0c90e4153d73c38f7f0e150becf7e021a5b
 2012-01-26 15:35:03 -05:00
Scott Main
74515ab855 am 6c055bbd: docs: add action bar icons ZIP 
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
  docs: add action bar icons ZIP
 2012-01-26 11:45:06 -08:00
Scott Main
6c055bbdf4 docs: add action bar icons ZIP 
Change-Id: Id38d82655d6bcc468890a4db93a19ac4e385db13
 2012-01-26 11:35:20 -08:00
Scott Main
91e00a605a am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1 
* commit '9ac4dd828065410efbb380992d996c7e93daf437':
  docs: remove the 1.0 icon template pack
 2012-01-25 18:00:36 -08:00
Scott Main
9ac4dd8280 Merge "docs: remove the 1.0 icon template pack" into ics-mr1 2012-01-25 17:58:54 -08:00
Scott Main
3fe452906d docs: remove the 1.0 icon template pack 
Change-Id: Ia73426f67b95bc3c5aa39150a6518ee28a215b42
 2012-01-25 17:54:28 -08:00
Scott Main
99a08555fa am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 
* commit 'f466db14ec32fbaf08a868df40f7685a7e7df3db':
  docs: remove ADL presentation PDFs to conserve site space
 2012-01-25 17:52:06 -08:00
Scott Main
f466db14ec Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 2012-01-25 17:50:20 -08:00
Scott Main
948eb9b29e docs: remove ADL presentation PDFs to conserve site space 
Change-Id: Ie606dc02943eb27a318b183b8ebd7201e3ee38bb
 2012-01-25 17:47:46 -08:00
Joe Malin
3036f34ada am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics 
* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
  DOC CHANGE: New Content Provider topics
 2012-01-25 17:30:17 -08:00
Joe Malin
9f426604e6 am a2a46f62: DOC CHANGE: New Content Provider topics 
* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
  DOC CHANGE: New Content Provider topics
 2012-01-25 17:27:46 -08:00
Robert Greenwalt
9800e30b54 am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1 
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
  Filter our v6 address from tethering dns.
 2012-01-25 11:30:44 -08:00
Robert Greenwalt
44f64c9657 Merge "Filter our v6 address from tethering dns." into ics-mr1 2012-01-25 11:28:30 -08:00
Roman Nurik
7057eb25ca am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1 
* commit 'cf077fdd79853dd4778598a623dc2f469c1a8934':
  docs: Android Design typo and grammar fixes
 2012-01-24 18:10:30 -08:00
Roman Nurik
cf077fdd79 Merge "docs: Android Design typo and grammar fixes" into ics-mr1 2012-01-24 18:08:52 -08:00
Roman Nurik
5d3b0c7a7a docs: Android Design typo and grammar fixes 
Change-Id: Ice0eb216c985183e2f41c287ea5d1cc7af1f31f2
 2012-01-24 17:51:17 -08:00
Jason Simmons
789fb2e966 Merge "Make AudioManager.adjustMasterVolume public and hidden" into ics-aah 2012-01-24 16:54:18 -08:00
Robert Greenwalt
03d58bc656 Filter our v6 address from tethering dns. 
Don't support IPv6 yet, and the tools crash when they see one, so
filter them out.

bug:5913888
Change-Id: Id7096aa70da4e3cc8e4702b0b489c0228a100db9
 2012-01-24 16:44:50 -08:00
Jason Simmons
db8b292b6d Make AudioManager.adjustMasterVolume public and hidden 
Change-Id: Ied4d07c2f67f24d1e1963f4ff30650042334d563
 2012-01-24 16:27:19 -08:00
Daniel Sandler
8f0fdd10dc am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1 
* commit '185c0ef7e4aaa4bb978a6eb5c93c569585a07f56':
  Stop showing "No internet connection" when there is one.
 2012-01-24 14:04:47 -08:00
Jason Simmons
717c37944c resolved conflicts for merge of 7eeaf3f0 to ics-aah 
Change-Id: I92b709268e22e3c3e9590c15173ab073b37db726
 2012-01-24 13:16:19 -08:00
Daniel Sandler
185c0ef7e4 Merge "Stop showing "No internet connection" when there is one." into ics-mr1 2012-01-24 12:54:48 -08:00
Eric Laurent
99322356a0 am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 
* commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
 2012-01-24 11:51:15 -08:00
Eric Laurent
7eeaf3f07a Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 2012-01-24 11:49:39 -08:00
Eric Laurent
41773d4655 Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 2012-01-24 11:49:16 -08:00
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
4e2acb1db5 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:39 -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
4fdbe9e550 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:35:19 -08:00
Dianne Hackborn
6c8bf2cc4c 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:35:12 -08:00
Daniel Sandler
7aeae0bdee 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:35:09 -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
681e74e840 am 4809f09f: docs: update fujitsu id, capitalize 
* commit '4809f09f55a6177bd69303630dc42cc738f71116':
  docs: update fujitsu id, capitalize
 2012-01-24 11:01:52 -08:00
Scott Main
0ab728d7f0 am cdf14454: docs: add fujitsu/toshiba USB vendor id 
* commit 'cdf14454326dcb2f43ae0da208a8ed65a38f2897':
  docs: add fujitsu/toshiba USB vendor id
 2012-01-24 10:59:25 -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
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