OSDN Git Service

android-x86/frameworks-base.git
9 years agoam e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp...
Luan Nguyen [Tue, 10 Feb 2015 18:40:34 +0000 (18:40 +0000)]
am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs

* commit 'e49fbfa21ccdeba56001b48604524794acea119e':
  docs: Fix various issues with incorrect code samples.

9 years agoMerge "docs: Fix various issues with incorrect code samples." 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

9 years agoam c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into...
Eric Gilmore [Tue, 10 Feb 2015 17:45:47 +0000 (17:45 +0000)]
am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs

* commit 'c9dbaf0483b0274879164806297180d260689f1f':
  Doc change: refactor GCM docs to be platform-agnostic.

9 years agodocs: Fix various issues with incorrect code samples.
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

9 years agoMerge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
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

9 years agoDoc change: refactor GCM docs to be platform-agnostic.
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

9 years agoam ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
Joe Fernandez [Sat, 7 Feb 2015 01:00:53 +0000 (01:00 +0000)]
am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs

* commit 'ba20f98c88b754b3a69d55963275e20ab2fba6bf':
  docs: remove + annotations in version references

9 years agoMerge "docs: remove + annotations in version references" into lmp-docs
Joe Fernandez [Sat, 7 Feb 2015 00:55:16 +0000 (00:55 +0000)]
Merge "docs: remove + annotations in version references" into lmp-docs

9 years agoam e0852368: Fix a few typos in Parcel.java.
John Spurlock [Thu, 5 Feb 2015 20:18:03 +0000 (20:18 +0000)]
am e0852368: Fix a few typos in Parcel.java.

* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
  Fix a few typos in Parcel.java.

9 years agoFix a few typos in Parcel.java.
John Spurlock [Wed, 4 Feb 2015 20:47:40 +0000 (15:47 -0500)]
Fix a few typos in Parcel.java.

Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16

9 years agoam eba583e3: docs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 17:20:35 +0000 (17:20 +0000)]
am eba583e3: docs: February 2015 Dashboard updates

* commit 'eba583e3930891f7a8a0e48a961a4a2471fc757c':
  docs: February 2015 Dashboard updates

9 years agodocs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 16:48:42 +0000 (08:48 -0800)]
docs: February 2015 Dashboard updates

Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282

9 years agoam 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage...
Jon Larimer [Sat, 31 Jan 2015 03:39:19 +0000 (03:39 +0000)]
am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de
automerge: 9e7e8af

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':

9 years agoam 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
Joe Fernandez [Sat, 31 Jan 2015 01:59:54 +0000 (01:59 +0000)]
am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs

* commit '1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
  docs: training intent doc error update

9 years agoMerge "docs: training intent doc error update" into lmp-docs
Joe Fernandez [Sat, 31 Jan 2015 01:00:15 +0000 (01:00 +0000)]
Merge "docs: training intent doc error update" into lmp-docs

9 years agodocs: training intent doc error update
Rich Slogar [Wed, 28 Jan 2015 23:22:24 +0000 (15:22 -0800)]
docs: training intent doc error update

b/18386294

Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1

9 years agoMerge "Limited AppCompat support" into lmp-dev
Deepanshu Gupta [Sat, 31 Jan 2015 00:50:34 +0000 (00:50 +0000)]
Merge "Limited AppCompat support" into lmp-dev

9 years agoMerge "Resource resolution fixes." into lmp-dev
Deepanshu Gupta [Sat, 31 Jan 2015 00:48:56 +0000 (00:48 +0000)]
Merge "Resource resolution fixes." into lmp-dev

9 years agoam 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage...
Jon Larimer [Sat, 31 Jan 2015 00:05:54 +0000 (00:05 +0000)]
am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge: 5c9d0de

* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation

9 years agoam 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
Joe Fernandez [Fri, 30 Jan 2015 23:34:44 +0000 (23:34 +0000)]
am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs

* commit '2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
  docs: studio emulator platform update

9 years agoMerge "docs: studio emulator platform update" into lmp-docs
Joe Fernandez [Fri, 30 Jan 2015 23:24:43 +0000 (23:24 +0000)]
Merge "docs: studio emulator platform update" into lmp-docs

