Eino-Ville Talvala
431b65d11f
am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
...
* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
Revert "Camera: Add new capability flags as system features as well"
2014-12-04 20:23:45 +00:00
Eino-Ville Talvala
08a125562c
Revert "Camera: Add new capability flags as system features as well"
...
This reverts commit 6aee1d2ba52cf7f44c9355f279844b8a937903da.
But leaves in some of the improved documentation.
Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
2014-12-03 11:12:39 -08:00
Eino-Ville Talvala
bd9567e156
am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
...
* commit 'e289082a7066a86032190aa100425ce29cd2a4f2':
Camera: Add new capability flags as system features as well
2014-11-24 18:05:40 +00:00
Scott Rowe
7863922116
am 9e9d1cd3: am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
...
* commit '9e9d1cd3ff536e8c9d00469f01b00b94fe73e0a2':
docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
2014-11-24 18:05:11 +00:00
Eino-Ville Talvala
dfa99f6367
Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
2014-11-22 04:57:49 +00:00
Scott Rowe
14f78ed7b8
Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
2014-11-21 17:34:29 +00:00
Eino-Ville Talvala
6aee1d2ba5
Camera: Add new capability flags as system features as well
...
Also add all the L and L MR1 new system features to the uses-feature documentation.
Bug: 18281970
Change-Id: I116ca3fd04cd90eb53cc696b6fa62488687e7740
2014-11-20 15:52:40 -08:00
Elliott Hughes
6c43e6b54d
Fix and be more explicit about plurals best practices.
...
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".
Bug: 18429565
(cherry picked from commit 1fe7d496db1ddc73289e6aae11f4dd4a970141d5)
Change-Id: I89656c74b7dfd91584e1bb6d0a3f2da1dda81079
2014-11-19 16:38:39 -08:00
Elliott Hughes
6973a63e96
am ec2d8d0b: am ea8ff822: Merge "Fix and be more explicit about plurals best practices."
...
* commit 'ec2d8d0bb8a36355b8d687c660b5c64e4aebd9b8':
Fix and be more explicit about plurals best practices.
2014-11-20 00:27:29 +00:00
Elliott Hughes
1fe7d496db
Fix and be more explicit about plurals best practices.
...
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".
Bug: 18429565
Change-Id: I09eb39ea6986850c3af28cca3052d319e3c97705
2014-11-19 16:18:45 -08:00
Scott Rowe
3632637b4a
docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21
...
Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
2014-11-07 16:05:13 -08:00
Scott Rowe
c1c58b9a96
am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
...
automerge: aa3be67
* commit 'aa3be670328ee9ff7e1fbd3ec077ff27ddf42013':
docs: b/18119632 isGame, b/18119595 banner
2014-11-03 17:29:59 +00:00
Scott Rowe
4c3a07ba05
docs: b/18119632 isGame, b/18119595 banner
...
Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
2014-10-31 09:51:27 -07:00
David Friedman
5decda261a
am 3be4e43b: am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
* commit '3be4e43b4cb81762c0fae2936b1546e2bb5acdcc':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
2014-10-30 23:43:31 +00:00
David Friedman
0fa6edced7
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
Change-Id: I7be014d27ef85631b5e26ad2b3ab81d3a12d1813
2014-10-28 16:38:11 -07:00
Natalie Masse
7e3f7ced52
am a2e6ec07: am 694a9e46: am 0fbbed83: am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed
...
* commit 'a2e6ec070cc9c127a5c376e3bf5e19de09c44324':
Link and typo fixed
2014-10-24 23:39:29 +00:00
Natalie Masse
60144a7a06
am bcf9ced4: am 1e5bb861: Link and typo fixed
...
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
Link and typo fixed
2014-10-24 22:36:54 +00:00
Dirk Dougherty
94ce09cb80
am e1fa68cd: am 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
...
* commit 'e1fa68cd24c5a97a549c101f3eeacb70cafb8c9d':
Doc change: Add Lollipop to platform versions table.
2014-10-17 19:11:31 +00:00
Scott Rowe
0e500adfc8
am 81584ee6: am 5100b72c: am fafb6c70: am dd886683: docs: Notifications changes for L
...
* commit '81584ee6ed1b0378847aaee0ae4091cb9fefe2a3':
docs: Notifications changes for L
2014-10-17 19:10:38 +00:00
Joe Fernandez
8733556213
am d81ca1da: am 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev
...
* commit 'd81ca1da0546b4d0d9ff32918132e625e89d4e16':
docs: Recents screen for tasks and activities
2014-10-17 19:10:23 +00:00
Joe Fernandez
bc31db59e5
am 315a45e0: am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev
...
* commit '315a45e085a14884e267c49498e94a316376e212':
Android 5.0 changes to IME switching
2014-10-17 19:09:52 +00:00
Natalie Masse
1e5bb86126
Link and typo fixed
...
Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
2014-10-17 13:50:24 +01:00
Dirk Dougherty
eab518b443
am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
...
* commit '22fa76dac8de6cfd9e7bc1eb8800f4cddbfc0640':
Doc change: Add Lollipop to platform versions table.
2014-10-17 09:24:36 +00:00
Dirk Dougherty
2b86948e46
Doc change: Add Lollipop to platform versions table.
...
Change-Id: Iad84444396a3b2d24403e88398ca21933741b819
2014-10-17 02:16:58 -07:00
Scott Rowe
1d90cac982
docs: Notifications changes for L
...
automerge: dd88668
* commit 'dd88668392839509c812a544b1132185b3825b69':
docs: Notifications changes for L
2014-10-17 07:09:17 +00:00
Scott Rowe
dd88668392
docs: Notifications changes for L
...
Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a
2014-10-16 23:48:25 -07:00
Joe Fernandez
06d2cb68b4
Merge "docs: Recents screen for tasks and activities" into lmp-dev
...
automerge: 321e764
* commit '321e7645c305dbc4f7444d364c879bad8946da2b':
docs: Recents screen for tasks and activities
2014-10-17 05:49:27 +00:00
Joe Fernandez
321e7645c3
Merge "docs: Recents screen for tasks and activities" into lmp-dev
2014-10-17 05:40:43 +00:00
Joe Fernandez
365ca55529
Merge "Android 5.0 changes to IME switching" into lmp-dev
...
automerge: d664dc9
* commit 'd664dc93f47e32df865384718055b200585e0e88':
Android 5.0 changes to IME switching
2014-10-17 05:33:00 +00:00
Scott Rowe
73d799dda2
docs: Recents screen for tasks and activities
...
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
2014-10-16 22:16:13 -07:00
Joe Fernandez
d664dc93f4
Merge "Android 5.0 changes to IME switching" into lmp-dev
2014-10-17 05:01:04 +00:00
David Friedman
e802d5432e
Android 5.0 changes to IME switching
...
Change-Id: I158736ee36706889a5277f02a652162194289514
2014-10-16 21:52:53 -07:00
David Friedman
bc6c216540
am 57c63dbf: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev automerge: f8e428d
...
* commit '57c63dbf271ebc66c9ce09eaac05b1d1f524944e':
OpenGL 3.1 and AEP documentation for L-release.
2014-10-16 19:16:25 +00:00
David Friedman
40d9eaa844
am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
...
* commit 'd12e6de645a39e6e902785d544100fb1963aa203':
OpenGL 3.1 and AEP documentation for L-release.
2014-10-16 18:10:38 +00:00
David Friedman
d12e6de645
Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
2014-10-16 18:06:01 +00:00
David Friedman
778d3552d6
OpenGL 3.1 and AEP documentation for L-release.
...
Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
2014-10-15 19:59:43 -07:00
Nick Kralevich
a26487cb28
am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev
...
* commit '55bb6a7b68595ee83b543eda40d191636de1831e':
Docs: adding closing bracket to un-break javadoc tokens.
2014-10-15 02:03:37 +00:00
Nick Kralevich
0763a03d22
am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev
...
* commit '0ae82b05be47df85551a1c759a93e84c8009947c':
Docs: adding closing bracket to un-break javadoc tokens.
2014-10-14 15:50:15 +00:00
Nick Kralevich
0ae82b05be
resolved conflicts for merge of a4eb81b6 to lmp-dev
...
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
2014-10-14 08:38:05 -07:00
Eric Gilmore
e77fe60760
Docs: adding closing bracket to un-break javadoc tokens.
...
Bug: 17186958
Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
2014-10-09 10:17:59 -07:00
Newton Allen
df2b8a1cb9
am 58f75627: am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
...
* commit '58f75627d195082e263f6d6d8e3c46c6d0970e63':
Fix some documentation typos.
2014-10-02 19:43:39 +00:00
Newton Allen
408f7534ef
am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
...
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
Fix some documentation typos.
2014-10-02 16:46:03 +00:00
Newton Allen
8f8a11b7fa
Fix some documentation typos.
...
Change-Id: I747a0ade5c7b9c45d4465bf327952338bbc1cfaa
(cherry picked from commit 4465d1a03ee5fddc5987c19fc36b0bb79e19572f)
2014-09-30 02:52:26 +00:00
Elliott Hughes
4656e69bf3
resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
...
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
2014-09-08 13:08:43 -07:00
Mark Doliner
d0646dca40
Small documentation fixes across many files.
...
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
2014-09-05 13:57:51 -07:00
Scott Rowe
3215da25dd
am 14f413be: am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
...
* commit '14f413be3c7701750b996b90c95471e8cf04ae96':
docs: b/15790433 updated for xxhdpi and xxxhdpi
2014-09-04 00:20:15 +00:00
Scott Rowe
14f413be3c
am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
...
* commit '048d8baaffadc28ee8e7bab0ce61a868c09c311a':
docs: b/15790433 updated for xxhdpi and xxxhdpi
2014-09-04 00:13:02 +00:00
Scott Rowe
0ccf80c31d
Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
2014-09-03 23:52:13 +00:00
Joe Fernandez
14a5d2bd4d
am a1a3c8a1: am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
...
* commit 'a1a3c8a126032596b722d9faa74c616a4a8974e7':
docs: Fix bug with Accessibility Services dev guide
2014-09-03 23:36:30 +00:00
Joe Fernandez
a1a3c8a126
am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
...
* commit '9de229527e710a90b03a415a9b752cc6e2a11592':
docs: Fix bug with Accessibility Services dev guide
2014-09-03 23:29:46 +00:00