OSDN Git Service
John Spurlock [Tue, 9 Sep 2014 21:47:52 +0000 (21:47 +0000)]
Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev
Alan Viverette [Tue, 9 Sep 2014 21:43:32 +0000 (21:43 +0000)]
Merge "Update alert dialog styling to match Material spec" into lmp-dev
John Spurlock [Tue, 9 Sep 2014 21:33:01 +0000 (17:33 -0400)]
QS: Fix tile padding on dual tile first lines.
Now that the caret is not being set, update the padding to
handle this case.
Bug:
17421027
Change-Id: Iaacf60df6e39801a27dad054f2d42c99b85c46cd
Philip Milne [Tue, 9 Sep 2014 17:37:31 +0000 (10:37 -0700)]
Fix for b/
16400888 - API Review: GridLayout attributes
Column weights specify the relative proportions of space distribution
within a *row*. With that in mind, I flipped the vertical and horizontal
axes in the docs - but that was a mistake. This CL flips the docs back.
The code works the right way around so doesn't need to be modified.
Change-Id: I1a36882eee8d1b9bd7b8ef10e03cbf66de0ac261
(cherry picked from commit
4ae5f5ee917b2014abe3b6e0b99451693cd2b896)
John Spurlock [Tue, 9 Sep 2014 21:20:27 +0000 (21:20 +0000)]
Merge "On db upgrade, reset ringer mode to normal." into lmp-dev
John Spurlock [Tue, 9 Sep 2014 21:05:54 +0000 (17:05 -0400)]
On db upgrade, reset ringer mode to normal.
When users upgrade to L, don't restore into a state that would force
zen mode to follow suit. A user's first encounter with zen mode
should be via the UI.
Bug:
16826161
Change-Id: I4eb63dce37d88f3a91b5034b3393eed2b768562c
Jean-Michel Trivi [Tue, 9 Sep 2014 20:49:49 +0000 (20:49 +0000)]
Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev
John Spurlock [Tue, 9 Sep 2014 20:40:02 +0000 (20:40 +0000)]
Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev
John Spurlock [Tue, 9 Sep 2014 20:32:42 +0000 (16:32 -0400)]
Zen: Map transition to ringer-mode silent to "priority".
Instead of "none".
Bug:
16875664
Change-Id: I2a425663f08f35854e7e857330afc20eef01ef2e
Amith Yamasani [Tue, 9 Sep 2014 20:29:38 +0000 (20:29 +0000)]
Merge "User restriction to disallow outgoing NFC beam" into lmp-dev
Jeff Sharkey [Tue, 9 Sep 2014 20:29:34 +0000 (20:29 +0000)]
Merge "Use sscanf() for parsing tag values." into lmp-dev
John Spurlock [Tue, 9 Sep 2014 20:24:03 +0000 (20:24 +0000)]
Merge "Doze: Wake up on touch, fade between states." into lmp-dev
John Spurlock [Tue, 9 Sep 2014 15:54:11 +0000 (11:54 -0400)]
Doze: Wake up on touch, fade between states.
- When dozing, the first motion event triggers a wake up.
- Fade the backgrounds to ease the transition out of doze.
Bug:
17167296
Change-Id: I5615ca0839dfa3ed2cf3001baf407c707f0676d5
Chris Craik [Tue, 9 Sep 2014 20:03:08 +0000 (20:03 +0000)]
Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev
Fred Fettinger [Fri, 29 Aug 2014 19:02:31 +0000 (14:02 -0500)]
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
bug:
17441218
GLConsumer uses glBindTexture() directly instead of going through
Caches::bindTexture(). This can cause libhwui to draw with the wrong
texture bound in the following case which involves 2 TextureViews:
Frame 1:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
Frame 2:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 2)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
HWUI renders TextureView B:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 2) and draws
In this case, HWUI will incorrectly draw TextureView A using texture 2 on
frame 2, because mBoundTextures[0]=1, even though the texture currently
bound to GL_TEXTURE_EXTERNAL_OES is 2.
Since GLConsumer is always used with a target of GL_TEXTURE_EXTERNAL_OES,
work around this problem by having mBoundTextures[] store only the
textures bound to the target GL_TEXTURE_2D. This is the common case
where the extra performance is needed. Since it's legal to have
different textures bound to GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES
on one texture unit, Caches::bindTexture() does not need to clear
mBoundTextures[mTextureUnit] when target != GL_TEXTURE_2D.
Change-Id: I8bc54ab8adcfacad7f3ed17a31236dc7a86c967a
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Riley Andrews [Tue, 9 Sep 2014 19:59:14 +0000 (19:59 +0000)]
Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev
Alan Viverette [Tue, 9 Sep 2014 19:57:08 +0000 (19:57 +0000)]
Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev
Jeff Sharkey [Tue, 9 Sep 2014 19:29:41 +0000 (12:29 -0700)]
Use sscanf() for parsing tag values.
Neither strtoll() nor strtoull() can parse the %llx formatted tag
values coming from the kernel. We know the lowest 32 bits will never
be set, so fast-path the 3-character case as 0x0.
Bug:
17365163
Change-Id: I238bbd2830c9335e7ab7a53362d6e12b46e0bcb3
Amith Yamasani [Tue, 9 Sep 2014 16:57:27 +0000 (09:57 -0700)]
User restriction to disallow outgoing NFC beam
This can be controlled by MDMs via DPM.
Also fixes:
- javadoc for restrictions
- persisting of cross profile copy/paste restriction
Bug:
17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
Griff Hazen [Tue, 9 Sep 2014 18:35:53 +0000 (18:35 +0000)]
Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev
Chris Craik [Tue, 9 Sep 2014 18:34:06 +0000 (18:34 +0000)]
Merge "Fix tessellation bounds computation" into lmp-dev
Winson Chung [Tue, 9 Sep 2014 18:33:17 +0000 (18:33 +0000)]
Merge "Fixing issue with screen pinning not working. (Bug
17436123)" into lmp-dev
Winson Chung [Tue, 9 Sep 2014 18:33:06 +0000 (18:33 +0000)]
Merge "Separating the notion of transposed search vs nav bar. (Bug
17402331)" into lmp-dev
Griff Hazen [Wed, 20 Aug 2014 18:56:44 +0000 (11:56 -0700)]
Copy visibility docs from support version to base Notification.
(Noticed the difference in a javadoc diff between Notification and
NotificationCompat)
Bug:
17424399
Change-Id: I639a46c429ffebf8ca47118b2ea80f40ccdc1286
Jason Monk [Tue, 9 Sep 2014 18:03:13 +0000 (18:03 +0000)]
Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev
Vineeta Srivastava [Tue, 9 Sep 2014 18:02:56 +0000 (18:02 +0000)]
Merge "Set MTU size to 1410 for Telus." into lmp-dev
Alexandra Gherghina [Tue, 9 Sep 2014 17:45:34 +0000 (17:45 +0000)]
Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev
Wink Saville [Mon, 8 Sep 2014 21:50:58 +0000 (14:50 -0700)]
Change suffix UsingSubId to ForSubscriber.
Bug:
17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
Griff Hazen [Tue, 9 Sep 2014 17:25:46 +0000 (17:25 +0000)]
Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev
Jae Seo [Tue, 9 Sep 2014 17:21:58 +0000 (17:21 +0000)]
Merge "Add Japanese content ratings" into lmp-dev
Jae Seo [Tue, 9 Sep 2014 17:02:37 +0000 (10:02 -0700)]
Add Japanese content ratings
Bug:
17434802
Change-Id: I4be1ff9e5621f0a973c38f1abb377b1c92131a02
Craig Mautner [Tue, 9 Sep 2014 17:05:03 +0000 (17:05 +0000)]
Merge "Remove deprecated (and now unused) API method." into lmp-dev
New Author Steven Liu [Tue, 26 Aug 2014 18:27:54 +0000 (11:27 -0700)]
Set MTU size to 1410 for Telus.
Bug:
17391167
Change-Id: I38c0d2a311624db66113b5eda2a5eceb6fec2a69
Dianne Hackborn [Tue, 9 Sep 2014 16:41:43 +0000 (16:41 +0000)]
Merge "Add new wallpaper features for insets and offsets." into lmp-dev
Adrian Roos [Tue, 9 Sep 2014 16:37:39 +0000 (16:37 +0000)]
Merge "Initilize LockPatternUtils with the current user" into lmp-dev
Adrian Roos [Tue, 9 Sep 2014 16:37:08 +0000 (16:37 +0000)]
Merge "Show confirmation dialog when adding user from QS" into lmp-dev
Adrian Roos [Tue, 9 Sep 2014 16:36:38 +0000 (16:36 +0000)]
Merge "Don't draw system bar backgrounds if FLAG_FULLSCREEN is set" into lmp-dev
Adrian Roos [Tue, 9 Sep 2014 16:35:07 +0000 (16:35 +0000)]
Merge "Don't crash if there's no QS panel" into lmp-dev
Craig Mautner [Tue, 9 Sep 2014 15:53:56 +0000 (08:53 -0700)]
Remove deprecated (and now unused) API method.
Removes ActivityOptions.makeLaunchTaskBehindAnimation().
Fixes bug
16958544.
Change-Id: I2d58f4235994fe01d55b3309d0ec6f8449c5d5b8
Jorim Jaggi [Tue, 9 Sep 2014 15:51:16 +0000 (15:51 +0000)]
Merge "Remove a few unnecessary withLayer() calls" into lmp-dev
Jorim Jaggi [Tue, 9 Sep 2014 15:49:06 +0000 (15:49 +0000)]
Merge "Fix padding between R and wifi icon" into lmp-dev
Selim Cinek [Tue, 9 Sep 2014 15:35:05 +0000 (15:35 +0000)]
Merge "Fixed a bug that the icon was not animating anymore when updating." into lmp-dev
Selim Cinek [Tue, 9 Sep 2014 15:34:44 +0000 (15:34 +0000)]
Merge "Properly announcing HUN state for talkback" into lmp-dev
Selim Cinek [Tue, 9 Sep 2014 15:34:06 +0000 (15:34 +0000)]
Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev
Jorim Jaggi [Tue, 9 Sep 2014 15:21:39 +0000 (17:21 +0200)]
Remove a few unnecessary withLayer() calls
Fixes some jank.
Bug:
17287256
Change-Id: I6c518f12decffa0d3a180499a92823b35e2dd4d5
Jorim Jaggi [Mon, 8 Sep 2014 21:57:20 +0000 (23:57 +0200)]
Fix padding between R and wifi icon
Also adds some padding for the type and the signal strength icon in
LTE, 3G, 4G and 1x case.
Bug:
17421452
Change-Id: Ib3e6d2983397833958bca1fd33eb8b8c69e7c7fd
Selim Cinek [Tue, 9 Sep 2014 13:51:38 +0000 (15:51 +0200)]
Fixed a bug that the icon was not animating anymore when updating.
Bug:
16043845
Change-Id: I0cdb1ee5ddefd4404cd9a6cab61baf1b281a457b
Jorim Jaggi [Tue, 9 Sep 2014 14:01:23 +0000 (14:01 +0000)]
Merge "Do not dim the non-activated notifications on lockscreen" into lmp-dev
Jorim Jaggi [Tue, 9 Sep 2014 13:21:38 +0000 (15:21 +0200)]
Do not dim the non-activated notifications on lockscreen
This fixes a lot of jank when showing all cards by tapping the more
card, because this lead to layer trashing in every frame (the
background was updated as well as the overall alpha for the card).
Bug:
17419967
Change-Id: Ib39af6eaab26409eedff72c921e9aa1ede31b830
Winson Chung [Tue, 9 Sep 2014 12:13:04 +0000 (14:13 +0200)]
Fixing issue with screen pinning not working. (Bug
17436123)
Jorim Jaggi [Tue, 9 Sep 2014 12:01:31 +0000 (12:01 +0000)]
Merge "Apply color to auto-redacted notification" into lmp-dev
Zoltan Szatmary-Ban [Tue, 9 Sep 2014 11:05:44 +0000 (11:05 +0000)]
Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev
Alexandra Gherghina [Tue, 9 Sep 2014 09:21:11 +0000 (10:21 +0100)]
Removing the NO_CROSS_PROFILE flag for intent forwarding
Bug:
17435289
Change-Id: Iffbecd3cf9338a8633bfcc5bc47247bfc50e7546
Paul Jensen [Tue, 9 Sep 2014 10:59:40 +0000 (10:59 +0000)]
Merge "Stop logging false error when lingering completes." into lmp-dev
Paul Jensen [Tue, 9 Sep 2014 10:59:18 +0000 (10:59 +0000)]
Merge "Don't send listening NetworkRequests to NetworkFactories." into lmp-dev
Paul Jensen [Tue, 9 Sep 2014 10:58:58 +0000 (10:58 +0000)]
Merge "Implement ConnectivityManager.reportBadNetwork() to trigger network validation." into lmp-dev
Selim Cinek [Mon, 8 Sep 2014 16:32:00 +0000 (18:32 +0200)]
Properly announcing HUN state for talkback
Bug:
17067870
Bug:
16652871
Change-Id: I5d33166eaab31e3ac58d75653c0f80fab23718c2
Selim Cinek [Mon, 8 Sep 2014 14:10:50 +0000 (16:10 +0200)]
Avoiding heads-up when accessibility is turned on
Bug:
16017019
Change-Id: I08ec75e6b3296eefb9ae5e8fdc9f8dd6c4ad4816
Selim Cinek [Tue, 9 Sep 2014 10:24:44 +0000 (10:24 +0000)]
Merge "Announcing the stream type when the volume panel comes up" into lmp-dev
Selim Cinek [Tue, 9 Sep 2014 10:23:43 +0000 (10:23 +0000)]
Merge "Fixed a bug with the anti-falsing logic with dismissing" into lmp-dev
Nicolas Prevot [Tue, 9 Sep 2014 09:07:00 +0000 (09:07 +0000)]
Merge "Allowing a ContentProvider to have a null authority." into lmp-dev
Yohei Yukawa [Tue, 9 Sep 2014 03:39:49 +0000 (12:39 +0900)]
Follow up API signature changes of CursorAnchorInfo part 2
This is another follow up CL for Ic8c6fab58c01206872a34e7e.
Ib2371849d32bb44da9ef59f05e648a476e03699a didn't cover
following renamings. This CL fixes them.
- #getCharacterRect -> #getCharacterBounds
- #getCharacterRectFlags -> #getCharacterBoundsFlags
BUG:
17365414
Change-Id: I120795da3f25f1e2fa71f455f92e3cd1c036c1d5
Griff Hazen [Tue, 9 Sep 2014 04:34:52 +0000 (21:34 -0700)]
Add support for a circular bitmap overlay for round android wear emulator.
Android wear emulators have never had support for enabling both gpu
emulation and also having a round clip overlay present. Fix this by
supporting a drawable overlay when the ro.emulator.circular system
property is set.
Bug:
13415409
Change-Id: I6e0840ebe5c77adb786a7ba7ec6af348308ca46a
Michael Wright [Tue, 9 Sep 2014 03:27:09 +0000 (03:27 +0000)]
Merge "Use new device identifier to check if a layout has been set." into lmp-dev
Riley Andrews [Thu, 21 Aug 2014 22:47:07 +0000 (15:47 -0700)]
Use surfaceflinger for recents thumbnail rotations.
+ This removes 30ms of latency on app to home transitions
on volantis.
Change-Id: Ia3747b8f8be0d41b9b3d095753edfe1df185c84d
Adam Powell [Tue, 9 Sep 2014 02:31:36 +0000 (02:31 +0000)]
Merge "New new design for ResolverActivity" into lmp-dev
Adam Powell [Sun, 7 Sep 2014 23:52:22 +0000 (16:52 -0700)]
New new design for ResolverActivity
Switch back to using a list as the grid and differently positioned
activity icons were confusing to users. Keep the distinct "last used"
presentation but align icons and titles with the further choices
below. Adjust this to make the fold more apparent. Remember
open/closed slider state across config changes.
Fix some bugs in nested scrolling and flinging.
Bug
17301272
Change-Id: I175937d5821df27b6ac7ffad7f01cd9a6ed3e3e3
Michael Wright [Tue, 9 Sep 2014 01:54:45 +0000 (18:54 -0700)]
Use new device identifier to check if a layout has been set.
Bug:
16486654
Change-Id: If55eacfc6878109b5bcb36ca338eb2cd75a40309
Deepanshu Gupta [Tue, 9 Sep 2014 02:07:35 +0000 (02:07 +0000)]
Merge "Build layoutlib create tests as part of sdk build." into lmp-dev
Eric Laurent [Tue, 9 Sep 2014 01:58:59 +0000 (01:58 +0000)]
Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev
Eric Laurent [Tue, 9 Sep 2014 01:51:35 +0000 (18:51 -0700)]
unhide AudioAttributes flag FLAG_HW_AV_SYNC
Bug:
17112525.
Change-Id: Ia817d8e4b6e517da04f948bcb138fc38faea6caf
Chris Craik [Tue, 9 Sep 2014 01:43:30 +0000 (18:43 -0700)]
Fix tessellation bounds computation
bug:
17401066
Now correctly accounts for scale, both in hairline case (where scale
needs to be accounted for), and in standard case (where scale
shouldn't be applied, since bounds are in local space)
Change-Id: I597a20834dce42ddb741b46e4c1a4f3169a48ccc
Deepanshu Gupta [Tue, 9 Sep 2014 01:38:57 +0000 (18:38 -0700)]
Build layoutlib create tests as part of sdk build.
LayoutLib Create tests are now built whenever LayoutLib create is built.
Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
Jean-Luc Brouillet [Tue, 9 Sep 2014 01:34:27 +0000 (01:34 +0000)]
Merge "Fix rsMatrix documentation." into lmp-dev
Vinit Deshpande [Tue, 9 Sep 2014 01:28:44 +0000 (01:28 +0000)]
Merge "Implement getAvailableChannels" into lmp-dev
Jean-Luc Brouillet [Tue, 9 Sep 2014 01:27:38 +0000 (18:27 -0700)]
Fix rsMatrix documentation.
A previous CL changed the source file. As the build system does not build
this doc file automatically, this CL updates it.
b/
17310590
Change-Id: I9536237d0b2cc449f1cf4a35159588f91bcdcad1
Dianne Hackborn [Mon, 8 Sep 2014 06:14:30 +0000 (23:14 -0700)]
Add new wallpaper features for insets and offsets.
Issue #
17394151: WallpaperService / Engines need to get notified
of WindowInsets
Issue #
17394203 Wallpapers need a system API to be shifted in order
to support burn in protection
Adds a new API on WallpaperManager to set additional offsets to
make wallpapers extend beyond the display size.
Insets are now reported to wallpapers, to use as they may. This
includes information about the above offsets, so they can place
their content within the visible area. And to help with this, also
expose the stable offsets APIs in WindowInsets which is also very
useful information for the wallpaper.
Another new API on WallpaperManager to set a raw offset to apply
to the wallpaper window, forcing it to move on the screen regardless
of what the wallpaper is drawing.
Fix wallpapers when used with overscan enabled, so they still extend
out across the entire screen. Conveniently, the above new window
insets information is very useful for this case as well!
And a new wallpaper test app for all this stuff.
Change-Id: I287ee36581283dd34607609fcd3170d99d120d8e
Andreas Gampe [Tue, 9 Sep 2014 00:41:34 +0000 (00:41 +0000)]
Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev
Deepanshu Gupta [Tue, 9 Sep 2014 00:31:02 +0000 (00:31 +0000)]
Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev
Deepanshu Gupta [Tue, 9 Sep 2014 00:30:23 +0000 (00:30 +0000)]
Merge "Add layoutlib tests to DIST_DIR" into lmp-dev
Deepanshu Gupta [Tue, 9 Sep 2014 00:30:07 +0000 (00:30 +0000)]
Merge "Remove warning for null entries in resource array." into lmp-dev
Dirk Dougherty [Tue, 9 Sep 2014 00:12:32 +0000 (00:12 +0000)]
am
d87e0484: am
604ae4c7: am
552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs
* commit '
d87e04843ee6dfdba45f133cde423ba30be60e7a':
Doc change: Add note to use explicit intent when binding to billing service.
Michael Wright [Tue, 9 Sep 2014 00:07:28 +0000 (00:07 +0000)]
Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev
Wink Saville [Tue, 9 Sep 2014 00:00:48 +0000 (00:00 +0000)]
Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev
Dirk Dougherty [Mon, 8 Sep 2014 23:59:34 +0000 (23:59 +0000)]
am
604ae4c7: am
552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs
* commit '
604ae4c79e67be6be19724e03f35b9e6cc3fd617':
Doc change: Add note to use explicit intent when binding to billing service.
Michael Wright [Mon, 8 Sep 2014 23:57:38 +0000 (16:57 -0700)]
Add FEATURE_GAMEPAD to current.txt
Change-Id: I5c5a7910983ac3bc5850fba2dfc4d96b11fbd2f0
Amit Mahajan [Mon, 8 Sep 2014 23:56:30 +0000 (23:56 +0000)]
Merge "Assisted dialing support of MO SMS" into lmp-dev
Dirk Dougherty [Mon, 8 Sep 2014 23:53:32 +0000 (23:53 +0000)]
am
552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs
* commit '
552e5ce6bb418b9a8b3b1ba9c102c562d0a4019e':
Doc change: Add note to use explicit intent when binding to billing service.
Amit Mahajan [Mon, 8 Sep 2014 23:52:35 +0000 (23:52 +0000)]
Merge "change the property name about IDP from 'telephony.' to 'gsm.'" into lmp-dev
Wink Saville [Mon, 8 Sep 2014 23:52:03 +0000 (16:52 -0700)]
Change getCurrentPhoneType to SystemApi
Bug:
17394367
Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683
Chris Craik [Mon, 8 Sep 2014 23:47:30 +0000 (23:47 +0000)]
Merge "Don't track TextureLayer lifecycles in RenderState" into lmp-dev
Steven Liu [Mon, 8 Sep 2014 18:33:33 +0000 (13:33 -0500)]
change the property name about IDP from 'telephony.' to 'gsm.'
'telphony.' couldn't be set successfully.
Change-Id: I8a9ee29461bf764f2b269bb81fafe83d8d5e48d9
Dirk Dougherty [Mon, 8 Sep 2014 23:46:55 +0000 (23:46 +0000)]
Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs
Chris Craik [Mon, 8 Sep 2014 23:40:21 +0000 (16:40 -0700)]
Don't track TextureLayer lifecycles in RenderState
bug:
17208461
They are destroyed via finalizer-enqueued destroy method, so it's not
valid to check that they've been destroyed at gl context destruction
time.
Change-Id: I670f69825547facd5f31d44acb406418881fee00
Sreeram Ramachandran [Mon, 8 Sep 2014 23:28:47 +0000 (23:28 +0000)]
Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev
Michael Wright [Mon, 8 Sep 2014 23:22:27 +0000 (23:22 +0000)]
Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev
Michael Wright [Mon, 8 Sep 2014 23:21:48 +0000 (23:21 +0000)]
Merge "Add FEATURE_GAMEPAD." into lmp-dev
Michael Wright [Mon, 8 Sep 2014 23:14:08 +0000 (23:14 +0000)]
Merge "Allow wake keys to wake dozing device." into lmp-dev
Michael Wright [Mon, 8 Sep 2014 23:13:42 +0000 (23:13 +0000)]
Merge "Remove unused variables from UsbHostManager." into lmp-dev
Michael Wright [Sat, 6 Sep 2014 00:57:44 +0000 (17:57 -0700)]
Add FEATURE_GAMEPAD.
This allows micro-consoles or other devices to signify that there's a
game controller in the box, even if the user hasn't connected it.
Change-Id: Ie5e2cf69f777ebe84abb83f34c9ed63d9555deff