9 years agoam 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix...
Jon Larimer [Fri, 30 Jan 2015 22:11:56 +0000 (22:11 +0000)]
am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation

9 years agoam 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage...
Jon Larimer [Fri, 30 Jan 2015 22:01:50 +0000 (22:01 +0000)]
am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

* commit '545dd853bffbf778a0a44816ac6ed381b13f2158':
  Fix build breakage in older branches by avoiding <> notation

9 years agoam 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branc...
Jon Larimer [Fri, 30 Jan 2015 21:54:31 +0000 (21:54 +0000)]
am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

* commit '9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
  Fix build breakage in older branches by avoiding <> notation

9 years agoam 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoidi...
Jon Larimer [Fri, 30 Jan 2015 21:44:17 +0000 (21:44 +0000)]
am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

* commit '159aa73574804967aded45d06b70df5a8dd64a58':
  Fix build breakage in older branches by avoiding <> notation

9 years agoam d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:28:59 +0000 (21:28 +0000)]
am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

* commit 'd403180997898c98f0be15b810c4c9dd9002f92c':
  Fix build breakage in older branches by avoiding <> notation

9 years agoam 48c95c43: Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am 48c95c43: Fix build breakage in older branches by avoiding <> notation

* commit '48c95c4370533bf27e537cbca1e64d060a016c5f':
  Fix build breakage in older branches by avoiding <> notation

9 years agoam e0063faa: Merge "docs: linux requirements update" into lmp-docs
Rich Slogar [Fri, 30 Jan 2015 01:41:58 +0000 (01:41 +0000)]
am e0063faa: Merge "docs: linux requirements update" into lmp-docs

* commit 'e0063faa8707e2424a33625aaf2228540fa67e85':
  docs: linux requirements update

9 years agoam b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
Scott Rowe [Fri, 30 Jan 2015 01:37:23 +0000 (01:37 +0000)]
am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs

* commit 'b86c3b80db09da85b50c1809520bbf893cb83d93':
  docs: Card View for Android TV training

9 years agoam 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed...
Scott Rowe [Fri, 30 Jan 2015 01:37:21 +0000 (01:37 +0000)]
am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text

* commit '87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text

9 years agoMerge "docs: linux requirements 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

9 years agoMerge "docs: Card View for Android TV training" 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

9 years agoFix build breakage in older branches by avoiding <> notation
Jon Larimer [Thu, 29 Jan 2015 20:54:43 +0000 (15:54 -0500)]
Fix build breakage in older branches by avoiding <> notation

Change-Id: I5e3d523dac1f364f52f0d2cab479c1705d667e5a

