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

152395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
d13d7b533d am d7a863be: Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169) 
* commit 'd7a863be76afb458cb59472ad02d49568ada6e04':
  Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
 2014-09-09 22:54:16 +00:00
Winson Chung
508f0fbd61 am 7d631483: Adding task switching animation xmls for further tweaking. (Bug 16656169) 
* commit '7d631483fc22a2d66f2510c93be8387d6c2bbdca':
  Adding task switching animation xmls for further tweaking. (Bug 16656169)
 2014-09-09 22:54:11 +00:00
Winson Chung
90ba230114 am b754940a: Fixing weird highlight on dismiss button ripple. (Bug 17420495) 
* commit 'b754940a89eea209763b564325e100f45bd1c0c3':
  Fixing weird highlight on dismiss button ripple. (Bug 17420495)
 2014-09-09 22:54:07 +00:00
Jeff Sharkey
ece96a8131 am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 
* commit 'c5d4ebd640a0bca62fb52a42830c8646316ee386':
  Missing manifest error should be NO_CERTIFICATES.
 2014-09-09 22:54:02 +00:00
Winson Chung
e5c06a6431 Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169) 
Change-Id: Id8f96455f6e11a13a8ac12d341464bca4419d7c5
 2014-09-09 22:49:04 +00:00
Winson Chung
3aa9c221c0 Adding task switching animation xmls for further tweaking. (Bug 16656169) 
Change-Id: I472116cb3d86a3f90a935b2a3ac058ffc2ac1b5d
 2014-09-09 22:48:19 +00:00
Winson Chung
7937fdb341 Fixing weird highlight on dismiss button ripple. (Bug 17420495) 
Change-Id: I769c0647417efeda9b39913c01c62be0d6ff7887
 2014-09-09 22:47:43 +00:00
Jeff Sharkey
ad5f44a68c Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 2014-09-09 22:44:52 +00:00
Yin-Chia Yeh
ec261ead49 am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '916d8fafe6b61b7499cc8d41331adfb11d2136fa':
  camera2: make 3A regions null when not available
 2014-09-09 22:31:57 +00:00
Eino-Ville Talvala
a8b4bb8c90 am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit '28312293a2dfab504e5d1e6102c5392d652b6981':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-09 22:31:52 +00:00
Yin-Chia Yeh
8544c7da86 Merge "camera2: make 3A regions null when not available" into lmp-dev 2014-09-09 22:24:49 +00:00
Eino-Ville Talvala
31913c334a Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 2014-09-09 22:20:58 +00:00
vandwalle
1853fddaf4 am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev 
* commit '5e811150b9d538d0e59a367d8d75a20d85a12549':
  make autojoin associated scan period a config opttion
 2014-09-09 22:19:48 +00:00
Svetoslav
08dd15e1f4 am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev 
* commit '3f49b128bc94c1b1e66decf96d46a83bcdb9a62b':
  Trim unnecessary pages when printing.
 2014-09-09 22:19:44 +00:00
vandwalle
2bc9f4178a Merge "make autojoin associated scan period a config opttion" into lmp-dev 2014-09-09 22:12:06 +00:00
Svetoslav
15040e0a58 Merge "Trim unnecessary pages when printing." into lmp-dev 2014-09-09 22:11:20 +00:00
Lajos Molnar
287cf721bc am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev 
* commit 'adbca3e552abc358326b4245a4fc4b8761e79b7e':
  initialize codec list before MediaCodec.getCodecInfo()
 2014-09-09 22:01:17 +00:00
Guang Zhu
63e47699b9 am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev 
* commit 'a3cd75926fd65afee93305ebe88f01c05a27be96':
  add some assert messages to download manager test
 2014-09-09 22:01:07 +00:00
Jeff Sharkey
bc09755e19 Missing manifest error should be NO_CERTIFICATES. 
When META-INF/MANIFEST.MF is missing, treat as NO_CERTIFICATES
instead of CERTIFICATE_ENCODING.  Also remove redundant layer of
debugging details when wrapping exceptions.

Bug: 15667982
Change-Id: I6e8216d5bf6e42da1feb70c89f991001380305be
 2014-09-09 14:57:26 -07:00
Lajos Molnar
bc67eee710 Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev 2014-09-09 21:55:43 +00:00
Guang Zhu
3ab7bf1a3d Merge "add some assert messages to download manager test" into lmp-dev 2014-09-09 21:51:17 +00:00
John Spurlock
b06cd76a69 am 7fa27583: Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev 
* commit '7fa275831652f2fcaf6df2d10264f2c9b8ae0346':
  QS: Fix tile padding on dual tile first lines.
 2014-09-09 21:49:52 +00:00
Alan Viverette
9597427fe9 am ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev 
* commit 'ba2ce6fa080df627646501f58bab5fde76b0f2c2':
  Update alert dialog styling to match Material spec
 2014-09-09 21:49:47 +00:00
