OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 672b1d13: am ba102925: Merge "more doc fixes for notifcations and wear" into klp...
Robert Ly [Fri, 27 Jun 2014 17:19:17 +0000 (17:19 +0000)]
am 672b1d13: am ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev

* commit '672b1d13c92ee14f13a70004acfb1971df323afe':
  more doc fixes for notifcations and wear

10 years agoam ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 17:13:40 +0000 (17:13 +0000)]
am ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev

* commit 'ba1029257999fbfc6c7741d05cee10b8f2036f2f':
  more doc fixes for notifcations and wear

10 years agoam af19c795: Merge "fix gmscore preview isntructions" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 14:35:28 +0000 (14:35 +0000)]
am af19c795: Merge "fix gmscore preview isntructions" into klp-modular-dev

* commit 'af19c795e275b1e7d16fad351b3a14f74ef29088':
  fix gmscore preview isntructions

10 years agoam 3822bf89: change the G+ community link
smain@google.com [Fri, 27 Jun 2014 01:19:21 +0000 (01:19 +0000)]
am 3822bf89: change the G+ community link

* commit '3822bf8935310f8f94a534b986a2af935336d7e8':
  change the G+ community link

10 years agochange the G+ community link
smain@google.com [Fri, 27 Jun 2014 01:12:51 +0000 (18:12 -0700)]
change the G+ community link

Change-Id: I68d453062232b739c3fdaee193eb9a20cd03d8f8

10 years agoam cf54f881: docs: Replaced image in L Preview material docs
Ricardo Cervera [Fri, 27 Jun 2014 01:03:39 +0000 (01:03 +0000)]
am cf54f881: docs: Replaced image in L Preview material docs

* commit 'cf54f881aced94aec5df3b956cfc6b380cbc6b87':
  docs: Replaced image in L Preview material docs

10 years agodocs: Replaced image in L Preview material docs
Ricardo Cervera [Fri, 27 Jun 2014 00:53:12 +0000 (17:53 -0700)]
docs: Replaced image in L Preview material docs

Change-Id: I7db905f0fc8ae2bf9826d74bc7030d5a41cd2859

10 years agoam bb5a3dfb: Doc change: point to correct plus community for ldp.
Dirk Dougherty [Thu, 26 Jun 2014 21:23:14 +0000 (21:23 +0000)]
am bb5a3dfb: Doc change: point to correct plus community for ldp.

* commit 'bb5a3dfbe858b899a04a0d406639e6602e403376':
  Doc change: point to correct plus community for ldp.

10 years agoDoc change: point to correct plus community for ldp.
Dirk Dougherty [Thu, 26 Jun 2014 21:14:17 +0000 (14:14 -0700)]
Doc change: point to correct plus community for ldp.

Change-Id: I6d22041f3de47ce59d418b492c8c7b2b758c2e05

10 years agoam d3e8c7f1: Doc change: change plus community for ldp.
Dirk Dougherty [Thu, 26 Jun 2014 21:12:42 +0000 (21:12 +0000)]
am d3e8c7f1: Doc change: change plus community for ldp.

* commit 'd3e8c7f19496d6a9ec94c6e7686bd0a6d35f730b':
  Doc change: change plus community for ldp.

10 years agoDoc change: change plus community for ldp.
Dirk Dougherty [Thu, 26 Jun 2014 19:44:24 +0000 (12:44 -0700)]
Doc change: change plus community for ldp.

Change-Id: I4dd149f2e2521f79d526dd89c08afb794fc83361

10 years agoam cfcb47c9: Merge "fix reference link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:41:33 +0000 (18:41 +0000)]
am cfcb47c9: Merge "fix reference link" into klp-modular-dev

* commit 'cfcb47c90ab2516e6f13cef83b1afe98ffe59e44':
  fix reference link

10 years agoam ff0b6006: Merge "fix link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:36:37 +0000 (18:36 +0000)]
am ff0b6006: Merge "fix link" into klp-modular-dev

* commit 'ff0b60068ad2f1ee0c9a09afdd4c1ed5abe94b3d':
  fix link

