125217 Commits

Author SHA1 Message Date
Ricardo Cervera
ca8757bfc5 Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 2014-02-12 21:04:00 +00:00
Craig Mautner
8dfda07dd4 am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '731c30c17dac51e2279f8f789a647c61bd55028b':
  Don't add windows from exiting app tokens twice.
2014-02-12 21:01:47 +00:00
Ricardo Cervera
10227d9c37 docs: Added Revision 3 of Google APIs System Image.
Updated Google Play services version to 4.2.42 too.

Change-Id: I1887414760e91808ed0a2574c24dab3598797f32
Review: http://quixote.mtv.corp.google.com:8003/tools/revisions/platforms.html
2014-02-12 12:59:46 -08:00
Craig Mautner
731c30c17d Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev 2014-02-12 20:56:36 +00:00
Alan Viverette
1e9357fbbd am 09591e89: Merge "Add support for assigning keyed View tags via XML"
* commit '09591e89e4cf6d3ea836b02e3ef965375f4ab214':
  Add support for assigning keyed View tags via XML
2014-02-12 12:48:57 -08:00
Alan Viverette
09591e89e4 Merge "Add support for assigning keyed View tags via XML" 2014-02-12 20:46:38 +00:00
Craig Mautner
ac90c19cab Don't add windows from exiting app tokens twice.
If an apptoken's removal has been delayed then it will be in both
mExitingAppTokens and the stack's tasks. When rebuilding the windows
the windows from that apptoken will get added twice. This change
skips adding those windows from apptokens that have already been
added from mExitingAppTokens.

Change-Id: I55f94b7dbef36aeacb390b91fbe82426eaac5458
2014-02-12 12:37:17 -08:00
Alan Viverette
c8375f45b1 am f556adf4: Merge "Set properties for pooled CollectionItemInfo, CollectionInfo"
* commit 'f556adf45e7fd925259b5c6bc87d23f0400a51c1':
  Set properties for pooled CollectionItemInfo, CollectionInfo
2014-02-12 12:28:52 -08:00
Alan Viverette
f556adf45e Merge "Set properties for pooled CollectionItemInfo, CollectionInfo" 2014-02-12 20:26:55 +00:00
John Spurlock
ae5708db9d am c4aee98a: Improve error handling in listener services.
* commit 'c4aee98a62f400dd9f6f964d26d739d409212775':
  Improve error handling in listener services.
2014-02-12 19:36:25 +00:00
John Spurlock
c4aee98a62 Improve error handling in listener services.
Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.

Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound.  Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.

Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes.  That is, silently fail (or return null) - and provide a
log warning.

Bug:12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
2014-02-12 14:31:36 -05:00
Alan Viverette
cdd2eddcb2 Set properties for pooled CollectionItemInfo, CollectionInfo
BUG: 12978446
Change-Id: I64a366952090ab663ffef43a1d210528805e113c
2014-02-12 11:28:33 -08:00
Narayan Kamath
3caed58ac7 am 8fa3f443: am 54e7f53f: Merge "Fix build."
* commit '8fa3f44342f3089aaf48de5c5a6f5a3e5d346cc7':
  Fix build.
2014-02-12 19:23:45 +00:00
Paul Duffin
0741e11c65 am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '75d67c6aa051392e711fde3b901a4f2c62f983db':
  Improve Parcel's handling of non-primitive arrays
2014-02-12 19:23:01 +00:00
Narayan Kamath
fc268ecae1 am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit 'aa98fb51a8a0148b72e1662cc42102c6547776ce':
  Use size_t* in AssetManager::createIdmap
2014-02-12 19:22:56 +00:00
John Spurlock
af9d20d782 am a447947e: Merge "Improve error handling in listener services."
* commit 'a447947e2ea9fc5ad4e3651a38de6fadb89afbd8':
  Improve error handling in listener services.
2014-02-12 11:22:36 -08:00
Dianne Hackborn
97de064a9a am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '133f6826e58aa7643858d4e50630103eb01f1815':
  Runtime resource overlay, iteration 2, test cases
