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

34432 Commits

Author SHA1 Message Date
Kenny Root
bd51158d61 resolved conflicts for merge of aca95ca0 to master 
Change-Id: I91adf923288ca724a8040ecf887e28e42ad7e259
 2013-09-12 21:49:35 -07:00
Svetoslav
90ce2f3f52 am 9282b9ac: am b72ff5aa: Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 
* commit '9282b9ac8eda1591bb54b46ddc4e88da1c2f0c56':
  Remove unneeded print APIs and update the min margins APIs.
 2013-09-12 21:42:28 -07:00
Raph Levien
e631c9ff2e am dcb2c68f: am 7558ec40: Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev 
* commit 'dcb2c68fd145ab6812a49da30731d6cde2f16cd1':
  Fix for AIOBE at android.text.AndroidBidi.directions
 2013-09-12 21:42:09 -07:00
Alan Viverette
aca95ca0e3 am 2a65a283: Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev 
* commit '2a65a2839e9b3e59a72348ee088f86cda7df604a':
  Add live region politeness to View, AccessibilityNodeInfo
 2013-09-12 21:37:50 -07:00
Svetoslav
9282b9ac8e am b72ff5aa: Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 
* commit 'b72ff5aa4b8be587bcea82761aa08cd8c14b8b48':
  Remove unneeded print APIs and update the min margins APIs.
 2013-09-12 21:37:37 -07:00
Raph Levien
dcb2c68fd1 am 7558ec40: Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev 
* commit '7558ec405f67b59afbf6089d13928cfdb2f950ff':
  Fix for AIOBE at android.text.AndroidBidi.directions
 2013-09-12 21:36:57 -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
Alan Viverette
2a65a2839e Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev 2013-09-13 01:45:10 +00: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
Alan Viverette
77e9a28e2f Add live region politeness to View, AccessibilityNodeInfo 
Alters the content change API to contain a bit mask of types of
changes represented by the event. Live regions send CONTENT_CHANGED
events immediately. Removes unused APIs for EXPANDABLE/EXPANDED.

BUG: 10527284
Change-Id: I21523e85e47df23706976dc0a8bf615f83072c04
 2013-09-12 17:16:09 -07:00
Svetoslav
651dd4e6ee Remove unneeded print APIs and update the min margins APIs. 
1. Removed unneeded code in Resolution that was storing its
   label as resource and package name. We do not have predefined
   resolutions, therefore we always persist the label.

2. Renamed the print attribute margins to minMargins to reflect
   that these are the minimal margins the printer support. Updated
   the docs as well.

3. Renamed the create method of all builder to build.

bug:10727487

Change-Id: Ie72ab8aaa5215b8bd2853885011b3b4efa4deb2e
 2013-09-12 16:58:58 -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
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
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
Raph Levien
7558ec405f Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev 2013-09-12 23:28:29 +00:00
Selim Gurun
76ffaa5808 Merge "Publish Print Api for Webview" into klp-dev 2013-09-12 23:22:29 +00:00
Raph Levien
68669a42fb Fix for AIOBE at android.text.AndroidBidi.directions 
This fixes bug 9900288: Multiple apps crashing; AIOBE at
android.text.AndroidBidi.directions.

The AndroidBidi.directions() method was not correctly handling the case
of a run of length 0, causing ArrayIndexOutOfBoundsException. This
patch simply avoids accessing the levels array in that case.

Change-Id: I036a85b7792ea3364725a87033ca74b94f0e93a1
 2013-09-12 16:21:39 -07: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
Tor Norbye
b6a3ef1834 Merge "Add typedefs and nullness annotations." 2013-09-12 22:22:06 +00: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
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
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
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
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
Igor Murashkin
ddc74f5ed1 am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 
* commit '6c62163976844b28859fca322b28af907ec2856d':
  camera_metadata: add android.lens.state MOVING enum value
 2013-09-12 11:26:16 -07:00
Igor Murashkin
6c62163976 Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 2013-09-12 18:21:15 +00:00
Chet Haase
8529b30b91 Fix TechChange's assumption about TextView targets 
Some of the code in the TextChange transition assumed that the
start values for a transition were for a TextView object. This may
not be the case, and we should return early (without creating an
animator) when it is not.

Issue #10725388 Frequent Framework crashes across apps

Change-Id: I6999eb2288f107f4b93ddb5b77cd068069d831ed
 2013-09-12 11:19:32 -07:00
Adam Powell
d488b785df am 179ba0c0: am a2906cb4: Merge "Show alternate menu panel on devices with menu key" into klp-dev 
* commit '179ba0c04b446406d226cdfe866317d0d2bcecce':
  Show alternate menu panel on devices with menu key
 2013-09-12 11:15:43 -07:00
Adam Powell
179ba0c04b am a2906cb4: Merge "Show alternate menu panel on devices with menu key" into klp-dev 
* commit 'a2906cb4d9355b7a08e7fdec1924c2dbc7fda622':
  Show alternate menu panel on devices with menu key
 2013-09-12 11:13:58 -07:00
Adam Powell
a2906cb4d9 Merge "Show alternate menu panel on devices with menu key" into klp-dev 2013-09-12 18:12:05 +00:00
Eino-Ville Talvala
d96748b02a Camera2: Add a missing key for controlling shading map mode 
Bug: 10726421
Change-Id: If41e00c921ab493c7427575258fed63cbbc22dc1
 2013-09-12 11:11:27 -07:00
Chet Haase
a9265c1083 am 913c0233: am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit '913c023387c319f6c7b1e4878a4d0d07f8624f78':
  Add exclude() methods to Transition
 2013-09-12 11:11:07 -07:00
Chet Haase
913c023387 am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit 'c0f652093ec9dffad23477402ab1cc0a5e415931':
  Add exclude() methods to Transition
 2013-09-12 11:09:26 -07:00
Chet Haase
c0f652093e Merge "Add exclude() methods to Transition" into klp-dev 2013-09-12 18:07:40 +00:00
Svetoslav
c6066799ad Handle print serivce crashes. 
1. Now after a print service crashes we are bringing it to the same
    state of its lifecycle. For example, if a service does a discovery
    and crashes we recreate the discovery session call the start
    discovery method and so on.

2. Turned off debugging logs since we have fully fledged state dump.

bug:10697779

Change-Id: Id790537461428e96b197eef12258996bda2bd1ce
 2013-09-12 10:52:26 -07:00
Jeff Sharkey
d4aa10d5be am c3414dc4: am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit 'c3414dc4baf2bb2c3ef5761912fea7f44d804ebc':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:22:22 -07:00
Flavio Lerda
9df07d19e3 am 3f36b33d: am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit '3f36b33dca0c1c9599c81b273e88b85d0e6fb06e':
  Document the order of values returned by keyAt().
 2013-09-12 09:22:18 -07:00
Jeff Sharkey
c3414dc4ba am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit '357f9e34ca4f0336e406044db35834530379db47':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:17:02 -07:00
Flavio Lerda
3f36b33dca am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit 'b25cfdf1ece9163292e2b4c86910fe07b14c0afa':
  Document the order of values returned by keyAt().
 2013-09-12 09:17:00 -07:00