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

83735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
6958c161a9 Merge "docs: misc bug fixes from external issues" into jb-dev 2012-08-14 12:38:22 -07:00
Jason Sams
6ab97682fd Intrinsics test 
Change-Id: I1847ad0c9190100eb84f7e052dd9f3bff81dc447
 2012-08-14 12:06:00 -07:00
Baligh Uddin
568ff8ff6b Merge "Import translations. DO NOT MERGE" 2012-08-14 11:45:50 -07:00
Baligh Uddin
501d0621d4 Merge "Import translations. DO NOT MERGE" 2012-08-14 11:45:50 -07:00
Scott Main
d632b43fab docs: change download URLs for design assets. 
These new URLs are dummies that are handled by a redirect rule for
all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/
Using this redirect allows us to change the storage location of the download assets in the future.

Change-Id: I0dc6ecc1a6898f1256ba4c9ff90b619366e47629
 2012-08-14 11:44:09 -07:00
Iliyan Malchev
8c700a874a am c29a6ffd: am 57853108: Revert "Add timestamp in scan results" 
* commit 'c29a6ffd8abf73623137b17e803e0c1ca363e6d3':
  Revert "Add timestamp in scan results"
 2012-08-14 11:24:06 -07:00
Iliyan Malchev
c29a6ffd8a am 57853108: Revert "Add timestamp in scan results" 
* commit '578531082b8e8c8aa03868e69591b7613b0e8b8e':
  Revert "Add timestamp in scan results"
 2012-08-14 11:22:43 -07:00
Iliyan Malchev
578531082b Revert "Add timestamp in scan results" 
Temporarily reverting this until all devices switch to using wpa_supplicant_8.

This reverts commit b31f78f93768fef269617ec788a5c6655a375f80.

Change-Id: I33fcb8415288d95289dcd46fa71e950e0f2b87ec
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2012-08-14 11:17:21 -07:00
Baligh Uddin
edc8e71a68 Import translations. DO NOT MERGE 
Change-Id: If52f9049a740fa722e7c15527b8d08921ae935bd
Auto-generated-cl: translation import
 2012-08-14 11:15:55 -07:00
Baligh Uddin
62a045f4bf am 9775ed37: (-s ours) am 73025eda: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9775ed3792ee0dddb92a806d79ee955ea8753c28':
  Import translations. DO NOT MERGE
 2012-08-14 11:10:15 -07:00
Baligh Uddin
9775ed3792 am 73025eda: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '73025eda13e19672534974efa06d1e2313bceb30':
  Import translations. DO NOT MERGE
 2012-08-14 11:07:58 -07:00
Baligh Uddin
73025eda13 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-14 11:05:27 -07:00
Baligh Uddin
75900f7d89 Import translations. DO NOT MERGE 
Change-Id: Ic8830e8e351d93506427aabed4f527dfe2f5888f
Auto-generated-cl: translation import
 2012-08-14 11:05:04 -07:00
Chiao Cheng
38de253d19 am 667cf415: am 472f4161: Merge "Adding limit and offset query parameters to CallLog." into jb-mr1-dev 
* commit '667cf4158a3bef4917fff2bc87e288e5eefec6c3':
  Adding limit and offset query parameters to CallLog.
 2012-08-14 10:58:11 -07:00
Chiao Cheng
667cf4158a am 472f4161: Merge "Adding limit and offset query parameters to CallLog." into jb-mr1-dev 
* commit '472f41614044cc40e89b76f2200b57bc28c7ddae':
  Adding limit and offset query parameters to CallLog.
 2012-08-14 10:55:56 -07:00
Chiao Cheng
472f416140 Merge "Adding limit and offset query parameters to CallLog." into jb-mr1-dev 2012-08-14 10:53:19 -07:00
Wink Saville
30ed509234 am 9328aa84: am 215ccb32: am d660b610: am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev 
* commit '9328aa84fa519b818d612d5dcd51b2c963a0ae93':
  show 3G icon for CDMA/1xRTT
 2012-08-14 10:50:35 -07:00
Wink Saville
9328aa84fa am 215ccb32: am d660b610: am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev 
* commit '215ccb32c74a41569ddcb203aa802201e40bb386':
  show 3G icon for CDMA/1xRTT
 2012-08-14 10:47:18 -07:00
