Commit Graph

41427 Commits

Author SHA1 Message Date
Alan Viverette
cfd3deef7d am 28d22bd2: am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
* commit '28d22bd23b219fc65eb80da04945fc0b72100040':
  Make SearchView styles public, remove public Holo styles added in L
2014-09-11 17:26:40 +00:00
George Mount
10dcaa134f am b13022fd: am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
* commit 'b13022fd5fc168a70cd833dc355ee7ae05938891':
  Fix ArrayIndexOutOfBoundsException.
2014-09-11 17:25:07 +00:00
Tao Bai
b1664bd741 am 42a3b372: am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev
* commit '42a3b372b5c41f5fe9b3c4e8645a924e32dd0443':
  Revise createIntent and parseResult API.
2014-09-11 17:24:48 +00:00
Craig Mautner
de1c660b36 am 242c891a: am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
* commit '242c891a8896977c90254a838b8f36fa165fdb6f':
  Wait for animation complete before completing boot
2014-09-11 17:24:32 +00:00
George Mount
6381c728ae am 92eba9f0: am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
* commit '92eba9f08abd508a849209c09328a3b1b3eb5c33':
  Move capturing entering views until just before transition.
2014-09-11 17:24:04 +00:00
Chet Haase
1368cbb2e9 am 35dc5ec9: am 969628cd: am 804df9eb: Use constant state in AnimatedVectorDrawable
* commit '35dc5ec9877b468cba32c60b729bfded559a5c5a':
  Use constant state in AnimatedVectorDrawable
2014-09-11 17:24:00 +00:00
Raph Levien
cfbcca8992 am 75e39a46: am fff6aab7: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
* commit '75e39a46e1df35bfd3f77b4583b31ca24888651e':
  Remove auto spaceifying behavior on paste
2014-09-11 17:23:07 +00:00
Jon Miranda
0b50acd03f am ea01c7d4: am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
* commit 'ea01c7d4ff251d6702ca687b5bf83f7928a30aaa':
  Tries to resolve reference resource names instead of its data.
2014-09-11 17:22:44 +00:00
Eino-Ville Talvala
c060183610 am 88720d12: am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
* commit '88720d12694af351811572c3de80e9a1eae7c637':
  Camera2: Allow captures right after abort
2014-09-11 17:22:02 +00:00
Robert Greenwalt
500c2e7c2c am efee3dea: am 5ad894d6: am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev
* commit 'efee3dea05d39d458519c259604394da91a7a722':
  Don't accept score below 0.
2014-09-11 14:16:53 +00:00
Jeff Davidson
9441a44c6d am e966d4d8: am 426a5429: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev
* commit 'e966d4d86c140b059158504e615042daa7d8e04f':
  Update unclear Fragment Javadoc.
2014-09-11 14:15:50 +00:00
Ruben Brunk
09f0d12d3a am 2868a44d: am 7ac22597: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev
* commit '2868a44d846345308fd0784ee3a31b280af66e9f':
  camera2: Fix preview stretching in LEGACY mode.
2014-09-11 14:15:03 +00:00
Esteban Talavera
92f2cadf07 am bfb49179: am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev
* commit 'bfb491793470f70cddcc7433a68f072a752aec41':
  Update string value for provisioning action and extra
2014-09-11 14:14:34 +00:00
Jason Monk
b01080dcd2 am b92f1d78: am 6a747735: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev
* commit 'b92f1d7809da77cdef37d8ea2fff7a6beeb0094d':
  Move zen mode constants and code to framework
2014-09-11 14:13:51 +00:00
John Spurlock
7377b57689 am cbd0cdc2: am 736196b2: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev
* commit 'cbd0cdc297a140179b583c613591933d6fa8a643':
  Zen: make Condition available over @SystemApi
2014-09-11 14:13:45 +00:00
George Mount
5aadc5e322 am 57980dca: am 568b3fe9: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev
* commit '57980dca613fee54e4993ea3cd12dd928b1fe007':
  Use intrinsic size for path animation in AnimatedVectorDrawable
2014-09-11 14:13:37 +00:00
George Mount
9f874eaaaf am c58233b2: am 557b3f66: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev
* commit 'c58233b2a4c6f51eafd2be5544bbcf45faa9a7ec':
  Fix fade transition not working with Activity Transitions.
