OSDN Git Service

android-x86/frameworks-base.git
11 years agoMerge "docs: dashboard update for 1/3/13" into jb-mr1-dev
Scott Main [Thu, 3 Jan 2013 19:44:43 +0000 (11:44 -0800)]
Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev

11 years agodocs: dashboard update for 1/3/13
Scott Main [Thu, 3 Jan 2013 18:56:31 +0000 (10:56 -0800)]
docs: dashboard update for 1/3/13

Change-Id: I0ff0b045d1c08a071fa706d8c0ff17943f2e752f

11 years agoAdd single crunch command to aapt. do not merge.
Xavier Ducrohet [Fri, 21 Dec 2012 17:54:02 +0000 (09:54 -0800)]
Add single crunch command to aapt. do not merge.

Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)

Change-Id: I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

11 years agoMerge "docs: add class on keyboards" into jb-mr1-dev
Scott Main [Sat, 22 Dec 2012 00:25:49 +0000 (16:25 -0800)]
Merge "docs: add class on keyboards" into jb-mr1-dev

11 years agodocs: add class on keyboards
Scott Main [Thu, 6 Dec 2012 00:13:25 +0000 (16:13 -0800)]
docs: add class on keyboards

Change-Id: I3fb179457af50eec9d111f84eb9fabf49bc7ab1b

11 years agodocs: add explanation of default permissions to Permission guide
Scott Main [Wed, 19 Dec 2012 00:07:36 +0000 (16:07 -0800)]
docs: add explanation of default permissions to Permission guide
and fix code snippet error in WebView guide.
external issue:41441

Change-Id: I5d021e4f04245385b62e992baebd702814fff930

11 years agoMerge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72e...
&& repo sync -j8 [Fri, 21 Dec 2012 20:43:13 +0000 (12:43 -0800)]
Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev

11 years agocherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce463...
&& repo sync -j8 [Sat, 1 Dec 2012 00:28:27 +0000 (16:28 -0800)]
cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596

Change-Id: I72c2621dcc674a2f486ec2a49e0eb409d8c9b5bd

11 years agoMerge "Doc change: point developer landing page featured content to blog post." into...
Dirk Dougherty [Thu, 20 Dec 2012 20:46:00 +0000 (12:46 -0800)]
Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev

11 years agoDoc change: point developer landing page featured content to blog post.
Dirk Dougherty [Thu, 20 Dec 2012 20:40:22 +0000 (12:40 -0800)]
Doc change: point developer landing page featured content to blog post.

Change-Id: I8201d223b4b2c28227c7aac3499a81d29c3ec9e3

11 years agoMerge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
Scott Main [Thu, 20 Dec 2012 20:01:50 +0000 (12:01 -0800)]
Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev

11 years agoMerge "docs: NDK r8d Release Notes" into jb-mr1-dev
Scott Main [Thu, 20 Dec 2012 20:02:01 +0000 (12:02 -0800)]
Merge "docs: NDK r8d Release Notes" into jb-mr1-dev

11 years agoMerge "Doc change: update develop landing page." into jb-mr1-dev
Dirk Dougherty [Thu, 20 Dec 2012 17:27:59 +0000 (09:27 -0800)]
Merge "Doc change: update develop landing page." into jb-mr1-dev

11 years agoMerge "Doc change: add mention of localized promo graphics." into jb-mr1-dev
Scott Main [Thu, 20 Dec 2012 00:12:17 +0000 (16:12 -0800)]
Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev

11 years agoUpdate the JNI spec link, and remove a dead link.
Elliott Hughes [Wed, 19 Dec 2012 01:24:36 +0000 (17:24 -0800)]
Update the JNI spec link, and remove a dead link.

Also remove the duplicate copy of this file. There's a redirect in place
from the old location.

Bug: http://code.google.com/p/android/issues/detail?id=41623

(cherry picked from commit 965da34de94cdb845b64bd676e45b260000cd09d)

Change-Id: I5a940383fb27900ba560822c060cc5ed864eb771

11 years agoam d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads
Joe Malin [Wed, 19 Dec 2012 18:35:32 +0000 (10:35 -0800)]
am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads

* commit 'd4289c6e20c0a42deba796d02b5a9bc60c9a4e7c':
  Android Training: Multiple Threads

11 years agoam c84b3603: am 8dd6275e: Android Training: Multiple Threads
Joe Malin [Wed, 19 Dec 2012 18:33:14 +0000 (10:33 -0800)]
am c84b3603: am 8dd6275e: Android Training: Multiple Threads

