summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* am 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge ↵Luan Nguyen2015-02-134-11/+127
|\ | | | | | | | | | | | | "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687 * commit '96a99bc3c1f57298c551254fcb8854410ff4e53f': docs: Update device art generator to include Wear generic devices.
| * am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to ↵Luan Nguyen2015-02-134-11/+127
| |\ | | | | | | | | | | | | | | | | | | | | | | | | include Wear generic devices." into lmp-docs automerge: fe2c687 * commit 'fe2c687b97f21b7dd5471279c1b2b9458dcd22bf': docs: Update device art generator to include Wear generic devices.
| | * Merge "docs: Update device art generator to include Wear generic devices." ↵Luan Nguyen2015-02-124-11/+127
| | |\ | | | | | | | | | | | | into lmp-docs
| | | * docs: Update device art generator to include Wear generic devices.Luan Nguyen2015-02-114-11/+127
| | | | | | | | | | | | | | | | | | | | bug: 14617426 Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
* | | | am 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge ↵Luan Nguyen2015-02-131-3/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb * commit '86391a2f63d60513279481e02c7234367cbced85': docs: Fix issue with onCreate() method declaration in file backup section
| * | | am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method ↵Luan Nguyen2015-02-131-3/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | declaration in file backup section" into lmp-docs automerge: e0306bb * commit 'e0306bbece4fd32d1e2f837dc515506180e04e8e': docs: Fix issue with onCreate() method declaration in file backup section
| | * | Merge "docs: Fix issue with onCreate() method declaration in file backup ↵Luan Nguyen2015-02-121-3/+6
| | |\ \ | | | | | | | | | | | | | | | section" into lmp-docs
| | | * | docs: Fix issue with onCreate() method declaration in file backup sectionLuan Nguyen2015-02-111-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 3180881 Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
* | | | | am b8f9e048: am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge ↵Luan Nguyen2015-02-131-9/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d * commit 'b8f9e04867aefe3b2f8fba05664c652f12bedc18': docs: Fix notification api guide issues (7461154, 12765600)
| * | | | am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues ↵Luan Nguyen2015-02-131-9/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (7461154, 12765600)" into lmp-docs automerge: 946bf2d * commit '946bf2de30545a548022b8b8ba1b0ebc890ab08e': docs: Fix notification api guide issues (7461154, 12765600)
| | * | | Merge "docs: Fix notification api guide issues (7461154, 12765600)" into ↵Luan Nguyen2015-02-121-9/+10
| | |\ \ \ | | | |/ / | | |/| | | | | | | lmp-docs
| | | * | docs: Fix notification api guide issues (7461154, 12765600)Luan Nguyen2015-02-101-9/+10
| | | |/ | | | | | | | | | | | | | | | | | | | | bug: 7461154 bug: 12765600 Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
* | | | am c7e48719: Merge "Remove references to persist.sys.language/country."Narayan Kamath2015-02-121-6/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 8be3724 * commit '8be3724a06f7b2d28c6664ca11a03f91f97f0972': Remove references to persist.sys.language/country.
| * | | | Remove references to persist.sys.language/country.Narayan Kamath2015-02-121-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses a couple of TODOs now that all usages have been removed and fixes a doc that specifies how the emulator locale can be set. bug: 17691569 Change-Id: I802ea1e12448a5442840cad1fdc0956d3e2c7a8c
* | | | | am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes ↵Shanea King-Roberson2015-02-102-7/+22
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and watch face development." into lmp-docs automerge: 696b68c automerge: accf077 * commit 'accf0770306419773c3119eb32ca912077894b11': Adding videos for 5.0 changes and watch face development.
| * | | | am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes ↵Shanea King-Roberson2015-02-102-7/+22
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | and watch face development." into lmp-docs * commit '24513bc580024a8a90c1ceab6746c0abb452d678': Adding videos for 5.0 changes and watch face development.
| | * | | Merge "Adding videos for 5.0 changes and watch face development." into lmp-docsShanea King-Roberson2015-02-102-7/+22
| | |\ \ \
| | | * | | Adding videos for 5.0 changes and watch face development.Eric Gilmore2015-02-102-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various ↵Luan Nguyen2015-02-108-55/+140
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues with incorrect code samples." into lmp-docs automerge: 6ee9018 * commit '6ee90183ab79f9c3b5216a9b0b6518de7679734a': docs: Fix various issues with incorrect code samples.
| * | | | | am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with ↵Luan Nguyen2015-02-108-55/+140
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incorrect code samples." into lmp-docs * commit 'ba795593e5941d89a861bb848c3f98800a0be3d6': docs: Fix various issues with incorrect code samples.
| | * | | | Merge "docs: Fix various issues with incorrect code samples." into lmp-docsLuan Nguyen2015-02-108-55/+140
| | |\ \ \ \
| | | * | | | docs: Fix various issues with incorrect code samples.Luan Nguyen2015-02-108-55/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 15671968 Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
* | | | | | | am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs ↵Eric Gilmore2015-02-1011-1096/+1445
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be platform-agnostic." into lmp-docs automerge: 2b36779 automerge: 2b7f0cf * commit '2b7f0cff1eebdb56a0c09bf5aec712df45147e25': Doc change: refactor GCM docs to be platform-agnostic.
| * | | | | | am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be ↵Eric Gilmore2015-02-1011-1096/+1445
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform-agnostic." into lmp-docs automerge: 2b36779 * commit '2b36779f30a511cc4439a519c95963280a779fdc': Doc change: refactor GCM docs to be platform-agnostic.
| | * | | | | Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docsEric Gilmore2015-02-1011-1096/+1445
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Doc change: refactor GCM docs to be platform-agnostic.kmccormick2015-02-0911-1096/+1445
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for: b/17733410 Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
* | | | | | am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ↵Joe Fernandez2015-02-072-23/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs * commit 'e3bc656a623b34d523001e628e779fe2f69e0fb1': docs: remove + annotations in version references
| * | | | | am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in ↵Joe Fernandez2015-02-072-23/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version references" into lmp-docs * commit '66c06cf9bb4fa3ba1477e120843e8fdb8a360e4e': docs: remove + annotations in version references
| | * | | | Merge "docs: remove + annotations in version references" into lmp-docsJoe Fernandez2015-02-072-23/+11
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | docs: remove + annotations in version referencesRich Slogar2015-01-222-23/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18417182 Change-Id: I16181a4ebb7a4ac40a7307438e120489b806f24e
* | | | | | am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates ↵Joe Fernandez2015-02-021-24/+29
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: c6ca860 automerge: d99924d * commit 'd99924d556b95bc05bbff9408519e301983193fb': docs: February 2015 Dashboard updates
| * | | | | am d14b6432: am eba583e3: docs: February 2015 Dashboard updatesJoe Fernandez2015-02-021-24/+29
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: c6ca860 * commit 'c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7': docs: February 2015 Dashboard updates
| | * | | | docs: February 2015 Dashboard updatesJoe Fernandez2015-02-021-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
* | | | | | am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs ↵Joe Fernandez2015-01-311-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2 automerge: f4b2bd4 * commit 'f4b2bd4c41233327f0fb2e4d45af8dc9c8eba689': docs: training intent doc error update
| * | | | | am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs ↵Joe Fernandez2015-01-311-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f02a8d9 automerge: cacf7da * commit 'cacf7da1c4d078641f099bab717e155609c5dc99': docs: training intent doc error update
| | * | | | Merge "docs: training intent doc error update" into lmp-docsJoe Fernandez2015-01-311-1/+2
| | |\ \ \ \
| | | * | | | docs: training intent doc error updateRich Slogar2015-01-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18386294 Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
* | | | | | | am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform ↵Joe Fernandez2015-01-311-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lmp-docs automerge: 3548de6 automerge: 95fa882 * commit '95fa88250a1957c7adfbd35d52f62e42cbe03df6': docs: studio emulator platform update
| * | | | | | am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform ↵Joe Fernandez2015-01-311-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lmp-docs * commit '5c37c8e66227b15d471047e7c4c986cf3c67876a': docs: studio emulator platform update
| | * | | | | Merge "docs: studio emulator platform update" into lmp-docsJoe Fernandez2015-01-301-1/+1
| | |\ \ \ \ \
| | | * | | | | docs: studio emulator platform updateRich Slogar2015-01-211-1/+1
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/5122160 Change-Id: I82966b0e9f32dc6e6641681f7726a8a8074525ff
* | | | | | | am 4649dcd7: am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux ↵Rich Slogar2015-01-301-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requirements update" into lmp-docs automerge: e9e2707 * commit '4649dcd7c41aa3893ff0e52c5142a7d95c678b7b': docs: linux requirements update
| * | | | | | am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements ↵Rich Slogar2015-01-301-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lmp-docs * commit 'f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787': docs: linux requirements update
| | * | | | | Merge "docs: linux requirements update" into lmp-docsRich Slogar2015-01-301-2/+2
| | |\ \ \ \ \
| | | * | | | | docs: linux requirements updateRich Slogar2015-01-211-2/+2
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18371514 Change-Id: I8e320b53bca248d37bff22e4313041d0c138779f
* | | | | | | am b2788236: am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View ↵Scott Rowe2015-01-305-1/+164
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Android TV training" into lmp-docs automerge: 1b5a0fb * commit 'b27882361ec5b0602d55783131ba28942b318a77': docs: Card View for Android TV training
| * | | | | | am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV ↵Scott Rowe2015-01-305-1/+164
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | training" into lmp-docs * commit '8f5714d3e1f29c0ec761c3471a12d2f486bbaee3': docs: Card View for Android TV training
| | * | | | | Merge "docs: Card View for Android TV training" into lmp-docsScott Rowe2015-01-305-1/+164
| | |\ \ \ \ \
| | | * | | | | docs: Card View for Android TV trainingScott Rowe2015-01-295-1/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
* | | | | | | | am 4ca01ef2: am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android ↵Scott Rowe2015-01-301-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TV overscan instructions: settings reversed in text automerge: 9ad282f * commit '4ca01ef21d7eacf398989740c6985a97891111e6': docs: b/19193358 Android TV overscan instructions: settings reversed in text
generated by cgit v1.1 at 2025-01-26 19:35:06 +0000