2014-09-11 14:13:32 +00:00
John Spurlock
613d076fa5 am 56e64b2a: am 88c61af5: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev
* commit '56e64b2a589a09786caa1eb1d9bfa59292a227f2':
  Zen: Make condition providers available via @SystemApi.
2014-09-11 14:13:24 +00:00
Adrian Roos
b6b356c07e am c52a9597: am 99006f6c: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev
* commit 'c52a95973ebacd5afcd6b2ae4937983726493d25':
  Add system trust agents on first boot or when adding user
2014-09-11 14:12:53 +00:00
Kenny Guy
fa16ba6727 am 39a0254d: am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev
* commit '39a0254dbfdd170f85602db395a5144f9dd77870':
  Remember userId when stripping / rebuilding notification.
2014-09-11 14:12:46 +00:00
Christoph Studer
cbbfdd93ce am 7e972136: am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev
* commit '7e97213689ca26aad243f5a5009c39f616298619':
  NoLiService: Delete @removed meetsInterruptionFilter
2014-09-11 14:12:41 +00:00
Christoph Studer
2c17ed07ec am 10afc04f: am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev
* commit '10afc04f80b3ae27f5d56f4f7a10ffd36366b432':
  Notification: Use ViewStub for ProgressBar
2014-09-11 14:12:36 +00:00
Adam Connors
de2f85e871 am 94705219: am 50c161df: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
* commit '94705219a13a9d8909c4502eac493d3ef9459403':
  Add feature flags for verified boot and securely remove users.
2014-09-11 14:12:28 +00:00
Alan Viverette
6b398e03c7 am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
* commit '1c19026dadb9d6013f48901aaf1e6451b42f0977':
  Make SearchView styles public, remove public Holo styles added in L
2014-09-10 23:38:16 +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
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
George Mount
11aa55502e am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
* commit '86d1c5d370576447d7c7c713bf0f258023a1c3d4':
  Fix ArrayIndexOutOfBoundsException.
2014-09-10 21:55:20 +00:00
Tao Bai
96bca16a43 am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev
* commit 'cdad4651a1e93b0cfe2b199e39e5583ce9a19454':
  Revise createIntent and parseResult API.
2014-09-10 21:55:15 +00:00
Craig Mautner
c787572762 am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
* commit '99a902ed763df87484342899ebe33aa3744be420':
  Wait for animation complete before completing boot
2014-09-10 21:55:05 +00:00
George Mount
05c4f7ad76 Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev 2014-09-10 21:47:58 +00:00
Tao Bai
bebc56209d Merge "Revise createIntent and parseResult API." into lmp-dev 2014-09-10 21:43:04 +00:00
George Mount
2e9616354c am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
* commit '7726c7408402872e57c36bc23add1f387ff5eb71':
  Move capturing entering views until just before transition.
2014-09-10 21:38:34 +00:00
Chet Haase
da789748f3 am 969628cd: am 804df9eb: Use constant state in AnimatedVectorDrawable
* commit '969628cdad8f3ba8581c01c0ffbf2b224196e979':
  Use constant state in AnimatedVectorDrawable
2014-09-10 21:38:29 +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
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
03d291fd5b am fff6aab7: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
* commit 'fff6aab7826321c6005987ef4bfc88ae695ac0aa':
  Remove auto spaceifying behavior on paste
2014-09-10 21:16:49 +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
7296d609f9 am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
* commit 'a8ced9220ac8f946d5bc5d1584981434eecb562b':
  Tries to resolve reference resource names instead of its data.
2014-09-10 20:53:25 +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
7c715ae007 am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
* commit '6b63cd118f2c3a82453c30618339092fa5d30323':
  Camera2: Allow captures right after abort
2014-09-10 20:04:08 +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
9fd4d3ce5b am 5ad894d6: am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev
* commit '5ad894d6a1e24949590ca261f303db190043ca70':
  Don't accept score below 0.
2014-09-10 19:47:50 +00:00
Robert Greenwalt
8c9e975c44 Merge "Don't accept score below 0." into lmp-dev 2014-09-10 19:30:22 +00:00
Jeff Davidson
a9a1449dad am 426a5429: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev
* commit '426a54290911d4ccbec5e139f42d1b472ea42138':
  Update unclear Fragment Javadoc.
2014-09-10 18:04:28 +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
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
Ruben Brunk
385c4d7a02 am 7ac22597: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev
* commit '7ac225974bc65256888c9825d1effc87e121145f':
  camera2: Fix preview stretching in LEGACY mode.
2014-09-10 17:32:17 +00: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