Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,345 Commits 3 Branches 0 Tags
f462d0aebab4cfa89f46f1f8da2cbd2f7a9ced59
Commit Graph

152345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Riley Andrews
0b81adcaea Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 2014-09-09 19:59:15 +00:00
Alan Viverette
b505298489 Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 2014-09-09 19:57:09 +00:00
Griff Hazen
2b775fa045 am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 
* commit 'df35ac5fab51383099a2f8e5206202af58ef79bf':
  Remove reference to StatusBarNotification after the value is accessed.
 2014-09-09 18:42:08 +00:00
Chris Craik
2c4cf3f5b0 am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev 
* commit 'c907100262b423e28dfd7258cb86c515c421a5d0':
  Fix tessellation bounds computation
 2014-09-09 18:36:36 +00:00
Winson Chung
44455d492d am 3d0581d0: Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 
* commit '3d0581d0c3a88b95760bec6fbbf4df033b6f239f':
  Fixing issue with screen pinning not working. (Bug 17436123)
 2014-09-09 18:36:32 +00:00
Winson Chung
ea33169e82 am 2d6118a1: Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 
* commit '2d6118a1821a882cfad600d78ef3de34800148ba':
  Separating the notion of transposed search vs nav bar. (Bug 17402331)
 2014-09-09 18:36:27 +00:00
Griff Hazen
380c394987 am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'c06b7a78433830308ac62be25b3a13d6415e3699':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:36:23 +00:00
Griff Hazen
2f439763bd Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 2014-09-09 18:35:54 +00:00
Chris Craik
69fb8a2399 Merge "Fix tessellation bounds computation" into lmp-dev 2014-09-09 18:34:08 +00:00
Winson Chung
69550456e3 Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 2014-09-09 18:33:18 +00:00
Winson Chung
31e8d7602c Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 2014-09-09 18:33:08 +00:00
Jason Monk
b34b8e9376 am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 
* commit '76779dbc3f743aada5c1f0c545dbf90722249511':
  Add user-specific playSoundEffect and use in NavBar
 2014-09-09 18:09:09 +00:00
Vineeta Srivastava
d3773b2914 am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev 
* commit 'a66c2cd18b668b8c692b2c632ec260e4b7fdb46f':
  Set MTU size to 1410 for Telus.
 2014-09-09 18:09:04 +00:00
Griff Hazen
fc3922d49b 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
 2014-09-09 18:03:40 +00:00
Jason Monk
9580f6c6cb Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 2014-09-09 18:03:14 +00:00
Vineeta Srivastava
1f14863871 Merge "Set MTU size to 1410 for Telus." into lmp-dev 2014-09-09 18:02:57 +00:00
Alexandra Gherghina
17f3cdc820 am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 
* commit 'c3b392d02693f8236fdc6ebc90412e3c4aaa5843':
  Removing the NO_CROSS_PROFILE flag for intent forwarding
 2014-09-09 17:52:46 +00:00
Wink Saville
5c1659045d am 5dac65ad: Change suffix UsingSubId to ForSubscriber. 
* commit '5dac65ad043ee9d0535813ef5dba06dd80c11f82':
  Change suffix UsingSubId to ForSubscriber.
 2014-09-09 17:46:53 +00:00
Alexandra Gherghina
7677694320 Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 2014-09-09 17:45:36 +00:00
Wink Saville
bc0272754d Change suffix UsingSubId to ForSubscriber. 
Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
 2014-09-09 17:38:19 +00:00
Griff Hazen
3eeb09605d am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 
* commit 'b0e0f2f6185fc42842ff3fccedcc608c5a8f8d27':
  Add support for a circular bitmap overlay for round android wear emulator.
 2014-09-09 17:31:02 +00:00
Jae Seo
2c42ed0b41 am e188fc30: Merge "Add Japanese content ratings" into lmp-dev 
* commit 'e188fc30686135b6d96ced7acf4afdf5ecdf641d':
  Add Japanese content ratings
 2014-09-09 17:30:57 +00:00
Griff Hazen
8fd30e4486 Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 2014-09-09 17:25:47 +00:00
Jae Seo
a45fe78110 Merge "Add Japanese content ratings" into lmp-dev 2014-09-09 17:21:59 +00:00
Craig Mautner
4e59ecf211 am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev 
* commit '77e1dc741bfce75f3e3f5446674d1545a74eae2b':
  Remove deprecated (and now unused) API method.
 2014-09-09 17:11:05 +00:00
