Commit Graph

41091 Commits

Author SHA1 Message Date
Chris Craik
b73b8e8f35 am a432b4d0: am 12902a44: am 8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev
* commit 'a432b4d090789d420f0beae177b257b56e331ed0':
  Replace native crash with IAE when calling picture.draw() w/ a HW canvas
2014-09-05 18:22:12 +00:00
Chris Craik
aab1c9bfec am 12902a44: am 8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev
* commit '12902a4442cb985e9494d944a7d7e9921e561fa1':
  Replace native crash with IAE when calling picture.draw() w/ a HW canvas
2014-09-05 18:09:52 +00:00
George Mount
9ee0ca2744 am 4b97ca76: am a0031cbc: am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev
* commit '4b97ca7682cde8eeec281efd488189b46ca4c986':
  API Review: Improve javadoc.
2014-09-05 17:52:27 +00:00
Chris Craik
def8a37128 Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 2014-09-05 17:49:20 +00:00
George Mount
c66e35b889 am a0031cbc: am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev
* commit 'a0031cbcfe2329cdc1c2834a9817ac5c2725a34f':
  API Review: Improve javadoc.
2014-09-05 17:42:20 +00:00
Svetoslav
de5684b5a7 am 35c2aca2: am 1d85c1a4: am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev
* commit '35c2aca25a56efc9479f03094052f16cf7f94219':
  Update FrameStats API per api-council request.
2014-09-05 17:35:27 +00:00
Svetoslav
13daae1862 am 170ace43: am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev
* commit '170ace439d91cb86f7b5b6f8129d44e2e5c40d61':
  Addressing API council comments for UserManager.
2014-09-05 17:35:22 +00:00
Amith Yamasani
ae76e4c99c am e6f95718: am 0acac4f5: am 3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev
* commit 'e6f95718f30720ec9ef02f326b21c7499aae476e':
  Remove class that was moved to a different package.
2014-09-05 17:35:13 +00:00
Chris Craik
96890564bd Replace native crash with IAE when calling picture.draw() w/ a HW canvas
bug:17397958
Change-Id: I75f942db0e604f9fd6ab31e6c81f718c0f57b16a
2014-09-05 10:33:39 -07:00
George Mount
0ff16cf43a Merge "API Review: Improve javadoc." into lmp-dev 2014-09-05 17:29:29 +00:00
George Mount
f9557619a7 API Review: Improve javadoc.
Bug 17189781
Also rename PatternMotion to PatternPathMotion

Change-Id: I1c4dcbdd65e33cf9de1504277e31f9f7ede0380d
2014-09-05 10:27:27 -07:00
Svetoslav
7b9d7bc1d4 am 1d85c1a4: am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev
* commit '1d85c1a4d3cf65a22907c5cb7f47f1e8765df832':
  Update FrameStats API per api-council request.
2014-09-05 17:24:39 +00:00
Svetoslav
79391c3c5d am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev
* commit '35952bf0e8fd0ace78b015c3cde29b322cd939bb':
  Addressing API council comments for UserManager.
2014-09-05 17:24:34 +00:00
Amith Yamasani
d48509d568 am 0acac4f5: am 3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev
* commit '0acac4f509db1bca7fece43550da8a0d558cfb9d':
  Remove class that was moved to a different package.
2014-09-05 17:24:24 +00:00
Jeff Sharkey
199f51ce30 am be5a66f7: am b4733a8d: am e7bea8e5: Merge "Move Size parceling to Bundle." into lmp-dev
* commit 'be5a66f706fdffe5eb0e9e744b94a5cd73d58e4a':
  Move Size parceling to Bundle.
2014-09-05 17:19:40 +00:00
Amith Yamasani
7fd339a2be am 86acf269: am 90f3b5ad: am 0c3b7b15: Merge "Don\'t allow guests to install from unknown sources" into lmp-dev
* commit '86acf269215992eb4d79eef9cad58986fd42dac4':
  Don't allow guests to install from unknown sources