* commit 'c84b3603fa27db68516187cea19de1e6a021152d':
  Android Training: Multiple Threads

11 years agoam 8dd6275e: Android Training: Multiple Threads
Joe Malin [Wed, 19 Dec 2012 18:31:39 +0000 (10:31 -0800)]
am 8dd6275e: Android Training: Multiple Threads

* commit '8dd6275e2871bea1acb20cbdd98ea0451b3d5be0':
  Android Training: Multiple Threads

11 years agoAndroid Training: Multiple Threads
Joe Malin [Mon, 26 Nov 2012 22:06:35 +0000 (14:06 -0800)]
Android Training: Multiple Threads

Change-Id: I58c472aa5ed82f6b4fb50d9bbb4e66841b9e99c3

11 years agodocs: NDK r8d Release Notes
Joe Fernandez [Tue, 11 Dec 2012 21:25:20 +0000 (13:25 -0800)]
docs: NDK r8d Release Notes

Change-Id: I93aba7b95b2e6a69a7cd3aca605470d568f1ecd1

11 years agodocs: SDK r21.0.1 Release Notes
Joe Fernandez [Wed, 12 Dec 2012 23:06:09 +0000 (15:06 -0800)]
docs: SDK r21.0.1 Release Notes

Change-Id: I5d3a5d29fd38d085b13b424ff6ab071925a5a261

11 years agodocs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict
Joe Fernandez [Tue, 18 Dec 2012 00:59:04 +0000 (16:59 -0800)]
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict
Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696
Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3

Change-Id: I315da053238943a7f77cc30564904bbf0cefed62

11 years agoDoc change: add mention of localized promo graphics.
Dirk Dougherty [Sat, 15 Dec 2012 05:55:24 +0000 (21:55 -0800)]
Doc change: add mention of localized promo graphics.

Change-Id: I41e583a4d214321633aa39ba235d5777b7e77586

11 years agoDoc change: update develop landing page.
Dirk Dougherty [Sat, 15 Dec 2012 06:05:27 +0000 (22:05 -0800)]
Doc change: update develop landing page.

Change-Id: I591cf8bb592053c0e397cf8eb2f827ca454d9f13

11 years agoMerge "docs: App Template Tool documentation" into jb-mr1-dev
Joe Fernandez [Mon, 17 Dec 2012 23:45:01 +0000 (15:45 -0800)]
Merge "docs: App Template Tool documentation" into jb-mr1-dev

11 years agoMerge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
Robert Ly [Mon, 17 Dec 2012 23:32:40 +0000 (15:32 -0800)]
Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev

11 years agochange onEnd() to withEndAction() in javadocs
Robert Ly [Mon, 17 Dec 2012 23:00:08 +0000 (15:00 -0800)]
change onEnd() to withEndAction() in javadocs

Change-Id: Ic9a04bf86d62249b47dc654052d58797dfc3990c

11 years agodocs: App Template Tool documentation
Joe Fernandez [Sat, 17 Nov 2012 00:10:52 +0000 (16:10 -0800)]
docs: App Template Tool documentation

Change-Id: I75b8956b808ab21cb744f67c2ce69405dc0a0de4

11 years agoMerge "docs: remove developer survery link" into jb-mr1-dev
Scott Main [Mon, 17 Dec 2012 19:41:55 +0000 (11:41 -0800)]
Merge "docs: remove developer survery link" into jb-mr1-dev

11 years agodocs: remove developer survery link
Scott Main [Mon, 17 Dec 2012 18:52:40 +0000 (10:52 -0800)]
docs: remove developer survery link

Change-Id: I8f87e53df4f920ace7f8258c6cf0686ad4d8fead

11 years agoMerge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev
Robert Ly [Mon, 17 Dec 2012 18:24:38 +0000 (10:24 -0800)]
Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev

11 years agodocs: update gms auth docs for bug 7737187
Robert Ly [Fri, 14 Dec 2012 20:22:04 +0000 (12:22 -0800)]
docs: update gms auth docs for bug 7737187

Change-Id: I32c39bbe39ff7d84ea88aeac2ca11a0110700266

11 years agoMerge "docs: add cursorloader class to side nav" into jb-mr1-dev
Scott Main [Fri, 14 Dec 2012 19:51:51 +0000 (11:51 -0800)]
Merge "docs: add cursorloader class to side nav" into jb-mr1-dev

