OSDN Git Service

android-x86/frameworks-base.git
11 years agoam 22cc2764: implement new organization for Training classes This also moves a few...
Scott Main [Thu, 15 Nov 2012 01:38:15 +0000 (17:38 -0800)]
am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis

* commit '22cc2764cc74e52888b043e0c6371594305bb5e9':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.

11 years agoimplement new organization for Training classes
Scott Main [Thu, 8 Nov 2012 00:35:16 +0000 (16:35 -0800)]
implement new organization for Training classes
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.

Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a

11 years agoam 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
Joe Malin [Tue, 13 Nov 2012 22:20:54 +0000 (14:20 -0800)]
am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs

* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction

11 years agoMerge "Notification.java javadoc: addAction" into jb-dev-docs
Joe Malin [Tue, 13 Nov 2012 22:14:23 +0000 (14:14 -0800)]
Merge "Notification.java javadoc: addAction" into jb-dev-docs

11 years agoam 52bfaaf7: docs: Android SDK Tools r21 Release Notes
Scott Main [Tue, 13 Nov 2012 03:43:28 +0000 (19:43 -0800)]
am 52bfaaf7: docs: Android SDK Tools r21 Release Notes

* commit '52bfaaf7444c8b4d571d0c81fadbb1609411d6e1':
  docs: Android SDK Tools r21 Release Notes

11 years agodocs: Android SDK Tools r21 Release Notes
Scott Main [Tue, 13 Nov 2012 03:39:58 +0000 (19:39 -0800)]
docs: Android SDK Tools r21 Release Notes

Change-Id: I7496c2af7592d8080ca4d0618466a9ccc578d0dd

11 years agoam 6453dfb7: update Download and installation guides for ADT Bundle
Scott Main [Tue, 13 Nov 2012 02:05:04 +0000 (18:05 -0800)]
am 6453dfb7: update Download and installation guides for ADT Bundle

* commit '6453dfb79712c288bdf825a2a4c43e583e5c8aa4':
  update Download and installation guides for ADT Bundle

11 years agoupdate Download and installation guides for ADT Bundle
Scott Main [Tue, 23 Oct 2012 21:14:18 +0000 (14:14 -0700)]
update Download and installation guides for ADT Bundle

Change-Id: I59d3113d4caf937b13e10c50618a37ae86d4ae55

11 years agoam 4233c939: Merge "Doc Update: param name change" into jb-dev-docs
kmccormick@google.com [Mon, 12 Nov 2012 23:00:12 +0000 (15:00 -0800)]
am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs

* commit '4233c939014c39ce9d95556db1b654e906f8ce5b':
  Doc Update: param name change

11 years agoMerge "Doc Update: param name change" into jb-dev-docs
&& repo sync -j8 [Mon, 12 Nov 2012 22:56:58 +0000 (14:56 -0800)]
Merge "Doc Update: param name change" into jb-dev-docs

11 years agoDoc Update: param name change
&& repo sync -j8 [Mon, 12 Nov 2012 22:45:08 +0000 (14:45 -0800)]
Doc Update: param name change

Change-Id: I320374f8d40ba090a561fe173bb08837abaa263a

11 years agoam aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs
Joe Fernandez [Mon, 12 Nov 2012 22:30:31 +0000 (14:30 -0800)]
am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs

* commit 'aac29f126ea8c42313a5481b4871828bbd40b4a6':
  docs: NDK r8c Release Notes

11 years agoam cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs
Joe Fernandez [Mon, 12 Nov 2012 22:29:08 +0000 (14:29 -0800)]
am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs

* commit 'cee5dab6752a9e793f620981014f3b7cc4f8c137':
  docs: JOBB tool help page

11 years agoMerge "docs: NDK r8c Release Notes" into jb-dev-docs
Joe Fernandez [Mon, 12 Nov 2012 22:28:05 +0000 (14:28 -0800)]
Merge "docs: NDK r8c Release Notes" into jb-dev-docs

11 years agoMerge "docs: JOBB tool help page" into jb-dev-docs
Joe Fernandez [Mon, 12 Nov 2012 22:25:54 +0000 (14:25 -0800)]
Merge "docs: JOBB tool help page" into jb-dev-docs

