Commit Graph

40423 Commits

Author SHA1 Message Date
Svetoslav Ganov
47f09dc91c am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev
* commit 'f0ccea9264761b45d55f7d98c234cfb3afde79be':
  Using the correct package name for ContentResolver
2014-09-11 15:59:34 +00:00
Dianne Hackborn
35fc269dc6 am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev
* commit 'b4ee4428d34002aea54e9dc62902f14dedf69604':
  Fix issue #17428001: Fix revokeUriPermissions
2014-09-11 15:59:19 +00:00
Lajos Molnar
b8f6ebf028 am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
* commit '3b22910c898f26e604f7823b65c0f4d02e396ffb':
  add android.util.SizeF.parseSizeF()
2014-09-11 15:59:15 +00:00
Alan Viverette
d509a2dfa6 am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
* commit '78f863c7c00948817ede61ec59e47c990009b00d':
  Fix docs and nulling behavior for TextView.setCompoundDrawables
2014-09-11 15:58:35 +00:00
Alan Viverette
cdd5221105 am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
* commit '8b5ef83e1ba6ae3584d041654726315e996fe2d5':
  Make SearchView styles public, remove public Holo styles added in L
2014-09-11 15:58:27 +00:00
Svetoslav Ganov
b1467faa23 Merge "Using the correct package name for ContentResolver" into lmp-dev 2014-09-11 01:21:21 +00:00
Dianne Hackborn
547f6e1803 Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 2014-09-11 00:55:25 +00:00
Lajos Molnar
5b54c9fb2a Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 2014-09-11 00:55:06 +00:00
Alan Viverette
593f2d33bb Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev 2014-09-10 23:31:04 +00:00
Alan Viverette
7ff0270e7d Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 2014-09-10 23:29:13 +00:00
Dianne Hackborn
192679a7d3 Fix issue #17428001: Fix revokeUriPermissions
You can now revoke permissions that were granted to you.

Change-Id: I9a1872059edc715b10bbd2d653e45420d43331c3
2014-09-10 16:20:24 -07:00
Alan Viverette
362f984df3 Make SearchView styles public, remove public Holo styles added in L
We shouldn't adding styles for a deprecated theme. Also this cleans up
the removed public resources for easier deletion later.

BUG: 17455273
Change-Id: I2c5caf354aab91463702f25c38f0dd29c153ba44
2014-09-10 16:05:35 -07:00
Xin Guan
2bcb97bfb5 Using the correct package name for ContentResolver
Change-Id: I0518391f7262c78043fbd42ddfefef0f2451382c
2014-09-10 15:19:16 -07:00
George Mount
9b727adc6c am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
* commit '0b46b9133b6c7d19c316d9d8ae472aafdfce4029':
  Fix ArrayIndexOutOfBoundsException.
2014-09-10 21:51:54 +00:00
Tao Bai
a0df890b46 am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev
* commit '3350edacefea92e2dfb5ad07a7b719334db8f157':
  Revise createIntent and parseResult API.
2014-09-10 21:51:50 +00:00
George Mount
05c4f7ad76 Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev 2014-09-10 21:47:58 +00:00
Craig Mautner
9830962083 am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
* commit 'cef60b6ac6e490803a1b14d4a4214e097cc5d269':
  Wait for animation complete before completing boot
2014-09-10 21:46:57 +00:00
Tao Bai
bebc56209d Merge "Revise createIntent and parseResult API." into lmp-dev 2014-09-10 21:43:04 +00:00
Craig Mautner
ebcd9189e3 Merge "Wait for animation complete before completing boot" into lmp-dev 2014-09-10 21:33:43 +00:00
George Mount
d56c779602 am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
* commit 'b74b8d498f584dc5b51b67190da45e266f95edf3':
  Move capturing entering views until just before transition.
