Commit Graph

40324 Commits

Author SHA1 Message Date
Adam Powell
3decd141a5 am ab9906c0: Merge "Support list navigation mode for toolbar action bars" into lmp-preview-dev
* commit 'ab9906c0735fb22017f3d673207897347edeba92':
  Support list navigation mode for toolbar action bars
2014-06-04 18:44:02 +00:00
Ruben Brunk
ccee3b158a am c354b069: Merge "DNG: Write out additional fields." into lmp-preview-dev
* commit 'c354b06955508816af29daefdac5ef9ea9b89fbb':
  DNG: Write out additional fields.
2014-06-04 18:43:50 +00:00
John Spurlock
7b92af62b8 am 7e127344: Zen: Stateful condition panel.
* commit '7e12734486152ee4f6467e13e6b4cdd3a9c7bf8d':
  Zen: Stateful condition panel.
2014-06-04 18:43:37 +00:00
Alan Viverette
22b893fde1 Merge commit '096d52fb' into manualmerge
Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
2014-06-04 11:42:06 -07:00
Alan Viverette
1fa8b11d93 am cd5b044e: Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev
* commit 'cd5b044eaf38cc1fad926dff5d5d1b35c3c8b6a3':
  Fix drawable cache, add quantum assets to preload list
2014-06-04 18:09:14 +00:00
Hector Dearman
13d6cfb3b5 Merge "Removes bad comment from CookieManager" 2014-06-04 17:12:36 +00:00
Sander Alewijnse
1b8737ee18 Merge "Remove enableSystemApp() and enableSystemAppWithInten()." 2014-06-04 10:11:46 +00:00
Przemyslaw Szczepaniak
e3abed72d6 Add missing #isSpeaking to TTS API V2
TextToSpeech#isSpeaking queries TTS engine if it's
currently outputting any audio, it was present in the
TTS API V1.

Change-Id: Iee4a91976b9b80653811fb458ac48d75418752cf
2014-06-04 09:16:55 +00:00
Yuncheol Heo
41eca132b2 Merge "Add API definition for WebSettings.setVideoOverlayForEmbeddedEncryptedVideoEnabled." 2014-06-04 05:12:55 +00:00
Adam Powell
0b4da0c4f2 Merge "Support list navigation mode for toolbar action bars" into lmp-preview-dev 2014-06-03 23:56:43 +00:00
Adam Powell
6790b0502b Support list navigation mode for toolbar action bars
Add support for the list(spinner) navigation mode for ToolbarActionBar
and WindowDecorActionBar when a Toolbar is substituting for an
ActionBarView.

Bug 15332084

Change-Id: Ic618686f7767c4a14410ae359435d7c1b244e4fa
2014-06-03 16:51:25 -07:00
Ruben Brunk
3f6680ad48 Merge "DNG: Write out additional fields." into lmp-preview-dev 2014-06-03 23:38:57 +00:00
John Spurlock
856edebad7 Zen: Stateful condition panel.
When DND is on, expanded panel shows the current time
condition, or time remaining.  The last time bucket
selected is remembered as the default option for the
next time.

Move the server-side countdown helper into a proper
condition provider, but register it in-process as a
system provider.

Move common countdown condition parsing into ZenModeConfig
to reuse from system components.

Keep the manual exit condition around in zen mode config
and add plumbing for getting / listening to the
controller.

Keep the last QS detail panel around instead of
recreating it every time.

Fix the time condition's plus and minus button
enabling logic, and enhance the click handler to
deal properly with the next or previous bucket.

Bug:15344758
Change-Id: Ie7018a1c20e20f6d7e5f9e7874188374e6f8e2ab
2014-06-03 19:05:55 -04:00
Alan Viverette
55a54e17df Merge "Update theme colors, fix EditText state transition" into lmp-preview-dev 2014-06-03 22:49:33 +00:00
Ruben Brunk
b8df8e07d6 DNG: Write out additional fields.
Bug: 15112503

Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
2014-06-03 15:07:50 -07:00
Alan Viverette
dcf7b59f84 Update theme colors, fix EditText state transition
BUG: 11218747
BUG: 15200201
Change-Id: I94368897ea9466ae971b25fc80d6ca43433aadd5
2014-06-03 14:43:38 -07:00
Alan Viverette
560ad617cb Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev 2014-06-03 21:11:27 +00:00
Alan Viverette
b6f9152b70 Fix drawable cache, add quantum assets to preload list
BUG: 15409352
Change-Id: Idb18fd99dc4229aace9082d6e26c88faf81d15bf
2014-06-03 12:52:25 -07:00
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
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
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
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
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
55691b8cc7 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
(cherry picked from commit 9a17b9c5a256cb4bb14821c5ee89b03b99c045e8)
2014-06-03 01:26:48 +00:00
Robert Greenwalt
49fa8e15ba Merge "Rewrite startUsingNetworkFeature for new API" into lmp-preview-dev 2014-06-03 01:26:19 +00:00
Jinsuk Kim
b9e60f35ef DO NOT MERGE: Added missing entries in the cec device array
Change-Id: Ibb775f47cb9fb53df0a1baf67d09d76c4cb42392
2014-06-03 10:15:39 +09: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
Robert Greenwalt
562cc54536 Rewrite startUsingNetworkFeature for new API
bug:14993207
Change-Id: I041a80faa07bf3094af13a6c606f3b15aa03f789
(cherry picked from commit 09fe5e618b09965183cf53fba87c39025a19e8d1)
2014-06-02 23:29:20 +00: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