10 years agoam 174943b3: Merge "fix more brokenness" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:28:15 +0000 (18:28 +0000)]
am 174943b3: Merge "fix more brokenness" into klp-modular-dev

* commit '174943b39dd8a2fa3aaed50220304d77f3546333':
  fix more brokenness

10 years agoMerge "more doc fixes for notifcations and wear" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 17:07:49 +0000 (17:07 +0000)]
Merge "more doc fixes for notifcations and wear" into klp-modular-dev

10 years agomore doc fixes for notifcations and wear
Robert Ly [Fri, 27 Jun 2014 16:25:42 +0000 (09:25 -0700)]
more doc fixes for notifcations and wear

Change-Id: I9f0d168a8ebafb778924919766910b79504ebf68

10 years agoMerge "fix gmscore preview isntructions" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 14:30:41 +0000 (14:30 +0000)]
Merge "fix gmscore preview isntructions" into klp-modular-dev

10 years agofix gmscore preview isntructions
Robert Ly [Thu, 26 Jun 2014 20:00:42 +0000 (13:00 -0700)]
fix gmscore preview isntructions

Change-Id: I58264d2bb608e726d95b64f3cfb829ffff573ea5

10 years agofix reference link
Robert Ly [Thu, 26 Jun 2014 18:36:23 +0000 (11:36 -0700)]
fix reference link

Change-Id: Ia291e04a6404a3732acdbc730a414b71ee5eee89

10 years agofix link
Robert Ly [Thu, 26 Jun 2014 18:31:46 +0000 (11:31 -0700)]
fix link

Change-Id: Ic8d7f135e43d1a76c56c5f66245a4a499e1efab1

10 years agofix more brokenness
Robert Ly [Thu, 26 Jun 2014 18:18:48 +0000 (11:18 -0700)]
fix more brokenness

Change-Id: I19c9d6345117825a2bb0504731c358adc7a2f55e

10 years agoMerge "fix reference link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:37:36 +0000 (18:37 +0000)]
Merge "fix reference link" into klp-modular-dev

10 years agoMerge "fix link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:32:48 +0000 (18:32 +0000)]
Merge "fix link" into klp-modular-dev

10 years agoMerge "fix more brokenness" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:22:09 +0000 (18:22 +0000)]
Merge "fix more brokenness" into klp-modular-dev

10 years agoMerge "Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio...
Paul McLean [Fri, 27 Jun 2014 16:06:08 +0000 (16:06 +0000)]
Merge "Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output"

10 years agoEnabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output
Paul McLean [Thu, 26 Jun 2014 22:28:40 +0000 (15:28 -0700)]
Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output

Bug: 13747844

Change-Id: Ia969dad4150adeafb375e3f9985f9d8ba7222638

10 years agoam 034bd9cd: am af19c795: Merge "fix gmscore preview isntructions" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 14:40:22 +0000 (14:40 +0000)]
am 034bd9cd: am af19c795: Merge "fix gmscore preview isntructions" into klp-modular-dev

* commit '034bd9cd58d14c76de8518ace5617d4a1b3282cf':
  fix gmscore preview isntructions

10 years agoIf DISALLOW_ADD_USER is enabled, do not allow users to be created.
Julia Reynolds [Thu, 26 Jun 2014 20:35:00 +0000 (16:35 -0400)]
If DISALLOW_ADD_USER is enabled, do not allow users to be created.

Bug: 15910634
Change-Id: I7e14bf7d71001f218402a5d90e2aadc54fcfd875

10 years agoMerge "Add Third Party Cookie API"
Hector Dearman [Fri, 27 Jun 2014 12:53:17 +0000 (12:53 +0000)]
Merge "Add Third Party Cookie API"

10 years agoAvoid upranking battery level/saver notifications
Christoph Studer [Thu, 26 Jun 2014 14:50:09 +0000 (16:50 +0200)]
Avoid upranking battery level/saver notifications

Bug: 15884933
Change-Id: Ia1a61c8b3d3f70feaa0a68702c1a8902b0c15bb7