John Spurlock
8143d2fbfd Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev 2014-09-09 21:47:53 +00:00
Guang Zhu
30478148bd add some assert messages to download manager test 
Change-Id: If2e1bdd115eddeeb7bdebf0fab29a3756fee4ceb
 2014-09-09 14:44:17 -07:00
Alan Viverette
6aad5057b6 Merge "Update alert dialog styling to match Material spec" into lmp-dev 2014-09-09 21:43:33 +00:00
Lajos Molnar
aa79d99576 initialize codec list before MediaCodec.getCodecInfo() 
Bug: 17374217
Change-Id: I8e8fc3a34ec01afdf5fc577979010183971c878b
 2014-09-09 14:35:33 -07:00
John Spurlock
baa958dc44 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
 2014-09-09 17:33:01 -04:00
Philip Milne
737d4a12b0 am 2a95b928: Fix for b/16400888 - API Review: GridLayout attributes 
* commit '2a95b928c8fbe326d79776fa30d0d18809a0dd45':
  Fix for b/16400888 - API Review: GridLayout attributes
 2014-09-09 21:29:23 +00:00
John Spurlock
a6db715a7f am 0b7a5768: Merge "On db upgrade, reset ringer mode to normal." into lmp-dev 
* commit '0b7a576895b15d19fd0b1880ccba633ea1d6010a':
  On db upgrade, reset ringer mode to normal.
 2014-09-09 21:29:18 +00:00
Philip Milne
1a7a63ad5e 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)
 2014-09-09 21:25:44 +00:00
John Spurlock
38553adb4f Merge "On db upgrade, reset ringer mode to normal." into lmp-dev 2014-09-09 21:20:28 +00:00
John Spurlock
7d424b6c50 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
 2014-09-09 17:05:54 -04:00
Jean-Michel Trivi
69890cfd21 am 013279ac: Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev 
* commit '013279ac439d3a4acb7e53a8af1ff8cd146543fa':
  Prevent NotificationManagerService from using bad stream type
 2014-09-09 20:57:11 +00:00
Jean-Michel Trivi
97dc52c857 Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev 2014-09-09 20:49:50 +00:00
John Spurlock
9fcbbebd6f am cdc2b578: Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev 
* commit 'cdc2b578ac80aad887745896b689bda4442a1028':
  Zen: Map transition to ringer-mode silent to "priority".
 2014-09-09 20:47:33 +00:00
John Spurlock
9ed0292a65 Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev 2014-09-09 20:40:03 +00:00
Amith Yamasani
5ac4d47091 am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit '7a9f541e596b4db8824969678896161c8e06d6bc':
  User restriction to disallow outgoing NFC beam
 2014-09-09 20:35:52 +00:00
John Spurlock
806dbae9e1 Zen: Map transition to ringer-mode silent to "priority". 
Instead of "none".

Bug:16875664
Change-Id: I2a425663f08f35854e7e857330afc20eef01ef2e
 2014-09-09 16:32:42 -04:00
Jeff Sharkey
df9d704a60 am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev 
* commit 'b8d727ec928c77d4131a5f90995f29b829443b57':
  Use sscanf() for parsing tag values.
 2014-09-09 20:31:26 +00:00
John Spurlock
f462d0aeba am d09f0b6b: Merge "Doze: Wake up on touch, fade between states." into lmp-dev 
* commit 'd09f0b6b2c599ea05172c20404a2009dec61a7e9':
  Doze: Wake up on touch, fade between states.
 2014-09-09 20:31:22 +00:00
Amith Yamasani
da6e6c888f Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 2014-09-09 20:29:57 +00:00
Jeff Sharkey
a237e05cd7 Merge "Use sscanf() for parsing tag values." into lmp-dev 2014-09-09 20:29:36 +00:00
John Spurlock
d5dfb723b8 Merge "Doze: Wake up on touch, fade between states." into lmp-dev 2014-09-09 20:24:04 +00:00
John Spurlock
8b12f22bc1 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
 2014-09-09 16:06:22 -04:00
Chris Craik
9261b0be28 am e46cfca2: Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev 
* commit 'e46cfca2a778cdcd0081afa2fc4177094c26e5d8':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
 2014-09-09 20:05:09 +00:00
Riley Andrews
fd8a25eba1 am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit '4b7c14bf1cb62c806223b12fdf3c5ba1d48908e7':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 20:05:04 +00:00
Alan Viverette
c6a76344b1 am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 
* commit 'e74dff14dc6e075e372aeedb6610243c28884610':
  Use correct row/column order in list and grid CollectionItems
 2014-09-09 20:04:58 +00:00
Chris Craik
b2201151f3 Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev 2014-09-09 20:03:09 +00:00
Fred Fettinger
70735bd5dd 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>
 2014-09-09 20:00:52 +00:00