George Mount
830593ee70
am aeb0a9db: am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev automerge: 8a536bb
...
* commit 'aeb0a9dba297a027344bc91e8b9e33c84c450876':
Fix NPE in moveSharedElementsToOverlay
2014-10-28 19:05:50 +00:00
George Mount
7883be77e5
am c1423972: am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev automerge: 69a3dd8
...
* commit 'c1423972727f59a02ca1bc3e55f694e9a27b82d5':
Fixed: Nested shared elements now transition separately.
2014-10-28 19:05:47 +00:00
Nicolas Prevot
755c098042
am ecdc14dc: am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev automerge: e86848c
...
* commit 'ecdc14dc31ba22f2569be5c8850d0d09a1a0c0a4':
Replace minimum with maximum in method description.
2014-10-28 18:15:59 +00:00
George Mount
aeb0a9dba2
am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
...
automerge: 8a536bb
2014-10-28 18:06:58 +00:00
George Mount
c142397272
am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
...
automerge: 69a3dd8
2014-10-28 18:06:04 +00:00
Nicolas Prevot
ecdc14dc31
am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
...
automerge: e86848c
2014-10-28 18:05:09 +00:00
George Mount
95d520f160
Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
2014-10-28 17:01:25 +00:00
George Mount
45b701085b
Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
2014-10-28 17:00:43 +00:00
Nicolas Prevot
555f1986f1
Replace minimum with maximum in method description.
...
BUG:18152344
Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
2014-10-28 16:18:47 +00:00
Erik Kline
ecb2397c33
am e9810e8d: Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4 automerge: 8fc600d
...
* commit 'e9810e8d532d87d23d3824d6165824a2da0cfee9':
(re)define the definition of "provisioned"
2014-10-28 09:00:20 +00:00
Lorenzo Colitti
8a140ccfe3
am 9d6f408a: am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev automerge: 35261c4
...
* commit '9d6f408ab5a3fc12a1cae2ffba928c79df74739c':
Change removeStackedLink to take an interface name.
2014-10-28 08:55:55 +00:00
Erik Kline
e9810e8d53
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4
...
automerge: 8fc600d
2014-10-28 08:54:03 +00:00
Lorenzo Colitti
9d6f408ab5
am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
...
automerge: 35261c4
2014-10-28 08:50:41 +00:00
Erik Kline
dd91fb4474
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
2014-10-28 07:53:37 +00:00
Alan Viverette
caa44c4812
am 52f67ffc: Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev automerge: e5d27a2 automerge: 8e448af
...
* commit '52f67ffc5ddb1994eb03c6687a89eccec8f60885':
Play CLICK sound effect when compound buttons are clicked
2014-10-28 07:17:21 +00:00
John Reck
a8f1bce008
am c7c8b069: Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad automerge: 49a01fc
...
* commit 'c7c8b069407236bcc04c086912c73002d48419ef':
Cleanup debug options
2014-10-28 07:17:03 +00:00
Alan Viverette
3ed8a3131b
am 7a21011a: Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev automerge: 3847552 automerge: 5a01fcd
...
* commit '7a21011a2de6dac1ccccea94998b2677f22e4b8e':
Fix min/max date range in DatePicker calendar mode
2014-10-28 07:16:59 +00:00
Alan Viverette
b21e2e392b
am 7e79fd3e: Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b automerge: b64176b
...
* commit '7e79fd3ee2e9b1f27f20fec7eaa4353bbdf1bab2':
Clean up some javadocs in Window.setFeature...()
2014-10-28 07:16:51 +00:00
Jeff Sharkey
6007da7b73
am a148a0dc: Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 automerge: a5921b9
...
* commit 'a148a0dc667ac35599a35a46f2232f0128269d78':
Drop DEV network stats to save RAM.
2014-10-28 07:16:34 +00:00
Dake Gu
286918f718
am 54aad953: am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev automerge: 63964d9
...
* commit '54aad9533646d3e4ebbf474858112d61424f9b6d':
ActivityTransition: Encode scaleType and matrix in snapshot view
2014-10-28 07:16:30 +00:00
Jeff Sharkey
23801ccafb
am 1c665948: am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev automerge: 301b563
...
* commit '1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7':
Reduce PackageManager RAM usage: ArrayMap/Set.
2014-10-28 07:16:25 +00:00
George Mount
24bf96f0a2
am 06e74b30: am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev automerge: 7b042be
...
* commit '06e74b30aebe38c93d55e1ffc05493c3c9941f52':
Fix transition being canceled improperly.
2014-10-28 07:15:39 +00:00
George Mount
5d0e36e692
am 8b92704f: am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev automerge: 3437192
...
* commit '8b92704f021fa4f33fcac5a50442b2f5259d198b':
Add resizeClip attribute to ChangeBounds.
2014-10-28 07:15:34 +00:00
Lorenzo Colitti
111cc9f511
Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
2014-10-28 07:00:31 +00:00
Lorenzo Colitti
f3cab63ef2
Change removeStackedLink to take an interface name.
...
This simplifies callers.
Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.
Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
2014-10-28 15:13:57 +09:00
Erik Kline
d3b9fd33c6
(re)define the definition of "provisioned"
...
Specifically:
[1] provide a hasIPv4(), and
[2] a hasIPv6()
each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.
Additionally:
[3] redefine isProvisioned() to return the logical OR
of [1] and [2] above.
Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".
Bug: 17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
2014-10-28 14:47:42 +09:00
Alan Viverette
52f67ffc5d
Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev automerge: e5d27a2
...
automerge: 8e448af
2014-10-28 03:39:26 +00:00
Alan Viverette
e5d27a22a6
Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev
2014-10-28 00:57:11 +00:00
Alan Viverette
d4e7790fee
Play CLICK sound effect when compound buttons are clicked
...
Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.
BUG: 16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5
2014-10-27 17:50:51 -07:00
John Reck
c7c8b06940
Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad
...
automerge: 49a01fc
2014-10-28 00:35:14 +00:00
Alan Viverette
7a21011a2d
Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev automerge: 3847552
...
automerge: 5a01fcd
2014-10-28 00:34:22 +00:00
Alan Viverette
7e79fd3ee2
Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b
...
automerge: b64176b
2014-10-28 00:32:19 +00:00
Jeff Sharkey
a148a0dc66
Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527
...
automerge: a5921b9
2014-10-28 00:27:07 +00:00
John Reck
b0aeaad442
Merge "Cleanup debug options" into lmp-mr1-dev
2014-10-27 23:27:30 +00:00
Alan Viverette
384755230c
Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev
2014-10-27 23:16:26 +00:00
Alan Viverette
253626b822
Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev
2014-10-27 22:39:12 +00:00
Dake Gu
54aad95336
am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
...
automerge: 63964d9
2014-10-27 21:34:58 +00:00
Jeff Sharkey
1c6659486c
am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
...
automerge: 301b563
2014-10-27 21:33:55 +00:00
George Mount
eca1ae5e44
Fix NPE in moveSharedElementsToOverlay
...
Bug 18119532
Change-Id: I334bda2d63427032583a15a483e000412024c150
2014-10-27 14:25:12 -07:00
George Mount
06e74b30ae
am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev
...
automerge: 7b042be
2014-10-27 21:22:49 +00:00
George Mount
8b92704f02
am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev
...
automerge: 3437192
2014-10-27 21:21:18 +00:00
Jeff Sharkey
49c1527cd5
Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev
2014-10-27 20:38:06 +00:00
Dake Gu
4c2e3491ec
Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
2014-10-27 20:23:28 +00:00
Jeff Sharkey
e67b8d2829
Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
2014-10-27 19:57:00 +00:00
John Reck
23d307c8d8
Cleanup debug options
...
Bug: 18138852
Bug: 18065434
Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00
2014-10-27 12:43:25 -07:00
George Mount
e0f76e9a6d
Merge "Fix transition being canceled improperly." into lmp-mr1-dev
2014-10-27 14:31:29 +00:00
George Mount
03d5c6f55b
Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev
2014-10-27 14:30:34 +00:00
Svet Ganov
5329b48404
am a6a440b6: am b32f04b7: Merge "Printing from two apps at the same time not working." into lmp-mr1-dev automerge: 5e1e4ef
...
* commit 'a6a440b69114ec74502c52254059a9c902d4f6d4':
Printing from two apps at the same time not working.
2014-10-25 03:41:48 +00:00
George Mount
8652102d3f
am a618afc0: am 511452cf: am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
...
* commit 'a618afc0c76ceefc9a0fb4dd9c1b5f7685e0e84e':
Fix NPE when rejected snapshots are null.
2014-10-25 02:36:40 +00:00
Svetoslav
cd34983dfa
am 89e5035d: am dcf21b96: Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev automerge: 74a4a8d
...
* commit '89e5035da643369b857ebc87d11aa5190b1fb8df':
Enhance computation of click point for accessibility.
2014-10-25 02:36:18 +00:00