10 years agoMerge "Rename managed profile string"
Alexandra Gherghina [Fri, 27 Jun 2014 10:16:43 +0000 (10:16 +0000)]
Merge "Rename managed profile string"

10 years agoRename managed profile string
Alexandra Gherghina [Fri, 27 Jun 2014 09:29:54 +0000 (10:29 +0100)]
Rename managed profile string

Bug: 15827349
Change-Id: I61b80171e7b6010f062d2e0bfa950b6b47858edf

10 years agoMerge "Turn on/off an overlay view by visibility change in TvView"
Youngsang Cho [Fri, 27 Jun 2014 09:39:12 +0000 (09:39 +0000)]
Merge "Turn on/off an overlay view by visibility change in TvView"

10 years agoFix test failures due to unexpected overload resolution
Yohei Yukawa [Fri, 27 Jun 2014 08:13:32 +0000 (17:13 +0900)]
Fix test failures due to unexpected overload resolution

Starting with Ie04e8a27050849fee1c93ef14b9944acc70fafe4,
CursorAnchorInfo#getComposingText() returns CharSequence rather
than String.  This causes unexpected overload resolution,
which results in test failures.

BUG: 15088391
Change-Id: I51e2b23573e92be7e5b1dcca6402e85364408215

10 years agoTurn on/off an overlay view by visibility change in TvView
Youngsang Cho [Fri, 27 Jun 2014 07:21:07 +0000 (16:21 +0900)]
Turn on/off an overlay view by visibility change in TvView

Bug: 15873405
Change-Id: I0e6db7fb61af6d79cbfc00cefddd8ba2a0a7ee7e

10 years agoMerge "Use CharSequence instead of String in CursorAnchorInfo"
Yohei Yukawa [Fri, 27 Jun 2014 07:32:10 +0000 (07:32 +0000)]
Merge "Use CharSequence instead of String in CursorAnchorInfo"

10 years agoUse CharSequence instead of String in CursorAnchorInfo
Yohei Yukawa [Fri, 27 Jun 2014 03:24:20 +0000 (12:24 +0900)]
Use CharSequence instead of String in CursorAnchorInfo

This might be useful if we need to pass some spans from the
application to the input method through CursorAnchorInfo.

This change makes CursorAnchorInfo more consistent with other
input method APIs where CharSequence is preferred over String.

BUG: 15088391
Change-Id: Ie04e8a27050849fee1c93ef14b9944acc70fafe4

10 years agoam f106d527: am 3822bf89: change the G+ community link
smain@google.com [Fri, 27 Jun 2014 01:24:09 +0000 (01:24 +0000)]
am f106d527: am 3822bf89: change the G+ community link

* commit 'f106d5279fd098ca93cd8d7e3323b1d8f1b8f242':
  change the G+ community link

10 years agoam eb63c4cd: am cf54f881: docs: Replaced image in L Preview material docs
Ricardo Cervera [Fri, 27 Jun 2014 01:09:14 +0000 (01:09 +0000)]
am eb63c4cd: am cf54f881: docs: Replaced image in L Preview material docs

* commit 'eb63c4cd6e286bb38e24040c96486efb2fd6902e':
  docs: Replaced image in L Preview material docs

10 years agoImplement volume control action in cec service.
Jungshik Jang [Wed, 25 Jun 2014 06:51:36 +0000 (15:51 +0900)]
Implement volume control action in cec service.

Hdmi CEC's volume control is based on key event handling
but in android we can only get delta of volume change.
VolumeControlAction simulates key event action from
delta of volume change. However, it's highly dependent
on <Report Audio Status> message coming from AVR.
This implementation waits 900ms for <Report Audio Status>
message and if no message arrives it finishes action.
Instead, HdmiCecLocalDeviceTv consumes it after action
termination so that Tv can reflect system audio's
volume all the time.

Change-Id: I0442d31721365acdc009c8fa1c1e0a4361e4a1cc