11 years agoMerge "DO NOT MERGE Control access to tts objects" into jb-dev
Geremy Condra [Thu, 8 Nov 2012 22:22:47 +0000 (14:22 -0800)]
Merge "DO NOT MERGE Control access to tts objects" into jb-dev

11 years agoam 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager...
Scott Main [Thu, 8 Nov 2012 01:30:22 +0000 (17:30 -0800)]
am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.

* commit '4623c0d842403bf2ae4b622590325c3635aaf563':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.

11 years agodocs: Add basic tool help pages for SDK and AVD Manager.
Scott Main [Wed, 7 Nov 2012 19:08:01 +0000 (11:08 -0800)]
docs: Add basic tool help pages for SDK and AVD Manager.
The SDK Manager page is needed particularly as a reference by
some pages rather than pointing to the installation guide.

Change-Id: Ie835e310f62cdc88bd6318e82f48e36bdd8e117a

11 years agoNotification.java javadoc: addAction
Joe Malin [Mon, 5 Nov 2012 19:36:40 +0000 (11:36 -0800)]
Notification.java javadoc: addAction

Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea

11 years agoam fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
kmccormick@google.com [Tue, 6 Nov 2012 23:56:25 +0000 (15:56 -0800)]
am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs

* commit 'fa2dbd693c3ffebd806cbbb4f708f754d58423ed':
  Doc change: GCM category & dry_run params

11 years agoMerge "Doc change: GCM category & dry_run params" into jb-dev-docs
&& repo sync -j8 [Tue, 6 Nov 2012 18:38:45 +0000 (10:38 -0800)]
Merge "Doc change: GCM category & dry_run params" into jb-dev-docs

11 years agoam 50c2275c: Android Training: CursorLoader
Joe Malin [Mon, 5 Nov 2012 21:59:48 +0000 (13:59 -0800)]
am 50c2275c: Android Training: CursorLoader

* commit '50c2275cff28c4a216f6924584e43cd64b90a3bf':
  Android Training: CursorLoader

11 years agoAndroid Training: CursorLoader
Joe Malin [Sat, 20 Oct 2012 19:41:40 +0000 (12:41 -0700)]
Android Training: CursorLoader

Change-Id: Ia8d723b5ce32002597b9444b8c7eff07b1ab29c8

11 years agoMerge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
Geremy Condra [Fri, 2 Nov 2012 21:19:45 +0000 (14:19 -0700)]
Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev

11 years agoam f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb...
Scott Main [Thu, 1 Nov 2012 22:31:53 +0000 (15:31 -0700)]
am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs

* commit 'f19804b5e994d183e6f6eeb512f74f2380ffd533':
  new dashboard stats for 11/1, platform version only

11 years agoMerge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
Scott Main [Thu, 1 Nov 2012 22:28:33 +0000 (15:28 -0700)]
Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs

11 years agonew dashboard stats for 11/1, platform version only
Scott Main [Thu, 1 Nov 2012 20:15:26 +0000 (13:15 -0700)]
new dashboard stats for 11/1, platform version only

Change-Id: If6e9633170793e45abfdc94ef215f45edd64e547

11 years agoDO NOT MERGE Control access to tts objects
Selim Gurun [Thu, 1 Nov 2012 18:55:14 +0000 (11:55 -0700)]
DO NOT MERGE Control access to tts objects

Bug: 7073422

Control access to inherited methods of texttospeech JS objects.

Change-Id: Ieae0efaf1267108abd97cdac9e8604f6246cefb9

11 years agoam 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
Robert Ly [Thu, 1 Nov 2012 21:16:47 +0000 (14:16 -0700)]
am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs

* commit '677c1e14fbd991a46b5496d0873b7ca155fd71fb':
  docs: google market -> google play

11 years agoMerge "docs: google market -> google play" into jb-dev-docs
Robert Ly [Thu, 1 Nov 2012 21:14:26 +0000 (14:14 -0700)]
Merge "docs: google market -> google play" into jb-dev-docs

11 years agoChange android.permission.SERIAL_PORT to signature|system.
Geremy Condra [Wed, 17 Oct 2012 21:06:31 +0000 (14:06 -0700)]
Change android.permission.SERIAL_PORT to signature|system.