11 years agodocs: add cursorloader class to side nav
Scott Main [Fri, 14 Dec 2012 19:39:03 +0000 (11:39 -0800)]
docs: add cursorloader class to side nav

Change-Id: I1be67b98f71b9e3759b06b851c30b49f8ccdef64

11 years agodocs: Fixing broken IABv3 internal links
Quddus Chong [Fri, 14 Dec 2012 19:22:29 +0000 (11:22 -0800)]
docs: Fixing broken IABv3 internal links

Change-Id: Ia0c087645e72a879c9883b9d62bf997afb407ce4

11 years agoam cad9660f: am 7eef172e: am ba34f097: Android Training: Loading Data in the Background
Joe Malin [Fri, 14 Dec 2012 02:08:02 +0000 (18:08 -0800)]
am cad9660f: am 7eef172e: am ba34f097: Android Training: Loading Data in the Background

* commit 'cad9660fe739df5ec6b919f8f5e94a222a3a83e9':
  Android Training: Loading Data in the Background

11 years agoam 7eef172e: am ba34f097: Android Training: Loading Data in the Background
Joe Malin [Fri, 14 Dec 2012 02:03:38 +0000 (18:03 -0800)]
am 7eef172e: am ba34f097: Android Training: Loading Data in the Background

* commit '7eef172e9b1c4ffc97cb7b9ea4216c718a832926':
  Android Training: Loading Data in the Background

11 years agoam ba34f097: Android Training: Loading Data in the Background
Joe Malin [Fri, 14 Dec 2012 01:58:19 +0000 (17:58 -0800)]
am ba34f097: Android Training: Loading Data in the Background

* commit 'ba34f097df278ce1861ebfecdaf634f519ba1f36':
  Android Training: Loading Data in the Background

11 years agoAndroid Training: Loading Data in the Background
Joe Malin [Tue, 6 Nov 2012 01:22:24 +0000 (17:22 -0800)]
Android Training: Loading Data in the Background

Change-Id: Ibb469cd068068b37ea95371afb7e4dca4535ba94

11 years agoam 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service
Joe Malin [Fri, 14 Dec 2012 00:18:19 +0000 (16:18 -0800)]
am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service

* commit '7096a17e953d7e126e6ac8952b38920e0ea7e7e1':
  Android Training: Run in a Background Service

11 years agoam 718c7484: am f0f5efbe: Android Training: Run in a Background Service
Joe Malin [Fri, 14 Dec 2012 00:16:54 +0000 (16:16 -0800)]
am 718c7484: am f0f5efbe: Android Training: Run in a Background Service

* commit '718c7484cf008d45f8501ae7d0cd57b31f935934':
  Android Training: Run in a Background Service

11 years agoam f0f5efbe: Android Training: Run in a Background Service
Joe Malin [Fri, 14 Dec 2012 00:15:36 +0000 (16:15 -0800)]
am f0f5efbe: Android Training: Run in a Background Service

* commit 'f0f5efbea206fd0fbac655519f3f535620ed74cc':
  Android Training: Run in a Background Service

11 years agoAndroid Training: Run in a Background Service
Joe Malin [Sat, 27 Oct 2012 18:16:19 +0000 (11:16 -0700)]
Android Training: Run in a Background Service

Change-Id: I002af57c65eccd0a624e00ef4b1607469199ce6b

11 years agoMerge "docs: NDK r8d Release Notes" into jb-mr1-dev
Joe Fernandez [Thu, 13 Dec 2012 20:13:34 +0000 (12:13 -0800)]
Merge "docs: NDK r8d Release Notes" into jb-mr1-dev

11 years agoMerge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
Joe Fernandez [Thu, 13 Dec 2012 20:10:58 +0000 (12:10 -0800)]
Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev

11 years agodocs: explain that layout height/width must be used to override include layouts
Scott Main [Thu, 13 Dec 2012 18:59:58 +0000 (10:59 -0800)]
docs: explain that layout height/width must be used to override include layouts

Change-Id: I7ee63f2f05b2e9a8cd424dfb2e7c9bead9d5efc6

11 years agodocs: SDK r21.0.1 Release Notes
Joe Fernandez [Wed, 12 Dec 2012 23:06:09 +0000 (15:06 -0800)]
docs: SDK r21.0.1 Release Notes

Change-Id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3

