123731 Commits

Author SHA1 Message Date
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
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
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
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
Paul Duffin
d562a9b516 Merge "Improve Parcel's handling of non-primitive arrays" 2014-02-12 10:27:14 +00:00
Dianne Hackborn
4385d37813 Fix build.
At least part of what is broken.  Other stuff still seems to be.

(cherry picked from 32bb5fae353b5bb6275e75952e89c514c7369cee)

Change-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8
2014-02-12 10:11:34 +00:00
Narayan Kamath
aa98fb51a8 am f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit 'f991771f81953f5d355eb905d05a784ed7287016':
  Use size_t* in AssetManager::createIdmap
2014-02-12 01:40:24 -08:00
Narayan Kamath
f991771f81 Merge "Use size_t* in AssetManager::createIdmap" 2014-02-12 09:32:17 +00:00
Ken Wakasa
55f79f509f Fix typo in comments for supportsSwitchingToNextInputMethod
Change-Id: I387acd8ce3125c0d35e43757de7166a284da630b
2014-02-12 12:54:58 +09:00
Dirk Dougherty
37ae70326f am 1654264e: Update generated docs for Google Play Services.
* commit '1654264edd68adfd4347d12112aa3124f1d0acb9':
  Update generated docs for Google Play Services.
2014-02-12 03:13:19 +00:00
Dirk Dougherty
1654264edd Update generated docs for Google Play Services.
Change-Id: I6dab64736cd07b1ffb398d9baab21250552c5e17
2014-02-11 18:19:13 -08:00
Colin Cross
13221c9cff frameworks/base: move idmap from frameworks/native
idmap depends on libandroidfw, so it should go in frameworks/base.

Change-Id: I3c1db3baa355f53d6b523d60f4377e63eff00c30
2014-02-11 18:11:36 -08:00
Alan Viverette
451a3417e9 Add support for assigning keyed View tags via XML
BUG: 12768823
Change-Id: Ic55c88894dc153c0af0805e403ad8e40d13abcd2
2014-02-11 18:08:46 -08:00
Colin Cross
ecbeae74f2 Use size_t* in AssetManager::createIdmap
ResTable::createIdmap takes a size_t*, and the idmap command is
passing in a size_t*, make AssetManager::createIdmap take a
size_t*.  Should fix the mac build.

Change-Id: Idc16dedfe2aa7367c75f89a937a8242d494e8f8e
2014-02-11 18:02:06 -08:00
Scott Main
4b1c556965 am 7ef544f0: am dac4429f: am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '7ef544f07f3bb78d3a49c5cd60ad667964cedd57':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
2014-02-12 01:30:04 +00:00
Scott Main
7ef544f07f am dac4429f: am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit 'dac4429f21caffea61b626797afd142db5025e42':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
2014-02-12 01:26:35 +00:00
Scott Main
dac4429f21 am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '08d28f59bd74ab4109cf5343ef056a8d4b796ef6':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
2014-02-12 01:24:02 +00:00
Scott Main
08d28f59bd am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '6d1d21340fe6ca84fdef76dd6f9ba7c315b7a73e':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
2014-02-12 01:18:48 +00:00
Scott Main
6d1d21340f am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '11bb34da5f68f70f3350199e3578445d9a1eaae3':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
2014-02-12 01:15:25 +00:00
Scott Main
11bb34da5f am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '9854f69f75352e473e34410b0b298b7c7f04434a':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
2014-02-12 01:12:08 +00:00
Scott Main
9854f69f75 Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page" into klp-docs 2014-02-12 01:09:21 +00:00
Jeff Brown
1717eb1dc1 am a872c22a: (-s ours) am be83e4a0: am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE)
* commit 'a872c22aa4b252c55a4fccfb0f2ec501278179ad':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
2014-02-12 00:45:00 +00:00
Jeff Brown
a872c22aa4 am be83e4a0: am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE)
* commit 'be83e4a08e909b773ffc06a6e59446deadb8af8b':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
2014-02-12 00:41:49 +00:00
Jeff Brown
be83e4a08e am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE)
* commit '38f96e5020b3e82b98fe97b0be363a5ad185860f':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
2014-02-12 00:37:24 +00:00
Jeff Brown
47b32a0be1 Merge "Add support for injecting events into ActivityContainers." 2014-02-12 00:35:08 +00:00
Dianne Hackborn
340312efac am d9e385b1: Fix build.
* commit 'd9e385b111ebf811beb0f29178a2fbd4d667509f':
  Fix build.
2014-02-11 22:58:16 +00:00
Jeff Brown
ca9bc702df Add support for injecting events into ActivityContainers.
Modified ActivityView to inject touch events it receives back into
its activity container.  The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
2014-02-11 14:47:48 -08:00
Dianne Hackborn
d9e385b111 Fix build.
At least part of what is broken.  Other stuff still seems to be.

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
(cherry picked from commit 32bb5fae353b5bb6275e75952e89c514c7369cee)
2014-02-11 22:47:42 +00:00
Jeff Brown
38f96e5020 Add support for injecting events into ActivityContainers. (DO NOT MERGE)
Modified ActivityView to inject touch events it receives back into
its activity container.  The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.

Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
2014-02-11 14:43:04 -08:00
Jean-Michel Trivi
ed8bb0159c Merge "AudioTrack JNI function rename" 2014-02-11 22:38:27 +00:00
Dianne Hackborn
32bb5fae35 Fix build.
At least part of what is broken.  Other stuff still seems to be.

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
2014-02-11 14:22:14 -08:00
Chris Wren
464c7efcbc use private notification for the heads up
HUN only shows if the device is on and unlocked

Change-Id: Ib3f11bb9267b95c88ddb8bef0b321db79d68841b
2014-02-11 16:50:43 -05:00
Chris Wren
f29c3b4997 explicitly handle clicks on the heads up notification
Bug: 11900055
Change-Id: I45c955f7ac91dc9f59528e382e9df490f0f96be5
2014-02-11 16:49:52 -05:00