9 years agoam 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledL...
Jon Larimer [Thu, 29 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7
automerge: bebfd58

* commit 'bebfd58604ae8a70c08056f3a5cd9289b27fe11c':

9 years agoam a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge...
Jon Larimer [Thu, 29 Jan 2015 19:29:31 +0000 (19:29 +0000)]
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94  -s ours
automerge: 6fe42f0  -s ours

* commit '6fe42f08702a0773c0dd2aad2d41c54f73bb057b':

9 years agodocs: b/19193358 Android TV overscan instructions: settings reversed in text
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

9 years agoam 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledL...
Jon Larimer [Thu, 29 Jan 2015 18:55:25 +0000 (18:55 +0000)]
am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
automerge: ea63fd7

* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
  Fix ParceledListSlice to enforce the same concrete types among its elements.

9 years agoam a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge...
Jon Larimer [Thu, 29 Jan 2015 18:54:16 +0000 (18:54 +0000)]
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
automerge: 48dad94  -s ours

* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
  DO NOT MERGE Restore calling identity before checking permission

9 years agodocs: Card View for Android TV training
Scott Rowe [Wed, 3 Dec 2014 21:21:53 +0000 (13:21 -0800)]
docs: Card View for Android TV training

Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96

9 years agoam ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge...
Jon Larimer [Thu, 29 Jan 2015 18:43:47 +0000 (18:43 +0000)]
am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
  Fix ParceledListSlice to enforce the same concrete types among its elements.

9 years agoam 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63...
Jon Larimer [Thu, 29 Jan 2015 18:43:43 +0000 (18:43 +0000)]
am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoam 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledL...
Jon Larimer [Thu, 29 Jan 2015 18:36:59 +0000 (18:36 +0000)]
am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit '88add68942694fc643518bcf5c26f6c3df7e9aa0':
  Fix ParceledListSlice to enforce the same concrete types among its elements.

9 years agoam a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge...
Jon Larimer [Thu, 29 Jan 2015 18:36:55 +0000 (18:36 +0000)]
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

* commit 'a43742ec620cb11faffa2c2b1847dc1accce5736':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoam a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice...
Jon Larimer [Thu, 29 Jan 2015 18:32:09 +0000 (18:32 +0000)]
am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit 'a5ccca242747d59233ec5ecebc20d4a721e7850e':
  Fix ParceledListSlice to enforce the same concrete types among its elements.

9 years agoam 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE...
Jon Larimer [Thu, 29 Jan 2015 18:32:05 +0000 (18:32 +0000)]
am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

* commit '6813f29e3247f0567b77fe7eb451215b5fadf67b':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoam 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checkin...
Jon Larimer [Thu, 29 Jan 2015 18:25:48 +0000 (18:25 +0000)]
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6  -s ours
automerge: f8571c8a  -s ours

* commit 'f8571c8a170f0cb8341b3e2adda306bb709b824a':

9 years agoam 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the...
Jon Larimer [Thu, 29 Jan 2015 18:25:28 +0000 (18:25 +0000)]
am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
  Fix ParceledListSlice to enforce the same concrete types among its elements.

9 years agoam 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling...
Jon Larimer [Thu, 29 Jan 2015 18:25:24 +0000 (18:25 +0000)]
am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

* commit '76cdbb0475fe881c8e7320c277e5ea4848be5bff':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoam de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete...
Jon Larimer [Thu, 29 Jan 2015 18:12:01 +0000 (18:12 +0000)]
am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
  Fix ParceledListSlice to enforce the same concrete types among its elements.

9 years agoam d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checkin...
Jon Larimer [Thu, 29 Jan 2015 18:11:57 +0000 (18:11 +0000)]
am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

* commit 'd0318a63e51107d5589d8970b079c27d8f788c5a':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoam 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checkin...
Jon Larimer [Thu, 29 Jan 2015 18:10:34 +0000 (18:10 +0000)]
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
automerge: 7ab0ac6  -s ours

* commit '7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoam 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling...
Jon Larimer [Thu, 29 Jan 2015 18:09:27 +0000 (18:09 +0000)]
am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

* commit '7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoam 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checkin...
Jon Larimer [Thu, 29 Jan 2015 18:02:27 +0000 (18:02 +0000)]
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

* commit '64d6bacf13e4ae913c52b773439a542dc5b2b714':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoam fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among...
Jon Larimer [Thu, 29 Jan 2015 18:00:58 +0000 (18:00 +0000)]
am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit 'fc731e6e40f6f449b8e7ac72c2cd36a57c04a32b':
  Fix ParceledListSlice to enforce the same concrete types among its elements.

9 years agoam 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission...
Jon Larimer [Thu, 29 Jan 2015 18:00:55 +0000 (18:00 +0000)]
am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

* commit '7dd12d7633663c7f5802bdaaf8e7232a48aba811':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoam 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission...
Jon Larimer [Thu, 29 Jan 2015 17:55:10 +0000 (17:55 +0000)]
am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

* commit '2f4ad45d60aac5b2b025e9eac34e289d406645dc':
  DO NOT MERGE Restore calling identity before checking permission

9 years agoMerge "Fix ParceledListSlice to enforce the same concrete types among its elements...
Jon Larimer [Thu, 29 Jan 2015 17:48:57 +0000 (17:48 +0000)]
Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

9 years agoMerge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
Jon Larimer [Thu, 29 Jan 2015 17:48:19 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

9 years agoMerge "DO NOT MERGE Restore calling identity before checking permission" into jb...
Jon Larimer [Thu, 29 Jan 2015 17:48:14 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

9 years agoam 49738792: Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 00:24:39 +0000 (00:24 +0000)]
am 49738792: Doc change: Update Ads terms language.

* commit '497387928d53cca060c3f43b3a9f5c7834564333':
  Doc change: Update Ads terms language.

9 years agoDoc change: Update Ads terms language.
Dirk Dougherty [Thu, 6 Nov 2014 18:58:06 +0000 (10:58 -0800)]
Doc change: Update Ads terms language.

Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643

9 years agoLimited AppCompat support
Deepanshu Gupta [Thu, 15 Jan 2015 23:35:21 +0000 (15:35 -0800)]
Limited AppCompat support

Change-Id: I4ac7234c9533b9f47f070335c4cb6ae605d8a89f

9 years agoam 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch...
Leon Scroggins III [Wed, 28 Jan 2015 18:23:47 +0000 (18:23 +0000)]
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5
automerge: 5d7bd13

* commit '5d7bd13fc88d066d4c27a2459f3e3a58a1f4dec2':

9 years agoam 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch...
Leon Scroggins III [Wed, 28 Jan 2015 17:39:52 +0000 (17:39 +0000)]
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
automerge: 1e0d4b5

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.

9 years agoFix ParceledListSlice to enforce the same concrete types among its elements.
Adam Lesinski [Fri, 7 Nov 2014 19:26:14 +0000 (11:26 -0800)]
Fix ParceledListSlice to enforce the same concrete types among its elements.

Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit 3df1c38ee098872352086e03d6f1adb16796ee29)

9 years agoam 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
Joe Fernandez [Tue, 27 Jan 2015 23:03:49 +0000 (23:03 +0000)]
am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs

* commit '05defb992eefb8a32742d64c06e8e8fd02dbf670':
  docs: plugin for gradle typo

9 years agoMerge "docs: plugin for gradle typo" into lmp-docs
Joe Fernandez [Tue, 27 Jan 2015 22:57:29 +0000 (22:57 +0000)]
Merge "docs: plugin for gradle typo" into lmp-docs

9 years agoam 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle...
Leon Scroggins III [Tue, 27 Jan 2015 22:55:00 +0000 (22:55 +0000)]
am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.

9 years agoam 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch...
Leon Scroggins III [Tue, 27 Jan 2015 22:48:29 +0000 (22:48 +0000)]
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '1dbbc2045ae16a4923b30c9576703d02a4363529':
  Handle bad ninepatch data.

9 years agoam 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:42:03 +0000 (22:42 +0000)]
am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '6106f6a490cb5816602e8e3ae84a5c653dda44d3':
  Handle bad ninepatch data.