2014-09-05 17:19:30 +00:00
Robert Greenwalt
683aba53f8 am 9d869562: am b6b07686: am a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev
* commit '9d869562cbcb9cabcba58320fdc3f6f5632809a9':
  Fix networking API per scripting checks.
2014-09-05 17:18:46 +00:00
Dharmesh Mokani
140616a89c am 6feba6b6: am 0b230ea6: am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev
* commit '6feba6b61ecddcb93a2b33a2ea52daad6cf70bd5':
  Address API review comment:AlwaysOnHotwordDetector
2014-09-05 17:18:26 +00:00
Alexandra Gherghina
f32a644580 am 1d42993c: am c0e7e74c: am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev
* commit '1d42993c437ff287f0507128ed07b2c6ff9f545e':
  Rename intent extra following API review
2014-09-05 17:18:16 +00:00
Marcin Kosiba
7dcb4e6c3e am 9257e8e4: am e9c1cb95: am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
* commit '9257e8e46234095a09c8678dc5cb4eefc09afedf':
  Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
2014-09-05 17:18:11 +00:00
Chris Wren
e341247c58 am a849cbc0: am 7b45868e: am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev
* commit 'a849cbc0f870791acfd3dd3698cc81256ac1db6e':
  Keep contact affinities separate across users.
2014-09-05 17:18:05 +00:00
Esteban Talavera
d8dd59afd8 am 07dfb259: am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev
* commit '07dfb259b5af6921ec80588df2d01f28805e8b15':
  Changed value of EXTRAs to match constant name in code.
2014-09-05 17:17:53 +00:00
Jeff Sharkey
8277cb60d8 am b4733a8d: am e7bea8e5: Merge "Move Size parceling to Bundle." into lmp-dev
* commit 'b4733a8dad31e10bba8a04ccefbf9016d7fd670b':
  Move Size parceling to Bundle.
2014-09-05 17:09:55 +00:00
Svetoslav
c5564b8c0e Merge "Update FrameStats API per api-council request." into lmp-dev 2014-09-05 17:09:45 +00:00
Amith Yamasani
aa0ac1a04f am 90f3b5ad: am 0c3b7b15: Merge "Don\'t allow guests to install from unknown sources" into lmp-dev
* commit '90f3b5ad76ca3c38fb9ed23f79869eee4ebdfb39':
  Don't allow guests to install from unknown sources
2014-09-05 17:09:42 +00:00
Robert Greenwalt
c049708d52 am b6b07686: am a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev
* commit 'b6b076866bad5b8a7550d469ce73128b963fc18f':
  Fix networking API per scripting checks.
2014-09-05 17:09:06 +00:00
Dharmesh Mokani
1ba5f6a2d1 am 0b230ea6: am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev
* commit '0b230ea6eb3902e5ee308d7974c521715d1191fb':
  Address API review comment:AlwaysOnHotwordDetector
2014-09-05 17:08:42 +00:00
Svetoslav
e2da374d6e Merge "Addressing API council comments for UserManager." into lmp-dev 2014-09-05 17:08:12 +00:00
Alexandra Gherghina
4a08f484cc am c0e7e74c: am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev
* commit 'c0e7e74c9cb418f24d67c192543681d652c16cfc':
  Rename intent extra following API review
2014-09-05 17:07:39 +00:00
Marcin Kosiba
1f5d122b2d am e9c1cb95: am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
* commit 'e9c1cb958a1b1caa0ab7a9b31fa4f10798f972da':
  Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
2014-09-05 17:07:35 +00:00
Chris Wren
b57da35784 am 7b45868e: am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev
* commit '7b45868e6083af082c232e32f48ebf24250f317d':
  Keep contact affinities separate across users.
2014-09-05 17:07:30 +00:00
Esteban Talavera
c8cf27016d am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev
* commit '4414705e57f8f090ccc99ca39613827d7f650612':
  Changed value of EXTRAs to match constant name in code.