10 years agoMerge "SurfaceTexture: Allow creation in detached mode"
Dan Stoza [Thu, 26 Jun 2014 22:11:56 +0000 (22:11 +0000)]
Merge "SurfaceTexture: Allow creation in detached mode"

10 years agoSurfaceTexture: Allow creation in detached mode
Dan Stoza [Thu, 26 Jun 2014 20:36:19 +0000 (13:36 -0700)]
SurfaceTexture: Allow creation in detached mode

Adds a constructor that doesn't require a GLES texture name and sets
up the SurfaceTexture in detached mode.

Bug: 15616428
Change-Id: I375495f481bfbe43b3830ab7d124cef8f1be0ac6

10 years agoam 4accf048: am cfcb47c9: Merge "fix reference link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:48:19 +0000 (18:48 +0000)]
am 4accf048: am cfcb47c9: Merge "fix reference link" into klp-modular-dev

* commit '4accf0489aff66bfeb6beb06b27d7a7897a7aaa1':
  fix reference link

10 years agob/15892295 If playback is active don't play a beep
RoboErik [Thu, 26 Jun 2014 17:26:43 +0000 (10:26 -0700)]
b/15892295 If playback is active don't play a beep

The old code removed the flag for playing a beep when changing volume
with active playback. This will do the same thing.

Change-Id: I708db66a1575d314b941166d4a6ca05d0a796dae

10 years agoam 61fe220e: am ff0b6006: Merge "fix link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:42:10 +0000 (18:42 +0000)]
am 61fe220e: am ff0b6006: Merge "fix link" into klp-modular-dev

* commit '61fe220eefa24dbfff785f6234fa60e9a6b174fe':
  fix link

10 years agoam dad1e31a: am 174943b3: Merge "fix more brokenness" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:33:45 +0000 (18:33 +0000)]
am dad1e31a: am 174943b3: Merge "fix more brokenness" into klp-modular-dev

* commit 'dad1e31a975f4c2416252e5318fa0b417bebeae8':
  fix more brokenness

10 years agoCamera2: Add 3A maxRegions tag to legacy device
Yin-Chia Yeh [Wed, 25 Jun 2014 22:37:24 +0000 (15:37 -0700)]
Camera2: Add 3A maxRegions tag to legacy device

Change-Id: I8ab4164a7f4c6f210b000cb623cbc686e0e79a35

10 years agoEnforce ConnectivityManager.releaseNetworkRequest callers own the NetworkRequest
Paul Jensen [Fri, 16 May 2014 18:31:12 +0000 (14:31 -0400)]
Enforce ConnectivityManager.releaseNetworkRequest callers own the NetworkRequest

Enforce that callers of ConnectivityManager.releaseNetworkRequest() are the
creators of the NetworkRequest being released by matching UIDs.

Change-Id: I439468c054bacc035e2db2c4967b24d183e78e9c

10 years agoMerge "Add IN/OUT flag for all Visibility transitions."
George Mount [Fri, 27 Jun 2014 15:45:40 +0000 (15:45 +0000)]
Merge "Add IN/OUT flag for all Visibility transitions."

10 years agoam 3f423aa1: add missing image and move link for layout
smain@google.com [Thu, 26 Jun 2014 17:11:41 +0000 (17:11 +0000)]
am 3f423aa1: add missing image and move link for layout

* commit '3f423aa1321f235cb0653bb42a057426237ddd7f':
  add missing image and move link for layout

10 years agoadd missing image and move link for layout
smain@google.com [Thu, 26 Jun 2014 17:04:49 +0000 (10:04 -0700)]
add missing image and move link for layout

Change-Id: I33dff4e2bd48f6eb786a628fb591a9ba7a5cae53

10 years agoam 7e4af93b: link fixes
Robert Ly [Thu, 26 Jun 2014 16:54:58 +0000 (16:54 +0000)]
am 7e4af93b: link fixes

* commit '7e4af93be6e1da6c6428f62c7ed71486f82218cd':
  link fixes