9 years agoam 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:31:47 +0000 (22:31 +0000)]
am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '9352296810926eae663477526545a55e1b1f7a27':
  Handle bad ninepatch data.

9 years agoam 01287549: am 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:17:11 +0000 (22:17 +0000)]
am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '01287549ad415c51377683696eb37c362d43061a':
  Handle bad ninepatch data.

9 years agoam 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:01:08 +0000 (22:01 +0000)]
am 9a6143fa: Handle bad ninepatch data.

* commit '9a6143fab7d93797e4b22a12b89e07c160e5c31d':
  Handle bad ninepatch data.

9 years agoam de113066: docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:16:53 +0000 (21:16 +0000)]
am de113066: docs: Transitions training class.

* commit 'de113066d80c3f19979eb531484af73f64640de9':
  docs: Transitions training class.

9 years agodocs: Transitions training class.
Ricardo Cervera [Mon, 12 Jan 2015 20:45:54 +0000 (12:45 -0800)]
docs: Transitions training class.

Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591

9 years agoHandle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 16:12:02 +0000 (11:12 -0500)]
Handle bad ninepatch data.

Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit a730ef3f77fc495bc90199b4d45efab26d609782)

9 years agoam 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses...
Sarah Maddox [Mon, 26 Jan 2015 20:23:25 +0000 (20:23 +0000)]
am 912cacde: 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

