150296 Commits

Author SHA1 Message Date
Alan Viverette
e809b11bc1 Improve dialog padding when title or body text are missing
BUG: 17446820
Change-Id: I20ace8660da90e6722e55978a3ce49eeafcd1220
2014-09-09 18:24:52 -07: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
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
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
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
97dc52c857 Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev 2014-09-09 20:49:50 +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
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
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
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
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
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
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
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
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
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
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
Jorim Jaggi
f832638b57 Merge "Fix padding between R and wifi icon" into lmp-dev 2014-09-09 15:49:08 +00:00
Selim Cinek
a9dddfb011 Merge "Fixed a bug that the icon was not animating anymore when updating." into lmp-dev 2014-09-09 15:35:07 +00:00
Selim Cinek
2d12d98303 Merge "Properly announcing HUN state for talkback" into lmp-dev 2014-09-09 15:34:45 +00:00
Selim Cinek
f219dad7e5 Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev 2014-09-09 15:34:07 +00:00
Jorim Jaggi
6107a10ca5 Remove a few unnecessary withLayer() calls
Fixes some jank.

Bug: 17287256
Change-Id: I6c518f12decffa0d3a180499a92823b35e2dd4d5
2014-09-09 17:23:29 +02:00
Jorim Jaggi
c737b9bd5a Fix padding between R and wifi icon
Also adds some padding for the type and the signal strength icon in
LTE, 3G, 4G and 1x case.

Bug: 17421452

Change-Id: Ib3e6d2983397833958bca1fd33eb8b8c69e7c7fd
2014-09-09 16:35:17 +02:00
Selim Cinek
51ae05d920 Fixed a bug that the icon was not animating anymore when updating.
Bug: 16043845
Change-Id: I0cdb1ee5ddefd4404cd9a6cab61baf1b281a457b
2014-09-09 16:35:08 +02:00