10 years agoam 2ceb05a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:54:54 +0000 (16:54 +0000)]
am 2ceb05a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '2ceb05a6a61d9de4b99408fbad4466fbc9dce548':
  Import translations. DO NOT MERGE

10 years agoam bbf69273: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:54:50 +0000 (16:54 +0000)]
am bbf69273: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'bbf69273a7ac6cc95a9b0682d0fe62f3a0afb35f':
  Import translations. DO NOT MERGE

10 years agoam 9cd24101: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:54:47 +0000 (16:54 +0000)]
am 9cd24101: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '9cd24101315392d6b58331a7969696ba873103f6':
  Import translations. DO NOT MERGE

10 years agoam 16e5d71b: Merge "Revert "new device family image for design, not photos"" into...
Scott Main [Thu, 26 Jun 2014 16:54:42 +0000 (16:54 +0000)]
am 16e5d71b: Merge "Revert "new device family image for design, not photos"" into klp-modular-dev

* commit '16e5d71b6bf78d00680d7e9efaf4e94273941292':
  Revert "new device family image for design, not photos"

10 years agolink fixes
Robert Ly [Thu, 26 Jun 2014 16:44:43 +0000 (09:44 -0700)]
link fixes

Change-Id: If91c07663347f485106e926167845ce184f17da2

10 years agoam 152440c6: Merge "new device family image for design, not photos" into klp-modular-dev
smain@google.com [Thu, 26 Jun 2014 15:55:32 +0000 (15:55 +0000)]
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

10 years agoam 590ee5f9: fix build, remove briefdocs
smain@google.com [Thu, 26 Jun 2014 15:55:27 +0000 (15:55 +0000)]
am 590ee5f9: fix build, remove briefdocs

* commit '590ee5f935139eeceec6ed75f658cb6007f82897':
  fix build, remove briefdocs

10 years agofix build, remove briefdocs
smain@google.com [Thu, 26 Jun 2014 15:31:11 +0000 (08:31 -0700)]
fix build, remove briefdocs

Change-Id: I94a611f4bdc2b9c7f305727aacf2edbe63b4ece7

10 years agoAdd IN/OUT flag for all Visibility transitions.
George Mount [Thu, 26 Jun 2014 00:04:51 +0000 (17:04 -0700)]
Add IN/OUT flag for all Visibility transitions.

Bug 15758206

Change-Id: If9b1871117a6808c87adc84ab9215b913ebd2704

10 years agoBadge document activities in Recents
Robin Lee [Thu, 26 Jun 2014 13:13:17 +0000 (14:13 +0100)]
Badge document activities in Recents

The activity icon provided by the app should not be used directly as
icons from activities in other profiles need to be badged.

@bug 15689369

Change-Id: Iee34d296eacc8aeba58f671e3f6b681bc9826425

10 years agoFix java doc.
Wink Saville [Thu, 26 Jun 2014 11:50:00 +0000 (04:50 -0700)]
Fix java doc.

Change-Id: I620c2ea77504fa4ead92e8a4faf0db4eff4f5e2b

10 years agoam c34fdb72: docs: add l-preview notifications
Robert Ly [Thu, 26 Jun 2014 09:50:29 +0000 (09:50 +0000)]
am c34fdb72: docs: add l-preview notifications

* commit 'c34fdb72b70eea142dea4cb75f3a6cc16e70270b':
  docs: add l-preview notifications

10 years agoam edd662ff: docs: final changes to index
Robert Ly [Thu, 26 Jun 2014 09:50:25 +0000 (09:50 +0000)]
am edd662ff: docs: final changes to index

* commit 'edd662ff667a404969b9f892bdb10ceaa5e2db25':
  docs: final changes to index

10 years agoam fa28e8cc: Merge "docs: index landing" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 09:50:19 +0000 (09:50 +0000)]
am fa28e8cc: Merge "docs: index landing" into klp-modular-dev

* commit 'fa28e8cc4baa4acc9e6cd3bfc5276b67cd8e86f0':
  docs: index landing

