122409 Commits

Author SHA1 Message Date
Dirk Dougherty
d7a50a6282 am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '57801123c16a160d03dd265ca2f193b51e876186':
  Doc change: add Drive API feature page. fix link text on several pages
2014-01-16 00:10:38 +00:00
Dirk Dougherty
5f26f2c9d2 am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '6ec44a882b87fffb37e9dbafe8c5535f16faf349':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
2014-01-16 00:10:34 +00:00
Dirk Dougherty
57801123c1 Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 2014-01-16 00:08:53 +00:00
Dirk Dougherty
6ec44a882b Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 2014-01-16 00:07:35 +00:00
Wink Saville
bef8958652 am 9bc74c4b: am ab092bb0: am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"
* commit '9bc74c4b20bc0c88d01b832517122c28439aa406':
  Fixed mistaken reference to "LTE". Bug 7637224
2014-01-16 00:06:02 +00:00
Wink Saville
9bc74c4b20 am ab092bb0: am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"
* commit 'ab092bb065b09ac0caa000269025c5a5ec951973':
  Fixed mistaken reference to "LTE". Bug 7637224
2014-01-16 00:03:13 +00:00
Wink Saville
ab092bb065 am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"
* commit '469881381b081157b95e8e5ee3c9293bbbc1c852':
  Fixed mistaken reference to "LTE". Bug 7637224
2014-01-16 00:00:18 +00:00
Wink Saville
469881381b am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"
* commit '5775697029760ca886a287ef2c3119d5097ded56':
  Fixed mistaken reference to "LTE". Bug 7637224
2014-01-15 15:57:10 -08:00
quddusc
cf27731826 am 9fa2cf62: am cf280856: am f6490353: am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '9fa2cf62155d128dc6594662ffa57f13beffcaf9':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
2014-01-15 23:52:33 +00:00
quddusc
a8c8aa9f0f am e0ed54cc: am 18ae7b08: am dba65d6f: am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit 'e0ed54cc53363a4fe16dc50f08a88d7f22fc68b1':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
2014-01-15 23:52:27 +00:00
Wink Saville
5775697029 am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"
* commit 'a6aa3199bdb676e349c28b861a04c34a4ec136e0':
  Fixed mistaken reference to "LTE". Bug 7637224
2014-01-15 15:49:14 -08:00
quddusc
9fa2cf6215 am cf280856: am f6490353: am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit 'cf280856d69a63b61bc4c5e8e61033174273fb9b':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
2014-01-15 23:47:45 +00:00
quddusc
e0ed54cc53 am 18ae7b08: am dba65d6f: am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '18ae7b0846a70be3e9cad1741130699e10ea5ca5':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
2014-01-15 23:47:39 +00:00
Wink Saville
a6aa3199bd Merge "Fixed mistaken reference to "LTE". Bug 7637224" 2014-01-15 23:44:54 +00:00
quddusc
cf280856d6 am f6490353: am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit 'f6490353833bba0826d5a21f3b41b451135da4e6':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
2014-01-15 23:43:52 +00:00
quddusc
18ae7b0846 am dba65d6f: am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit 'dba65d6fb5b9489ac5434ce3eece7f66227442f1':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
2014-01-15 23:43:47 +00:00
quddusc
f649035383 am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '77916b9ae1a5780f0aac46eb00d0fc835a8d6c84':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
2014-01-15 15:40:55 -08:00
quddusc
dba65d6fb5 am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '57edc17c398b3b438e1a3264219a6fa7f444341a':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
2014-01-15 15:40:50 -08:00
quddusc
77916b9ae1 am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit 'bf43ef272ad386ad89d115ab8be1b706ae29034e':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
2014-01-15 23:37:08 +00:00
quddusc
57edc17c39 am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '563daeeaf11bb17c8570e11de63d1f1d6fb0c8bc':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
2014-01-15 23:37:04 +00:00
quddusc
bf43ef272a Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs 2014-01-15 23:34:50 +00:00
Victoria Lease
d849f546db check for null mEditor in TextView.canCopy()
canSelectText(), canCut(), and canPaste() do it, too!
canCopy() wants to be cool like them!

Bug: 11388122
Change-Id: I8595effbff269c05ac3f763419298970045ba054
2014-01-15 15:16:30 -08:00
Ricardo Cervera
b96c0ab4fb docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890
HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html

Change-Id: I08c63828b0250ca727b69dfbcf37f01a0328dcf9
2014-01-15 15:16:30 -08:00
quddusc
563daeeaf1 cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
Change-Id: I6b00a0b0c209b2703db62ea7fd103ac6a58b36a8
2014-01-15 14:18:38 -08:00
Chet Haase
a6198d37fc Merge "Fix bug in PathMeasure with trimmed paths" 2014-01-15 22:10:00 +00:00
Ricardo Cervera
d400ba6efb docs: Fixed typos in audio-focus.jd. Bug: 12528498
HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html

