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

5673 Commits

Author SHA1 Message Date
The Android Open Source Project
dbccd44a63 Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD 
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
 2013-11-22 11:18:57 -08:00
Christopher Tate
4f33a5d7dd am 1f835093: Merge "Remove parentheses around return statement" 
* commit '1f8350935caa6a44ef2608e34d4e3a91db4424a7':
  Remove parentheses around return statement
 2013-10-30 12:22:36 -07:00
Taeho Kim
67ab4bae1d Remove parentheses around return statement 
Removed parentheses around return statement in drag-n-drop sample,
which is not part of the Android style.

Change-Id: I09701829b277f2aa84b1fff1c7a8ea8241bdc578
Signed-off-by: Taeho Kim <jyte82@gmail.com>
 2013-10-30 20:13:59 +09:00
Christopher Tate
94de60cccc am e431b97c: Merge "Fixed Drag-and-Drop sample code" 
* commit 'e431b97c1f1692a42c9a348a5ff930f82eee2537':
  Fixed Drag-and-Drop sample code
 2013-10-29 15:05:54 -07:00
Taeho Kim
130e1294e8 Fixed Drag-and-Drop sample code 
Fixed some erros in 'Responding to drag events' sample code on
http://developer.android.com/guide/topics/ui/drag-drop.html

Changed View.OnDragEventListener to View.OnDragListener,
deleted brace start('{') after DragEvent.ACTION_DRAG_ENTERED which
does not have matching ends, and removed 'break' on each case in
swich statement which causes 'Unreachable code' error.
Added return statement at the 'default' case, so that onDrag() method
can return value in all case.

Change-Id: I7d2335f5c405626e3f0cff275b52818762c84634
Signed-off-by: Taeho Kim <jyte82@gmail.com>
 2013-10-29 23:32:16 +09:00
Kenny Root
ddc9162881 am a1b4d97b: Merge "Removed duplicate items on table of contents" 
* commit 'a1b4d97b6920d3cd84fe19b07512a0de6996bb4c':
  Removed duplicate items on table of contents
 2013-10-21 10:31:23 -07:00
