Commit Graph

40297 Commits

Author SHA1 Message Date
Alan Viverette
02a078d088 am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev
* commit '25931adee5ba954220190f48901bb66c8c9dd462':
  Clean up drawable theming APIs
2014-06-03 17:16:27 +00:00
Dianne Hackborn
bcaffd0586 am da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev
* commit 'da4a186f8bf49d8ea06d5ad6d402d9b073ee3841':
  Some battery stats history fixes.
2014-06-03 17:16:01 +00:00
George Mount
d7954a8a29 am 5a745332: Merge "Delay sending shared element position until after layout." into lmp-preview-dev
* commit '5a745332b3e5bac89052484e2ae4978a9a1e1bcd':
  Delay sending shared element position until after layout.
2014-06-03 17:15:47 +00:00
Adam Powell
a5dd05f26f am ef7c0948: Merge "Add an internal method for setting optical insets." into lmp-preview-dev
* commit 'ef7c0948ea1379ee9f3f5f40267ca2cf5e76a36b':
  Add an internal method for setting optical insets.
2014-06-03 17:15:34 +00: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
John Reck
7e3a7fc35f Merge "Remove GLRenderer" 2014-06-03 14:27:26 +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
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
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
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
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 6431d11cd4)

Change-Id: I85d4f8785deea02a6a4d3cb0b05e6ef8bf64826b
2014-06-03 11:35:49 +01: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
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
Robert Greenwalt
9e32be5d26 Merge "Refactor NetworkFactory." 2014-06-03 01:11:00 +00:00
Yohei Yukawa
083a3e6151 Merge "Reenable DynamicRotationList for language-switching-aware IMEs" 2014-06-03 00:51:32 +00:00
Alan Viverette
5a4af17e27 Merge "Clean up drawable theming APIs" into lmp-preview-dev 2014-06-02 23:41:59 +00:00
Alan Viverette
6dbe51b50e Clean up drawable theming APIs
Removes APIs for themed creation of a drawable from a stream, since
that doesn't involve any inflation. Also cleans up tinting methods
left over from previous clean up.

BUG: 15089957
Change-Id: I2af7aa9a6d351ae61b33ee1216c674fae1bffe11
Signed-off-by: Alan Viverette <alanv@google.com>
2014-06-02 16:39:04 -07:00
John Reck
84a4c887a0 Remove GLRenderer
Change-Id: I180286417c1a354fc7eb1eadb1884ac6add0795c
2014-06-02 16:33:52 -07:00
Jinsuk Kim
d79b39220d Merge "Added missing entries in the cec device array" 2014-06-02 23:24:56 +00:00
Robert Greenwalt
3192dec321 Refactor NetworkFactory.
Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use.  Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
2014-06-02 16:19:08 -07:00
Robert Greenwalt
8f3799867d Merge "Rewrite startUsingNetworkFeature for new API" 2014-06-02 23:12:29 +00:00
Dianne Hackborn
0bec638839 Merge "Some battery stats history fixes." into lmp-preview-dev 2014-06-02 22:57:41 +00:00
George Mount
cdd5c8f34b Merge "Delay sending shared element position until after layout." into lmp-preview-dev 2014-06-02 22:42:45 +00:00
Fabrice Di Meglio
b3d5856e68 am f3c294df: Merge "Code cleaning" into lmp-preview-dev
* commit 'f3c294df46bab8f50bead51e70f562778b8c5deb':
  Code cleaning
2014-06-02 22:10:36 +00:00
Adam Powell
08c06495cc Merge "Add an internal method for setting optical insets." into lmp-preview-dev 2014-06-02 21:36:55 +00:00
Adam Powell
dbb06e0c8c Add an internal method for setting optical insets.
This will allow views to calculate their own optical insets
e.g. during measurement. Candidate for public API down the road once
it proves itself for framework views.

Change-Id: I098d7b7b52e5aaf7eccc8ef34d79791d127d8c77
2014-06-02 14:24:47 -07:00
Jae Seo
3c784d6359 Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev 2014-06-02 21:03:58 +00:00
Fabrice Di Meglio
b75a69f9b3 Merge "Code cleaning" into lmp-preview-dev 2014-06-02 20:50:43 +00:00
George Mount
d265bd7446 Delay sending shared element position until after layout.
Bug 15380396

