drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,546 Commits 1 Branch 0 Tags
Commit Graph

113546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Gurun
e68e06d0b9 am 2b274021: am 76ffaa58: Merge "Publish Print Api for Webview" into klp-dev 
* commit '2b274021f28e92cb7e32d6194f54cb5c374add93':
  Publish Print Api for Webview
 2013-09-12 21:42:05 -07:00
Selim Gurun
2b274021f2 am 76ffaa58: Merge "Publish Print Api for Webview" into klp-dev 
* commit '76ffaa5808331591d9db4c2abfe9f739eebb0be9':
  Publish Print Api for Webview
 2013-09-12 21:36:54 -07:00
Selim Gurun
da7d642253 Publish Print Api for Webview 
Bug:10652036

Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64

This is a cherry-pick of a5c86c644bce5f9d472541b2d1ddc1b39299f004
to prevent a automerger failure.

Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewProvider.java
 2013-09-12 18:12:16 -07:00
Svetoslav
f4f613b127 am a03cf04b: am 25f17f29: Merge "Not change the print options on printer change if possible." into klp-dev 
* commit 'a03cf04b8d7bd47dac94208cb1f5df3230a36e86':
  Not change the print options on printer change if possible.
 2013-09-12 16:45:37 -07:00
Vinit Deshapnde
bd9daeaac7 am 4d1cef6b: am 96ece970: Merge "Disable additional logging in WifiConfigStore/WifiNative" into klp-dev 
* commit '4d1cef6b3fec5ad4da0c99d57b1c4e768a2f1efa':
  Disable additional logging in WifiConfigStore/WifiNative
 2013-09-12 16:45:25 -07:00
Jeff Brown
67bd48fc3f am 9def46c9: am 09652ac1: Merge "Allow phone to enter suspend with positive proximity." into klp-dev 
* commit '9def46c9763c4e32690c15085e04985d29a7d485':
  Allow phone to enter suspend with positive proximity.
 2013-09-12 16:45:21 -07:00
Chris Craik
7cca88352f am 3f30e67a: am 88ee0dac: Merge "Move DeferredDisplayState out of ops" into klp-dev 
* commit '3f30e67afbceb185c52833cec539cc0199716ef0':
  Move DeferredDisplayState out of ops
 2013-09-12 16:45:16 -07:00
Jeff Brown
f3142095fd am 3cb86769: am 26267660: Merge "Make View onKeyUp symmetric with onKeyDown." into klp-dev 
* commit '3cb86769fd04891f01e2ea8fcf54edb9ecb97922':
  Make View onKeyUp symmetric with onKeyDown.
 2013-09-12 16:44:52 -07:00
David Christie
e82f2c0c2a am 23642e74: am baae82a8: Merge "Don\'t track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location. There is no reason to show Android OS in that list simply because 
* commit '23642e74211f3f3f72f929255f36fb7b6384d61e':
  Don't track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location.  There is no reason to show Android OS in that list simply because of internal location requests supporting other clients.
 2013-09-12 16:44:46 -07:00
Vinit Deshapnde
8f8c563e6f am b2c06ba5: am b481dae2: Merge "Fix invalid Wifi Network system crash" into klp-dev 
* commit 'b2c06ba5711ffa3781b9bfe1c11051cc274be9e3':
  Fix invalid Wifi Network system crash
 2013-09-12 16:44:41 -07:00
Svetoslav
6d803dede7 am 410fc394: am ef2088a2: Merge "Handle print serivce crashes." into klp-dev 
* commit '410fc39444d479ee708193ac2ae1a81b72187dd3':
  Handle print serivce crashes.
 2013-09-12 16:44:37 -07:00
Chet Haase
ebcb9ecf2b am 9501a452: am e850c973: Merge "Hide translucent activity conversion API" into klp-dev 
* commit '9501a452af30dd15559804193c8183bbaa42a669':
  Hide translucent activity conversion API
 2013-09-12 16:44:24 -07:00
Chet Haase
f1690b1fe8 am 79f245e4: am 90b10f89: Merge "Fix TechChange\'s assumption about TextView targets" into klp-dev 
* commit '79f245e472b9df546a3f7bb95f66ea9b055ad707':
  Fix TechChange's assumption about TextView targets
 2013-09-12 16:44:20 -07:00
Selim Gurun
76ffaa5808 Merge "Publish Print Api for Webview" into klp-dev 2013-09-12 23:22:29 +00:00
Tor Norbye
311913d09e Removing trailing comma in initializer; fails on some javac versions 
Change-Id: Ie651ca8ee625a881f739dc3ede5190adb9eb9860
 2013-09-12 16:03:45 -07:00