Bug: 7367956
Change-Id: I0bc65936ba59c43c18d9a6ba52affff4c921f2fb

11 years agoam ac294abb: Revision to Notifications API guide
Joe Malin [Thu, 1 Nov 2012 20:55:08 +0000 (13:55 -0700)]
am ac294abb: Revision to Notifications API guide

* commit 'ac294abb40483fc734e22833371d95cbb161ec87':
  Revision to Notifications API guide

11 years agoRevision to Notifications API guide
Joe Malin [Tue, 16 Oct 2012 17:32:15 +0000 (10:32 -0700)]
Revision to Notifications API guide

Change-Id: I52229dfdff3649e03a1fbce91234c8b2a544502a

11 years agoam c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb...
Dirk Dougherty [Wed, 31 Oct 2012 00:01:53 +0000 (17:01 -0700)]
am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs

* commit 'c7255569bba20d94200dc05ffd5ce7b61bdc569c':
  Doc change: fix broken link in publishing steps TOC.

11 years agoMerge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
Dirk Dougherty [Tue, 30 Oct 2012 23:56:57 +0000 (16:56 -0700)]
Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs

11 years agoDoc change: fix broken link in publishing steps TOC.
Dirk Dougherty [Tue, 30 Oct 2012 23:51:54 +0000 (16:51 -0700)]
Doc change: fix broken link in publishing steps TOC.

Change-Id: I1b7453dfe276be40a23f1bd59a463e6d4f9b0412

11 years agodocs: NDK r8c Release Notes
Joe Fernandez [Wed, 10 Oct 2012 17:25:17 +0000 (10:25 -0700)]
docs: NDK r8c Release Notes

Change-Id: I873460d3ad1d4259f602138b566195edc5e24c4a

11 years agodocs: JOBB tool help page
Joe Fernandez [Wed, 24 Oct 2012 22:36:10 +0000 (15:36 -0700)]
docs: JOBB tool help page

Change-Id: I0651c0080cb8bb2436591247d72dfe7be66061f5

11 years agoam ea502b27: Merge "docs: animations au class" into jb-dev-docs
Robert Ly [Thu, 25 Oct 2012 23:26:57 +0000 (16:26 -0700)]
am ea502b27: Merge "docs: animations au class" into jb-dev-docs

* commit 'ea502b27020872003f1d2be1fb2644b04cc59a67':
  docs: animations au class

11 years agoMerge "docs: animations au class" into jb-dev-docs
Robert Ly [Thu, 25 Oct 2012 23:24:03 +0000 (16:24 -0700)]
Merge "docs: animations au class" into jb-dev-docs

11 years agodocs: animations au class
Robert Ly [Wed, 3 Oct 2012 21:20:26 +0000 (14:20 -0700)]
docs: animations au class

Change-Id: I776ccdf44014fe38dd55dedfed8730306d2a2cea

11 years agoam 76cdbdc8: Doc change: update develop landing page content.
Dirk Dougherty [Wed, 24 Oct 2012 17:38:45 +0000 (10:38 -0700)]
am 76cdbdc8: Doc change: update develop landing page content.

* commit '76cdbdc848153680d27e8f7abd6281c0f95d793e':
  Doc change: update develop landing page content.

11 years agoDoc change: update develop landing page content.
Dirk Dougherty [Tue, 23 Oct 2012 04:30:29 +0000 (21:30 -0700)]
Doc change: update develop landing page content.

Change-Id: I1b3639e4097650d9182b8e2bf213f1603ee17e10

11 years agoDoc change: GCM category & dry_run params
&& repo sync -j8 [Thu, 18 Oct 2012 21:55:29 +0000 (14:55 -0700)]
Doc change: GCM category & dry_run params

Bug # 7171849

Change-Id: Ifde95a058fc90b777faf3d43d34a72b048e20126

11 years agoam 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
Dirk Dougherty [Sun, 21 Oct 2012 00:51:00 +0000 (17:51 -0700)]
am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.

* commit '6faae9ad08670c30379fed451e73171f7d1b6ac8':
  Doc change: remove a few third-party refs. Fix broken image ref.

11 years agoDoc change: remove a few third-party refs. Fix broken image ref.
Dirk Dougherty [Sun, 21 Oct 2012 00:32:05 +0000 (17:32 -0700)]
Doc change: remove a few third-party refs. Fix broken image ref.