2014-02-12 19:22:24 +00:00
John Spurlock
a447947e2e Merge "Improve error handling in listener services." 2014-02-12 19:20:21 +00:00
Nick Kralevich
dd3d95f182 resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
2014-02-12 11:05:59 -08:00
Derek Sollenberger
c248461ac9 am ebcf70b1: Merge "Revert "Refactor setting an SkPaint onto a hwui Layer.""
* commit 'ebcf70b128f209ed74f781f82fe3fa11c017246f':
  Revert "Refactor setting an SkPaint onto a hwui Layer."
2014-02-12 11:04:26 -08:00
Derek Sollenberger
ebcf70b128 Merge "Revert "Refactor setting an SkPaint onto a hwui Layer."" 2014-02-12 19:00:46 +00:00
Derek Sollenberger
90d0c75e94 Revert "Refactor setting an SkPaint onto a hwui Layer."
This reverts commit e889298cd6ae1fc0d76bc00d7d12586db03eb261.

Change-Id: I4b1d609b2d4280595d40cb10d6c18875c22999f8
2014-02-12 18:59:05 +00:00
Baligh Uddin
b88ed5ccba Import translations. DO NOT MERGE
Change-Id: I7aef0ba2b5f45b3e60d7840408176c6a61d9d8ee
Auto-generated-cl: translation import
2014-02-12 10:34:22 -08:00
Baligh Uddin
2878f71e26 Import translations. DO NOT MERGE
Change-Id: I4113b4d3949ace6f67894e1c67f898672b871dbc
Auto-generated-cl: translation import
2014-02-12 10:26:17 -08:00
Derek Sollenberger
efdf735e94 am 5f97e9e9: Merge "Refactor setting an SkPaint onto a hwui Layer."
* commit '5f97e9e9ed2a6da22a6ed90b8db11052dd6a8cd7':
  Refactor setting an SkPaint onto a hwui Layer.
2014-02-12 10:13:10 -08:00
Derek Sollenberger
5f97e9e9ed Merge "Refactor setting an SkPaint onto a hwui Layer." 2014-02-12 18:10:21 +00:00
John Spurlock
da9a3bed8e Improve error handling in listener services.
Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.

Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound.  Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.

Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes.  That is, silently fail (or return null) - and provide a
log warning.

Bug:12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
2014-02-12 12:35:10 -05:00
Narayan Kamath
8fa3f44342 am 54e7f53f: Merge "Fix build."
* commit '54e7f53fce25366781840a124aa018534c4eb52b':
  Fix build.
2014-02-12 09:29:55 -08:00
Narayan Kamath
54e7f53fce Merge "Fix build." 2014-02-12 17:26:58 +00:00
Scott Main
636f58dfd5 am 44bb4e9c: am 7594767e: am aa318b28: am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
* commit '44bb4e9cd51b6ea114465f74a725455500be130c':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
2014-02-12 09:18:03 -08:00
Dirk Dougherty
3efc4dafae am 003a1e33: am 57b00e2b: am 17f0d48c: am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services.
* commit '003a1e33ee2cf5a0e01b6efe7b138b8ee5b751e4':
  Update generated docs for Google Play Services.
2014-02-12 09:17:59 -08:00
Scott Main
44bb4e9cd5 am 7594767e: am aa318b28: am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
* commit '7594767e55e011101ed9341f01d40730fdbd4cc7':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
2014-02-12 17:15:26 +00:00
Dirk Dougherty
003a1e33ee am 57b00e2b: am 17f0d48c: am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services.
* commit '57b00e2bdf1d2eb596c6525a6fdaa16563e1f132':
  Update generated docs for Google Play Services.
2014-02-12 17:15:20 +00:00
Scott Main
7594767e55 am aa318b28: am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
* commit 'aa318b2851042c6f98723446f33469a6545c7294':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
2014-02-12 17:12:10 +00:00
Dirk Dougherty
57b00e2bdf am 17f0d48c: am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services.
* commit '17f0d48ccf4ea817308e8cc3958d249bf77c2a2f':
  Update generated docs for Google Play Services.