11 years agodocs: NDK r8d Release Notes
Joe Fernandez [Tue, 11 Dec 2012 21:25:20 +0000 (13:25 -0800)]
docs: NDK r8d Release Notes

Change-Id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696

11 years agodocs: Edit fixes for IABv3 docs.
Quddus Chong [Mon, 10 Dec 2012 19:08:12 +0000 (11:08 -0800)]
docs: Edit fixes for IABv3 docs.

Change-Id: I20228491c90d05a39ce44f80aa1a065ce60c31e3

11 years agodocs: Merged commits for final release of IABv3 docs.
Quddus Chong [Sun, 9 Dec 2012 01:06:30 +0000 (17:06 -0800)]
docs: Merged commits for final release of IABv3 docs.

Change-Id: Ib7c26052bb1b4de9a44d78817d7012839eaa953a

11 years agodocs: remove minsdkversion for clarity
Scott Main [Wed, 5 Dec 2012 20:25:42 +0000 (12:25 -0800)]
docs: remove minsdkversion for clarity

Change-Id: I4ae06f447436ef8170a66a075cc08f1667387133

11 years agoMerge "Doc change: In-app Billing -- add notes about orderId change and subscription...
Dirk Dougherty [Wed, 5 Dec 2012 02:40:21 +0000 (18:40 -0800)]
Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev

11 years agoDoc change: In-app Billing -- add notes about orderId change and subscription orderIds.
Dirk Dougherty [Wed, 5 Dec 2012 01:55:18 +0000 (17:55 -0800)]
Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.

Change-Id: Iccd08387a6d28ac04c303f9da10d1d98dbf8f8b1

11 years agodocs: add link to developer survey on main landing pages
Scott Main [Wed, 5 Dec 2012 02:23:09 +0000 (18:23 -0800)]
docs: add link to developer survey on main landing pages

Change-Id: Icf635993a6b3ff20d6e226b1e13358fd0ffcd398

11 years agodocs: fix broken link on maps page
Scott Main [Wed, 5 Dec 2012 01:32:30 +0000 (17:32 -0800)]
docs: fix broken link on maps page

Change-Id: I07e8129df1dcc61b0c2f7b81065092b06e31b8e8

11 years agoMerge "docs: update webview guide with javascript interface info" into jb-mr1-dev
Scott Main [Wed, 5 Dec 2012 01:25:49 +0000 (17:25 -0800)]
Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev

11 years agodocs: fix AI download links
Scott Main [Wed, 5 Dec 2012 00:44:27 +0000 (16:44 -0800)]
docs: fix AI download links

Change-Id: I2773f0edf1dc73bee9b8ea1ca0e09a9fd85086ef

11 years agoupdate building first app class with some changes to eclipse workflow
Scott Main [Wed, 21 Nov 2012 22:21:12 +0000 (14:21 -0800)]
update building first app class with some changes to eclipse workflow
and account for small differences when using an IDE other than eclipse

Change-Id: I1ea8a00cd3d03623a43d6b5f75234095130c0aa3

11 years agodocs: update webview guide with javascript interface info
Scott Main [Mon, 5 Nov 2012 19:21:38 +0000 (11:21 -0800)]
docs: update webview guide with javascript interface info

Change-Id: I328d36bf54261ac7d10121424102308159d79f6f

11 years agodocs: delete gps overview page
Scott Main [Tue, 4 Dec 2012 23:43:16 +0000 (15:43 -0800)]
docs: delete gps overview page

Change-Id: Ie2dbc4755ba0b16c730ee86646babcdc8edd3dc2

11 years agodocs: add backup service to gp docs
Scott Main [Tue, 4 Dec 2012 04:31:35 +0000 (20:31 -0800)]
docs: add backup service to gp docs

