137948 Commits

Author SHA1 Message Date
Raph Levien
1044046aa9 am 8e3605e4: Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev
* commit '8e3605e4de5a109792acca22c37976ac52ee571e':
  Check for NULL on TypefaceImpl unref
2014-06-03 17:15:21 +00:00
Alan Viverette
7a98f74438 Fix NPE when ripples are canceled due to visibility change
BUG: 15406248
Change-Id: I63ce42fef8e1614372ee4a82e45eb15e8bbe1fe3
2014-06-03 10:13:22 -07:00
puff wen
e40348cf47 Add class CellularNetwork for plmn parsing and retrieve mcc and mnc.
Change-Id: Ic5d9c35ea8adcb432c7e601321050fbdfecc5fa7
2014-06-03 10:10:12 -07:00
Nicolas Prevot
93d8c7259d Merge "Adding user consent extras to DevicePolicyManager." 2014-06-03 17:08:50 +00:00
Nicolas Prevot
3742ec394f Adding user consent extras to DevicePolicyManager.
Adding ACTION_PROVISIONING_USER_HAS_CONSENTED and EXTRA_PROVISIONING_TOKEN to DevicePolicyManager.
They can be used to tell ManagedProvisioning to skip user consent.

Change-Id: I5ef8ab2a14969bb29a2ee3dbdce5ca3225e0759a
2014-06-03 17:07:34 +00:00
Jae Seo
4c9e57f156 resolved conflicts for merge of ebe661c4 to master
Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
2014-06-03 17:06:58 +00:00
Winson Chung
6b264f6e7b Merge "Fixing crash, ensuring that we get the post-animation callback, adding nav bar scrim (Bug. 15157307)" into lmp-preview-dev 2014-06-03 16:19:58 +00:00
ztenghui
5e9a42588e Merge "Add the tree hierarchy for the group" 2014-06-03 16:03:37 +00:00
Nicolas Prevot
2808907362 Merge "Updating the pictures and labels for cross-profile intents." 2014-06-03 14:52:58 +00:00
John Reck
55ce00e7ef fix build
Change-Id: I7fbe80ab0fbbc857c5785034a3c4129bccdec41c
2014-06-03 07:42:52 -07:00
John Reck
7e3a7fc35f Merge "Remove GLRenderer" 2014-06-03 14:27:26 +00:00
Jorim Jaggi
8dd95e03f8 Animate unlock icon while unlocking.
When the user reaches the threshold such that the gesture is accepted
as an unlock, the icon scales a bit and gets fully opaque. When the
user flings, it gets even larger and fades out.

Bug: 15163546
Change-Id: Icd963aa8f7268712f239b204cdfa61ebc2baf4d0
2014-06-03 16:21:40 +02:00
Narayan Kamath
2cbc51f5ac am 00e3c58d: am 73f7cd98: Merge "Fix build."
* commit '00e3c58d0232952bdcafd02f71e6c9fb00b4d248':
  Fix build.
2014-06-03 14:11:55 +00:00
Narayan Kamath
00e3c58d02 am 73f7cd98: Merge "Fix build."
* commit '73f7cd98d61eded2cc3af0f672937c7a2ec5c10a':
  Fix build.
2014-06-03 14:08:51 +00:00
Robert Greenwalt
32aa65a112 Fix Legacy NetworkInfo API
Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
(cherry picked from commit 16fe1c18289de200d2249e51db8c0986619f487b)
2014-06-03 14:00:56 +00:00
Narayan Kamath
c32a244e90 am dd2e9d33: am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."
* commit 'dd2e9d3386d2d74f99f79bcad951ff5cdefa6fab':
  Scan for renderscript files before deciding ABIs.
2014-06-03 13:58:35 +00:00
Narayan Kamath
5770f2bfab am 797b109c: (-s ours) am 7ed98c43: Merge "Add an --abi argument to "pm install""
* commit '797b109c60bda8e122075b0c2101d3f2a0b67c07':
  Add an --abi argument to "pm install"
2014-06-03 13:58:30 +00:00
Narayan Kamath
73f7cd98d6 Merge "Fix build." 2014-06-03 13:56:03 +00:00
Narayan Kamath
26c6c03196 Fix build.
Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
2014-06-03 14:54:52 +01:00
Jorim Jaggi
93a2bb2063 Improve hint animations.
Show the hint text longer so that users have enough time to read it,
also "highlight" the corresponding icon by making it fully opaque
during the gesture.

Bug: 15189049
Change-Id: Ie0429752b63bae41bb6992778ebb3bd5678f9676
2014-06-03 15:31:47 +02:00
Jorim Jaggi
b3f0a2ff00 Hint for phone and camera.
Bug: 15189049
Bug: 15126962
Change-Id: Ie28fc8202ace4af56542201d168572ef6ad78d19
2014-06-03 15:31:19 +02:00
Narayan Kamath
522a027806 am 41aa48be: am 032c5c05: Merge "Log process abis during start."
* commit '41aa48beacc93a1511a290e91293402eeb787165':
  Log process abis during start.
2014-06-03 13:29:04 +00:00
Narayan Kamath
dd2e9d3386 am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."
* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
  Scan for renderscript files before deciding ABIs.