Svetoslav
a03cf04b8d am 25f17f29: Merge "Not change the print options on printer change if possible." into klp-dev 
* commit '25f17f295b4da464a2758c11a02cabb51bf4722f':
  Not change the print options on printer change if possible.
 2013-09-12 15:40:28 -07:00
Svetoslav
25f17f295b Merge "Not change the print options on printer change if possible." into klp-dev 2013-09-12 22:38:35 +00:00
Tor Norbye
b6a3ef1834 Merge "Add typedefs and nullness annotations." 2013-09-12 22:22:06 +00:00
Vinit Deshapnde
4d1cef6b3f am 96ece970: Merge "Disable additional logging in WifiConfigStore/WifiNative" into klp-dev 
* commit '96ece97073d197a056a9314ceca8a4a8ba445c26':
  Disable additional logging in WifiConfigStore/WifiNative
 2013-09-12 15:22:05 -07:00
Vinit Deshapnde
96ece97073 Merge "Disable additional logging in WifiConfigStore/WifiNative" into klp-dev 2013-09-12 22:19:15 +00:00
Jeff Brown
9def46c976 am 09652ac1: Merge "Allow phone to enter suspend with positive proximity." into klp-dev 
* commit '09652ac1db59b70de47ff5ea49953773312a171f':
  Allow phone to enter suspend with positive proximity.
 2013-09-12 15:18:25 -07:00
Jeff Brown
09652ac1db Merge "Allow phone to enter suspend with positive proximity." into klp-dev 2013-09-12 22:15:38 +00:00
Chris Craik
3f30e67afb am 88ee0dac: Merge "Move DeferredDisplayState out of ops" into klp-dev 
* commit '88ee0dac81dec12aefdeee23072df9b3864a06a4':
  Move DeferredDisplayState out of ops
 2013-09-12 15:11:27 -07:00
Chris Craik
88ee0dac81 Merge "Move DeferredDisplayState out of ops" into klp-dev 2013-09-12 22:08:54 +00:00
Vinit Deshapnde
3569fdd9af Disable additional logging in WifiConfigStore/WifiNative 
It was introduced to debug the disappearing APs; now that we think that
we've got to the bottom of it, it is being disabled by default. Set VDBG
to true to get it back.

Bug: 10568538

Change-Id: I226cacf48cccba9671f09164bbb50380adc6b322
 2013-09-12 14:53:46 -07:00
Jeff Brown
ec0832133a Allow phone to enter suspend with positive proximity. 
As part of the power manager rewrite in JB MR1, we removed the ability
for the phone to suspend with positive proximity because it was not
clear that the proximity sensor was always correctly registered as
a wake-up source.  The sensor service itself does not contain any
code to manage wake-ups.  Therefore proximity sensor based wake-up
relies on the sensor driver acquiring a timed wake lock when the
sensor reports a negative result.  This behavior is not very well
defined in the sensor HAL so there is a chance that it will not
work reliably on all devices.

This change adds a new config.xml resource to specify whether the
device should be allowed to suspend when the screen is off due to
positive proximity.  Devices that support this feature should set
the "config_suspendWhenScreenOffDueToProximity" resource to "true" in
their resource overlays.  The feature is disabled by default.

Bug: 9760828
Change-Id: Ic65ab7df0357271b133e2e44f5e35e7756e1e9e0
 2013-09-12 14:37:21 -07:00
Svetoslav
cc65b0c325 Not change the print options on printer change if possible. 
If the user selects some print options from the dialog and then
changes the printer to one that has the same capabilities the
selections in the UI should not change.

bug:10631856

Change-Id: Ia76ce58c446815e3498d2f4b4739dee62d11d96a
 2013-09-12 14:29:53 -07:00
Jeff Brown
3cb86769fd am 26267660: Merge "Make View onKeyUp symmetric with onKeyDown." into klp-dev 
* commit '26267660957a4428a66d8f142e2bdfa6ce6fe12f':
  Make View onKeyUp symmetric with onKeyDown.
 2013-09-12 13:55:44 -07:00
Jeff Brown
2626766095 Merge "Make View onKeyUp symmetric with onKeyDown." into klp-dev 2013-09-12 20:53:16 +00:00
David Christie
23642e7421 am baae82a8: Merge "Don\'t track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location. There is no reason to show Android OS in that list simply because of internal lo 
* commit 'baae82a8532d5d77f3471bf8f7dcc004f5ec7e11':
  Don't track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location.  There is no reason to show Android OS in that list simply because of internal location requests supporting other clients.
 2013-09-12 13:44:48 -07:00
David Christie
baae82a853 Merge "Don't track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location. There is no reason to show Android OS in that list simply because of internal location requests supporting other clients." into klp-dev 2013-09-12 20:39:31 +00:00
Chris Craik
c1c5f08702 Move DeferredDisplayState out of ops 
bug:9969358