Change-Id: Ic87f18f791b98fc3438bc79e6ae95de86f1cc8fc

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 4 Dec 2012 05:04:42 +0000 (21:04 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agodocs: revisions to GPS Setup page w/ note about emulator
Scott Main [Mon, 3 Dec 2012 23:09:16 +0000 (15:09 -0800)]
docs: revisions to GPS Setup page w/ note about emulator

Change-Id: I19400813a0220892654e38fa5142d9f8526a639c

11 years agoMerge "docs: udpate for google service landing page and capitalize GPS in titles...
Scott Main [Mon, 3 Dec 2012 21:01:19 +0000 (13:01 -0800)]
Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev

11 years agodocs: udpate for google service landing page and capitalize GPS in titles
Scott Main [Mon, 3 Dec 2012 21:00:09 +0000 (13:00 -0800)]
docs: udpate for google service landing page and capitalize GPS in titles

Change-Id: I8cff9c5bc6eee7a60bc5db88763ad57eb63c7e7d

11 years agoMerge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
Scott Main [Mon, 3 Dec 2012 20:58:48 +0000 (12:58 -0800)]
Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev

11 years agodocs: refresh gms and gcm javadocs
Robert Ly [Mon, 3 Dec 2012 20:24:07 +0000 (12:24 -0800)]
docs: refresh gms and gcm javadocs

Change-Id: I5532eb9f87e2ab87488884e70102e8b4cbadf255

11 years agodocs: update dashboard for 12/1, plus misc fixes
Scott Main [Mon, 3 Dec 2012 17:19:10 +0000 (09:19 -0800)]
docs: update dashboard for 12/1, plus misc fixes

Change-Id: I7f06b6c66476aee2bd69b8017b5707c483b252b7

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Dec 2012 18:15:19 +0000 (10:15 -0800)]
Import translations. DO NOT MERGE

Change-Id: I3ebc7310e109d45facea00213daacf9d10e22285
Auto-generated-cl: translation import

11 years agoMerge "docs: update reference links and misc revisions" into jb-mr1-dev
Scott Main [Mon, 3 Dec 2012 08:22:23 +0000 (00:22 -0800)]
Merge "docs: update reference links and misc revisions" into jb-mr1-dev

11 years agodocs: update location/maps doc with info for maps api
Scott Main [Mon, 3 Dec 2012 03:00:48 +0000 (19:00 -0800)]
docs: update location/maps doc with info for maps api

Change-Id: I793f47791883efe88ff0d6c8effe0787d9654a88

11 years agoMerge "docs: add javadocs for gcm" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 02:20:15 +0000 (18:20 -0800)]
Merge "docs: add javadocs for gcm" into jb-mr1-dev

11 years agodocs: add sdk manager launch info for eclipse
Scott Main [Mon, 3 Dec 2012 02:01:07 +0000 (18:01 -0800)]
docs: add sdk manager launch info for eclipse

Change-Id: I91f23456fd57afa3cf55cba6ed63d746fb94f2fd

11 years agodocs: add javadocs for gcm
Robert Ly [Mon, 3 Dec 2012 01:24:48 +0000 (17:24 -0800)]
docs: add javadocs for gcm

Change-Id: I6c4c0990f1a9eec51cc2bf0fd857607b90ac184e

11 years agoMerge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev
Dirk Dougherty [Mon, 3 Dec 2012 01:43:11 +0000 (17:43 -0800)]
Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev

11 years agodocs: update reference links and misc revisions
Scott Main [Mon, 3 Dec 2012 00:07:30 +0000 (16:07 -0800)]
docs: update reference links and misc revisions

Change-Id: Id198d04a4feaf9a3bdee82f1093edabed1c561d2

11 years agoDoc change: remove old version of gcm javadoc and misc files.
Dirk Dougherty [Mon, 3 Dec 2012 01:33:08 +0000 (17:33 -0800)]
Doc change: remove old version of gcm javadoc and misc files.

Change-Id: Icbc0345e04432af97fb859be8787741b7e979c1b

11 years agoMerge "Doc change: updating lib links" into jb-mr1-dev
Katie McCormick [Mon, 3 Dec 2012 00:48:14 +0000 (16:48 -0800)]
Merge "Doc change: updating lib links" into jb-mr1-dev

11 years agoDoc change: updating lib links
Katie McCormick [Sat, 1 Dec 2012 03:06:35 +0000 (19:06 -0800)]
Doc change: updating lib links

Bug # 7038255

Change-Id: I702aeaed5fcbf7a9cb46b2ccd0e7baff53e48dab

11 years agomove Setup link for play services
Scott Main [Sat, 1 Dec 2012 04:25:38 +0000 (20:25 -0800)]
move Setup link for play services

Change-Id: I436abf4929e2d69c5f9fadca0f79321d069618ea

11 years agomisc changes for landing pages
Scott Main [Sat, 1 Dec 2012 00:50:00 +0000 (16:50 -0800)]
misc changes for landing pages

Change-Id: I4eff32dccbb111b419bb733035c7a145ac3944b6