Jae Seo
fe5998b5ad Add Japanese content ratings 
Bug: 17434802
Change-Id: I4be1ff9e5621f0a973c38f1abb377b1c92131a02
 2014-09-09 10:06:52 -07:00
Craig Mautner
345d4f4f14 Merge "Remove deprecated (and now unused) API method." into lmp-dev 2014-09-09 17:05:04 +00:00
Dianne Hackborn
3046cbd8ef am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev 
* commit '0ad9e247c3b553baee5b42599536d9b0bfbbba31':
  Add new wallpaper features for insets and offsets.
 2014-09-09 16:45:33 +00:00
Adrian Roos
87ba3f6a27 am 08b3499c: Merge "Initilize LockPatternUtils with the current user" into lmp-dev 
* commit '08b3499cae764590755d5d3ad380e5169cdf2924':
  Initilize LockPatternUtils with the current user
 2014-09-09 16:45:28 +00:00
Adrian Roos
f6c6e6c0c9 am c60d7426: Merge "Show confirmation dialog when adding user from QS" into lmp-dev 
* commit 'c60d74266933b7799f0ce7b3f0a75c2b7c0ed0e0':
  Show confirmation dialog when adding user from QS
 2014-09-09 16:45:24 +00:00
Adrian Roos
213a44751a am dda9415e: Merge "Don\'t draw system bar backgrounds if FLAG_FULLSCREEN is set" into lmp-dev 
* commit 'dda9415e45de566ddbb72ebc9d2088f80f3b74a2':
  Don't draw system bar backgrounds if FLAG_FULLSCREEN is set
 2014-09-09 16:45:19 +00:00
Adrian Roos
6381ca82ac am eb578566: Merge "Don\'t crash if there\'s no QS panel" into lmp-dev 
* commit 'eb57856678dfae14137c7960a96a5f5b428a70a3':
  Don't crash if there's no QS panel
 2014-09-09 16:45:12 +00:00
New Author Steven Liu
82468851b5 Set MTU size to 1410 for Telus. 
Bug: 17391167
Change-Id: I38c0d2a311624db66113b5eda2a5eceb6fec2a69
 2014-09-09 16:44:44 +00:00
Dianne Hackborn
bb8c483461 Merge "Add new wallpaper features for insets and offsets." into lmp-dev 2014-09-09 16:41:44 +00:00
Adrian Roos
84e4e62d3b Merge "Initilize LockPatternUtils with the current user" into lmp-dev 2014-09-09 16:37:40 +00:00
Adrian Roos
e5322f47bf Merge "Show confirmation dialog when adding user from QS" into lmp-dev 2014-09-09 16:37:09 +00:00
Adrian Roos
bb9637bb58 Merge "Don't draw system bar backgrounds if FLAG_FULLSCREEN is set" into lmp-dev 2014-09-09 16:36:39 +00:00
Adrian Roos
e60d6ed7cb Merge "Don't crash if there's no QS panel" into lmp-dev 2014-09-09 16:35:09 +00:00
Jorim Jaggi
ef646ea250 am bc6542cc: Merge "Remove a few unnecessary withLayer() calls" into lmp-dev 
* commit 'bc6542cca228440c6ca29fe038a2cf98e1b47fd5':
  Remove a few unnecessary withLayer() calls
 2014-09-09 15:57:27 +00:00
Jorim Jaggi
1dae3cf327 am 71d150d2: Merge "Fix padding between R and wifi icon" into lmp-dev 
* commit '71d150d2549277f664f69aada6cd08022e984a5e':
  Fix padding between R and wifi icon
 2014-09-09 15:57:22 +00:00
Craig Mautner
0321573fa7 Remove deprecated (and now unused) API method. 
Removes ActivityOptions.makeLaunchTaskBehindAnimation().

Fixes bug 16958544.

Change-Id: I2d58f4235994fe01d55b3309d0ec6f8449c5d5b8
 2014-09-09 08:53:56 -07:00
Jorim Jaggi
fbc3f1984a Merge "Remove a few unnecessary withLayer() calls" into lmp-dev 2014-09-09 15:51:18 +00:00