2014-09-05 17:07:19 +00:00
Svetoslav
53dcd394aa Update FrameStats API per api-council request.
bug:17390382

Change-Id: I50518834569f4d0ec394709294537256f03530e0
2014-09-05 10:07:02 -07:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager.
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
2014-09-05 10:07:02 -07:00
Amith Yamasani
d50f8c46f6 Merge "Remove class that was moved to a different package." into lmp-dev 2014-09-05 17:03:31 +00:00
Jeff Sharkey
d3cc74cac2 Merge "Move Size parceling to Bundle." into lmp-dev 2014-09-05 16:46:00 +00:00
Amith Yamasani
36d8d25860 Remove class that was moved to a different package.
Completes the API change.

Bug: 17006805
Change-Id: I5031e05df6b1a317a902482274eb056ecaf5dfbb
2014-09-05 09:42:59 -07:00
Amith Yamasani
a240d8377a Merge "Don't allow guests to install from unknown sources" into lmp-dev 2014-09-05 16:32:30 +00:00
Robert Greenwalt
a0843f4967 Merge "Fix networking API per scripting checks." into lmp-dev 2014-09-05 16:17:26 +00:00
Jeff Sharkey
5ef33984d0 Move Size parceling to Bundle.
Size itself shouldn't be Parcelable, since that would be a layering
violation.

Bug: 17390381
Change-Id: Ica62709bd889db51c916c550a0146714b002baa3
2014-09-05 09:07:35 -07:00
Dharmesh Mokani
19b210c98c Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 2014-09-05 15:56:17 +00:00
George Mount
0a6f664ff2 am b7c6a799: am 86d466b3: am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev
* commit 'b7c6a7990a59a70ab1876f7e6a1322a92fbcc4ed':
  Fix selection of epicenter in Activity Transitions.
2014-09-05 15:55:47 +00:00
George Mount
e4bf22a740 am 6629a210: am f43c2592: am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev
* commit '6629a21012a09b30ba50446aa9fdf901d803afd9':
  Fix NPE when Window disappears during a transition.
2014-09-05 15:55:42 +00:00
George Mount
729aa5b2b6 am a538aac4: am e389d9d0: am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev
* commit 'a538aac40e100719fbcfd24b87aab48e29ae31eb':
  API Review: Change SharedElementListener to SharedElementCallback.
2014-09-05 15:55:20 +00:00
Martin Kosiba
87396dae15 am 4b9fd335: am f5969458: am c3ec88fd: Merge "Change WebView.zoomBy return type to void." into lmp-dev
* commit '4b9fd3354d3bcc033060b118cf5b109996b1e626':
  Change WebView.zoomBy return type to void.
2014-09-05 15:55:04 +00:00
Winson Chung
30618384f6 am 3407514f: am 69c8df27: am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev
* commit '3407514fb9a96f9a32451f1bbc9892e070375262':
  Generalizing Recents widget category to Search box. (Bug 17334589)
2014-09-05 15:54:58 +00:00
Kenny Guy
8ebc2f1a0d am b14b98f6: am cc3fa1ef: am 42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev
* commit 'b14b98f6a1828f26f23d678e43fb32d1d86eea66':
  Fix RemoteViews to inflate views for current user.
2014-09-05 15:54:37 +00:00
George Mount
efc1799234 am 86d466b3: am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev
* commit '86d466b324a31117e5da230b04f165b3b1fa4665':
  Fix selection of epicenter in Activity Transitions.
2014-09-05 15:45:08 +00:00
George Mount
3ea1ea4683 am f43c2592: am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev
* commit 'f43c2592fc4ca83cc5274836fa4fcbc6bac956fb':
  Fix NPE when Window disappears during a transition.
2014-09-05 15:45:01 +00:00
George Mount
02d882ee43 am e389d9d0: am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev
* commit 'e389d9d001510346ff743f4e5fd0279a37551c9e':
  API Review: Change SharedElementListener to SharedElementCallback.
2014-09-05 15:44:40 +00:00