Instead of storing DeferredDisplayState within an op (thus forcing ops
to be tied to a single state instance), associate each op with a new
state at DeferredDisplayList insertion time.

Now, DisplayLists (and the ops within) can be reused in a single
DeferredDisplayList draw call, as ops will use different state
instances at different points in the frame.

Change-Id: I525ab2abe0c3883679f2fa00b219b293e9ec53d9
 2013-09-12 13:33:01 -07:00
Vinit Deshapnde
b2c06ba571 am b481dae2: Merge "Fix invalid Wifi Network system crash" into klp-dev 
* commit 'b481dae2f5238252d81dafeecf13d5f387824689':
  Fix invalid Wifi Network system crash
 2013-09-12 13:31:24 -07:00
Vinit Deshapnde
b481dae2f5 Merge "Fix invalid Wifi Network system crash" into klp-dev 2013-09-12 20:28:57 +00:00
Svetoslav
410fc39444 am ef2088a2: Merge "Handle print serivce crashes." into klp-dev 
* commit 'ef2088a26a42621329c6b9fecb323566e19490e4':
  Handle print serivce crashes.
 2013-09-12 13:27:47 -07:00
Svetoslav
ef2088a26a Merge "Handle print serivce crashes." into klp-dev 2013-09-12 20:24:40 +00:00
David Christie
9e9ce92541 Don't track LocationManager internal requests in AppOps (b/10725757). 
AppOps stats are used to populate the "apps recently using location"
list in settings->location.  There is no reason to show Android OS
in that list simply because of internal location requests supporting
other clients.

Change-Id: I6908aa63deb19d22733b8d9cdae6ea5dbbea55e0
 2013-09-12 13:19:53 -07:00
Chet Haase
9501a452af am e850c973: Merge "Hide translucent activity conversion API" into klp-dev 
* commit 'e850c973b0662975137cee8a05f8ee2cb82d9b2a':
  Hide translucent activity conversion API
 2013-09-12 12:44:25 -07:00
Chet Haase
79f245e472 am 90b10f89: Merge "Fix TechChange\'s assumption about TextView targets" into klp-dev 
* commit '90b10f89d7c1dd217f07f4b51ed8e5c93deccc52':
  Fix TechChange's assumption about TextView targets
 2013-09-12 12:44:22 -07:00
Chet Haase
e850c973b0 Merge "Hide translucent activity conversion API" into klp-dev 2013-09-12 19:41:33 +00:00
Chet Haase
90b10f89d7 Merge "Fix TechChange's assumption about TextView targets" into klp-dev 2013-09-12 19:41:16 +00:00
Eino-Ville Talvala
0f05de62e7 am db0e1cf1: am 2d861e87: Merge "Camera2: Fix build: Add new key to API" into klp-dev 
* commit 'db0e1cf14a53b4f4885123966984ef80d32331ed':
  Camera2: Fix build: Add new key to API
 2013-09-12 12:12:44 -07:00
Eino-Ville Talvala
db0e1cf14a am 2d861e87: Merge "Camera2: Fix build: Add new key to API" into klp-dev 
* commit '2d861e87ae556b73d8bab5a6db20207a5653560f':
  Camera2: Fix build: Add new key to API
 2013-09-12 12:10:00 -07:00
Eino-Ville Talvala
2d861e87ae Merge "Camera2: Fix build: Add new key to API" into klp-dev 2013-09-12 19:06:55 +00:00
Eino-Ville Talvala
986b1bd73f Camera2: Fix build: Add new key to API 
Change-Id: Ie44a9e3b1c8d04dd266d39f59a5916ddaf5fca67
 2013-09-12 11:52:45 -07:00
Eino-Ville Talvala
b91133c73a am a937b013: am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 
* commit 'a937b013f5ebe81562a0d298f9c990c975ba1dcf':
  Camera2: Add a missing key for controlling shading map mode
 2013-09-12 11:39:42 -07:00
Eino-Ville Talvala
a937b013f5 am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 
* commit '184b17ddef985ba99f1b1ad8f660a742a9f31a19':
  Camera2: Add a missing key for controlling shading map mode
 2013-09-12 11:36:51 -07:00
Robert Greenwalt
8265343545 am 16666176: am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-dev 
* commit '16666176c0de5abc1f5390b9b2e07c32e51a97f9':
  Fix Wifi Batch Scanning
 2013-09-12 11:32:32 -07:00
Eino-Ville Talvala
184b17ddef Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 2013-09-12 18:32:29 +00:00
Igor Murashkin
d6b8a4ab4c am ddc74f5e: am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 
* commit 'ddc74f5ed1d541ea89964228417eff3d5d6ad071':
  camera_metadata: add android.lens.state MOVING enum value
 2013-09-12 11:32:28 -07:00