Wink Saville
215ccb32c7 am d660b610: am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev 
* commit 'd660b610c8b98d23263d3863ae8438a569597a16':
  show 3G icon for CDMA/1xRTT
 2012-08-14 10:44:50 -07:00
Chet Haase
6c53920187 am bd94e98f: am e8165ac5: Merge "Optimize interactions with glyph cache" into jb-mr1-dev 
* commit 'bd94e98f6a430c504cc09844962c0ac8b664913b':
  Optimize interactions with glyph cache
 2012-08-14 10:43:47 -07:00
Wink Saville
d660b610c8 am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev 
* commit '116748d0d16f8e747fdfdaf2326d9a58bb2317d5':
  show 3G icon for CDMA/1xRTT
 2012-08-14 10:42:50 -07:00
Chet Haase
bd94e98f6a am e8165ac5: Merge "Optimize interactions with glyph cache" into jb-mr1-dev 
* commit 'e8165ac5fdd95ddcf65309b4225f55074b12ccc4':
  Optimize interactions with glyph cache
 2012-08-14 10:41:31 -07:00
Wink Saville
116748d0d1 Merge "show 3G icon for CDMA/1xRTT" into jb-dev 2012-08-14 10:40:34 -07:00
Chet Haase
e8165ac5fd Merge "Optimize interactions with glyph cache" into jb-mr1-dev 2012-08-14 10:38:45 -07:00
Chet Haase
e816baea65 Optimize interactions with glyph cache 
There are two fixes here:
- precaching: instead of caching-then-drawing whenever there is a new
glyph, we cache at DisplayList record time. Then when we finally draw that
DisplayList, we just upload the affected texture(s) once, instead of once
per change. This is a huge savings in upload time, especially when there are
larger glyphs being used by the app.
- packing: Previously, glyphs would line up horizontally on each cache line, leaving
potentially tons of space vertically, especially when smaller glyphs got put into cache
lines intended for large glyphs (which can happen when an app uses lots of unique
glyphs, a common case with, for example, chinese/japanese/korean languages). The new
approach packs glyphs vertically as well as horizontally to use the space more efficiently
and provide space for more glyphs in these situations.

Change-Id: I84338aa25db208c7bf13f3f92b4d05ed40c33527
 2012-08-14 10:33:30 -07:00
Madan Ankapura
5333400bd5 show 3G icon for CDMA/1xRTT 
when config_showMin3G is enabled to true in a CDMA device

Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
 2012-08-14 10:17:54 -07:00
Narayan Kamath
13f8215179 am 31d68f42: am 9c3d7a88: Fixes to TextToSpeechService#synthesizeToFile 
* commit '31d68f4268f190ca9c0e56cdc20e6e3800c37f35':
  Fixes to TextToSpeechService#synthesizeToFile
 2012-08-14 08:43:20 -07:00
Narayan Kamath
824c393b56 am 8df5472b: am ed4e541a: Fix bug in BlockingAudioTrack. 
* commit '8df5472b64f542dbf3fbf5192312f3f1f239463f':
  Fix bug in BlockingAudioTrack.
 2012-08-14 08:41:38 -07:00
Narayan Kamath
31d68f4268 am 9c3d7a88: Fixes to TextToSpeechService#synthesizeToFile 
* commit '9c3d7a888d0c5c09f0153e81018ff68aa6e91712':
  Fixes to TextToSpeechService#synthesizeToFile
 2012-08-14 08:41:23 -07:00
Narayan Kamath
8df5472b64 am ed4e541a: Fix bug in BlockingAudioTrack. 
* commit 'ed4e541a20cc662b8399844684d18ad0060bd1cb':
  Fix bug in BlockingAudioTrack.
 2012-08-14 08:39:40 -07:00
Narayan Kamath
9c3d7a888d Fixes to TextToSpeechService#synthesizeToFile 
- Fixes a strict mode violation, defers file validity checks
  to when the engine starts synthesizing audio.
- Fixes some log spam when done() is called twice.

bug:6215680
bug:5415258
Change-Id: I4001be848b5208422d4091b7398e94ed311c649f
 2012-08-14 08:38:26 -07:00
Narayan Kamath
ed4e541a20 Fix bug in BlockingAudioTrack. 
Will be seen when createStreamingAudioTrack() returns null,
which will happen if the audioflinger / audiomanager are unhealthy.

Also removes some confusing synchronization from this class.

bug:6636401
Change-Id: Iaf68a305665b7bc973898145e9cd1563e2569a2b
 2012-08-14 08:36:27 -07:00
