Commit Graph

41725 Commits

Author SHA1 Message Date
John Reck
52d2b2df9d am c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev
* commit 'c1d32f0c5c5832a3bbf923a92d62b2e434dfe70b':
  Fix root RenderNode damage calculation
2014-07-17 18:14:18 +00:00
Sailesh Nepal
909d1b5755 resolved conflicts for merge of 03e88771 to master
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
2014-07-17 11:05:42 -07:00
Christopher Tate
e2ba7a37fc am c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
* commit 'c92b1dd5f3e06a7e43f4086b2db418a8334aa7d2':
  Always call finishBackup() if performFullBackup() succeeded
2014-07-17 16:45:23 +00:00
Fabrice Di Meglio
79b834078e am fd6eeda0: Fix bug #16309454 Broken recent button after dismissing set time dialog
* commit 'fd6eeda0f7f578735a9b2b6a36fb1f130993f488':
  Fix bug #16309454 Broken recent button after dismissing set time dialog
2014-07-17 16:45:01 +00:00
Jeff Davidson
46b6f2a8f4 am 8f406122: Remove obsolete remark from XXHDPI comment.
* commit '8f4061221469cde3d92b6f7dede5c8b10df1edc0':
  Remove obsolete remark from XXHDPI comment.
2014-07-17 16:44:56 +00:00
Barnaby James
48f3552093 Add intents for setting airplane and zen mode by voice only.
Change-Id: I28a262da86eb102d1bd12265f96db0efec5db203
2014-07-17 07:24:09 -07:00
ztenghui
3f55ce84ff am 7fdb6e06: am 6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
* commit '7fdb6e0658855bb0a3ffe78c05bf509aa73aa1d7':
  Add more reverse support to AnimatedVD
2014-07-17 14:12:58 +00:00
ztenghui
ab36c677ba am 6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
* commit '6f5df88108b7fb6b9a59ac36f448bd23b5397ef1':
  Add more reverse support to AnimatedVD
2014-07-17 14:02:46 +00:00
Niels Egberts
6c472fe969 TtsSpan builders for each TtsSpan type.
The reason for separate classes for each type, instead of a more flat
structure is to enable easy discovery of the available arguments that
can be set. For L we'll have about 12 types with 30 arguments and
almost all of the arguments are type specific. In future releases
we'll introduce more arguments. With editors that have code completion
one can construct a span without having to consult the documentation.

For now it only contains Text and Cardinal types.