2014-09-10 21:32:08 +00:00
Chet Haase
f4e67d69c7 am 804df9eb: Use constant state in AnimatedVectorDrawable
* commit '804df9eb62ed13668aacbd1609640a92846932f9':
  Use constant state in AnimatedVectorDrawable
2014-09-10 21:26:49 +00:00
George Mount
4245e161c6 Merge "Move capturing entering views until just before transition." into lmp-dev 2014-09-10 21:26:23 +00:00
Chet Haase
6f6578e81c Use constant state in AnimatedVectorDrawable
Complex animated vector drawables can be expensive to load due to
sub-optimal parsing of the String-based pathData. Suffering that penalty
every time the same drawable is loaded (such as material-themed
ProgressBars) is painful.

The new approach caches constant state of both the VectorDrawable (including
the pathData geometry) and the animators (which includes potentially expensive
path-based interpolators).

issue #17366831 Material ProgressBar taking 200+ms to inflate

Change-Id: Iba3b541e24cfce8c07f5aa9fe6aa7d7b92b2fe1c
2014-09-10 21:21:53 +00:00
Raph Levien
968882e760 am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
* commit 'a31b4f03f6a98edcd8ae97900e9b1b24957ae4e0':
  Remove auto spaceifying behavior on paste
2014-09-10 21:05:25 +00:00
Raph Levien
20dbc370e3 Merge "Remove auto spaceifying behavior on paste" into lmp-dev 2014-09-10 20:55:51 +00:00
Jon Miranda
90981b1311 am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
* commit 'cfb0664eb37e09ed352991f65dc7135ba00f5fa6':
  Tries to resolve reference resource names instead of its data.
2014-09-10 20:43:05 +00:00
Jon Miranda
83e3ec9d4e Merge "Tries to resolve reference resource names instead of its data." into lmp-dev 2014-09-10 20:34:08 +00:00
Eino-Ville Talvala
b8dbb01409 am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
* commit '90229edc689b3faebe215ce4841d1bf39d848bb5':
  Camera2: Allow captures right after abort
2014-09-10 19:52:53 +00:00
Eino-Ville Talvala
657d30e7f4 Merge "Camera2: Allow captures right after abort" into lmp-dev 2014-09-10 19:48:21 +00:00
Robert Greenwalt
e2d31a26f0 am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev
* commit 'eb843b1461bba376be9dd9448bff1d8b06e25e59':
  Don't accept score below 0.
2014-09-10 19:37:18 +00:00
Robert Greenwalt
8c9e975c44 Merge "Don't accept score below 0." into lmp-dev 2014-09-10 19:30:22 +00:00
Raph Levien
5a689ce78e Remove auto spaceifying behavior on paste
The paste action contained some logic to automatically insert or remove
spaces, basically to emulate the semantics of the text being a sequence
of space-separated words. This was never universally loved, and gives
particularly unexpected behavior with a hardware keyboard.

This patch simply removes the logic to automatically adjust spaces on
paste, so what gets pasted is simply the literal buffer contents.

Bug: 16900326
Bug: 3304489
Change-Id: I5cdf9c43d98a17aa708883b47245aa7929a124d2
2014-09-10 11:03:18 -07:00
Jeff Davidson
65dfe5317a am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev
* commit 'cfd0e5c15a752fec962bee3b82b10cf95bb90315':
  Update unclear Fragment Javadoc.
2014-09-10 17:53:11 +00:00
Jeff Davidson
6cb95276c3 Merge "Update unclear Fragment Javadoc." into lmp-dev 2014-09-10 17:46:21 +00:00
Robert Greenwalt
35f7a94c84 Don't accept score below 0.
Network Factories are allowed to go below, but networks need to be
constrained.  Allowing the network to go below 0 meant that -1 could
sometimes leak through and foul the logic.

The core of 17361330 will be fixed when we stop sending scores for
listens to NetworkFactories, but it exposed this issue too.  Summary:

