Tim Murray
b730d866a0
Fix IO_INPUT with 64-bit.
...
bug 16846318
bug 17006933
Change-Id: Ic13ef26875d8a6fab1ffb542d62038b768a536ff
2014-08-18 18:14:32 -07:00
Santos Cordon
823fd3c79d
Update conference call APIs.
...
Clean up conference call APIs to use a distinct type separate from
Connection. Also allow the addition of Conference calls at any point
using addConference() API method.
Bug:16844332
Bug:16449372
Change-Id: I34e45fde1aa43559f5f4e29b990929c188b16875
2014-08-18 17:30:58 +00:00
John Spurlock
73f84480af
Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev
2014-08-16 04:32:18 +00:00
John Spurlock
dd753c00d5
Zen: Remove "allow disable" filter from noman.
...
No longer used by dialer.
Bug:15344099
Change-Id: Ib2d00804f671fae520303531e8ccde9e44f817ec
2014-08-19 16:16:58 -04:00
George Mount
cd02b48b3d
Merge "Set start transform before animator starts." into lmp-dev
2014-08-18 21:31:41 +00:00
George Mount
dbe3655c0b
Set start transform before animator starts.
...
Bug 16958319
ChangeImageTransform was waiting until the animator started
before setting the image matrix. Animators with a
start delay would leave the ImageView with the final transform
before the animator started.
Change-Id: I5ebc03b58a8697da3edf4a01c8906d60e7938f44
2014-08-19 16:43:45 +00:00
Lorenzo Colitti
35f39b6660
Merge "Stop using LinkProperties for static configuration." into lmp-dev
2014-08-16 04:32:18 +00:00
Lorenzo Colitti
0a82e80073
Stop using LinkProperties for static configuration.
...
LinkProperties can represent way more complicated configurations
than what we can actually apply to interfaces. This makes it
error-prone to use it to represent static configuration, both
when trying to apply configuration coming from LinkProperties
and when trying to save configuration from current
LinkProperties.
Instead, move static configuration (IPv4 only, since we don't
support static IPv6 configuration) into a separate
StaticIpConfiguration class.
Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
2014-08-19 11:59:43 -07:00
Chris Craik
13600f9ed4
Merge "Don't cast shadows from gradients with transparent parts" into lmp-dev
2014-08-19 15:47:37 +00:00
Jesse Hall
efa5a01dc6
am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
...
* commit '87978406b405cafc773703b7c849e372339527b8':
VirtualDisplayAdapter: Set the transaction surface even if NULL
2014-08-19 19:12:08 +00:00
Chris Craik
c49e3ce6c6
Don't cast shadows from gradients with transparent parts
...
bug:17070982
Change-Id: I607dd3c9397845fce53b7f097ec0b57246077ea1
2014-08-19 11:11:11 -07:00
Jesse Hall
87978406b4
am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
...
* commit 'df7af46a4c034410dd1544415c3dcf19edef82e3':
VirtualDisplayAdapter: Set the transaction surface even if NULL
2014-08-19 16:31:17 +00:00
Jesse Hall
df7af46a4c
VirtualDisplayAdapter: Set the transaction surface even if NULL
...
Bug: 17116728
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
2014-08-19 09:18:40 -07:00
Igor Murashkin
3a6eba01c4
Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev
2014-08-19 02:43:23 +00:00
Igor Murashkin
517b74533a
camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
...
Return empty array since no implementation-defined sizes are supported
Bug: 17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
2014-08-19 10:51:30 -07:00
Shishir Agrawal
a34bdb18c5
Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev
2014-08-19 02:43:23 +00:00
Igor Murashkin
ae0da7a81c
Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev
2014-08-19 02:43:23 +00:00
Lajos Molnar
d504ab14d2
media.MediaPlayer: don't check file-existence for URI-s with scheme
...
setDataSource can be called with URI-s as well as with file paths.
Check file-existence only for file:// URI-s as well as URI-s
without scheme (which are assumed to be paths).
Bug: 17109022
Change-Id: I70f16a4f614dcef0b47fa264cf708473036cef4e
2014-08-19 11:08:08 -07:00
Igor Murashkin
981952d07a
camera2: (Legacy) Add control.sceneMode = DISABLED to templates
...
Bug: 17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f
2014-08-19 11:04:31 -07:00
Andrew Solovay
eb60d0f193
am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs
...
* commit '94174ff788cc6a4f79e2026d7d0995f75246a2de':
docs: Documented new fields returned by getSkuDetails().
2014-08-18 21:19:37 +00:00
Andrew Solovay
94174ff788
am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs
...
* commit '8319455afca3dc4c8f799d7752dfa44780cf8855':
docs: Documented new fields returned by getSkuDetails().
2014-08-18 21:08:17 +00:00
Ricardo Cervera
cce5036cb0
am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents
...
* commit '88a1f40c5d6111c74feb8e3022ffdccbf489a2e4':
docs: Removing radio from music intents
2014-08-18 19:38:16 +00:00
Ricardo Cervera
88a1f40c5d
am fb1f5bde: docs: Removing radio from music intents
...
* commit 'fb1f5bdef03844547152f921dcaa044269b5a0cb':
docs: Removing radio from music intents
2014-08-18 19:28:02 +00:00
Ricardo Cervera
fb1f5bdef0
docs: Removing radio from music intents
...
Change-Id: Iaf645d692b247994dd8c12835c387ff296b26019
2014-08-18 12:13:04 -07:00
Ricardo Cervera
f960409f3b
am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6
...
* commit '72ca94ee29c71541b7628c44f44ef5cddff9a6e9':
docs: Updated links for Android Studio 0.8.6
2014-08-18 16:49:18 +00:00
Ricardo Cervera
72ca94ee29
am d0842384: docs: Updated links for Android Studio 0.8.6
...
* commit 'd0842384cb9d6a19f129434457c88de64f2b0b06':
docs: Updated links for Android Studio 0.8.6
2014-08-18 16:40:01 +00:00
Ricardo Cervera
d0842384cb
docs: Updated links for Android Studio 0.8.6
...
Change-Id: Ic01263930b94232445704c03854414bd07ca4c33
2014-08-18 09:03:59 -07:00
Deepanshu Gupta
da9baa15bf
am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK
...
* commit 'd519f7424fd2faad371e7678b3dc11114fa5222f':
Layoutlib: Update wifi and battery icon for KK
2014-08-16 06:04:07 +00:00
Deepanshu Gupta
d519f7424f
am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK
...
* commit 'b6c923a2dfd86eb56a8f83d5a27f21996331e436':
Layoutlib: Update wifi and battery icon for KK
2014-08-16 05:53:49 +00:00
Deepanshu Gupta
b6c923a2df
am 59eedf52: Layoutlib: Update wifi and battery icon for KK
...
* commit '59eedf528ca29a32b6d7f358f5076929f8fbb164':
Layoutlib: Update wifi and battery icon for KK
2014-08-16 05:45:42 +00:00
Jinsuk Kim
8809f1e547
Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev
2014-08-16 04:25:55 +00:00
Andrew Solovay
fc6b01f463
am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs
...
* commit 'eb60d0f1937392351ef81f10b651749bd47f7898':
docs: Documented new fields returned by getSkuDetails().
2014-08-19 05:52:57 +00:00
Jinsuk Kim
ed0864557b
CEC: Invoke events listener upon MHL device state change
...
With this change, mobile devices state changes are propagated through
TIF to UI, hence the input pickers shows the mobile devices as
expected.
Bug: 16986744
Change-Id: Id633207acf4f814f57d43cc1de5f8cb88ac23ad6
2014-08-19 13:41:51 +09:00
Terry Heo
a890ec19d0
Merge "CEC: Fix JNI initialization error of HdmiMhlController" into lmp-dev
2014-08-16 04:12:14 +00:00
Terry Heo
4926b87243
CEC: Fix JNI initialization error of HdmiMhlController
...
Correct signature of nativeSendScratchpadCommand.
Bug: 17096490
Change-Id: I9694cb3b10724e34d507588fc3946318bb378398
2014-08-20 03:26:47 +00:00
Jaewan Kim
67d666f604
Merge "Fix NPE when passing null TvContentRating" into lmp-dev
2014-08-16 04:12:14 +00:00
Jaewan Kim
a42be3c950
Fix NPE when passing null TvContentRating
...
Change-Id: I80b0ca60b1623356fd39015521b50ae9f1eaef07
2014-08-19 11:55:07 +09:00
Dongwon Kang
79fc32794c
Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev
2014-08-19 02:08:36 +00:00
Dongwon Kang
911d0827ca
TIF: verify the hardware input ID from getHardwareInputId().
...
This will prevent an input from displaying other tuner inputs.
Change-Id: I77a6b99599eac4a9048a12e2928bc16b34d94343
2014-08-18 23:33:26 +00:00
Winson Chung
dd7930354a
Merge "Adding shadows to the focus state and fab button. (Bug 16950262)" into lmp-dev
2014-08-16 04:03:42 +00:00
Winson Chung
f95c7f5727
Adding shadows to the focus state and fab button. (Bug 16950262)
...
- Fixing regression where we weren't resetting the dim colors properly.
Change-Id: Ib95cc96d40f80bc22b7ecd7c816d5cbaa9b592c5
2014-08-19 20:45:37 +00:00
Winson Chung
abedcab44c
Small tweaks to the stack curve and header transition. (Bug 16656169)
...
Change-Id: I96120063a66f267ad0b6a39b3dd020bc030083b8
2014-08-19 20:45:36 +00:00
Adam Lesinski
1bd805c943
Merge "Add Shell command to set AppOps permissions" into lmp-dev
2014-08-19 02:43:23 +00:00
Adam Lesinski
b5cf61be7c
Add Shell command to set AppOps permissions
...
Change-Id: I6446543b27f0d2d2e69590a2807e713c6d5ccbbc
2014-08-19 11:27:19 -07:00
Amith Yamasani
7376a44b57
Merge "Rephrase the Exit guest action and dialog text" into lmp-dev
2014-08-19 02:43:23 +00:00
Amith Yamasani
e5b274ac61
Rephrase the Exit guest action and dialog text
...
Exiting guest session -> Removing guest?
Buttons = Cancel / Remove
Bug: 16495144
Change-Id: I3952e0818fa03edff6f9131a32e6469cbaa27b85
2014-08-18 21:01:22 +00:00
Adrian Roos
d47ad033c3
Fix bars jumping to black on activity launch
...
During animations, the wallpaper crop is the
union of the start and end crop. This prevents
the system bars from jumping to black when an
activity with opaque bars is launched.
Bug: 16441036
Change-Id: Ic0f3bc2e83b9830514a3456a27ae6f23716f3240
2014-08-18 14:37:18 +00:00
Jason Monk
95d9ad0f79
Merge "Fixes to lock task API from API review" into lmp-dev
2014-08-16 04:32:18 +00:00
John Spurlock
9a888b9be1
Merge "QS: Add scanning progress state indication." into lmp-dev
2014-08-16 04:32:18 +00:00
John Spurlock
465cefa1a2
QS: Add scanning progress state indication.
...
- Create a modified version of the new platform horizontal
indeterminate progress indicator, and align it to the bottom
of the header.
- Ensure the scanning state takes the active detail panel into
account.
Bug:16145178
Change-Id: I7f80c458ff6565aa00085da9059a4e9fe7e49233
2014-08-16 10:54:24 -04:00