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

66230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
6bf9873397 am 9413752f: am e7ffc5a6: am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1 
* commit '9413752f30a505dfd36fcedb26dc1dd933c9840d':
  docs: remove the 1.0 icon template pack
 2012-01-25 18:05:58 -08:00
Scott Main
9413752f30 am e7ffc5a6: am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1 
* commit 'e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
  docs: remove the 1.0 icon template pack
 2012-01-25 18:03:20 -08:00
Scott Main
e7ffc5a633 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:42 -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
4c281dae6c am 8a89e93b: am 1f9026ca: am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 
* commit '8a89e93ba40d6ce5534262f8dcd878817adfa08f':
  docs: remove ADL presentation PDFs to conserve site space
 2012-01-25 17:57:14 -08:00
Scott Main
8a89e93ba4 am 1f9026ca: am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 
* commit '1f9026caf1af0f7d3eb9de81641ac290fd340b4b':
  docs: remove ADL presentation PDFs to conserve site space
 2012-01-25 17:54:48 -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
1f9026caf1 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:08 -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
77fe98057d am bf80175c: am ba8dd79f: am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics 
* commit 'bf80175cca216636edd4b139da581eaeaee31888':
  DOC CHANGE: New Content Provider topics
 2012-01-25 17:35:26 -08:00
Joe Malin
bf80175cca am ba8dd79f: am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics 
* commit 'ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
  DOC CHANGE: New Content Provider topics
 2012-01-25 17:33:06 -08:00
Joe Malin
ba8dd79f4e am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics 
* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
  DOC CHANGE: New Content Provider topics
 2012-01-25 17:30:13 -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
Svetoslav Ganov
db155ee9ba am 758d97c3: Merge "Fixing failing focus tests" 
* commit '758d97c3126144018b38d0e4ca4deb8b92420e0c':
  Fixing failing focus tests
 2012-01-25 17:11:35 -08:00
Svetoslav Ganov
758d97c312 Merge "Fixing failing focus tests" 2012-01-25 17:09:54 -08:00
Svetoslav Ganov
36a561b4ee Fixing failing focus tests 
Change-Id: I3df6a72f6340cbf2e42ce4913e28471e9358088b
 2012-01-25 17:05:04 -08:00
Teng-Hui Zhu
4e8cacf492 am 99b46be9: Merge "Make sure WebView get notified before the EGL context destroyed." 
* commit '99b46be97bd02d304024d692de12e5779ed34355':
  Make sure WebView get notified before the EGL context destroyed.
 2012-01-25 16:56:02 -08:00
Teng-Hui Zhu
99b46be97b Merge "Make sure WebView get notified before the EGL context destroyed." 2012-01-25 16:53:05 -08:00
Dianne Hackborn
6f2b3985ad am 52da22f2: Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc." 
* commit '52da22f2731cf5f312be9a913295af6638e49595':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
 2012-01-25 16:18:05 -08:00
Dianne Hackborn
52da22f273 Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc." 2012-01-25 16:15:43 -08:00
Alex Sakhartchouk
1e69f42fa2 Adding accidentally removed init block. 
Change-Id: I66790a1c405e682d9ddd1beb36544844562e02c0
 2012-01-25 15:24:57 -08:00
Teng-Hui Zhu
a34eb91a20 Make sure WebView get notified before the EGL context destroyed. 
bug:5639899

Change-Id: Id778cf3dac1d2f6d6b8014b7a911b51dc14fcc8a
 2012-01-25 15:23:59 -08:00
Dianne Hackborn
d96e3dfa02 Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-01-25 15:14:50 -08:00
Gilles Debunne
9156516be2 am 3f696b26: Merge "Unbalanced batch edit begin and end leave TextView unresponsive" 
* commit '3f696b264e4a3dd28421e9e1a58fe2c6241f48e4':
  Unbalanced batch edit begin and end leave TextView unresponsive
 2012-01-25 15:11:01 -08:00
Gilles Debunne
3f696b264e Merge "Unbalanced batch edit begin and end leave TextView unresponsive" 2012-01-25 15:08:29 -08:00
Fabrice Di Meglio
018332b93a am 842e3790: Merge "Update Javadoc for InputConnection.deleteSurroundingText()" 
* commit '842e379074e069d0273711399f45a2d7109f9e64':
  Update Javadoc for InputConnection.deleteSurroundingText()
 2012-01-25 14:56:09 -08:00
Fabrice Di Meglio
842e379074 Merge "Update Javadoc for InputConnection.deleteSurroundingText()" 2012-01-25 14:52:40 -08:00
Alex Sakhartchouk
54567028ba Merge "Changing blur passes to use new shader structure." into graphics-dev 2012-01-25 14:44:04 -08:00
Alex Sakhartchouk
5121da171e Changing blur passes to use new shader structure. 
Change-Id: I8590cc7bfb0ae5b5b55a574852c4c86c3a914ce0
 2012-01-25 14:34:54 -08:00
Gilles Debunne
c012d9897a am c6854d43: Merge "TextView\'s display list updated on layout" 
* commit 'c6854d43fc13fe0c9818ba077dcdbe5204fa6bf2':
  TextView's display list updated on layout
 2012-01-25 14:09:23 -08:00
