Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,017 Commits 3 Branches 0 Tags
199f51ce30f8ef3fa204d279c54ed09b7fe02563
Commit Graph

44561 Commits

Author SHA1 Message Date
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
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
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
Jeff Sharkey
d3cc74cac2 Merge "Move Size parceling to Bundle." into lmp-dev 2014-09-05 16:46:00 +00: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
Martin Kosiba
e181320e15 am f5969458: am c3ec88fd: Merge "Change WebView.zoomBy return type to void." into lmp-dev 
* commit 'f59694580f658512bea7d7b26cce541dafae603a':
  Change WebView.zoomBy return type to void.
 2014-09-05 15:44:27 +00:00
Winson Chung
e5ab65d614 am 69c8df27: am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 
* commit '69c8df2791e67f7ecf2c35f0ce2e548dfbc4ea02':
  Generalizing Recents widget category to Search box. (Bug 17334589)
 2014-09-05 15:44:22 +00:00
Kenny Guy
cc8b8e8e0e am cc3fa1ef: am 42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 
* commit 'cc3fa1ef5c5058d352dbf9d22141fa12d763e106':
  Fix RemoteViews to inflate views for current user.
 2014-09-05 15:44:00 +00:00
Adam Powell
f514df8d19 am 06515e28: am ce9978b5: am c3b7ca91: Merge "Menu callbacks for ToolbarActionBars, part 2" into lmp-dev 
* commit '06515e283887946a8131dd93828cfcc36e13920c':
  Menu callbacks for ToolbarActionBars, part 2
 2014-09-05 15:33:29 +00:00
Craig Mautner
f25a0c2ced am 7dfb0390: am b8479376: am d5bb6256: Merge "Update API per council request" into lmp-dev 
* commit '7dfb0390a83b79cbdc334e19f03b1da790871943':
  Update API per council request
 2014-09-05 15:33:16 +00:00
Alexandra Gherghina
f363bda252 Merge "Rename intent extra following API review" into lmp-dev 2014-09-05 15:16:02 +00:00
Marcin Kosiba
8d4e83aca0 Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 2014-09-05 15:13:40 +00:00
Chris Wren
c237555c6c Merge "Keep contact affinities separate across users." into lmp-dev 2014-09-05 14:58:40 +00:00
Alexandra Gherghina
3315f6b5a3 Rename intent extra following API review 
Bug: 17389968
Change-Id: Id2bd8d12019ad7a4c5a3ac8a7f76f55d06fc4dff
 2014-09-05 15:48:07 +01:00
Esteban Talavera
ac15b85229 Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 2014-09-05 14:46:10 +00:00
Chris Wren
da4bd209cf Keep contact affinities separate across users. 
Also ignore people extras on USER_ALL notifications.

Bug: 16213960
Change-Id: Ic0341c88d42d4a4f12cac35c0f41c2746aec02ac
 2014-09-05 10:36:32 -04:00
Anwar Ghuloum
248b369661 Merge "Timing Hacks DO NOT MERGE" into lmp-dev 2014-09-05 14:22:51 +00:00
Marcin Kosiba
100c20c900 Rename WebResourceRequest.hasUserGestureInsecure to hasGesture. 
This is in response to API council feedback.

BUG: 17253647
Change-Id: I6da2aa2510a73276fcdbad9219adfeaaed41d3ba
 2014-09-05 14:22:32 +00:00
Anwar Ghuloum
629dc18013 Timing Hacks DO NOT MERGE 
Let's submit to see any lingering effects.

Bug: 17310019
Change-Id: I791bceec0b6aa8b80ac4e6c582a10c3f0ec7a906
 2014-09-05 07:17:39 -07:00
George Mount
ffd09aed4e Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 2014-09-05 14:14:53 +00:00
George Mount
c2d66a0282 Merge "Fix NPE when Window disappears during a transition." into lmp-dev 2014-09-05 14:14:40 +00:00
George Mount
88dcd1a5f7 Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 2014-09-05 13:55:35 +00:00
Martin Kosiba
76c9742862 Merge "Change WebView.zoomBy return type to void." into lmp-dev 2014-09-05 13:44:34 +00:00
Martin Kosiba
3a82acdbf6 Change WebView.zoomBy return type to void. 
It turns out that the semantics of the return value are confusing
and so we decided to not return a result from this method at all.
The developer can call canZoomIn/canZoomOut to determine whether
the WebView is at the zoom limit, so there is no loss of
functionality.

BUG: 17374808
Change-Id: I4dfde71d5ac4a3f91c8755b257411aad06a1b1f6
 2014-09-05 13:41:48 +00:00
Winson Chung
acdc602f18 Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 2014-09-05 13:41:40 +00:00