154983 Commits

Author SHA1 Message Date
Joe Fernandez
1b361d90d3 docs: Android TV publishing requirements
Change-Id: If1105cb596934034a7156b573c99905bbe6c4978
2014-10-08 20:56:32 -07:00
Geoff Mendal
e73bb6e059 am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '49c5ddd67793735a2d6fc036614cdfab944d56f6':
  Import translations. DO NOT MERGE
2014-10-09 03:06:49 +00:00
Quddus Chong
10be6fed66 am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
* commit '8f25f390e515be9783e8cce913f8de051e097419':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
2014-10-09 03:03:14 +00:00
Mike Lockwood
cf61b3f6e6 am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev
* commit '3910f53c5ebccbe64ab768591dc7c377f1eb0153':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
2014-10-09 03:03:09 +00:00
Eino-Ville Talvala
eeec4b9ebc am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev
* commit 'ef773e3569969592fb220b7ccc49dafcabfdd67a':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
2014-10-09 03:02:35 +00:00
Chong Zhang
a6ae8ba4a5 MediaHTTPConnection: do not use proxy for localhost
Bug: 17681512
Change-Id: Iba25d89636d8f96efc0eb90e0dd7a135c82ff16a
2014-10-09 02:07:40 +00:00
Christopher Tate
2e0f66820e Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 2014-10-09 02:04:02 +00:00
Christopher Tate
da058e260d Also monitor MOVED_TO events for wallpaper updates
Restore uses moveTo(), not open/write/close, so we need
to watch for that as well.  Now the wallpaper service sees
and regenerates the wallpaper image immediately upon restore.

Bug 17909454

Change-Id: I0db224c3d507bdc40399d49bb4bea01899f76ad1
2014-10-08 18:57:48 -07:00
Fred Fettinger
6c858c25f3 am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
* commit 'b4093c12f8a8cf73f869419904c60e953f5725ee':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
2014-10-09 01:23:59 +00:00
mike dooley
879142bf1c Fix hangouts conference calling regression.
Check the connection-by-id hash table instead of conference-by-id hash
table when setting conferenceable connections.

Bug: 17919110
Change-Id: Ia8a5ab3fb96926e600d21eca7737a0044b233563
2014-10-09 01:15:58 +00:00
Fred Fettinger
b4093c12f8 hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
Cherry-picked into klp-modular-dev.

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>
(cherry picked from commit e4de36bbc2baf13206deb53ced39f0befadb1861)
2014-10-09 00:57:17 +00:00
Alan Viverette
466f5581ef Merge "Slow down ripple background fade in from press" into lmp-mr1-dev 2014-10-09 00:51:19 +00:00
Tim Kilbourn
37bd07768a Merge "Don't start SearchDialog on television." into lmp-dev 2014-10-09 00:49:36 +00:00
Alan Viverette
fe087d38a8 Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev 2014-10-09 00:32:56 +00:00
Svetoslav
2f2864b7b1 am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev
* commit '3dd06d9005bd572a3b012b3a2b27adfa94533144':
  Restored widget provider id not properly updated.
2014-10-09 00:15:02 +00:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
2014-10-09 00:14:54 +00:00
Jeff Brown
704998abba Merge "Ensure we correctly unblank displays when added." into lmp-dev 2014-10-09 00:14:40 +00:00
Deepanshu Gupta
985d59d7e3 am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib.
* commit '908a4f9a4372a9627e821b5800936095b0f0b5b0':
  Exclude KXmlParser from LayoutLib.
2014-10-09 00:14:31 +00:00
Jeff Sharkey
b01a5ba2b7 am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev
* commit '562262cc89838529316ff2f3e511c0d876b08677':
  Bring along more ApplicationInfo fields.
2014-10-09 00:14:25 +00:00
Geoff Mendal
db5b94d405 am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'f121892bc8c73b06086f8ebc059dd86f680b5197':
  Import translations. DO NOT MERGE
2014-10-09 00:13:25 +00:00
smain@google.com
b880707c7f am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below
* commit '63cd4977fd72de401f347ba159a71fe3d04399b3':
  fix unclickable link due to overlay from offset dev below
2014-10-09 00:10:06 +00:00
smain@google.com
63cd4977fd am 770c3c5e: fix unclickable link due to overlay from offset dev below
* commit '770c3c5ed52f354fe04ced31aaa56ba57a028955':
  fix unclickable link due to overlay from offset dev below