1 - add a network listener.  This isn't  a request so it's not sent
to networks.
2 - alter your score (ethernet sets score to -1 when the link goes
down) (16:07:39.782)
3 - a bug in ConnectivityService causes score changes to get sent for
all network requests and network listeners causing NetworkFactories
to no see 2 entities.  This bug will be fixed by a pending change
(https://googleplex-android-review.googlesource.com/#/c/540840/).
This causes the ethernet NetworkFactory to see two entities, both
served by networks of score -1.  (16:07:39.989)
4 - disconnect Ethernet - this only sends 0 scores for known
requests, not network listeners.  Had it been sent for both entities
they both would have evaluated that the networkfactory score (-1)
was lower than the request score (0) and both released their
refcount. (16:08:03.147)
5 - this means the listener is tracked by the EthernetNetworkFactory
with a score of -1 while the factory itself has a score of -1 so the
network release isn't called.

bug:17361330
Change-Id: Ife34ca0f9c233dd3c3df80f6fea580af43afcdeb
2014-09-10 10:39:37 -07:00
Craig Mautner
6e2f395a86 Wait for animation complete before completing boot
Defer the boot process in ActivityManagerService,
WindowManagerService and PowerManagerService until the boot
animation has completed.

Fixes bug 16309312.

Change-Id: Ic5e0d627ca4ded3e211c5d2afece89da40d34642
2014-09-10 10:29:39 -07:00
Ruben Brunk
b0e0fd61f7 am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev
* commit '17fcb2556b1c04a42398738dcc1ad491b3597aa7':
  camera2: Fix preview stretching in LEGACY mode.
2014-09-10 17:20:58 +00:00
Ruben Brunk
a3256cd3e7 Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 2014-09-10 17:11:21 +00:00
Esteban Talavera
964a03bcaa am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev
* commit '55bffb5041e18f2cf6884841165c2bbaf9576b98':
  Update string value for provisioning action and extra
2014-09-10 17:06:45 +00:00
Esteban Talavera
df980618a3 Merge "Update string value for provisioning action and extra" into lmp-dev 2014-09-10 16:26:50 +00:00
Jason Monk
e66afcdb46 am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev
* commit '473d27fa34875083dfea48e933c2e9300979c64a':
  Move zen mode constants and code to framework
2014-09-10 15:10:24 +00:00
Jason Monk
c8e4fa41f2 Merge "Move zen mode constants and code to framework" into lmp-dev 2014-09-10 15:00:20 +00:00
John Spurlock
ee0d27f3d0 am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev
* commit '821268455ca57051983c0e5f8cc24695033be174':
  Zen: make Condition available over @SystemApi
2014-09-10 14:54:35 +00:00
John Spurlock
3e5d59c365 Merge "Zen: make Condition available over @SystemApi" into lmp-dev 2014-09-10 14:46:20 +00:00
John Spurlock
9034f2452b Zen: make Condition available over @SystemApi
Fix build.

Bug:16819503
Change-Id: I011723a770a9a8b7fc8124defd56137ec5f1704e
2014-09-10 10:42:13 -04:00
George Mount
ac0c86b344 am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev
* commit '1fac2ba1c9577f88cf93e88794780af9b5eacb1b':
  Use intrinsic size for path animation in AnimatedVectorDrawable
2014-09-10 14:38:19 +00:00
George Mount
87995ee2be am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev
* commit 'bfbb5882cb2e11d9a201e4f5ade6a3fe9f43e6b0':
  Fix fade transition not working with Activity Transitions.
2014-09-10 14:38:15 +00:00
George Mount
b7d63aedf5 Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 2014-09-10 14:30:17 +00:00
George Mount
cb0567f98c Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 2014-09-10 14:29:59 +00:00
John Spurlock
7456ae83e8 am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev
* commit '3a972844e934b1031d73bfb114d84a7d2f8d4b19':
  Zen: Make condition providers available via @SystemApi.
2014-09-10 13:45:09 +00:00