2014-02-12 17:12:06 +00:00
Scott Main
aa318b2851 am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
* commit '879592d89a78383a9e3cd29d53357f34337e5f04':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
2014-02-12 17:09:06 +00:00
Dirk Dougherty
17f0d48ccf am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services.
* commit '8b6597bd07411ff3037d068dd0ef55d70ff18f18':
  Update generated docs for Google Play Services.
2014-02-12 17:09:03 +00:00
Scott Main
879592d89a am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
* commit 'bc64716cfb1269d07b64f89c3b46800afa5dc266':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
2014-02-12 17:06:32 +00:00
Dirk Dougherty
8b6597bd07 am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services.
* commit 'b6ecc342d3e9f355a78a0a10e613bbda31286f3a':
  Update generated docs for Google Play Services.
2014-02-12 17:06:26 +00:00
Scott Main
bc64716cfb am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
* commit 'a2739fa795981f597b044e93a5c552051cfe1c00':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
2014-02-12 17:03:26 +00:00
Dirk Dougherty
b6ecc342d3 am 37ae7032: am 1654264e: Update generated docs for Google Play Services.
* commit '37ae70326feebd23cf2b9c5254f1250d5bf3a029':
  Update generated docs for Google Play Services.
2014-02-12 17:03:22 +00:00
Scott Main
a2739fa795 am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
* commit 'a4c5bba07e121569ab504b2191ee576f09407f5b':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
2014-02-12 16:59:56 +00:00
Scott Main
a4c5bba07e add document about GoogleApiClient and one about GoogleAuthUtil
also remove the Authorization document from the Google Services
section.
bug:10679818

Change-Id: Ibfade1eca68d89afe30b79d75ca5e38a2b3a84a8
2014-02-12 08:54:49 -08:00
John Spurlock
e0a5c6ec5a am eb9e74b4: Merge "Simplify immersive mode confirmation cling logic."
* commit 'eb9e74b47b850e9462bc936222562b04a2d352c8':
  Simplify immersive mode confirmation cling logic.
2014-02-12 08:46:19 -08:00
John Spurlock
eb9e74b47b Merge "Simplify immersive mode confirmation cling logic." 2014-02-12 16:43:49 +00:00
Derek Sollenberger
e889298cd6 Refactor setting an SkPaint onto a hwui Layer.
This CL removes the unecessary JNI call to set the colorFilter on
a layer.

Change-Id: I9e088f888938d4315745aa618334bfdb9e61343a
2014-02-12 11:26:06 -05:00
John Spurlock
d9b70bdc1a Simplify immersive mode confirmation cling logic.
Instead of keeping track of confirmations per-package, track
a global confirmation per-user.  If the panic signal is received,
reshow the cling at most once per-user per-reboot.

Ensure the nav bar becomes visible after the panic signal.
Usually this happens as a side effect of showing the keyguard.
However, in the case where there is no keyguard (Security = None)
show the transient nav bar temporarily as a hint.

Also listen to the correct observer uri to pick up confirmation
setting changes.

Bug:12242125
Change-Id: Ic95e2a8630ec3802b8ef462fcaa92366b9343a3f
2014-02-12 10:33:21 -05:00
Chris Wren
1ed2f65a78 am ad8e18d4: Merge topic \'hun\'
* commit 'ad8e18d4908de84550dd45b1104afa31779e7f6e':
  use private notification for the heads up
  explicitly handle clicks on the heads up notification
2014-02-12 05:58:38 -08:00
Chris Wren
ad8e18d490 Merge topic 'hun'
* changes:
  use private notification for the heads up
  explicitly handle clicks on the heads up notification
2014-02-12 13:52:22 +00:00
Paul Duffin
75d67c6aa0 am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit 'd562a9b5160b491a9cc884f72651e46d786bdc0a':
  Improve Parcel's handling of non-primitive arrays
2014-02-12 02:29:41 -08:00