Baligh Uddin
2cbab6c907
Import translations. DO NOT MERGE
...
Change-Id: I69929680cab4ea18219ae4b6890812578c9dd8ca
Auto-generated-cl: translation import
2014-06-26 11:50:05 -07:00
Lorenzo Colitti
9a22972080
Merge "Initial RDNSS tracking implementation."
2014-06-24 01:46:27 +00:00
Lorenzo Colitti
93e6d9db78
Initial RDNSS tracking implementation.
...
Add a DnsServerRepository to NetlinkTracker that keeps track of
IPv6 DNS servers received via RDNSS. It supports expiring
existing DNS servers when their lifetimes go below zero and
keeping track of more than just the 2 or 3 DNS servers that are
currently in use, so that if they all expire DNS will continue to
work.
It does not yet expire DNS servers using timers, only when a new
update comes in.
Bug: 9180552
Change-Id: I455699076198f43570a3b0b8ec7e5967514d6086
2014-06-27 01:06:21 +09:00
Raph Levien
3660789f06
Switch all text layout to Minikin
...
This patch switches all text layout operations to use Minikin, removes
the USE_MINIKIN #ifdef, and deletes some of the code that was only used
in the old TextLayout path (although some more refactoring remains).
Change-Id: I51b5c4e2bb46cfd9d204c12b9f16f135c769f5b5
2014-06-26 08:23:48 -07:00
Raph Levien
d194262f53
Delete Paint.getTextGlyphs()
...
The Paint.getTextGlyphs() method was used for testing the old Arabic
shaper and is entirely obsolete. Note that this is the very last
dependency (other than some enums in the header) for the old TextLayout
code path.
Change-Id: I7b596f0c0942ed50987fc8e0478cd93e667f1f9e
2014-06-26 15:15:28 +00:00
Raph Levien
bb7a64203d
Merge "Fix build breakage"
2014-06-26 08:19:24 +00:00
Raph Levien
3d528c403c
Fix build breakage
...
Other files were including GraphicsJNI.h and didn't have Minikin in the
include path. This patch eliminates the offending include.
Change-Id: I05c9dbf80b93f1731fd0192015e2c9c68a9dd3c6
2014-06-26 09:06:21 -07:00
smain@google.com
d4f50f21a3
am 1fff0b32: am 152440c6: Merge "new device family image for design, not photos" into klp-modular-dev
...
* commit '1fff0b321c226afb056907d4accda4aec498dd2a':
new device family image for design, not photos
2014-06-26 16:01:34 +00:00
smain@google.com
24cc139bfa
am 6988c162: am 590ee5f9: fix build, remove briefdocs
...
* commit '6988c162a38802b02035f019137473e5881f2f50':
fix build, remove briefdocs
2014-06-26 16:01:28 +00:00
smain@google.com
1fff0b321c
am 152440c6: Merge "new device family image for design, not photos" into klp-modular-dev
...
* commit '152440c67acace16dc1655a821352b0d69a61562':
new device family image for design, not photos
2014-06-26 15:55:32 +00:00
smain@google.com
6988c162a3
am 590ee5f9: fix build, remove briefdocs
...
* commit '590ee5f935139eeceec6ed75f658cb6007f82897':
fix build, remove briefdocs
2014-06-26 15:55:27 +00:00
smain@google.com
590ee5f935
fix build, remove briefdocs
...
Change-Id: I94a611f4bdc2b9c7f305727aacf2edbe63b4ece7
2014-06-26 08:31:11 -07:00
Robert Ly
f4c7c271a8
am c34fdb72: docs: add l-preview notifications
...
* commit 'c34fdb72b70eea142dea4cb75f3a6cc16e70270b':
docs: add l-preview notifications
2014-06-26 09:50:29 +00:00
Robert Ly
3e9a1368e4
am edd662ff: docs: final changes to index
...
* commit 'edd662ff667a404969b9f892bdb10ceaa5e2db25':
docs: final changes to index
2014-06-26 09:50:25 +00:00
Robert Ly
259030cba4
am fa28e8cc: Merge "docs: index landing" into klp-modular-dev
...
* commit 'fa28e8cc4baa4acc9e6cd3bfc5276b67cd8e86f0':
docs: index landing
2014-06-26 09:50:19 +00:00
Robert Ly
e0041dc18c
am c24e1813: Merge "docs: Added links and release notes for ADT 23, Studio 0.8, SDK Tools" into klp-modular-dev
...
* commit 'c24e18134ee1155d6ec35837644d940f93039370':
docs: Added links and release notes for ADT 23, Studio 0.8, SDK Tools
2014-06-26 09:50:15 +00:00
smain@google.com
aaba687d04
am dfb41027: lots of updates to the wear design guide actually decent layout with images
...
* commit 'dfb4102718dcb87acdf4015dc44ab578f57e945f':
lots of updates to the wear design guide actually decent layout with images
2014-06-26 09:49:58 +00:00
Robert Ly
c34fdb72b7
docs: add l-preview notifications
...
Change-Id: I76a4f4c544087bdcef07a7990d5623c4de68a75d
2014-06-26 02:31:40 -07:00
Robert Ly
edd662ff66
docs: final changes to index
...
Change-Id: I1a9a454937a975f2b2a36ab1132e8bb91dc4059a
2014-06-26 02:06:52 -07:00
smain@google.com
152440c67a
Merge "new device family image for design, not photos" into klp-modular-dev
2014-06-26 05:47:42 +00:00
smain@google.com
9a5dcb8c44
new device family image for design, not photos
...
Change-Id: I94350e17c3fe26ede6233d65eda22d1bfc71f970
2014-06-26 01:08:36 -07:00
smain@google.com
dfb4102718
lots of updates to the wear design guide
...
actually decent layout with images
Change-Id: I45047158b61d3d8202b0f77e1ff8aea9c57da7c5
2014-06-25 22:03:59 -07:00
Ricardo Cervera
bc71daa161
am a1bc384d: docs: Added GitHub links to the samples
...
* commit 'a1bc384d22de86fc5d8fac90328fa619a6a3fceb':
docs: Added GitHub links to the samples
2014-06-26 03:57:44 +00:00
Ricardo Cervera
a1bc384d22
docs: Added GitHub links to the samples
...
Change-Id: I944844d64396b0ae07e4c55118d4cd960480c5b7
2014-06-25 20:37:33 -07:00
Jason Sams
6b52ca5949
am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
...
* commit '89e4c715e01f4a2da31a92788547282d699752bf':
Add check and throw for failed Intrinsic init.
2014-06-26 00:25:28 +00:00
Jason Sams
89e4c715e0
am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
...
* commit '7165bd6d7496159b426f072bdf13adfffc917a24':
Add check and throw for failed Intrinsic init.
2014-06-26 00:20:26 +00:00
Joe Fernandez
7265bc4544
am 50cbb708: am c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
...
* commit '50cbb708b4e6a99b92a646fd548058f1ff4e766c':
docs: fix wear whitelist sign up language to be less confusing
2014-06-25 23:00:33 +00:00
smain@google.com
a91c0f6b47
am 603514ad: am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page
...
* commit '603514adfc2582e194cf6aed112fd5eab40c529d':
update wear icons on preview page
2014-06-25 23:00:30 +00:00
destradaa
5c2395a4d2
am 72e18628: Merge branch \'klp-modular-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev
...
* commit '72e186283fdef7f6ac56409bf52a5748f6a4749c':
2014-06-25 23:00:27 +00:00
Robert Ly
b9abab2f42
am 017ec80f: am d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
...
* commit '017ec80fa1ca1212f9c98dcdbb07d1f0bab938d5':
docs: add gms core preview hoop-jumping
2014-06-25 23:00:16 +00:00
Joe Fernandez
50cbb708b4
am c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
...
* commit 'c12a14442734085f2f1d7f3a38e634331537b08e':
docs: fix wear whitelist sign up language to be less confusing
2014-06-25 22:55:14 +00:00
smain@google.com
603514adfc
am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page
...
* commit '08eb76f42ed53ea3967a4559d9e60a961f9450b5':
update wear icons on preview page
2014-06-25 22:55:13 +00:00
destradaa
72e186283f
Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev
2014-06-25 22:55:07 +00:00
Joe Fernandez
c12a144427
am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
...
* commit '52e2416cc72f7d87e2f7f1aa29b7a9cb85ae0c70':
docs: fix wear whitelist sign up language to be less confusing
2014-06-25 22:49:36 +00:00
smain@google.com
58b170e84a
am 8f414479: fix back link for preview nav
...
* commit '8f414479f91f73c3b8432ca93991ba643b9c846f':
fix back link for preview nav
2014-06-25 22:32:26 +00:00
smain@google.com
8f414479f9
fix back link for preview nav
...
Change-Id: I684129ba5c43d49ff52410939e8b034ccc4877ad
2014-06-25 15:19:28 -07:00
Robert Ly
fa8ad32716
am ed929960: Merge "docs: add gcore instructions for preview" into klp-modular-dev
...
* commit 'ed929960584cba38a81b49cff597dba59d50a0a7':
docs: add gcore instructions for preview
2014-06-25 21:38:49 +00:00
smain@google.com
a16f0958fc
am 8f832719: Merge "add license wall to downloading the L Preview system images" into klp-modular-dev
...
* commit '8f832719632cdbcbcc555c94f898ddbf38174de9':
add license wall to downloading the L Preview system images
2014-06-25 21:28:15 +00:00
Joe Fernandez
02ea12eabf
am 54c6e0aa: Merge "Final L-Preview Guidelines for Android TV Games Staged at http://boku.mtv.corp.google.com:9195/preview/tv/games/index.html " into klp-modular-dev
...
* commit '54c6e0aa1f27e5ecf3db64710563a305d78e9d39':
Final L-Preview Guidelines for Android TV Games Staged at http://boku.mtv.corp.google.com:9195/preview/tv/games/index.html
2014-06-25 20:53:54 +00:00
Stephen Hines
af97f87a47
am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
...
* commit '6d38cec12baa98fc50abd033eddd359a66843efa':
Switch from size_t -> uint32_t for dimensions array.
2014-06-25 20:50:26 +00:00
Stephen Hines
6d38cec12b
am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
...
* commit '924ed1fae19ba70b5c6267b977ae8c72b63fe99a':
Switch from size_t -> uint32_t for dimensions array.
2014-06-25 20:44:09 +00:00
Robert Ly
017ec80fa1
am d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
...
* commit 'd0039968fa6caafcbb39e9613af75686a2f1ce46':
docs: add gms core preview hoop-jumping
2014-06-25 19:29:45 +00:00
smain@google.com
3edaf370e3
am d9d9d335: am 80c07fb9: am ec6f162f: DO NOT MERGE!
...
* commit 'd9d9d335fbd88d77ad10f5850e824c72c85bcfb0':
DO NOT MERGE!
2014-06-25 19:25:30 +00:00
smain@google.com
d01b9d7c47
am 92fd15a3: am 5f4a2b83: (-s ours) am 53126416: DO NOT MERGE!
...
* commit '92fd15a31f54a76900c2fc27d19ef5313eeeec6f':
DO NOT MERGE!
DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
2014-06-25 19:25:26 +00:00
Scott Main
31e3f69e04
am 62b2d414: am 1b4a9dbf: (-s ours) am 87670bcb: Revert "add \'coming soon\' page for google io announcements"
...
* commit '62b2d414e194b41fc1a745b98cb6e608ec22c523':
Revert "add 'coming soon' page for google io announcements"
2014-06-25 19:25:22 +00:00
smain@google.com
83985711ad
am 7ac0aa1e: am bf5d1a93: (-s ours) am cca2a91a: add \'coming soon\' page for google io announcements
...
* commit '7ac0aa1ea3b282b375a8fedd572f30145299b10a':
add 'coming soon' page for google io announcements
2014-06-25 19:25:18 +00:00
smain@google.com
d9d9d335fb
am 80c07fb9: am ec6f162f: DO NOT MERGE!
...
* commit '80c07fb99b5a923ffd35e1b8e4cff64197074aa5':
DO NOT MERGE!
2014-06-25 19:21:08 +00:00
smain@google.com
92fd15a31f
am 5f4a2b83: (-s ours) am 53126416: DO NOT MERGE!
...
* commit '5f4a2b83850868fa5898661cb2555e54023060c0':
DO NOT MERGE!
DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
2014-06-25 19:21:04 +00:00
Scott Main
62b2d414e1
am 1b4a9dbf: (-s ours) am 87670bcb: Revert "add \'coming soon\' page for google io announcements"
...
* commit '1b4a9dbf832870fc0ffc17212d10b34e61d4c943':
Revert "add 'coming soon' page for google io announcements"
2014-06-25 19:12:48 +00:00
Robert Ly
1e1ca756a9
am 823ce529: Merge "fix build" into klp-modular-dev
...
* commit '823ce5298fec4d0d9f5773ce16af882e633f1f16':
fix build
2014-06-25 19:12:46 +00:00