Change-Id: Ife1826f9c7d409e131b50e7178eba22f962d4219

11 years agoLayoutlib: Read and close XML files as soon as possible. do not merge.
Xavier Ducrohet [Thu, 18 Oct 2012 01:38:49 +0000 (18:38 -0700)]
Layoutlib: Read and close XML files as soon as possible. do not merge.

Because passing an InputStream to KXML does not close the
stream after the file has been parsed, the files are staying
locked on windows until the gc and finalizers are run.

This change preload the XML files and close their stream,
and then pass the content in a stream to the parser.

(cherry picked from commit c48b0b940d632b9862ff6aa32665e37fe9e50845)

Change-Id: I1b225454c166026c1aab6290c55ac8279e8862d5

11 years agoam 07322102: revise code sample for callback interface
Scott Main [Thu, 18 Oct 2012 19:18:31 +0000 (12:18 -0700)]
am 07322102: revise code sample for callback interface

* commit '07322102e5f1877bc2860d2c72eeeb41839d6bea':
  revise code sample for callback interface

11 years agoUpdate layoutlib for jb mr1. do not merge.
Xavier Ducrohet [Wed, 17 Oct 2012 02:56:03 +0000 (19:56 -0700)]
Update layoutlib for jb mr1. do not merge.

Status bar displayed on all devices.
Update logic for displaying nav bar to whether or not
device has soft button.

Update navigation buttons to new look.
Remove battery and signal from navigation bar.

(cherry picked from commit 891b703f7b1e0e396d16477cc66a286da7161b49)

Change-Id: Id7cc9ad4255d2c4d2e6461a565dfe2cc17e12e75

11 years agorevise code sample for callback interface
Scott Main [Wed, 17 Oct 2012 17:42:54 +0000 (10:42 -0700)]
revise code sample for callback interface

Change-Id: I8e27e2579dcc5cb84a71c74769fb89bb639e16ba

11 years agodocs: google market -> google play
Robert Ly [Wed, 17 Oct 2012 18:50:40 +0000 (11:50 -0700)]
docs: google market -> google play

Change-Id: I546a0c07920612a3fa31a2507c934a28c4d9f419

11 years agoam e249763d: small update to Toast guide, flatten sidenav for notifications/toasts...
Scott Main [Fri, 12 Oct 2012 21:12:07 +0000 (14:12 -0700)]
am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications

* commit 'e249763db18bb445e93f493046946c13185aa09d':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications

11 years agosmall update to Toast guide, flatten sidenav for notifications/toasts,
Scott Main [Fri, 12 Oct 2012 19:06:10 +0000 (12:06 -0700)]
small update to Toast guide, flatten sidenav for notifications/toasts,
new screenshots for notifications

Change-Id: I0c02e9e6db70a60ca299ff7f0caa7c8276b7ab68

11 years agoam 01154bda: DOC CHANGE: Notifications Guide
Joe Malin [Fri, 12 Oct 2012 00:38:46 +0000 (17:38 -0700)]
am 01154bda: DOC CHANGE: Notifications Guide

* commit '01154bdae9d6f3d1fbed3169ffa194d51045c9cf':
  DOC CHANGE: Notifications Guide

11 years agoDOC CHANGE: Notifications Guide
Joe Malin [Fri, 24 Aug 2012 16:49:50 +0000 (09:49 -0700)]
DOC CHANGE: Notifications Guide

Change-Id: I7968e933b0fdc5b1de1aa24acbad4f65f183ca42

11 years agoam 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb...
Joe Fernandez [Thu, 11 Oct 2012 21:35:35 +0000 (14:35 -0700)]
am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs

* commit '45c56ae70a1989301fa0fac5c72c51b296f5146e':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)

11 years agoMerge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs
Joe Fernandez [Thu, 11 Oct 2012 21:33:37 +0000 (14:33 -0700)]
Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs

11 years agoresolved conflicts for merge of 0b479e43 to jb-dev
Katie McCormick [Wed, 10 Oct 2012 18:09:03 +0000 (11:09 -0700)]
resolved conflicts for merge of 0b479e43 to jb-dev

