OSDN Git Service
Rich Slogar [Tue, 17 Feb 2015 22:06:45 +0000 (22:06 +0000)]
Merge "docs: studio mipmap update" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:02:44 +0000 (22:02 +0000)]
Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* changes:
docs: studio proxy setting setup
docs: studio proxy setup
Oliver Woodman [Tue, 17 Feb 2015 20:48:49 +0000 (20:48 +0000)]
Merge "Update ExoPlayer developer guide." into lmp-docs
Oliver Woodman [Mon, 16 Feb 2015 17:49:34 +0000 (17:49 +0000)]
Update ExoPlayer developer guide.
This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.
Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
Rich Slogar [Tue, 17 Feb 2015 20:37:51 +0000 (20:37 +0000)]
Merge "docs: studio revision 1-1" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:16:08 +0000 (20:16 +0000)]
Merge "docs: android plugin for gradle revisions page" into lmp-docs
David Friedman [Sat, 14 Feb 2015 02:36:33 +0000 (02:36 +0000)]
Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
Rich Slogar [Fri, 30 Jan 2015 23:25:21 +0000 (15:25 -0800)]
docs: studio mipmap update
Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
Rich Slogar [Mon, 26 Jan 2015 19:08:55 +0000 (11:08 -0800)]
docs: studio proxy setting setup
b/
18332702
Change-Id: If3a78fc7b906bb94cfa74fc07b95ef72a84cf825
Rich Slogar [Tue, 10 Feb 2015 20:56:46 +0000 (12:56 -0800)]
docs: studio revision 1-1
Change-Id: I7464ace70e9b9e430fd0f03329e20b64b1e1a56a
Rich Slogar [Thu, 15 Jan 2015 00:04:08 +0000 (16:04 -0800)]
docs: android plugin for gradle revisions page
Change-Id: I15750eb11f69f9286fdd542c8e5a5e702b1a1255
David Friedman [Fri, 13 Feb 2015 05:30:59 +0000 (21:30 -0800)]
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Change-Id: I91ed7bc228849f3181591357037b368b4b261eee
Luan Nguyen [Thu, 12 Feb 2015 19:01:02 +0000 (19:01 +0000)]
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
Luan Nguyen [Thu, 12 Feb 2015 17:11:27 +0000 (17:11 +0000)]
Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
Luan Nguyen [Thu, 12 Feb 2015 17:10:49 +0000 (17:10 +0000)]
Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
Luan Nguyen [Tue, 10 Feb 2015 21:10:39 +0000 (13:10 -0800)]
docs: Fix issue with onCreate() method declaration in file backup section
bug:
3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
Luan Nguyen [Mon, 2 Feb 2015 20:17:40 +0000 (12:17 -0800)]
docs: Update device art generator to include Wear generic devices.
bug:
14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
Luan Nguyen [Tue, 3 Feb 2015 17:58:34 +0000 (09:58 -0800)]
docs: Fix notification api guide issues (
7461154,
12765600)
bug:
7461154
bug:
12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
Shanea King-Roberson [Tue, 10 Feb 2015 19:57:29 +0000 (19:57 +0000)]
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
Luan Nguyen [Tue, 10 Feb 2015 18:31:29 +0000 (18:31 +0000)]
Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
Eric Gilmore [Tue, 10 Feb 2015 18:29:36 +0000 (10:29 -0800)]
Adding videos for 5.0 changes and watch face development.
On branch pilot-videos
Changes to be committed:
modified: docs/html/about/versions/android-5.0-changes.jd
modified: docs/html/training/wearables/watch-faces/index.jd
Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
Luan Nguyen [Wed, 28 Jan 2015 17:30:28 +0000 (09:30 -0800)]
docs: Fix various issues with incorrect code samples.
bug:
15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
Eric Gilmore [Tue, 10 Feb 2015 01:13:01 +0000 (01:13 +0000)]
Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
kmccormick [Fri, 12 Dec 2014 23:00:37 +0000 (15:00 -0800)]
Doc change: refactor GCM docs to be platform-agnostic.
Fix for:
b/
17733410
Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
Joe Fernandez [Sat, 7 Feb 2015 00:55:16 +0000 (00:55 +0000)]
Merge "docs: remove + annotations in version references" into lmp-docs
John Spurlock [Wed, 4 Feb 2015 20:47:40 +0000 (15:47 -0500)]
Fix a few typos in Parcel.java.
Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16
Joe Fernandez [Mon, 2 Feb 2015 16:48:42 +0000 (08:48 -0800)]
docs: February 2015 Dashboard updates
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
Joe Fernandez [Sat, 31 Jan 2015 01:00:15 +0000 (01:00 +0000)]
Merge "docs: training intent doc error update" into lmp-docs
Rich Slogar [Wed, 28 Jan 2015 23:22:24 +0000 (15:22 -0800)]
docs: training intent doc error update
b/
18386294
Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
Joe Fernandez [Fri, 30 Jan 2015 23:24:43 +0000 (23:24 +0000)]
Merge "docs: studio emulator platform update" into lmp-docs
Rich Slogar [Fri, 30 Jan 2015 01:32:17 +0000 (01:32 +0000)]
Merge "docs: linux requirements update" into lmp-docs
Scott Rowe [Fri, 30 Jan 2015 01:30:43 +0000 (01:30 +0000)]
Merge "docs: Card View for Android TV training" into lmp-docs
Scott Rowe [Thu, 29 Jan 2015 19:01:33 +0000 (11:01 -0800)]
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Change-Id: I7c617ed67068927d27c5a2243a2dd07b04e668b5
Scott Rowe [Wed, 3 Dec 2014 21:21:53 +0000 (13:21 -0800)]
docs: Card View for Android TV training
Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
Dirk Dougherty [Thu, 6 Nov 2014 18:58:06 +0000 (10:58 -0800)]
Doc change: Update Ads terms language.
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
Joe Fernandez [Tue, 27 Jan 2015 22:57:29 +0000 (22:57 +0000)]
Merge "docs: plugin for gradle typo" into lmp-docs
Ricardo Cervera [Mon, 12 Jan 2015 20:45:54 +0000 (12:45 -0800)]
docs: Transitions training class.
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
Sarah Maddox [Mon, 26 Jan 2015 20:12:21 +0000 (20:12 +0000)]
Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 19:11:56 +0000 (11:11 -0800)]
docs: studio proxy setup
Change-Id: Ifbe3f03a47cfb1a59ade4e2fb678a51a7256fdb4
Ricardo Cervera [Mon, 26 Jan 2015 19:32:12 +0000 (19:32 +0000)]
Merge "docs: Wear DataItem listener improvements" into lmp-docs
Sarah Maddox [Sun, 30 Nov 2014 22:08:26 +0000 (09:08 +1100)]
docs: Adds new geocoding sample to Location API training.
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Bug:
17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
Rich Slogar [Fri, 23 Jan 2015 17:56:50 +0000 (09:56 -0800)]
docs: plugin for gradle typo
b/
19106103
Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e
Rich Slogar [Fri, 23 Jan 2015 01:47:58 +0000 (17:47 -0800)]
docs: remove + annotations in version references
b/
18417182
Change-Id: I16181a4ebb7a4ac40a7307438e120489b806f24e
Ricardo Cervera [Thu, 22 Jan 2015 17:50:47 +0000 (17:50 +0000)]
Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Ricardo Cervera [Wed, 14 Jan 2015 16:29:38 +0000 (08:29 -0800)]
docs: Fixes to the watch faces design guidelines
Bug:
19001253
Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
Luan Nguyen [Wed, 21 Jan 2015 23:16:36 +0000 (15:16 -0800)]
docs: Fix companion configuration (
18864041)
Fix declaration of var and incorrect method call (
18617393)
bug:
18864041
bug:
18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
Rich Slogar [Wed, 21 Jan 2015 23:34:54 +0000 (15:34 -0800)]
docs: linux requirements update
b/
18371514
Change-Id: I8e320b53bca248d37bff22e4313041d0c138779f
Rich Slogar [Wed, 21 Jan 2015 21:52:56 +0000 (13:52 -0800)]
docs: studio emulator platform update
b/
5122160
Change-Id: I82966b0e9f32dc6e6641681f7726a8a8074525ff
Andrew Solovay [Wed, 21 Jan 2015 19:20:57 +0000 (19:20 +0000)]
Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
Ricardo Cervera [Tue, 20 Jan 2015 21:41:56 +0000 (13:41 -0800)]
docs: Wear DataItem listener improvements
Change-Id: I07bf2ab063556dd4f6e42a5835f73dd5b326d26e
Luan Nguyen [Wed, 21 Jan 2015 16:19:18 +0000 (16:19 +0000)]
Merge "docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171)." into lmp-docs
Luan Nguyen [Tue, 20 Jan 2015 16:41:51 +0000 (08:41 -0800)]
docs: Fix conditional in ambient mode check method (
18832168).
Fix issue with non existent variable (
18832287).
Fix issue with outdated instructions (
18832293).
Fix issue with misleading time tick (
18832171).
bug:
18832168
bug:
18832171
bug:
18832287
bug:
18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
Andrew Solovay [Tue, 20 Jan 2015 23:47:31 +0000 (15:47 -0800)]
docs: WebView security notes for apps on pre-K devices
Added paragraph describing security precautions for apps that use
WebView on devices running versions older than Android 4.4. See first
comment for doc stage location.
bug:
19075466
Change-Id: I69937d8dfc37ec1ba693f969500b9dc7404c4635
Scott Rowe [Sat, 17 Jan 2015 01:31:52 +0000 (01:31 +0000)]
Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 01:31:13 +0000 (01:31 +0000)]
Merge "docs: Add screenshot" into lmp-docs
David Friedman [Sat, 17 Jan 2015 00:23:29 +0000 (00:23 +0000)]
Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
David Friedman [Wed, 19 Nov 2014 21:03:45 +0000 (13:03 -0800)]
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
Quddus Chong [Fri, 16 Jan 2015 22:03:31 +0000 (22:03 +0000)]
Merge "docs: Fixed typos in Game Controller training code snippets. bug:
17959906" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 21:58:36 +0000 (21:58 +0000)]
Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 20:26:20 +0000 (12:26 -0800)]
docs: adding studio-sample-in-editor.png file
Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
Quddus Chong [Fri, 16 Jan 2015 19:35:07 +0000 (11:35 -0800)]
docs: Fixed typos in Game Controller training code snippets.
bug:
17959906
Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27
Ricardo Cervera [Tue, 13 Jan 2015 18:04:04 +0000 (10:04 -0800)]
docs: Add browseable Wearable Support Lib Javadoc
Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1
Joe Fernandez [Fri, 16 Jan 2015 18:49:27 +0000 (18:49 +0000)]
Merge "docs: studio disk space requirements typo" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:47:51 +0000 (18:47 +0000)]
Merge "docs: link to sdk manager" into lmp-docs
Ricardo Cervera [Fri, 4 Apr 2014 18:17:06 +0000 (11:17 -0700)]
docs: Added info on noHistory and onActivityResult().
Bug:
13807256
Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83
Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
Rich Slogar [Fri, 16 Jan 2015 00:43:56 +0000 (00:43 +0000)]
Merge "docs: studio support library revisions update" into lmp-docs
Dirk Dougherty [Fri, 16 Jan 2015 00:41:55 +0000 (00:41 +0000)]
Merge "Doc change: Add new analytics information to Distribute." into lmp-docs
Dirk Dougherty [Fri, 12 Dec 2014 19:51:13 +0000 (11:51 -0800)]
Doc change: Add new analytics information to Distribute.
Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84
Rich Slogar [Fri, 16 Jan 2015 00:27:49 +0000 (00:27 +0000)]
Merge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:00 +0000 (00:27 +0000)]
Merge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:26:38 +0000 (00:26 +0000)]
Merge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Thu, 11 Dec 2014 23:51:18 +0000 (15:51 -0800)]
docs: studio support library revisions update
Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b
Luan Nguyen [Thu, 15 Jan 2015 17:24:09 +0000 (09:24 -0800)]
docs: Remove reference to handheld app for bitmap resource locations.
bug:
17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6
Scott Rowe [Mon, 12 Jan 2015 23:28:04 +0000 (15:28 -0800)]
docs: removing code captions
Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45
Ricardo Cervera [Tue, 13 Jan 2015 16:35:04 +0000 (16:35 +0000)]
am
f5569413: docs: Fix broken link in Common Intents
* commit '
f556941357ea391cae6dcd2e22b71a837a216d06':
docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:28:22 +0000 (08:28 -0800)]
docs: Fix broken link in Common Intents
Bug:
18991366
Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
Scott Rowe [Mon, 5 Jan 2015 21:35:46 +0000 (13:35 -0800)]
docs: Add screenshot
Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396
Ricardo Cervera [Mon, 12 Jan 2015 21:53:27 +0000 (21:53 +0000)]
am
d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
* commit '
d8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
docs: Add parent calls to WatchFaces snippet.
Ricardo Cervera [Mon, 12 Jan 2015 21:49:21 +0000 (21:49 +0000)]
Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
Joe Fernandez [Mon, 12 Jan 2015 21:27:24 +0000 (21:27 +0000)]
am
8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
* commit '
8062f1f34113f4d73d37ebb57245342cca9d8f9c':
docs: Removing obsolete L-Preview docs and images
Joe Fernandez [Mon, 12 Jan 2015 21:23:16 +0000 (21:23 +0000)]
Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
Joe Fernandez [Mon, 12 Jan 2015 21:16:26 +0000 (21:16 +0000)]
am
76110e7c: docs: Remove Wear preview reference docs
* commit '
76110e7c46297a221d8f2c92fbaef46b6f405294':
docs: Remove Wear preview reference docs
Ricardo Cervera [Mon, 12 Jan 2015 20:54:32 +0000 (12:54 -0800)]
docs: Add parent calls to WatchFaces snippet.
Bug:
18982021
Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b
Joe Fernandez [Mon, 12 Jan 2015 18:28:03 +0000 (10:28 -0800)]
docs: Remove Wear preview reference docs
These docs are out of date and unreachable due to redirect rules.
Change-Id: I76d9ccfff139b2377c45d71af2998a99b82a2f14
Joe Fernandez [Mon, 12 Jan 2015 18:20:41 +0000 (10:20 -0800)]
docs: Removing obsolete L-Preview docs and images
- /preview/images/
- TV Preview index pages
- Notifications preview page
Change-Id: I3e7c4e06bcdb6804fd83a80a8171a9d8e0c57117
Eric Gilmore [Mon, 12 Jan 2015 17:07:12 +0000 (17:07 +0000)]
am
fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs
* commit '
fec824b6118a73bdc760acaf7dbd9420ffe7fe91':
Adding Android Fundamentals video.
Eric Gilmore [Mon, 12 Jan 2015 17:02:30 +0000 (17:02 +0000)]
Merge "Adding Android Fundamentals video." into lmp-docs
Eric Gilmore [Mon, 12 Jan 2015 16:26:43 +0000 (16:26 +0000)]
am
6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs
* commit '
6c8b80acbb456b5b537137a181dc2ad4cbd07adc':
Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
Deepanshu Gupta [Sat, 10 Jan 2015 09:49:53 +0000 (09:49 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar. automerge:
bb600de
automerge:
8d9361a
* commit '
8d9361a4ec1260b268865af6dcc8b2c5bb316f9d':
Deepanshu Gupta [Sat, 10 Jan 2015 09:48:39 +0000 (09:48 +0000)]
Support Locale.toLanguageTag on Java 6 automerge:
dbd64f7
automerge:
7da2b5d
* commit '
7da2b5dbc259ef026bb075905f9fda3695dd4615':
Deepanshu Gupta [Sat, 10 Jan 2015 09:47:08 +0000 (09:47 +0000)]
LayoutLib: Fix System.arraycopy() automerge:
51fb775
automerge:
55c7bd4
* commit '
55c7bd4dac3078ab220823e522c9257246933c46':
Deepanshu Gupta [Sat, 10 Jan 2015 04:59:11 +0000 (04:59 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar.
automerge:
bb600de
* commit '
bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 04:57:42 +0000 (04:57 +0000)]
Support Locale.toLanguageTag on Java 6
automerge:
dbd64f7
* commit '
dbd64f7c904287f9e1bf5bb22385aace85274cab':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 04:56:36 +0000 (04:56 +0000)]
LayoutLib: Fix System.arraycopy()
automerge:
51fb775
* commit '
51fb7754fc9a232a225b31b37219f4b0dcba6711':
LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:05 +0000 (03:51 +0000)]
am
bb600de6: am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:01 +0000 (03:51 +0000)]
am
dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
* commit '
dbd64f7c904287f9e1bf5bb22385aace85274cab':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 03:43:48 +0000 (03:43 +0000)]
am
51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
* commit '
51fb7754fc9a232a225b31b37219f4b0dcba6711':
LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 02:16:44 +0000 (02:16 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
74147527357b9abd9d30b3a2dbd72a5172a35625':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 02:10:55 +0000 (02:10 +0000)]
am
8505c387: Special case AppCompat to show action bar.
* commit '
8505c3870a17f41d23329344fe381cd9ff324bd2':
Special case AppCompat to show action bar.
Deepanshu Gupta [Mon, 14 Jul 2014 22:50:49 +0000 (15:50 -0700)]
Support Locale.toLanguageTag on Java 6
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit
5cd9dde5a2a77c5095f985186d8f03147fd22870)