Gilles Debunne
c6854d43fc Merge "TextView's display list updated on layout" 2012-01-25 14:07:08 -08:00
Wink Saville
61c98bc15d am b675f516: Merge "Add additional debug" 
* commit 'b675f516da196103597542d2c03f30f70359808e':
  Add additional debug
 2012-01-25 14:07:05 -08:00
Wink Saville
b675f516da Merge "Add additional debug" 2012-01-25 14:04:59 -08:00
Wink Saville
c7d7eafb66 Add additional debug 
When ConnectivityService#startUsingNetworkFeature is called and the
special network is not available output some additional information.

Change-Id: I34b226a208596fa6418f1f37a0feec1d274d493c
 2012-01-25 13:47:54 -08:00
Wink Saville
234539431a am 556f0dba: Merge "Fix ClassCastException" 
* commit '556f0dba10517c76b6f20e95e3f4510c0cfb5911':
  Fix ClassCastException
 2012-01-25 13:47:13 -08:00
Wink Saville
556f0dba10 Merge "Fix ClassCastException" 2012-01-25 13:45:02 -08:00
Fabrice Di Meglio
39d23bddef Update Javadoc for InputConnection.deleteSurroundingText() 
- give more precision about how the text is considered

Change-Id: Ie2f09bb3338e7dc0e98da0595d1500a6352d09d3
 2012-01-25 13:40:27 -08:00
Nick Pelly
46c519c817 am c97a5520: Improve NDEF API\'s 
* commit 'c97a552023c3c71079b39092e80c9b44f25a789b':
  Improve NDEF API's
 2012-01-25 13:24:39 -08:00
Nick Pelly
c97a552023 Improve NDEF API's 
o Add NdefRecord.toMimeType()
  Maps the record to a MIME type
o Add NdefRecord.toUri()
  Maps the record to a URI
o Add hidden NfcAdapter.dispatch()
  Helps test the dispatch path.
o Modify createMime(), createUri() and createExternal():
  Do not try and strictly follow RFC requirements for URI or MIME content
  types. This just leads to heartbreak - the RFC requirements are too strict.
  For example RFC1341 forbids the use of '.' in a MIME type, however this is in
  common use in types such as "application/vnd.companyname". I think the best
  approach is to only remove 'obvious' whitespace issues, and to convert
  uppercase to lowercase as per Android guidelines.

Change-Id: Id686f5f3b05b2dceafad48e1cfcbdb2b3890b854
 2012-01-25 13:17:19 -08:00
Nick Pelly
41a3598a81 am dc828acd: Merge "Add API\'s for normalizing MIME\'s and URI\'s." 
* commit 'dc828acd5fadb266b13cce459b1cacfad8ef7aef':
  Add API's for normalizing MIME's and URI's.
 2012-01-25 12:57:58 -08:00
Nick Pelly
dc828acd5f Merge "Add API's for normalizing MIME's and URI's." 2012-01-25 12:55:58 -08:00
Wink Saville
b2bf3350a2 Fix ClassCastException 
In "Change I95ed2aae: Stop using shared DUN APN when tethering stops",
sha1: 8beff9586ff89a1e59469e9820fd9e9d704300d2, an assumption is made
that the msg.obj is always an ApnContext, this is not true for CDMA.
Eventually we plan on removing the destinction between GSM and CDMA but
for now we need to handle it handle it.

Bug: 5904734
Change-Id: I86873dc7aeda5234c14a6fe1e4ec7345ee30e957
 2012-01-25 12:42:51 -08:00
Dianne Hackborn
affb139982 am 43ea4e10: Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs." 
* commit '43ea4e10dc402d20f506cdb4b4f27e49b4dc0443':
  Added JELLY_BEAN version name; update some targetSdkVersion docs.
 2012-01-25 12:32:13 -08:00
Dianne Hackborn
43ea4e10dc Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs." 2012-01-25 12:29:17 -08:00
Gilles Debunne
954325ed26 TextView's display list updated on layout 
Bug 5903021

We need to invalidate the DL at anytime the layout is changed.

Change-Id: Ief06c988b88cdf1b35fe8ce9bac1243326ea44c4
 2012-01-25 11:57:09 -08:00
Jeff Brown
37ba8d6954 am 56965f97: Merge "Fix an inconsistent comment." 
* commit '56965f97b33941440ffa0fc711d5d0f68ea45170':
  Fix an inconsistent comment.
 2012-01-25 11:54:58 -08:00
Jeff Brown
56965f97b3 Merge "Fix an inconsistent comment." 2012-01-25 11:52:48 -08:00
Robert Greenwalt
ae92b4b18a am 01e78a60: am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1 
* commit '01e78a60a44def8edcdbea4c7f85ac5bedec0211':
  Filter our v6 address from tethering dns.
 2012-01-25 11:36:04 -08:00
Robert Greenwalt
01e78a60a4 am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1 
* commit '109533519153307b10e2b3ae327ca4b4cd0c75d3':
  Filter our v6 address from tethering dns.
 2012-01-25 11:33:14 -08:00