drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,899 Commits 1 Branch 0 Tags
Commit Graph

154899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
6167950b7a am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:46:14 +00:00
ztenghui
e6411c76c4 Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 2014-10-09 16:34:40 +00:00
Geoff Mendal
c1f4c0fefe am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e73bb6e059dbd073b09246471b332b6b0e72f191':
  Import translations. DO NOT MERGE
 2014-10-09 13:04:23 +00:00
Quddus Chong
00c1c564b0 am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '10be6fed6629a3f977d3b693f70868df3c5d1c0c':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-09 13:04:18 +00:00
Mike Lockwood
cf1e5c3912 am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit 'cf61b3f6e653749b3d04eb531d76918e88eb98bd':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-09 13:04:13 +00:00
Eino-Ville Talvala
7e7a14c541 am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit 'eeec4b9ebc15545e59985eab29385157cbbd8e9f':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 13:04:08 +00:00
Svetoslav
fc324ddf05 am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '2f2864b7b13ee4846a1d95c2c03eeb5752629f21':
  Restored widget provider id not properly updated.
 2014-10-09 13:03:28 +00:00
Dianne Hackborn
d83e9e4280 am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:03:21 +00:00
Deepanshu Gupta
0a61c7ee4a am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '985d59d7e3e676a02892b2a5e131510a993b3449':
  Exclude KXmlParser from LayoutLib.
 2014-10-09 13:03:13 +00:00
Jeff Sharkey
b424849533 am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit 'b01a5ba2b7c1bc22e30d6cc16c30f8e1215701cd':
  Bring along more ApplicationInfo fields.
 2014-10-09 13:03:07 +00:00
Geoff Mendal
437e5c9c9a am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'db5b94d4050c169cf1c41aca8af83b1c0225c037':
  Import translations. DO NOT MERGE
 2014-10-09 13:03:02 +00:00
Filip Gruszczynski
301d2276f9 am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 
* commit '49e2371a271e33bbe8177c3f87d5f3b8ef7f59c5':
  Log exception when creating Activity in ActivityUnitTestCase.
 2014-10-09 13:03:01 +00:00
Robin Lee
a300025d23 Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 2014-10-09 12:55:17 +00:00
Joe Fernandez
e2f757d9f3 am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'a63f81ec897988befad7b286b50f73a42319fd5e':
  docs: Android TV publishing requirements
 2014-10-09 12:07:07 +00:00
Joe Fernandez
a63f81ec89 am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'e15773be4837baf15079d5d7e8f8c0c09cef952f':
  docs: Android TV publishing requirements
 2014-10-09 12:01:36 +00:00
Robin Lee
d0130e8539 DevicePolicy: One cert tracker warning per profile 
Shows one notification per profile instead of one notification per
user or (previously) one notification per device.

Bug: 17794425
Change-Id: I6f0d34a16fa2a45082941387ac765dd99eefa131
 2014-10-09 12:46:13 +01:00
Joe Fernandez
e15773be48 Merge "docs: Android TV publishing requirements" into klp-modular-docs 2014-10-09 04:19:20 +00:00
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
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