10 years agoam c24e1813: Merge "docs: Added links and release notes for ADT 23, Studio 0.8, SDK...
Robert Ly [Thu, 26 Jun 2014 09:50:15 +0000 (09:50 +0000)]
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

10 years agoam dfb41027: lots of updates to the wear design guide actually decent layout with...
smain@google.com [Thu, 26 Jun 2014 09:49:58 +0000 (09:49 +0000)]
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

10 years agodocs: add l-preview notifications
Robert Ly [Thu, 26 Jun 2014 09:17:12 +0000 (02:17 -0700)]
docs: add l-preview notifications

Change-Id: I76a4f4c544087bdcef07a7990d5623c4de68a75d

10 years agodocs: final changes to index
Robert Ly [Thu, 26 Jun 2014 08:18:05 +0000 (01:18 -0700)]
docs: final changes to index

Change-Id: I1a9a454937a975f2b2a36ab1132e8bb91dc4059a

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:17:14 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Revert "new device family image for design, not photos"" into klp-modular-dev
Scott Main [Thu, 26 Jun 2014 16:11:36 +0000 (16:11 +0000)]
Merge "Revert "new device family image for design, not photos"" into klp-modular-dev

10 years agoRevert "new device family image for design, not photos"
Scott Main [Thu, 26 Jun 2014 16:10:50 +0000 (16:10 +0000)]
Revert "new device family image for design, not photos"

This reverts commit 9a5dcb8c44a0f64b4abfd8f2bc19136c42cf1232.

Change-Id: I8bb04608b99358c7a07871cd4adf0de2143d7f3a

10 years agonew device family image for design, not photos
smain@google.com [Thu, 26 Jun 2014 08:03:55 +0000 (01:03 -0700)]
new device family image for design, not photos

Change-Id: I94350e17c3fe26ede6233d65eda22d1bfc71f970

10 years agoModify DNS server update methods.
Lorenzo Colitti [Mon, 23 Jun 2014 15:34:39 +0000 (00:34 +0900)]
Modify DNS server update methods.

1. Make addDnsServer not add duplicate servers and return a
   boolean value incating whether it changed anything. This is
   consistent with what we do for LinkAddresses and routes.
2. Add a setDnsServers method that sets all the DNS servers to
   the specified collection. This is consistent with what we do
   for LinkAddress.

Bug: 9180552
Change-Id: I5baed09253261b66ea42ae2ea82398118e3ab0ac

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:17:12 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:17:19 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "new device family image for design, not photos" into klp-modular-dev
smain@google.com [Thu, 26 Jun 2014 15:51:37 +0000 (15:51 +0000)]
Merge "new device family image for design, not photos" into klp-modular-dev

10 years agolots of updates to the wear design guide
smain@google.com [Tue, 24 Jun 2014 21:12:45 +0000 (14:12 -0700)]
lots of updates to the wear design guide
actually decent layout with images

Change-Id: I45047158b61d3d8202b0f77e1ff8aea9c57da7c5

10 years agoam a1bc384d: docs: Added GitHub links to the samples
Ricardo Cervera [Thu, 26 Jun 2014 03:57:44 +0000 (03:57 +0000)]
am a1bc384d: docs: Added GitHub links to the samples

* commit 'a1bc384d22de86fc5d8fac90328fa619a6a3fceb':
  docs: Added GitHub links to the samples

10 years agodocs: Added GitHub links to the samples
Ricardo Cervera [Thu, 26 Jun 2014 00:14:03 +0000 (17:14 -0700)]
docs: Added GitHub links to the samples

Change-Id: I944844d64396b0ae07e4c55118d4cd960480c5b7

10 years agoUpdate service connections when TV input list is updated
Jaewan Kim [Tue, 24 Jun 2014 07:59:48 +0000 (16:59 +0900)]
Update service connections when TV input list is updated

Bug: 15738607
Change-Id: Ie2d24d0c36308e6757b7d6939d79874c3bdd7211

10 years agoam 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
Jason Sams [Thu, 26 Jun 2014 00:25:28 +0000 (00:25 +0000)]
am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."