Change-Id: I04bc45425f11b3562a4219719716c55eaff2228e

11 years agoMerge "Doc changes: misc GCM updates." into jb-dev-docs
&& repo sync -j8 [Wed, 10 Oct 2012 17:34:48 +0000 (10:34 -0700)]
Merge "Doc changes: misc GCM updates." into jb-dev-docs

11 years agoMerge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into...
Geremy Condra [Wed, 10 Oct 2012 04:32:08 +0000 (21:32 -0700)]
Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev

11 years agoMerge "DO NOT MERGE remove defunct javascript interface" into jb-dev
Geremy Condra [Wed, 10 Oct 2012 04:32:00 +0000 (21:32 -0700)]
Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev

11 years agoDO NOT MERGE Control access to inherited methods of jsinterface objects
Selim Gurun [Tue, 4 Sep 2012 23:45:53 +0000 (16:45 -0700)]
DO NOT MERGE Control access to inherited methods of jsinterface objects

Bug: 7073422

Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.

Clean cherry pick of 94740e6c333a109be7516abbd17dd418f23b4f0c

Provided @JavascriptInterface to methods that are accessible from
js.

Clean cherry pick of b743a23fc5bce9965c1539c3c8611614424a5aff

Add a glue logic to require use of annotations in injected accessibility
 objects.

Change-Id: I4135bd6787b2084177215302cd2c72afed090dc0

11 years agoam f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
Dirk Dougherty [Wed, 10 Oct 2012 00:33:52 +0000 (17:33 -0700)]
am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs

* commit 'f761a9a634a43662525d9c0c537ac5499263fd81':
  Doc change: edits to TV tablet story.

11 years agoMerge "Doc change: edits to TV tablet story." into jb-dev-docs
Dirk Dougherty [Wed, 10 Oct 2012 00:31:34 +0000 (17:31 -0700)]
Merge "Doc change: edits to TV tablet story." into jb-dev-docs

11 years agoam aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist....
Dirk Dougherty [Tue, 9 Oct 2012 22:50:12 +0000 (15:50 -0700)]
am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs

* commit 'aa0d43ba2581bb97f9ee955ea185b4f2759055c6':
  Doc change: Link to AVDs docs from tablet quality checklist.

11 years agoMerge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev...
Dirk Dougherty [Tue, 9 Oct 2012 22:48:34 +0000 (15:48 -0700)]
Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs

11 years agoDoc change: Link to AVDs docs from tablet quality checklist.
Dirk Dougherty [Tue, 9 Oct 2012 22:43:10 +0000 (15:43 -0700)]
Doc change: Link to AVDs docs from tablet quality checklist.

Change-Id: Ifb20a903a0dd32009b6db6e583a6d0c86cddb52e

11 years agoDoc changes: misc GCM updates.
&& repo sync -j8 [Thu, 27 Sep 2012 23:09:14 +0000 (16:09 -0700)]
Doc changes: misc GCM updates.

Change-Id: I12e7ae6c4b52b8aa54dc355d09916c3b4499f172

11 years agodocs: Release Notes: Android Platform 4.1.2 (16, r3)
Joe Fernandez [Tue, 9 Oct 2012 19:27:47 +0000 (12:27 -0700)]
docs: Release Notes: Android Platform 4.1.2 (16, r3)

Change-Id: I30988ac0c6c9d1c958a066f1e623f00a44cfb658

11 years agoMerge "docs: nfc ndef helper methods bug 5957772" into jb-dev
Robert Ly [Tue, 9 Oct 2012 18:38:00 +0000 (11:38 -0700)]
Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev

11 years agoam 46c4b488: Doc change: Subscriptions free trials on Google Play.
Dirk Dougherty [Tue, 9 Oct 2012 17:33:53 +0000 (10:33 -0700)]
am 46c4b488: Doc change: Subscriptions free trials on Google Play.

* commit '46c4b4886ae7b3a982cb1803f2b3ed7b7aa5f1c4':
  Doc change: Subscriptions free trials on Google Play.

11 years agoDoc change: Subscriptions free trials on Google Play.
Dirk Dougherty [Sun, 7 Oct 2012 22:05:07 +0000 (15:05 -0700)]
Doc change: Subscriptions free trials on Google Play.