2014-06-03 13:24:50 +00:00
Narayan Kamath
797b109c60 am 7ed98c43: Merge "Add an --abi argument to "pm install""
* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"
2014-06-03 13:24:45 +00:00
Narayan Kamath
41aa48beac am 032c5c05: Merge "Log process abis during start."
* commit '032c5c054c331b63f2d45ee9c497ac852faec633':
  Log process abis during start.
2014-06-03 13:24:34 +00:00
Jorim Jaggi
282a615263 Hide phone/camera affordance when unlocking.
Bug: 15163546
Change-Id: If9f3e270bb3f5473abd687061a0c3f6faf2bf3b0
2014-06-03 14:59:41 +02:00
Narayan Kamath
7cb13f8a0a Merge "Scan for renderscript files before deciding ABIs." 2014-06-03 12:20:05 +00:00
Narayan Kamath
dad8f819a7 Merge "Add an --abi argument to "pm install"" 2014-06-03 12:01:53 +00:00
Narayan Kamath
d47e38b634 Scan for renderscript files before deciding ABIs.
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
2014-06-03 12:58:35 +01:00
Lorenzo Colitti
e4d7fc02ab Merge "Fix Legacy NetworkInfo API" 2014-06-03 11:58:24 +00:00
Narayan Kamath
7ed98c43f8 Merge "Add an --abi argument to "pm install"" 2014-06-03 11:10:02 +00:00
Robert Greenwalt
b90b20b5d5 Fix Legacy NetworkInfo API
Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
2014-06-03 19:58:54 +09:00
Adrian Roos
f8053993c9 Merge "Remove now defunct touch analysis facility" 2014-06-03 10:46:43 +00:00
Adrian Roos
af12d0aff0 Merge "Disable now defunct touch analysis facility - DO NOT MERGE" into lmp-preview-dev 2014-06-03 10:45:15 +00:00
Narayan Kamath
116bdbd823 Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

bug: 14453227

(cherry picked from commit 6431d11cd420536aaa9d93ae510a3151ccc4df1d)

Change-Id: I85d4f8785deea02a6a4d3cb0b05e6ef8bf64826b
2014-06-03 11:35:49 +01:00
Yuncheol Heo
71b197a0a3 Merge "Add SystemAudioAction(FromAvr|FromTv)." 2014-06-03 10:12:53 +00:00
Narayan Kamath
6431d11cd4 Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
2014-06-03 11:11:47 +01:00
Yuncheol Heo
63a2e0696c Add SystemAudioAction(FromAvr|FromTv).
The system audio can be initiated by Tv itself or by AVR through
<Set System Audio Mode> CEC message.

This CL also includes:
- Add HdmiConstants, HdmiUtil class to handle various constants and
  utility functions.
- Add default message dispatcher to all queued actions.
- Add an argument on HdmiControlService.removeAction(class) to prevent
  from removing the caller itself.

Change-Id: I9fd9089bed876f04b58c483879b64edfae94a298
2014-06-03 19:09:44 +09:00
Narayan Kamath
032c5c054c Merge "Log process abis during start." 2014-06-03 09:57:03 +00:00
Jungshik Jang
c3e9b45da0 Merge "DO NOT MERGE: Added missing entries in the cec device array" into lmp-preview-dev 2014-06-03 04:14:49 +00:00
Evan Charlton
faa3ff9ba8 Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev 2014-06-03 03:47:06 +00:00
Craig Mautner
228742d278 Force all windows to redraw before unblanking screen
The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.

Fixes bug 15092354.

Change-Id: I349995bf6446d6c462dccdc2b599bab9ab0ab2c8
2014-06-02 20:29:38 -07:00
Wei Wang
6510d43d07 Merge "Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925." into lmp-preview-dev 2014-06-03 03:03:04 +00:00
Robert Greenwalt
1062171090 Merge "Refactor NetworkFactory." into lmp-preview-dev 2014-06-03 02:59:22 +00:00
Dongwon Kang
7b2ae34b97 Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev 2014-06-03 02:31:28 +00:00
Jean-Michel Trivi
f723f8e9cf AudioFormat class
Change-Id: I425c80c6caed98f6fa31e8cad8f15435c99ebc20
2014-06-02 19:31:05 -07:00
Christopher Tate
c777185688 Finish migration of backup transport constants
...and make sure to fix a couple of lingering Javadoc references.

Bug 15329632

Change-Id: I1de7b53a58940834cd2dae2301fd5f65dbb48ba6
2014-06-02 19:10:54 -07:00
Christopher Tate
bfb131317b Merge "Add full-backup stream API to BackupTransport" 2014-06-03 02:07:01 +00:00
Christopher Tate
4dd2635bf5 Add full-backup stream API to BackupTransport
Also started migrating the definition of transport success/failure constants
into BackupTransport to make them permanent.

The new methods are not yet plumbed in; this is just to allow forward
progress against a proposed stable API.

Bug 15329632

Change-Id: I27472e09b831350c140b9fa548ebda3af334eb1a
2014-06-02 18:57:21 -07:00
vandwalle
0aa5420504 handle removal of self added configurations
Change-Id: Ib2891ac38a4a876b0cd4f198cf26198b9fc12909
(cherry picked from commit 23fea6a042073e3cb1b0e74be5b0d096916ab6b8)
2014-06-03 01:31:50 +00:00