* commit '89e4c715e01f4a2da31a92788547282d699752bf':
  Add check and throw for failed Intrinsic init.

10 years agoam 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
Jason Sams [Thu, 26 Jun 2014 00:20:26 +0000 (00:20 +0000)]
am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."

* commit '7165bd6d7496159b426f072bdf13adfffc917a24':
  Add check and throw for failed Intrinsic init.

10 years agoam 50cbb708: am c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up langua...
Joe Fernandez [Wed, 25 Jun 2014 23:00:33 +0000 (23:00 +0000)]
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

10 years agoam 603514ad: am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page
smain@google.com [Wed, 25 Jun 2014 23:00:30 +0000 (23:00 +0000)]
am 603514ad: am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page

* commit '603514adfc2582e194cf6aed112fd5eab40c529d':
  update wear icons on preview page

10 years agoam 72e18628: Merge branch \'klp-modular-dev\' of https://googleplex-android.googlesou...
destradaa [Wed, 25 Jun 2014 23:00:27 +0000 (23:00 +0000)]
am 72e18628: Merge branch \'klp-modular-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev

* commit '72e186283fdef7f6ac56409bf52a5748f6a4749c':

10 years agoam 017ec80f: am d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview...
Robert Ly [Wed, 25 Jun 2014 23:00:16 +0000 (23:00 +0000)]
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

10 years agoam c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up language to be...
Joe Fernandez [Wed, 25 Jun 2014 22:55:14 +0000 (22:55 +0000)]
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

10 years agoam 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page
smain@google.com [Wed, 25 Jun 2014 22:55:13 +0000 (22:55 +0000)]
am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page

* commit '08eb76f42ed53ea3967a4559d9e60a961f9450b5':
  update wear icons on preview page

10 years agoMerge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct...
destradaa [Wed, 25 Jun 2014 22:55:07 +0000 (22:55 +0000)]
Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev

10 years agoam 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing...
Joe Fernandez [Wed, 25 Jun 2014 22:49:36 +0000 (22:49 +0000)]
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

10 years agoam 8f414479: fix back link for preview nav
smain@google.com [Wed, 25 Jun 2014 22:32:26 +0000 (22:32 +0000)]
am 8f414479: fix back link for preview nav

* commit '8f414479f91f73c3b8432ca93991ba643b9c846f':
  fix back link for preview nav

10 years agofix back link for preview nav
smain@google.com [Wed, 25 Jun 2014 22:11:40 +0000 (15:11 -0700)]
fix back link for preview nav

Change-Id: I684129ba5c43d49ff52410939e8b034ccc4877ad

10 years agoam ed929960: Merge "docs: add gcore instructions for preview" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 21:38:49 +0000 (21:38 +0000)]
am ed929960: Merge "docs: add gcore instructions for preview" into klp-modular-dev

* commit 'ed929960584cba38a81b49cff597dba59d50a0a7':
  docs: add gcore instructions for preview

10 years agoam 8f832719: Merge "add license wall to downloading the L Preview system images"...
smain@google.com [Wed, 25 Jun 2014 21:28:15 +0000 (21:28 +0000)]
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

10 years agoam 54c6e0aa: Merge "Final L-Preview Guidelines for Android TV Games Staged at http...
Joe Fernandez [Wed, 25 Jun 2014 20:53:54 +0000 (20:53 +0000)]
am 54c6e0aa: Merge "Final L-Preview Guidelines for Android TV Games Staged at 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

10 years agoam 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
Stephen Hines [Wed, 25 Jun 2014 20:50:26 +0000 (20:50 +0000)]
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.

10 years agoam 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
Stephen Hines [Wed, 25 Jun 2014 20:44:09 +0000 (20:44 +0000)]
am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."

* commit '924ed1fae19ba70b5c6267b977ae8c72b63fe99a':
  Switch from size_t -> uint32_t for dimensions array.

10 years agoam d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview hoop-jumping...
Robert Ly [Wed, 25 Jun 2014 19:29:45 +0000 (19:29 +0000)]
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