Change-Id: I981eb94658f9f152d1c1a9915ffaadd63b4a965d

11 years agodocs: nfc ndef helper methods bug 5957772
Robert Ly [Tue, 28 Feb 2012 21:05:50 +0000 (13:05 -0800)]
docs: nfc ndef helper methods bug 5957772

Change-Id: I9c8356f44c1f9cc4a5187d40816cbfdd6212ab6e

11 years agoDO NOT MERGE remove defunct javascript interface
Selim Gurun [Wed, 5 Sep 2012 18:53:44 +0000 (11:53 -0700)]
DO NOT MERGE remove defunct javascript interface

Bug: 7073422

The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.

Clean cherry pick of d773ca8ff2a7a5be94d7f2aaa8ff5ef5dac501a8

Change-Id: I033d29718d08803f375759faf83e2058df6d4906

11 years agoDoc change: edits to TV tablet story.
Dirk Dougherty [Mon, 8 Oct 2012 18:41:44 +0000 (11:41 -0700)]
Doc change: edits to TV tablet story.

Change-Id: Idbada9a3b83f7e80cd7cf7b79da5c2f9ab4398d6

11 years agoam a4c7176d: Merge "Doc change: Add core quality and tablet quality docs and spotligh...
Dirk Dougherty [Sat, 6 Oct 2012 02:03:51 +0000 (19:03 -0700)]
am a4c7176d: Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs

* commit 'a4c7176dbc5193085ba3f2f602d16adac12cfa63':
  Doc change: Add core quality and tablet quality docs and spotlight.

11 years agoMerge "Doc change: Add core quality and tablet quality docs and spotlight." into...
Dirk Dougherty [Sat, 6 Oct 2012 01:56:23 +0000 (18:56 -0700)]
Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs

11 years agoam d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs
Dirk Dougherty [Sat, 6 Oct 2012 01:52:13 +0000 (18:52 -0700)]
am d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs

* commit 'd8a4a72ab5f99d2dc5e95a07d9e3eb6ada40da6b':
  Doc change: edits to distribute content.

11 years agoMerge "Doc change: edits to distribute content." into jb-dev-docs
Dirk Dougherty [Sat, 6 Oct 2012 01:50:02 +0000 (18:50 -0700)]
Merge "Doc change: edits to distribute content." into jb-dev-docs

11 years agoDoc change: Add core quality and tablet quality docs and spotlight.
Dirk Dougherty [Mon, 20 Aug 2012 18:07:36 +0000 (11:07 -0700)]
Doc change: Add core quality and tablet quality docs and spotlight.

Change-Id: Ia88e66818200fdc20417c0fe20672a5758284028

Conflicts:

docs/html/distribute/googleplay/quality/core.jd
docs/html/distribute/googleplay/quality/index.jd
docs/html/distribute/googleplay/quality/tablet.jd