Daniel Sandler
1c1edaa5f1 Use a color resource to specify the dim behind panels. 
Change-Id: I551d9969dc1f4032f26fd94cf9719f07873abb5e
 2012-08-14 11:28:38 -04:00
Daniel Sandler
da4ab9114a am b7b6f820: am a6aef1bb: Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev 
* commit 'b7b6f8200dca3e65fe84cf41342197fb29acecb6':
  New status bar capable of multiple sliding panels.
 2012-08-14 08:01:00 -07:00
Steve Block
9ccdb0461c am 3d935621: am 27f3e32e: Clarify JavaDoc for WebView.loadData() 
* commit '3d93562115237d8a893f3e686e44116ba506d57a':
  Clarify JavaDoc for WebView.loadData()
 2012-08-14 07:59:11 -07:00
Daniel Sandler
b7b6f8200d am a6aef1bb: Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev 
* commit 'a6aef1bbb4382fa5f89d0b7ad2cc46be4c6de1e7':
  New status bar capable of multiple sliding panels.
 2012-08-14 07:58:54 -07:00
Steve Block
3d93562115 am 27f3e32e: Clarify JavaDoc for WebView.loadData() 
* commit '27f3e32ee181ccd809fbe74ec5f7fb43aea197f7':
  Clarify JavaDoc for WebView.loadData()
 2012-08-14 07:57:02 -07:00
Daniel Sandler
a6aef1bbb4 Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev 2012-08-14 07:56:44 -07:00
Steve Block
c723e35336 Clean up JavaDoc for CookieManager 
Bug: 5461416
Change-Id: I0ae09943007cf3866daad97a76f5008e61c471ed
 2012-08-14 15:54:38 +01:00
Steve Block
27f3e32ee1 Clarify JavaDoc for WebView.loadData() 
Bug: 5461416
Change-Id: I3f0955677ea64bb4073c97aabea34096298cd710
 2012-08-14 15:54:35 +01:00
The Android Automerger
07599e8fca merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-14 07:07:18 -07:00
Daniel Hansson
4b71686d09 Keep keyguard from starting after finished call when screen is on 
Previously keyguard would start after a call ended, even though
the screen was on, if the screen had not been turned off since
phone startup.

Change-Id: I03c18a0bb2a58760614645871f4703afb9a0677d
 2012-08-14 13:42:36 +02:00
Matthew Xie
6e8f4d7820 am 3fe98084: am 58de1427: Merge "Implement enableNoAutoconnect()" into jb-mr1-dev 
* commit '3fe98084e661f29c769664463f602a90a72c35c8':
  Implement enableNoAutoconnect()
 2012-08-14 00:42:09 -07:00
Matthew Xie
3fe98084e6 am 58de1427: Merge "Implement enableNoAutoconnect()" into jb-mr1-dev 
* commit '58de1427c313e0debf2a929931e8c4065d4d46c5':
  Implement enableNoAutoconnect()
 2012-08-14 00:39:16 -07:00
Matthew Xie
58de1427c3 Merge "Implement enableNoAutoconnect()" into jb-mr1-dev 2012-08-14 00:37:01 -07:00
Ganesh Ganapathi Batta
fffa86ba83 Implement enableNoAutoconnect() 
Adding enableNoAutoconnect() API support in Bluetooth service
 to let BT enable in quiet mode

Change-Id: I546f3ceb298082a9c9a698f406379470e3cc0d4f
 2012-08-14 00:18:07 -07:00
Jeff Brown
1d89d2b56d am adeadda2: am caaeda95: Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev 
* commit 'adeadda2027ecc87399ce4504145a5bcc78e1bec':
  Add a toString() method to Sensor for debugging purposes.
 2012-08-13 23:19:44 -07:00
Jeff Brown
adeadda202 am caaeda95: Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev 
* commit 'caaeda955bd80df9d9ab310e7ab504865a2e32e9':
  Add a toString() method to Sensor for debugging purposes.
 2012-08-13 23:17:24 -07:00
Jeff Brown
caaeda955b Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev 2012-08-13 23:14:56 -07:00
Mike Lockwood
6e5a4946dd am c18184f1: am 510cff94: am f02354e2: am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 
* commit 'c18184f14da6128db51b1343c6e466ac293a00e7':
  Added missing USB_DEVICE_ATTACHED broadcast to running Activity
 2012-08-13 20:48:17 -07:00