Change-Id: I94531e600133d9f4f59a4170cceef1ee7a360ca7
2014-07-17 12:19:42 +01:00
Sailesh Nepal
001bbbb239 TTY: frameworks/base changes
This CL makes the following changes:
  1. New public APIs:
    - TelecommManager.getCurrentTtyMode: This is used to
      get current TTY mode. It's used by Telephony to set
      the phone state before calls are created (which is why
      it can't be a Conneciton API).
    - TelecommConstants.TTY_MODE_*: These are constants
      copied from Phone.java
    - TelecommConstants.ACTION_CURRENT_TTY_MODE_CHANGED: This
      action is fired when the current TTY mode changes.
      Apps can listen to this before and during a call.
      The old version of this was in TtyIntent.java which
      I deleted.

  2. New private API
    - TelecommManager.isTtySupported: This is used by
      Telephony to hide the TTY settings on devices
      that don't support TTY

  3. Various updates to use the constants renamed in this CL

Change-Id: I652b095af30cc2732a06829dc23492e5355660da
2014-07-16 21:14:58 +00:00
Fabrice Di Meglio
278387fb5f Fix bug #16309454 Broken recent button after dismissing set time dialog
- correct set and use the Canceled state

Change-Id: Id60ae14c493254193ee677b66388a64a49618273
2014-07-16 20:13:45 +00:00
Jeff Davidson
61a5a3f2c3 Remove obsolete remark from XXHDPI comment.
XXHDPI screens now make up 15% of all Android devices, so developers
should be encouraged to include assets at this density.

Change-Id: I9d845769233a71dd954b5f35246aabb774a1c40d
2014-07-16 13:10:18 -07:00
Narayan Kamath
2b3b2bc80f am baba92bd: Merge "Dexopt for Context.createPackageContext when code is included." into lmp-dev
* commit 'baba92bd1da887db7c3e834fe7d2a7081936aecf':
  Dexopt for Context.createPackageContext when code is included.
2014-07-16 19:16:40 +00:00
Yorke Lee
938a9ffd3d am af195ca0: Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev
* commit 'af195ca07b7bf7452b140d7dfa226942bd947c47':
  Make ContactPreferences use SharedPreferences instead of System settings (1/5)
2014-07-16 19:07:37 +00:00
Narayan Kamath
fe0ebdddc1 am 093eaa8d: Temporary workaround for getApplicationInfo + multiArch.
* commit '093eaa8d7ac1dd8f84c07852f2566d8e129177f5':
  Temporary workaround for getApplicationInfo + multiArch.
2014-07-16 18:05:58 +00:00
Narayan Kamath
514fcafacd am 4adbb78f: Merge "Adjust nativeLibraryDir for package contexts of multiArch installs." into lmp-dev
* commit '4adbb78fa8330ea635d938af117b47a75512a504':
  Adjust nativeLibraryDir for package contexts of multiArch installs.
2014-07-16 18:05:54 +00:00
Narayan Kamath
caa7119294 Temporary workaround for getApplicationInfo + multiArch.
Google play services client libraries construct native paths
using pm.getApplicationInfo().nativeLibraryDir.

This is a temporary workaround until we've switched all code
over to pm.createPackageContext().getApplicationInfo() or
whatever API we decide on to surface correct multi-arch
lib paths.

bug: 16013931

Change-Id: Ib719cf6f31da9a29b76e942cd2e28bda1f19b264
2014-07-16 17:58:42 +00:00
Jason Monk
8929a5f91b am bc0f6147: Merge "Finalizing lock-to-app UX" into lmp-dev
* commit 'bc0f6147ddc6718a30d12b89d9a39e65c568ef28':
  Finalizing lock-to-app UX
2014-07-16 17:14:35 +00:00
Sandeep Siddhartha
24e119a24b am 8a121f48: Merge "Hook in startRecogniton call" into lmp-dev
* commit '8a121f484b64c7a4434dcad287d93532337e1d75':
  Hook in startRecogniton call
2014-07-16 17:05:04 +00:00
Jeff Sharkey
50bad3121d am 5ddccbd2: Merge "Add code cache directory for apps." into lmp-dev
* commit '5ddccbd263e50c6c2d3b63ea290e0db661a726f5':
  Add code cache directory for apps.
2014-07-16 17:00:30 +00:00
Christopher Tate
c295a44336 Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev 2014-07-16 16:25:13 +00:00
Christopher Tate
a176d22110 Always call finishBackup() if performFullBackup() succeeded
Even if we later get an error from sendBackupData() we need to give
the transport its teardown callback.  This simplifies the transport
logic considerably.

Change-Id: Ib8c0e210d4a876ee6b083a4d619dfccc462da4e5
2014-07-16 13:10:58 -07:00
Narayan Kamath
2631fda583 am b6c2cce1: am baba92bd: Merge "Dexopt for Context.createPackageContext when code is included." into lmp-dev
* commit 'b6c2cce1233ce77565a7980752876ec73f10c537':
  Dexopt for Context.createPackageContext when code is included.
2014-07-16 19:21:05 +00:00
Yorke Lee
1ded4e9c98 am 1c86f0da: am af195ca0: Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev
* commit '1c86f0da95f270c66e6356fc4d4bca1ef2c5fe08':
  Make ContactPreferences use SharedPreferences instead of System settings (1/5)
2014-07-16 19:12:49 +00:00
Narayan Kamath
04057d4999 am 5baa23d7: am 093eaa8d: Temporary workaround for getApplicationInfo + multiArch.
* commit '5baa23d7d8249dec9fe24d0d6a4265e05f36783b':
  Temporary workaround for getApplicationInfo + multiArch.
2014-07-16 18:11:33 +00:00
Narayan Kamath
b1b745790e am 095a96b1: am 4adbb78f: Merge "Adjust nativeLibraryDir for package contexts of multiArch installs." into lmp-dev
* commit '095a96b1e0715e5a4436f093f6dd31eec6409ae8':
  Adjust nativeLibraryDir for package contexts of multiArch installs.
2014-07-16 18:11:29 +00:00
Jason Monk
0840221cbb am 2973edd2: am bc0f6147: Merge "Finalizing lock-to-app UX" into lmp-dev
* commit '2973edd25f17538b2de9bfdbc5b29869f1a769b3':
  Finalizing lock-to-app UX
2014-07-16 17:19:25 +00:00
Sandeep Siddhartha
e2a9caffe6 am 15f3c08d: am 8a121f48: Merge "Hook in startRecogniton call" into lmp-dev
* commit '15f3c08d18de3e48c460ead3942f77ef63ca5133':
  Hook in startRecogniton call
2014-07-16 17:08:14 +00:00
Jeff Sharkey
faee1741db am 97308915: am 5ddccbd2: Merge "Add code cache directory for apps." into lmp-dev
* commit '9730891509b0c7bb50b0b2ecf498c3b993dcef39':
  Add code cache directory for apps.
2014-07-16 17:04:05 +00:00
Jeff Sharkey
d0a2de06a7 Merge "Add code cache directory for apps." into lmp-dev 2014-07-16 16:25:13 +00:00
Alex Klyubin
8f730adf13 am e6078129: am d1c5208b: Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev
* commit 'e607812949c4d2fb733b20a5a172a4b2e5bd227f':
  No need to explicitly enable TLS-PSK cipher suites.
2014-07-16 15:35:44 +00:00
Alex Klyubin
e36542faa6 am d1c5208b: Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev
* commit 'd1c5208bddd14812ae8e7b4f18a3d769e252d268':
  No need to explicitly enable TLS-PSK cipher suites.
2014-07-16 15:31:33 +00:00
Adam Connors
0e96eac397 am bdb9e425: am 7250f656: Merge "Revert "Remove enableSystemApp methods."" into lmp-dev
* commit 'bdb9e425cf90fb05a8d19a4ebdf8454ec7a40655':
  Revert "Remove enableSystemApp methods."
2014-07-16 14:24:33 +00:00
Adam Connors
66f58686c5 am 7250f656: Merge "Revert "Remove enableSystemApp methods."" into lmp-dev
* commit '7250f65642930a6906135ac2ca71090fbe4b52e5':
  Revert "Remove enableSystemApp methods."
2014-07-16 14:20:57 +00:00
Andrew Solovay
d75fd88ee5 am 9053f216: am ebbabf28: am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit '9053f216f1d1c5bf4b71281a3de77a665d060cf1':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:59:56 +00:00
Andrew Solovay
a4f56e35a7 am ebbabf28: am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit 'ebbabf2858f2080e6c8e5c5558b57259ee15f65b':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:54:41 +00:00
Andrew Solovay
f7cecf8f4b am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit 'c8fcb3bcdb71fe16624bea146a67b13c150adb82':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:36:16 +00:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:29:08 +00:00
Alex Klyubin
09f1c724e3 Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev 2014-07-16 13:12:22 +00:00
Narayan Kamath
bbdbfcc7f6 am cc4b75b8: resolved conflicts for merge of 73083ed1 to lmp-dev-plus-aosp
* commit 'cc4b75b87a7b38fc2c4c746ef97074b4f2b36280':
  Add an internal API to get all asset locales.
2014-07-16 13:09:34 +00:00
Narayan Kamath
4b8e1c6860 resolved conflicts for merge of 73083ed1 to lmp-dev-plus-aosp
Change-Id: I010e48082776070faffe2719d9cb13c307d1dcff
2014-07-16 14:05:55 +01:00
John Spurlock
4cd9c6dd97 am facee9d9: am 798c7ad8: Merge "Zen: handle exit conditions across reboots." into lmp-dev
* commit 'facee9d9f948a8b492b49ba93a444431f758a09e':
  Zen: handle exit conditions across reboots.
2014-07-16 12:59:47 +00:00
Marcin Kosiba
45a3f4b1fc am a9dcfe0e: am 11231acb: Merge "Add more params to WebViewClient.shouldInterceptRequest." into lmp-dev
* commit 'a9dcfe0e9ea0ae92989c2eb599814cadaafa4a9e':
  Add more params to WebViewClient.shouldInterceptRequest.
2014-07-16 12:59:37 +00:00
Ben Murdoch
1521c02894 am 23111c5a: am c50b1104: Plumb temporary view detach calls through WebView.
* commit '23111c5a4f031ca8114b79657348e2fc8dc2a0dd':
  Plumb temporary view detach calls through WebView.
2014-07-16 12:59:33 +00:00
Narayan Kamath
73083ed1e4 am 3c8f8caa: Merge "Add an internal API to get all asset locales."
* commit '3c8f8caaa711c0d025dab85cfdacc7586e75d31a':
  Add an internal API to get all asset locales.
2014-07-16 12:57:02 +00:00
Jeff Sharkey
4ed745d359 Add code cache directory for apps.
This provides a directory where apps can cache compiled or optimized
code generated at runtime.  The platform will delete all files in
this location on both app and platform upgrade.

Bug: 16187224
Change-Id: I641b21d841c436247f35ff235317e3a4ba520441
2014-07-15 22:13:26 -07:00
Jeff Sharkey
6b5dbcbfc5 am 76014649: am 21c0fec8: Merge "Mark resource-only splits as hasCode=false." into lmp-dev
* commit '7601464965dd43b946fa8c0c29aff54da31aa3e5':
  Mark resource-only splits as hasCode=false.
2014-07-16 03:33:00 +00:00
Ben Murdoch
7302f4f8f7 Plumb temporary view detach calls through WebView.
Intercept View#onStartTemporaryDetach/onFinishTemporaryDetach
to handle focus changes correctly.

Bug: 14313621
Change-Id: I92ba2f44359643fee63f30b9c35b1ae4183e4245
2014-07-16 03:28:43 +00:00
Jeff Sharkey
78a130144b Mark resource-only splits as hasCode=false.
PackageManagerService now skips dexopt for split APKs that don't
declare they have code.  Also surface more detailed error messages
in logs.

Bug: 14975160
Change-Id: Ie6078dba724815020cee59b7fc52317e88ca097a
2014-07-15 20:18:39 -07:00
Jeff Sharkey
2c509a774d am beb50dd9: am 5417dd75: Merge "Parse more split APK manifest details." into lmp-dev
* commit 'beb50dd93279b18ebc07827b96a6a406da107af1':
  Parse more split APK manifest details.
2014-07-16 03:00:27 +00:00