11 years agoam 2ed01adc: a few more crosslinks for design guide (to other design docs or dev...
Scott Main [Sat, 6 Oct 2012 00:03:33 +0000 (17:03 -0700)]
am 2ed01adc: a few more crosslinks for design guide (to other design docs or dev docs)

* commit '2ed01adc8d1af5a11520bd71450b764ca36fcb1c':
  a few more crosslinks for design guide (to other design docs or dev docs)

11 years agoa few more crosslinks for design guide (to other design docs or dev docs)
Scott Main [Thu, 4 Oct 2012 18:14:01 +0000 (11:14 -0700)]
a few more crosslinks for design guide (to other design docs or dev docs)

Change-Id: Icba63102236b6efe445957f1f3070b705a40e1a9

11 years agoam e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source...
Joe Fernandez [Thu, 4 Oct 2012 20:07:15 +0000 (13:07 -0700)]
am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs

* commit 'e3eeeb6d03ed8575df5e8c8dfecd4e26af2d4127':
  docs: Remove Android Open Accessory docs, which are now on source.android.com

11 years agoMerge "docs: Remove Android Open Accessory docs, which are now on source.android...
Joe Fernandez [Thu, 4 Oct 2012 20:05:12 +0000 (13:05 -0700)]
Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs

11 years agoam 688447e5: fix the lesson title names
Scott Main [Thu, 4 Oct 2012 19:45:29 +0000 (12:45 -0700)]
am 688447e5: fix the lesson title names

* commit '688447e512185dab4acd9ddfc9f22066d164ff4e':
  fix the lesson title names

11 years agofix the lesson title names
Scott Main [Thu, 4 Oct 2012 19:43:05 +0000 (12:43 -0700)]
fix the lesson title names

Change-Id: I09ba41685664b92b5082376a8b9e885bf444415f

11 years agodocs: Remove Android Open Accessory docs, which are now on source.android.com
Joe Fernandez [Thu, 4 Oct 2012 18:43:09 +0000 (11:43 -0700)]
docs: Remove Android Open Accessory docs, which are now on source.android.com

Change-Id: I5346de7e575304523d33a94329792fb1a37db89b

11 years agoresolved conflicts for merge of 78866b71 to jb-dev
Scott Main [Thu, 4 Oct 2012 18:39:00 +0000 (11:39 -0700)]
resolved conflicts for merge of 78866b71 to jb-dev

Change-Id: I028637f4622f398769ad43e714d45ec95ff3f23d

11 years agoMerge "Doc update: TTL change." into jb-dev-docs
Scott Main [Thu, 4 Oct 2012 17:20:12 +0000 (10:20 -0700)]
Merge "Doc update: TTL change." into jb-dev-docs

11 years agoam cea1f19c: Merge "add links from various design docs to corresponding developer...
Scott Main [Thu, 4 Oct 2012 17:08:00 +0000 (10:08 -0700)]
am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs

* commit 'cea1f19cb85c8204cc920bb1073c0726b610cedd':
  add links from various design docs to corresponding developer docs

11 years agoMerge "add links from various design docs to corresponding developer docs" into jb...
Scott Main [Thu, 4 Oct 2012 17:06:02 +0000 (10:06 -0700)]
Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs

11 years agoDoc change: edits to distribute content.
Dirk Dougherty [Thu, 4 Oct 2012 00:43:04 +0000 (17:43 -0700)]
Doc change: edits to distribute content.

Change-Id: Ief68326428be5fc94060daca664b062e0af1f9df

11 years agoadd links from various design docs to corresponding developer docs
Scott Main [Thu, 4 Oct 2012 01:47:08 +0000 (18:47 -0700)]
add links from various design docs to corresponding developer docs

Change-Id: Id731979a9b6ebcfc956848933d64ea5cf64953b5

11 years agoam 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs...
Dirk Dougherty [Thu, 4 Oct 2012 02:38:17 +0000 (19:38 -0700)]
am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs

* commit '99f5ff0abb361de352f374822d2edc1a9379ad0c':
  Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."

11 years agoMerge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer...
Dirk Dougherty [Thu, 4 Oct 2012 02:37:00 +0000 (19:37 -0700)]
Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs

11 years agoRevert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
Dirk Dougherty [Thu, 4 Oct 2012 02:36:08 +0000 (19:36 -0700)]
Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."

This reverts commit c395f4a39cef3e0c2eaac8318b5e1723eac7d696

Change-Id: If74bdf2e567f60fc1af9e2c272531ef58e2cee41

11 years agoam 48b2cadf: fix badge generator button
Scott Main [Thu, 4 Oct 2012 00:26:24 +0000 (17:26 -0700)]
am 48b2cadf: fix badge generator button

* commit '48b2cadf1bc2c1c3400e567e1ea7c66be86e3ff5':
  fix badge generator button

11 years agofix badge generator button
Scott Main [Thu, 4 Oct 2012 00:23:45 +0000 (17:23 -0700)]
fix badge generator button

Change-Id: I797da9baca30873db0c3600de67c41a0fba1b492

11 years agoresolved conflicts for merge of f15f8a1b to jb-dev
Scott Main [Wed, 3 Oct 2012 23:42:06 +0000 (16:42 -0700)]
resolved conflicts for merge of f15f8a1b to jb-dev

Change-Id: Ic20777658426aa27304858dd51f315ee967a7bfa

11 years agoMerge "docs: Update design download links" into jb-dev
Scott Main [Wed, 3 Oct 2012 23:36:21 +0000 (16:36 -0700)]
Merge "docs: Update design download links" into jb-dev