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

154646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
1f4ea68a07 am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit 'd94df395a87836b5dba6bd159010046e1d016661':
  User restriction to disallow outgoing NFC beam
 2014-09-09 21:56:09 +00:00
Jeff Sharkey
30d40e707b am a5746ce3: am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev 
* commit 'a5746ce305bc331c4cb6a5bd1fa152c17813e0f8':
  Use sscanf() for parsing tag values.
 2014-09-09 21:56:04 +00:00
John Spurlock
ec034796ab am 1d182090: am d09f0b6b: Merge "Doze: Wake up on touch, fade between states." into lmp-dev 
* commit '1d1820902aab92865bd8ddebb1ddf55f4998051f':
  Doze: Wake up on touch, fade between states.
 2014-09-09 21:56:00 +00:00
Chris Craik
e938707a64 am 78558652: am e46cfca2: Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev 
* commit '785586526d97aab356acbcb4d8b4a79904ff3424':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
 2014-09-09 21:55:44 +00:00
Riley Andrews
4ef0f50c29 am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit 'f41b14855e6fd1bcf2ddaa843d0e177825010023':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 21:55:38 +00:00
Alan Viverette
d381834c77 am aafd303e: am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 
* commit 'aafd303e48e95fda8b2b5bd9e3541e87997d6ef4':
  Use correct row/column order in list and grid CollectionItems
 2014-09-09 21:55:33 +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
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
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
Jeff Sharkey
e47d5435de 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
 2014-09-09 12:29:41 -07:00
Amith Yamasani
26af829fd7 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
 2014-09-09 12:09:47 -07:00
Griff Hazen
6b6fe58db1 am 527006ad: am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 
* commit '527006ad3a84a1cec342d00a59ab766aee4730cd':
  Remove reference to StatusBarNotification after the value is accessed.
 2014-09-09 18:47:50 +00:00
Chris Craik
a23fc5877b am 70cf8fba: am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev 
* commit '70cf8fba276269c6d162819bf4cbcdf06f6d22ea':
  Fix tessellation bounds computation
 2014-09-09 18:47:43 +00:00
Winson Chung
72e6144823 am e5ef0872: am 3d0581d0: Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 
* commit 'e5ef08721892e08b0aa035a4610897b49d78e289':
  Fixing issue with screen pinning not working. (Bug 17436123)
 2014-09-09 18:47:38 +00:00
Winson Chung
9b5de18d3c am 79768b15: am 2d6118a1: Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 
* commit '79768b1542aaf2fa1f259e754de3c8c2d07b1058':
  Separating the notion of transposed search vs nav bar. (Bug 17402331)
 2014-09-09 18:47:34 +00:00
Griff Hazen
1d67649c61 am accb122d: am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'accb122dcd7b45914b508299af0b44376745bed3':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:47:29 +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
4fefc7d7bd am a03fb8a1: am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 
* commit 'a03fb8a19e055ae9d1d56fc21d304da9e11c5510':
  Add user-specific playSoundEffect and use in NavBar
 2014-09-09 18:19:59 +00:00
Vineeta Srivastava
1db0d8ff67 am 04454473: am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev 
* commit '04454473a0cf58fc42f71d93ceb742c7927682ed':
  Set MTU size to 1410 for Telus.
 2014-09-09 18:19:54 +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
ed225682c5 am f695833a: am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 
* commit 'f695833ab5764c7b031f43f78a288eec2e162dcc':
  Removing the NO_CROSS_PROFILE flag for intent forwarding
 2014-09-09 17:57:56 +00:00
Wink Saville
d601edd52e am 94804242: am 5dac65ad: Change suffix UsingSubId to ForSubscriber. 
* commit '948042422975e4c445e73213cb4c4a49b48d108d':
  Change suffix UsingSubId to ForSubscriber.
 2014-09-09 17:57:51 +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
Griff Hazen
7341db9a2e am 40c1a0f1: am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 
* commit '40c1a0f157c581bdd88e3c55c625d2b438389bd6':
  Add support for a circular bitmap overlay for round android wear emulator.
 2014-09-09 17:42:09 +00:00
Jae Seo
8e036f3a83 am c83c5596: am e188fc30: Merge "Add Japanese content ratings" into lmp-dev 
* commit 'c83c5596bf4f2e463ca54d12e566f4c04b9c55aa':
  Add Japanese content ratings
 2014-09-09 17:42:04 +00:00