11 years agoMerge "Fix typos in LinearLayout comments" into jb-mr1-dev
Fabrice Di Meglio [Sat, 1 Dec 2012 01:14:11 +0000 (17:14 -0800)]
Merge "Fix typos in LinearLayout comments" into jb-mr1-dev

11 years agoMerge "docs: gcm navtree" into jb-mr1-dev
Scott Main [Sat, 1 Dec 2012 01:04:31 +0000 (17:04 -0800)]
Merge "docs: gcm navtree" into jb-mr1-dev

11 years agodocs: gcm navtree
Robert Ly [Sat, 1 Dec 2012 01:02:22 +0000 (17:02 -0800)]
docs: gcm navtree

Change-Id: Ie20a0cc7caf8e0b5ff2a6f56ddc3932f25768fa3

11 years agoMerge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
Quddus Chong [Sat, 1 Dec 2012 00:38:50 +0000 (16:38 -0800)]
Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev

11 years agoMerge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
Robert Ly [Sat, 1 Dec 2012 00:33:51 +0000 (16:33 -0800)]
Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev

11 years agodocs: Fixed typo in android tool syntax.
Quddus Chong [Sat, 1 Dec 2012 00:26:35 +0000 (16:26 -0800)]
docs: Fixed typo in android tool syntax.

Change-Id: Ic40f10e3f6b7c052dc40cb723f40956a750544e8

11 years agodocs: update javadocs with gcm @value stuff
Robert Ly [Sat, 1 Dec 2012 00:15:46 +0000 (16:15 -0800)]
docs: update javadocs with gcm @value stuff

Change-Id: I837a1734e00d61f74cf8faac78f75258d66b6d05

11 years agoMerge "Doc change: add SMP Primer for Android. Support a new "article" toc style...
Dirk Dougherty [Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)]
Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev

11 years agoDoc change: add SMP Primer for Android. Support a new "article" toc style in training.
Dirk Dougherty [Thu, 29 Nov 2012 02:53:10 +0000 (18:53 -0800)]
Doc change: add SMP Primer for Android. Support a new "article" toc style in training.

Change-Id: I75826e12bb255e1fe85822b8c51e750ada01dfc5

11 years agoMerge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
Nicolas Klein [Fri, 30 Nov 2012 22:50:37 +0000 (14:50 -0800)]
Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev

11 years agoFix some typos and missing @param in android.os.Bundle
Nicolas Klein [Fri, 30 Nov 2012 22:41:46 +0000 (14:41 -0800)]
Fix some typos and missing @param in android.os.Bundle

getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.

Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0

11 years agoMerge "docs: gms fixes" into jb-mr1-dev
Robert Ly [Fri, 30 Nov 2012 22:31:42 +0000 (14:31 -0800)]
Merge "docs: gms fixes" into jb-mr1-dev

11 years agoMerge "docs: add correct toc for google reference" into jb-mr1-dev
Robert Ly [Fri, 30 Nov 2012 20:12:32 +0000 (12:12 -0800)]
Merge "docs: add correct toc for google reference" into jb-mr1-dev

11 years agodocs: add correct toc for google reference
Robert Ly [Fri, 30 Nov 2012 19:58:19 +0000 (11:58 -0800)]
docs: add correct toc for google reference

Change-Id: I594794b8d7ed5c52acdc37d5a4eddd2fdd229bcd

11 years agoMerge "Revert "docs: gms javadocs"" into jb-mr1-dev
Robert Ly [Fri, 30 Nov 2012 19:52:43 +0000 (11:52 -0800)]
Merge "Revert "docs: gms javadocs"" into jb-mr1-dev

11 years agoMerge "Cannot move edit text cursor to first position using character granularity...
Svetoslav Ganov [Fri, 30 Nov 2012 19:43:54 +0000 (11:43 -0800)]
Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev

11 years agoresolved conflicts for merge of 011132a7 to jb-mr1-dev
Nick Kralevich [Fri, 30 Nov 2012 18:23:56 +0000 (10:23 -0800)]
resolved conflicts for merge of 011132a7 to jb-mr1-dev

Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb

11 years agoam b8da0376: Secure a handful of framework broadcasts
Robert Greenwalt [Fri, 30 Nov 2012 18:05:33 +0000 (10:05 -0800)]
am b8da0376: Secure a handful of framework broadcasts

* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
  Secure a handful of framework broadcasts

11 years agoMerge "docs: gms and gcm javadocs" into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 17:56:48 +0000 (09:56 -0800)]
Merge "docs: gms and gcm javadocs" into jb-mr1-dev