Taeho Kim
6ef383ad13 Removed duplicate items on table of contents 
Removed duplicate, broken item in 'in this document' on Performance Tips (http://developer.android.com/traning/articles/perf-tips.html)

Change-Id: I499d9bb314fa471e6d2c0590f59c2f71077c00b8
Signed-off-by: Taeho Kim <jyte82@gmail.com>
 2013-10-17 11:10:19 +09:00
Joe Fernandez
7ce6090a30 am 5cff1d32: am 4928e2ce: am e90993bb: am 61884867: am 2d96a0d3: FileProvider training fix: add note about Support Lib to setup lesson 
* commit '5cff1d32adcaad178fc1ba5adf6b8545022ba474':
  FileProvider training fix: add note about Support Lib to setup lesson
 2013-10-16 16:47:42 -07:00
Joe Fernandez
4928e2cef5 am e90993bb: am 61884867: am 2d96a0d3: FileProvider training fix: add note about Support Lib to setup lesson 
* commit 'e90993bb5d30521fcb858702493b55836628b8b2':
  FileProvider training fix: add note about Support Lib to setup lesson
 2013-10-16 16:40:17 -07:00
Joe Fernandez
e90993bb5d am 61884867: am 2d96a0d3: FileProvider training fix: add note about Support Lib to setup lesson 
* commit '6188486766230318ee1e4b91164f3c69c5a4359a':
  FileProvider training fix: add note about Support Lib to setup lesson
 2013-10-16 16:37:48 -07:00
Dirk Dougherty
c724c28f3c am 2c837ca3: am afb3a418: Merge "Doc change: add i/o 2013 design video embeds to videos page." into klp-dev 
* commit '2c837ca3b5a99e9d89b0ab6d2155f10b048ed255':
  Doc change: add i/o 2013 design video embeds to videos page.
 2013-10-16 16:36:08 -07:00
Joe Fernandez
6188486766 am 2d96a0d3: FileProvider training fix: add note about Support Lib to setup lesson 
* commit '2d96a0d3424314b53b46b0fd6fd5b0dad71e7790':
  FileProvider training fix: add note about Support Lib to setup lesson
 2013-10-16 16:34:06 -07:00
Dirk Dougherty
afb3a418c3 Merge "Doc change: add i/o 2013 design video embeds to videos page." into klp-dev 2013-10-16 23:10:12 +00:00
Joe Fernandez
2d96a0d342 FileProvider training fix: add note about Support Lib to setup lesson 
Change-Id: I7c513705a22bdac390ac260a3d70bdd771c998e7
 2013-10-16 15:05:48 -07:00
Scott Main
e2ac9a975c am 315bd412: am 1bab3f53: am a4825fbe: am 655d8c40: am 4aa6b10c: add some search suggestions 
* commit '315bd412a7bd7c74fb32c2a6f963320526b3cbb8':
  add some search suggestions
 2013-10-16 11:39:51 -07:00
Scott Main
1bab3f5306 am a4825fbe: am 655d8c40: am 4aa6b10c: add some search suggestions 
* commit 'a4825fbe24871c57cc855c7d8640a92d114c0514':
  add some search suggestions
 2013-10-16 11:29:58 -07:00
Scott Main
a4825fbe24 am 655d8c40: am 4aa6b10c: add some search suggestions 
* commit '655d8c40092730c8029299eb28961263eaad086c':
  add some search suggestions
 2013-10-16 11:27:46 -07:00
Scott Main
655d8c4009 am 4aa6b10c: add some search suggestions 
* commit '4aa6b10c7f79090ddf72d64dcc3954fbf135e192':
  add some search suggestions
 2013-10-16 11:21:41 -07:00
Scott Main
4aa6b10c7f add some search suggestions 
Change-Id: I6b3026bff30dc27119995d93529874fdfa000d5f
 2013-10-16 11:18:04 -07:00
Dirk Dougherty
593d970615 Doc change: add i/o 2013 design video embeds to videos page. 
Change-Id: I9dc0655671f0365905b01615a64905c12c0a2375
Bug-Id: 11191366
 2013-10-14 18:40:38 -07:00
Scott Main
4c33396508 am a8891de3: am 9ecc2904: am da5d7027: am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs 
* commit 'a8891de3776aa38d13f3e6119233ba1345dff1ef':
  add docs about managing app memory
 2013-10-14 10:07:21 -07:00
Scott Main
9ecc29043f am da5d7027: am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs 
* commit 'da5d7027a8905dd17f1cb8dd249d0d9320a97fec':
  add docs about managing app memory
 2013-10-14 09:59:52 -07:00
Scott Main
da5d7027a8 am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs 
* commit '5a99a7023ee5f8f054a9e8d10ed78e6c3f30a839':
  add docs about managing app memory
 2013-10-14 09:57:11 -07:00
Scott Main
5a99a7023e am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs 
* commit '4dfe894440f3b1af62df8e6cb74503c86519c74d':
  add docs about managing app memory
 2013-10-14 09:52:07 -07:00
Scott Main
4dfe894440 Merge "add docs about managing app memory" into jb-mr2-docs 2013-10-14 16:49:11 +00:00
Dirk Dougherty
50260360f4 am 86858479: am 00c5db05: Merge "Doc change: fix link to widgets design doc." into klp-dev 
* commit '86858479e53dc39bafce3be418b39e009df44783':
  Doc change: fix link to widgets design doc.
 2013-10-14 09:19:24 -07:00
Dirk Dougherty
00c5db0596 Merge "Doc change: fix link to widgets design doc." into klp-dev 2013-10-14 16:12:29 +00:00
Joe Malin
5f2bc80f18 am e8117b64: am a2c64bb6: am 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class 
* commit 'e8117b64ee8580892e9fdad76bbd152bcf123c96':
  DOC CHANGE: FileProvider training class
 2013-10-12 15:56:42 -07:00
Joe Malin
91245730a1 am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class 
* commit 'ca3387776037cd00b7bd7114535e3f3365cf3464':
  DOC CHANGE: FileProvider training class
 2013-10-12 15:49:09 -07:00
Joe Malin
ca33877760 am 45edbb70: DOC CHANGE: FileProvider training class 
* commit '45edbb701ac44891aa07a403a55ee2393da9b25f':
  DOC CHANGE: FileProvider training class
 2013-10-12 15:46:02 -07:00
Scott Main
a3f0e01f33 add docs about managing app memory 
Change-Id: I8bd7b05e7ce00faedbbc131a38f2a73637d1b365
 2013-10-11 19:40:36 -07:00
Dirk Dougherty
cd514970cc Doc change: fix link to widgets design doc. 
bug: 11184594
Change-Id: I975696d172d0862ac20c46f709e81b01bf78fb0f
 2013-10-11 17:29:06 -07:00
Joe Malin
45edbb701a DOC CHANGE: FileProvider training class 
Change-Id: Idad8840dec02150733f23cfefdeaf152a260f63a
 2013-10-11 16:48:18 -07:00
Scott Main
0234285b43 am d5786ca0: am 1001cf21: am eae969c1: am 439c4b47: am c0da3f1d: media-formats.html: clarify WebP availability 
* commit 'd5786ca0a6773f0aa6dbccbf1f894cccb8c2cfc9':
  media-formats.html: clarify WebP availability
 2013-10-11 12:50:17 -07:00
Scott Main
eae969c17a am 439c4b47: am c0da3f1d: media-formats.html: clarify WebP availability 
* commit '439c4b4783ec9e800e9a6fd6fc38dd393c41b77b':
  media-formats.html: clarify WebP availability
 2013-10-11 12:30:43 -07:00
Scott Main
439c4b4783 am c0da3f1d: media-formats.html: clarify WebP availability 
* commit 'c0da3f1d60f99c3188906d429ed38edbdd934f12':
  media-formats.html: clarify WebP availability
 2013-10-11 12:27:13 -07:00
Scott Main
c0da3f1d60 media-formats.html: clarify WebP availability 
Lossless and transparency support were added in JB-MR1

CL copied from https://critique.corp.google.com/#review/53655564

Change-Id: I2c568525ff7c7a540328e41a57b6f16647733e4e
 2013-10-11 12:03:12 -07:00
Dirk Dougherty
83fec5426a am a16ad1e9: am 384f060f: am a8914d02: am 0c74fc28: am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit 'a16ad1e9c539ed11c17b230c6036a7e178f09511':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 19:20:30 -07:00
Dirk Dougherty
a8914d02f4 am 0c74fc28: am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit '0c74fc28b71df1a59bd6c94e62c1247ae922cff7':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 17:53:51 -07:00
Dirk Dougherty
0c74fc28b7 am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit '234101a4c597fe285703f7a012ef9eda6c751578':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 17:50:21 -07:00
Dirk Dougherty
234101a4c5 Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 2013-10-11 00:48:14 +00:00
Dirk Dougherty
3f848899f4 Doc change: add tablet success story and fix a few issues. 
Change-Id: Ifdc494270d200604b9a228601b5ead0e8b2c4e3f
 2013-10-10 16:34:40 -07:00
Joe Malin
104b91056e am 9b6ce699: am ead8478a: am 299d57f7: am a3da7e4e: am 48872ee0: Merge "DOC CHANGE: Android Beam training class" into jb-mr2-docs 
* commit '9b6ce6994a1b11343d6ea5d4312233b34e1499d9':
  DOC CHANGE: Android Beam training class
 2013-10-09 16:26:02 -07:00
Scott Main
d5e2fd07c8 am 7b8c6c76: am a473027d: am 483a2c21: am 144f2e58: am 6a831b7d: fix typo in code comment 
* commit '7b8c6c76ade5fee6a04d1b121d6870bf2c064871':
  fix typo in code comment
 2013-10-09 16:22:30 -07:00
Joe Malin
299d57f7df am a3da7e4e: am 48872ee0: Merge "DOC CHANGE: Android Beam training class" into jb-mr2-docs 
* commit 'a3da7e4ec0da78a05e91d74ce50f7b6008deb135':
  DOC CHANGE: Android Beam training class
 2013-10-09 16:15:31 -07:00
Scott Main
483a2c218c am 144f2e58: am 6a831b7d: fix typo in code comment 
* commit '144f2e58830d1deae77675286fb7eafb27e456bd':
  fix typo in code comment
 2013-10-09 16:11:49 -07:00
Joe Malin
a3da7e4ec0 am 48872ee0: Merge "DOC CHANGE: Android Beam training class" into jb-mr2-docs 
* commit '48872ee0a0a0d2fcfe36fa1116af00f41ccd1e3c':
  DOC CHANGE: Android Beam training class
 2013-10-09 16:11:09 -07:00
Joe Malin
48872ee0a0 Merge "DOC CHANGE: Android Beam training class" into jb-mr2-docs 2013-10-09 23:08:15 +00:00
Scott Main
144f2e5883 am 6a831b7d: fix typo in code comment 
* commit '6a831b7d5cd87b5b2c7660c84ed34f8ccc5ae275':
  fix typo in code comment
 2013-10-09 16:07:16 -07:00
Joe Malin
2e1c7b7495 DOC CHANGE: Android Beam training class 
Change-Id: I4960d2b0ef8fdd32cf985f2104b0819e1311337b
 2013-10-09 09:39:30 -07:00