Svetoslav
e9866fdfa3
Merge "Adjust preview page footer height and font size." into lmp-dev
2014-07-15 16:04:58 +00:00
Svetoslav
b4d873288d
Adjust preview page footer height and font size.
...
bug:16300627
Change-Id: I135c13085fa0c48de6bedaa58b3974f800547e99
2014-07-15 12:31:39 -07:00
Svetoslav
fd9369c7ae
Update the color pallete of the print options UI.
...
The print options UI now uses the material theme with custom
branding collors that follow the rest of the system UI.
bug:16301325
Change-Id: I5fefcd95ada0172a028574550dcfdf628f9ce22d
2014-07-15 11:40:09 -07:00
Craig Mautner
fde7a08479
Merge "Fix build" into lmp-dev
2014-07-15 16:05:45 +00:00
Craig Mautner
c2d6400fb6
Fix build
...
Add parameter to WindowManagerPermissionTests.
Fixes build.
Change-Id: Iecf064ee0be612e59aa1b7f0a42807be1bc59e78
2014-07-15 12:28:43 -07:00
Craig Mautner
bb74246278
Launch activity behind launching task.
...
Use ActivityOptions.makeLaunchTaskBehindAnimation() to launch tasks
behind the current task. Includes animations for launching and
launched tasks.
Fixes bug 16157517.
Change-Id: I0a94af70b4748592e94673b958ee824cfb3d7ec0
2014-07-15 11:36:25 -07:00
Chris Wren
015e922fa7
Merge "Implement application-level high priority bit." into lmp-dev
2014-07-15 16:05:17 +00:00
Paul Jensen
fdc4e4af73
Fix hiding of sign-in to network notification.
...
Don't rely on the NetworkAgent still being connected when we go to
hide the notification. The notification is hidden when the
NetworkAgent is disconnected so that wasn't a safe assumption.
By using the NetID as the notification identifier we also fix the
issue of multiple notifications of the same network type inadvertently
hiding the incorrect notification with the same network type.
bug:16317917
Change-Id: I01fdc466a0f430af9fc378445586ec7b83b3ac83
2014-07-15 19:06:39 +00:00
Chris Wren
54bbef435e
Implement application-level high priority bit.
...
Enable checkbox in settings and wire it to NotificationManagerSerivce.
Add RankingHelper to collect ranking configs and logic.
Bug: 15080024
Change-Id: Ib1d3b0b5ca4fcfdc52c2cb6838a009b9addf1094
2014-07-15 15:04:29 -04:00
Derek Sollenberger
cdf2564deb
Merge "Separate Canvas JNI code from the implementation. DO NOT MERGE" into lmp-dev
2014-07-15 16:05:07 +00:00
Wei Wang
96e2285066
Merge "Remove MR2 BLE Advertising hidden API from L codebase (1/2)." into lmp-dev
2014-07-15 16:05:04 +00:00
Jean-Michel Trivi
91edb23fdd
Merge "DO NOT MERGE Audio virtualizer effect: add support for querying capabilities" into lmp-dev
2014-07-15 16:05:01 +00:00
Chet Haase
39b88cdb35
Merge "Set existing TypeEvaluator on new KeyframeSet when changing object values" into lmp-dev
2014-07-15 16:05:01 +00:00
Chet Haase
4ae3e6af08
Set existing TypeEvaluator on new KeyframeSet when changing object values
...
This avoids NullPointerException crash when changing values without
first canceling a running animator.
Issue #16245303 KeyframeSet crash on null keyframe or evaluator
Change-Id: I50ce5223310fe87e3382c446e2d36d93ae38a8fe
2014-07-15 17:39:48 +00:00
Dan Sandler
6d8edb1170
Merge "Pressed the "dim" button on the clock one too many times." into lmp-dev
2014-07-15 16:05:45 +00:00
Dan Sandler
bd8797616d
Pressed the "dim" button on the clock one too many times.
...
Bug: 16202293
Change-Id: I0d1c746bb775f56db018c231a296daca848e9235
2014-07-15 13:38:41 -04:00
Narayan Kamath
d7671a7100
Merge "Don't throw errors on sharedUid adjustment." into lmp-dev
2014-07-15 16:05:01 +00:00
Winson Chung
82c8c5e987
DO NOT MERGE Using a fixed sized ImageView to prevent unnecessary layouts.
...
- Preparing for task view clipping using the view outline
Change-Id: I4aae4189a759a48057f1e3729cc2a9e6d553c11e
2014-07-15 17:25:21 +00:00
Craig Mautner
0b23e20be6
Merge "Add null check" into lmp-dev
2014-07-15 16:05:04 +00:00
Craig Mautner
3b1dac8c5a
Add null check
...
Fixes bug 15847145.
Change-Id: Ia4d223da578bc38516824dd82dd3c5b8d58328dd
2014-07-15 09:51:33 -07:00
Paul Jensen
2bb7e34168
Fix T-Mobile provisioning detection.
...
Add User-Agent to HTTP request for captive portal.
bug:16316314
Change-Id: I32d4f75f4eb114574dd2a39d241cb085383b4f94
2014-07-15 16:11:41 +00:00
Andrew Lee
e3ec9da3d4
Merge "Add VideoState member variable to InCallCall." into lmp-dev
2014-07-15 16:04:58 +00:00
Andrew Lee
85f5d4263d
Add VideoState member variable to InCallCall.
...
Bug: 16015750
Change-Id: Idee72075e992a94423a3ca7882959fbde03c4434
2014-07-15 10:33:22 -07:00
Svetoslav
5a554fb5b9
Merge "Update the color pallete of the print options UI." into lmp-dev
2014-07-15 16:05:07 +00:00
Craig Mautner
00e7ba05ac
Merge "Launch activity behind launching task." into lmp-dev
2014-07-15 16:05:04 +00:00
Amith Yamasani
4d922e6f74
Merge "Revert some new APIs for restrictions provider" into lmp-dev
2014-07-15 16:04:58 +00:00
Amith Yamasani
5470bc184a
Revert some new APIs for restrictions provider
...
Simplify back to being a broadcast receiver and add an extra to
indicate that a new request is desired vs. returning a pending
response from before.
Change-Id: Iafd16ed98293a2cc09006d2cce097fc3d590bbe2
2014-07-15 09:43:20 -07:00
Narayan Kamath
377ea31c43
Don't throw errors on sharedUid adjustment.
...
Given that this is "best effort" anyway, stop short of
aborting installs when ABIs can't be adjusted. Otherwise
it will be impossible to test or upgrade an APP that has
a shared UID and changes ABIs. All apps that use a given
sharedUid are expected to use the same instruction set.
Change-Id: Ia9ffd1eb2df7c6ec9a39b23fc40e58794c013749
2014-07-15 15:55:58 +00:00
Jean-Michel Trivi
d2bebb3ab8
DO NOT MERGE Audio virtualizer effect: add support for querying capabilities
...
Change-Id: Ib62bab6655996575d7703be0bcb55fa8559a68a2
(cherry picked from commit 57fa19dec7150678020e7f1fe6e6879fd9d873f5)
2014-07-15 15:45:16 +00:00
Derek Sollenberger
f5d6c555c3
Separate Canvas JNI code from the implementation. DO NOT MERGE
...
This introduces Canvas.h which is a pure virtual interface that
is intended to be used by both Skia and HWUI implementation. To help
stage this transition this CL only introduces the interface and Skia
implementation. The interface is not intended to be final and will
undoubtedly go through iterations in both style and location as we
look to introduce the HWUI implementation.
BUG:15672762
Change-Id: Idefadede356f688edb8eb09b4a02aa01b4077f62
2014-07-15 15:08:29 +00:00
John Spurlock
a7cf5597e3
QS: Fix bug in header toggle switch.
...
Bug:16314528
Change-Id: Ia6061c61bbbad73862d2e63331135b324f102feb
2014-07-15 10:56:46 -04:00
George Mount
01e9a97fe6
Don't lose ActivityOptions during orientation change.
...
Bug 16188506
Change-Id: I056153e6ddbaf328dd65b8b27a91ae773c33ea22
2014-07-15 14:38:28 +00:00
Wei Wang
890b46a0d5
Remove MR2 BLE Advertising hidden API from L codebase (1/2).
...
Change-Id: I78bb8b89de56bddb7422da1d1d4468c88a68ea11
2014-07-14 19:31:49 -07:00
Lajos Molnar
7be24522ce
MediaExtractor: set buffer offset/limit in readSampleData
...
also fix setting offset/limit in MediaCodec's getBuffer.
Bug: 13008204
Change-Id: Iadf0f006cfccc2546971cc5384058e1a2721780b
2014-07-15 02:30:32 +00:00
Jinsuk Kim
be1da5e5cc
Merge "Apply hdmi control options to operation" into lmp-dev
2014-07-14 21:27:36 +00:00
Amith Yamasani
b99a90227a
Merge "Introduce a public intent for launching Home settings" into lmp-dev
2014-07-15 00:22:01 +00:00
Amith Yamasani
eb7b94a388
Introduce a public intent for launching Home settings
...
Bug: 16303152
Change-Id: I47e4461ae246aae7e31c8e06ca9370d6f04f61b4
2014-07-14 18:02:08 -07:00
Ruchi Kandoi
6b879024fa
Merge "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode." into lmp-dev
2014-07-14 23:57:14 +00:00
Ruchi Kandoi
0fe32ae50b
PowerManager: Adds a call to reduce refresh rate while device is in
...
BatterySaverMode.
Adds a binder call to the surface flinger to change the refresh rate
while the device is in BatterySaverMode.
Change-Id: I9b5fdcc279757ceb4b9917cb0445643b50133a04
2014-07-15 00:09:38 +00:00
Shishir Agrawal
1c41116f03
Merge "ITelephony.aidl: Minor spelling fix." into lmp-dev
2014-07-14 23:51:50 +00:00
Shishir Agrawal
fc3646f58e
ITelephony.aidl: Minor spelling fix.
...
Change-Id: I88be72fce6184beb1ac7542af8ced7917900b593
2014-07-14 16:58:12 -07:00
Chris Craik
a859523bdd
Merge "Revert shadow defaults to previous values" into lmp-dev
2014-07-14 22:50:50 +00:00
Chris Craik
2f129e3765
Revert shadow defaults to previous values
...
Change-Id: Ic0c8a922a9e70f0adbc04e56779240887414b3b8
2014-07-14 17:30:54 -07:00
Chris Craik
757f0f36b9
Merge "Implement outline support for nine patches" into lmp-dev
2014-07-14 22:55:21 +00:00
Wei Liu
b7697c698b
am c84e73d1: am 9d43fa84: Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
...
* commit 'c84e73d1035d99743da243a202c1499f70518620':
Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
2014-07-15 00:49:30 +00:00
Alan Viverette
a2ff611fd6
resolved conflicts for merge of dca272b8 to lmp-dev
...
Change-Id: Ifbd10ace66f7488f225bfae6e26bab60ab56e651
2014-07-14 17:46:27 -07:00
Christopher Tate
583a9bd0da
Merge "Fix build" into lmp-dev
2014-07-14 23:57:14 +00:00
Christopher Tate
65665aac63
Fix build
...
BridgeContext didn't show up in the working tree as a build participant.
Tsk tsk.
Change-Id: I2b52d99f319b43c2906a7fb9b25139a3df5b3676
2014-07-14 17:11:53 -07:00
Wei Liu
c84e73d103
am 9d43fa84: Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
...
* commit '9d43fa84054dc3c0229f5138495f6b6cdf0477db':
Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
2014-07-14 23:18:00 +00:00
Ruben Brunk
28c49c9d20
camera2: Update shader scaling matrix for legacy mode.
...
Bug: 15116722
Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
2014-07-14 22:57:07 +00:00