* commit '912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.

9 years agoMerge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient...
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

9 years agoam edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
Ricardo Cervera [Mon, 26 Jan 2015 19:39:48 +0000 (19:39 +0000)]
am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs

* commit 'edb7a4420bfbf3e7f9efc06718b45c56bbd3dc2d':
  docs: Wear DataItem listener improvements

9 years agoMerge "docs: Wear DataItem listener improvements" into lmp-docs
Ricardo Cervera [Mon, 26 Jan 2015 19:32:12 +0000 (19:32 +0000)]
Merge "docs: Wear DataItem listener improvements" into lmp-docs

9 years agodocs: Adds new geocoding sample to Location API training.
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

9 years agodocs: plugin for gradle typo
Rich Slogar [Fri, 23 Jan 2015 17:56:50 +0000 (09:56 -0800)]
docs: plugin for gradle typo

b/19106103

Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e

9 years agodocs: remove + annotations in version references
Rich Slogar [Fri, 23 Jan 2015 01:47:58 +0000 (17:47 -0800)]
docs: remove + annotations in version references

b/18417182

Change-Id: I16181a4ebb7a4ac40a7307438e120489b806f24e

9 years agoam bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Ricardo Cervera [Thu, 22 Jan 2015 17:56:54 +0000 (17:56 +0000)]
am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs

* commit 'bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
  docs: Fixes to the watch faces design guidelines

9 years agoMerge "docs: Fixes to the watch faces design guidelines" into lmp-docs
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

9 years agodocs: Fixes to the watch faces design guidelines
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

9 years agoam 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var...
Luan Nguyen [Thu, 22 Jan 2015 17:29:30 +0000 (17:29 +0000)]
am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

* commit '1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

9 years agodocs: Fix companion configuration (18864041)
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

9 years agodocs: linux requirements update
Rich Slogar [Wed, 21 Jan 2015 23:34:54 +0000 (15:34 -0800)]
docs: linux requirements update

b/18371514

Change-Id: I8e320b53bca248d37bff22e4313041d0c138779f

9 years agoam 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into...
Andrew Solovay [Wed, 21 Jan 2015 23:10:59 +0000 (23:10 +0000)]
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs

* commit '78f4342fac982a130a62dac2a459cef2a4c29f5a':
  docs: WebView security notes for apps on pre-K devices

9 years agoam f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168...
Luan Nguyen [Wed, 21 Jan 2015 23:10:55 +0000 (23:10 +0000)]
am f082f898: 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

* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
  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).

9 years agodocs: studio emulator platform update
Rich Slogar [Wed, 21 Jan 2015 21:52:56 +0000 (13:52 -0800)]
docs: studio emulator platform update

b/5122160

Change-Id: I82966b0e9f32dc6e6641681f7726a8a8074525ff

9 years agoMerge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
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

9 years agodocs: Wear DataItem listener improvements
Ricardo Cervera [Tue, 20 Jan 2015 21:41:56 +0000 (13:41 -0800)]
docs: Wear DataItem listener improvements

Change-Id: I07bf2ab063556dd4f6e42a5835f73dd5b326d26e

9 years agoMerge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with...
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

9 years agodocs: Fix conditional in ambient mode check method (18832168).
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

9 years agodocs: WebView security notes for apps on pre-K devices
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

9 years agoam 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug...
Ricardo Cervera [Tue, 20 Jan 2015 18:03:50 +0000 (18:03 +0000)]
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4
automerge: eada048

* commit 'eada048addc14a95ced54b17c6a75f5f899e2c2a':

9 years agoam 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug...
Ricardo Cervera [Tue, 20 Jan 2015 17:57:45 +0000 (17:57 +0000)]
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
automerge: e8f6bd4

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam c987ca05: Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 02:28:51 +0000 (02:28 +0000)]
am c987ca05: Merge "docs: removing code captions" into lmp-docs

* commit 'c987ca05010a8cc06572d5b04c93fb6404f8bf45':
  docs: removing code captions