2014-10-09 00:04:57 +00:00
Tim Kilbourn
99e9095430 Don't start SearchDialog on television.
Bug: 17654744
Change-Id: Ie76405d648b7ac34a70465e275315f9cf277a3fe
2014-10-08 17:01:42 -07:00
smain@google.com
9f928944fa Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 2014-10-08 23:58:34 +00:00
smain@google.com
770c3c5ed5 fix unclickable link due to overlay from offset dev below
Change-Id: I59bedd0e928d578a3bd030caa4add4cfa96db83f
2014-10-08 16:54:21 -07:00
Christopher Tate
6dea8de709 Merge "Actually tell the widget service that restore is starting" into lmp-dev 2014-10-08 23:31:31 +00:00
smain@google.com
12c50e0ed0 update droiddoc option to include api level 21 for javadoc tagging
Change-Id: Ifdb09267b0cdab4cd89aaea455de6270481ff230
2014-10-08 16:23:34 -07:00
ztenghui
4cc3e2704a Support dot separation as the svg path data did.
Like "0.0.0" will be separated to "0.0 .0" now, just to make sure we are more
complied with svg path data.

b/17892882

Change-Id: Id7b64e9882f5174aa794a0256e2a29d66c724876
2014-10-08 15:51:37 -07:00
RoboErik
a78601dc19 Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev 2014-10-08 22:30:05 +00:00
Alan Viverette
f92f26fef2 Slow down ripple background fade in from press
BUG: 17433613
Change-Id: Ie9c4046532d61ad8ef8e044d14557db5d52e0d0b
2014-10-08 14:49:21 -07:00
Christopher Tate
c0a30bcfae Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 2014-10-08 21:48:10 +00:00
Filip Gruszczynski
49e2371a27 Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 2014-10-08 21:12:25 +00:00
Fabrice Di Meglio
f7ace52459 Fix bug #17900580 Top bar drop shadow no longer transparent
- use the correct padding value depending on the device type: some
padding for large tablet UI when we are in two pane mode. No padding
for all the other cases.

Change-Id: I4863e5c6d2487696334068bd0fe9a91d0fb86cac
2014-10-08 21:05:07 +00:00
Georgi Nikolov
6eb0f4808d Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev 2014-10-08 20:50:47 +00:00
Ye Wen
de73afe268 Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev 2014-10-08 20:47:06 +00:00
Jeff Hao
272bf3a274 Improve priority ordering of apps when performing boot dexopt.
Added core apps and updated system apps.

Bug: 17641843
Change-Id: Ia00ea3399cf1e1acaef45ff8df8f754442de5185
2014-10-08 20:36:24 +00:00
Adam Lesinski
59d208ddc1 Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev 2014-10-08 20:34:55 +00:00
Ye Wen
724dbbd733 Make MmsServiceBroker more robust to MmsService crashes
Retry connecting to MmsService when disconnected or upon each API call
if disconnected.

b/17862188

Change-Id: Iecfb0a6ffb59b94f6c1121bf00ba2db438ed7001
2014-10-08 13:12:04 -07:00
Geoff Mendal
f1b81bf189 am 293b883c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '293b883c754df6c69ec9a77820d39fb55dc60018':
  Import translations. DO NOT MERGE
2014-10-08 20:01:37 +00:00
Chris Craik
86fd9278a9 Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev 2014-10-08 19:58:13 +00:00
Geoff Mendal
293b883c75 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-08 19:56:41 +00:00
Geoff Mendal
e19fa35585 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-08 19:54:21 +00:00
Geoff Mendal
49c5ddd677 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-08 19:53:12 +00:00
Adam Lesinski
54e064bcea Remove UsageEvents#resetToStart() as it doesn't work
After completely iterating over a UsageEvents object, the internal parcel
is recycled. If resetToStart is called then, it does nothing.

Bug:17909428
Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
2014-10-08 12:33:16 -07:00
Christopher Tate
431906b34f Turn on dimension validation in wallpaper restore
Bug 17906491

Change-Id: I4c76c3197df95b51a6e44d1fe2d522b6c05284e5
2014-10-08 12:19:48 -07:00
Quddus Chong
8f25f390e5 am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
* commit '9df3d67bdc7c1fa79d0daab1f2ae5f69a476f8dd':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
2014-10-08 19:08:31 +00:00
Mike Lockwood
3910f53c5e Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 2014-10-08 19:07:23 +00:00
Jeff Brown
0033a86c25 Ensure we correctly unblank displays when added.
A previous change introduced a regression in the case where
a device has been added but is initially blanked.  Because
we made changes to defer certain work until we escape the
critical section when making changes to the global display
state, we forgot to apply these changes when displays are
initially added.

This causes problems with HDMI displays remaining blanked
after they are plugged in.

Added a quick fix to ensure we perform the work when adding
a display although we don't bother trying to defer it outside
of the critical section.

Bug: 17909838
Change-Id: If5373d20d8827b7f4330a8cf49f8de64ca3f0740
2014-10-08 12:06:39 -07:00
Geoff Mendal
50053dbf28 Import translations. DO NOT MERGE
Change-Id: I30dfc9ade88728eaa4ee1d1a9921c3f69d9e349b
Auto-generated-cl: translation import
2014-10-08 12:05:39 -07:00
Geoff Mendal
c926f83394 Import translations. DO NOT MERGE
Change-Id: Ib6860d633a07ab2c18b4352f7a783e2ad18e266a
Auto-generated-cl: translation import
2014-10-08 11:57:47 -07:00