Also updated fade duration to 300ms now that shared element
transition can take place before fade.

Change-Id: I9053615c83b9e0938b015645de0eb6c1534cbb34
2014-06-02 13:39:14 -07:00
Dianne Hackborn
fc0641340f Some battery stats history fixes.
- Now the full wake history uses the history tag if it can.
  Hopefully this will still result in a consistent history,
  since that isn't really want the tag is for...  but the
  current implementation in places will probably make this work.

- Possibly fix a bug with inconsistent state between partial
  history snapshots: after a snapshot is printed, don't allow
  any more batching into the most recent history entry, so the
  next snapshot will not miss anything that might get placed
  into it soon after.

Also rework command line arguments for enable/disable to make these
commands instead of options.

Change-Id: Ia33445cad1538bf8df549cef284f1e736efbc079
2014-06-02 12:42:12 -07:00
John Reck
776512d4b6 am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev
* commit 'feccbdc4d0bee3eb4c395bd93ba51cbc6616527a':
  Add setStartValue to RNA
2014-06-02 18:19:44 +00:00
Jae Seo
d5cc4a281e Put TV Input Framework under android.media.tv, including TvContract
Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
2014-06-02 11:02:52 -07:00
John Reck
c6b3264e16 Add setStartValue to RNA
Bug: 15198607
 Should be good-enough for Ripples to use for pseudo-chaining
 support.

Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63
2014-06-02 11:00:09 -07:00
dcashman
559321abbf Merge "Add ArrayUtils methods and tests for consumption by KeySet code." 2014-06-02 17:34:09 +00:00
dcashman
874d0d4032 Add ArrayUtils methods and tests for consumption by KeySet code.
Adds methods for dealing specifically with long data types.  Used by
PackageKeySetData as part of the KeySet work.  Add appropriate test methods
to MoreAsserts as well.

Bug: 6967056
Change-Id: I1e263301b353e0cd1b45126be6ef5ec310f311a8
2014-06-02 10:29:40 -07:00
Yohei Yukawa
07bd732034 Reenable DynamicRotationList for language-switching-aware IMEs
In order to reenable DynamicRotationList for
language-switching-aware IMEs, this CL reverts
I84291fd4a7d6192b3bd0c366c49 with fixing a bug that the dynamic
rotation state is reset even when the list of input methods is
not changed.

With this CL, the dynamic rotation state is preserved when the
enabled input methods is not changed actually.

BUG: 7043015
Change-Id: I506828c7a363e79f1c767eeb28f0d3746ff1cb0d
2014-06-02 19:20:36 +09:00
Jinsuk Kim
cf6527ca98 Added missing entries in the cec device array
Change-Id: Ibb775f47cb9fb53df0a1baf67d09d76c4cb42392
2014-06-02 18:25:00 +09:00
Jungshik Jang
11969e8266 Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-dev 2014-06-02 04:37:46 +00:00
Jungshik Jang
9b4d25a8c5 Merge "DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService" into lmp-preview-dev 2014-06-02 04:37:31 +00:00
Jungshik Jang
9bb6fbb743 Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-dev 2014-06-02 04:35:58 +00:00
Jungshik Jang
1dcef4f9cd Merge "DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API" into lmp-preview-dev 2014-06-02 04:35:45 +00:00
Jungshik Jang
5a0d97b1c2 Merge "DO NOT MERGE: Add the constants for the callback result of SendCecCommand()." into lmp-preview-dev 2014-06-02 04:34:02 +00:00
Jinsuk Kim
af9d45e88b DO NOT MERGE: Register HdmiControlService
Register the new service that will replace HdmiCecService.
The old one will be removed once the client of the old service
finishes migration to the new service.

Change-Id: I3906292fcf0a7c8286bc89af21a03bd11d3a0e72
2014-06-02 11:03:45 +09:00
Jinsuk Kim
e74282b70b DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService
HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
2014-06-02 11:02:51 +09:00