Change-Id: I2198e4e27661b374d7c812bc7f26658073feae20
2014-01-15 13:50:43 -08:00
Igor Murashkin
432005306d Merge "camera2: @hide android.statistics.predictedColor*" 2014-01-15 21:30:24 +00:00
Igor Murashkin
aef3b7ed9f camera2: @hide android.statistics.predictedColor*
Change-Id: I8c1b7596c1e0c311a4f9fabdd5de72b4b7b372b5
2014-01-15 13:28:19 -08:00
Ricardo Cervera
8caf1e6b31 am 0f38580f: am 6150b2c6: am 4f216e1d: am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit '0f38580febcf9f2d71f7c1067cb00fe3b3f4476a':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 21:21:00 +00:00
Ricardo Cervera
0f38580feb am 6150b2c6: am 4f216e1d: am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit '6150b2c6ac95dc9b0bd3556d6e542402b5899da6':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 21:18:07 +00:00
Ricardo Cervera
6150b2c6ac am 4f216e1d: am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit '4f216e1db9c01e5bbdf461fe25d41bad2874c082':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 21:13:41 +00:00
Ricardo Cervera
4f216e1db9 am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit 'c919f4f47787245ddda32d0e41e7bae0facd0ee8':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 13:11:13 -08:00
Ricardo Cervera
c919f4f477 am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit 'bab2235ae89e37452e9be8a8b6d2581fe59e0162':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 21:07:21 +00:00
Ricardo Cervera
bab2235ae8 Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs 2014-01-15 21:03:54 +00:00
John Spurlock
dd8877bced Merge "Tear down bars on destroy() and avoid null pointers." 2014-01-15 21:00:16 +00:00
Igor Murashkin
3242f4fb19 camera2: Fix @see being emitted into middle of javadoc (+more)
Other minor fixes:
- javadoc optional/FULL correctly emitted for properties lacking details
- javadoc details being incorrectly dedented before being rendered by
  markdown, causing spurious <code> blocks to be emitted

Bug: 12552669
Change-Id: I4c6615ec47810757b8348995db2b199222a3a77e
2014-01-15 12:27:41 -08:00
Chet Haase
c8f0b11cc4 Fix bug in PathMeasure with trimmed paths
Logic in the hardware renderer optimizes path rendering for simple
paths that consist of only rectangles. Any operation on the path that
adds any other primitive sets the simplicity flag to false appropriately.
PathMeasure.getSegment(), however, avoids those code paths and never sets
the mIsSimple flag at all, so it returns its original value (true, if the
path was simply constructed with no operations before being used in the
getSegment() call).

The fix is to avoid the optimization for paths used in getSegment(), since
it's not clear what operations will end up in the path and it's likely not
going to be just simple rectangles in any case.

Issue #12533902 PathMeasure.getSegment is broken

Change-Id: I71e77207e4d5c649c326557d33eba31e9b0fd45e
2014-01-15 12:12:20 -08:00
Jeff Hao
70216e599e am ac20b469: am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit 'ac20b469259129df948bae1fa5434098b1801185':
  Add sample profiling interface to startMethodTracing.
2014-01-15 19:50:53 +00:00
Jeff Hao
ac20b46925 am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '6c13f384749150e9fa6f930023a9161fe97402d0':
  Add sample profiling interface to startMethodTracing.
2014-01-15 19:48:18 +00:00
Jeff Hao
6c13f38474 am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '56b110649424534de36ca41b3e352a73b6bdf3c0':
  Add sample profiling interface to startMethodTracing.
2014-01-15 19:45:06 +00:00
Jeff Hao
56b1106494 am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
  Add sample profiling interface to startMethodTracing.
2014-01-15 11:41:30 -08:00
Jeff Hao
9a5005a3bf am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit 'f6730d26841377de0f7ee60fa78c6ef2f8be1f2e':
  Add sample profiling interface to startMethodTracing.
2014-01-15 11:38:01 -08:00
Jeff Hao
f6730d2684 Merge "Add sample profiling interface to startMethodTracing." 2014-01-15 19:34:39 +00:00
Zhijun He
399f05d1e7 Camera2: Update awbMode related javadoc spec
Change-Id: I999d2bc94834c6f6d4483493707f05c92d7c5d67
2014-01-15 11:31:30 -08:00
Jeff Hao
d02e60fbd4 Add sample profiling interface to startMethodTracing.
Frameworks base side of this change. Also changed art and libcore.

Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
2014-01-15 11:27:24 -08:00
Ricardo Cervera
980edc3ca1 docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
Change-Id: I6c247e172b2a6dd0ef25afc6cf33f0960fc0fa8d
Review: http://quixote.mtv.corp.google.com:8101/google/play/publishing/multiple-apks.html
2014-01-15 11:25:10 -08:00
Leon Scroggins III
5aa3e4d58d Merge "Fix Javadoc build break." 2014-01-15 19:24:39 +00:00
Leon Scroggins III
2bc49ca96e Fix Javadoc build break.
Remove links to non-specific function name.

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
2014-01-15 14:23:14 -05:00
John Spurlock
ab847cf16d Tear down bars on destroy() and avoid null pointers.
Change-Id: Ie393689bbf2f0b28895bfde5098c883b5d4ea4a6
2014-01-15 14:18:43 -05:00
John Reck
81155da284 Merge "Remove dead code" 2014-01-15 18:57:13 +00:00