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

113596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sungsoo Lim
42a1390499 Update api/current.txt 
Needed to run make update-api after
the merge of http://goo.gl/6RC3I4

Change-Id: If6cf3a520ff14c37a2ba317b799d246be2b620af
 2013-09-13 20:48:12 +09:00
Kenny Root
add53aeaeb am 7bc59add: am 753c1a33: am 457f0f5e: Merge "Move helper function to webkit" 
* commit '7bc59add59412f2461213d0ff7ea59b2ac76cec0':
  Move helper function to webkit
 2013-09-12 23:41:41 -07:00
Kenny Root
7bc59add59 am 753c1a33: am 457f0f5e: Merge "Move helper function to webkit" 
* commit '753c1a3342357eed6b29c08ad8ca708755d84390':
  Move helper function to webkit
 2013-09-12 23:39:01 -07:00
Kenny Root
753c1a3342 am 457f0f5e: Merge "Move helper function to webkit" 
* commit '457f0f5e486c158bbe9816df39d2cbc52cec3b51':
  Move helper function to webkit
 2013-09-12 23:35:13 -07:00
Kenny Root
457f0f5e48 Merge "Move helper function to webkit" 2013-09-13 06:30:53 +00:00
Kenny Root
cb4317a5a7 Move helper function to webkit 
This particular helper function is being removed from NativeCrypto, so
move it here as it's the last user of it.

Change-Id: Iea13ba499487d838068d6156d4d1e6861d05eb36
 2013-09-12 23:00:54 -07:00
Lajos Molnar
4e8f5e3f78 am 6118745b: am ab62870c: Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev 
* commit '6118745be53fed977edf1b29a2b0ecd2222e33a8':
  MediaFormat: add getInteger with default value convenience method
 2013-09-12 21:57:28 -07:00
Jean Chalard
f6fac14e2e am 4895ec3d: am 940a2ad6: Merge "Don\'t send the same values to onUpdateSelection repeatedly" into klp-dev 
* commit '4895ec3dcc214891b9788cde3c9720ee9656596c':
  Don't send the same values to onUpdateSelection repeatedly
 2013-09-12 21:57:24 -07:00
Lajos Molnar
fb73df74d5 am 736469ad: am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev 
* commit '736469ad5d9b21071d187a07e8f2575910960b7d':
  Fix CalledFromWrongThreadException in MediaPlayer's subtitle support
 2013-09-12 21:57:21 -07:00
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
Romain Guy
b1c53942f1 am 0885b291: am 4801a4f9: Merge "Always disable the clip for layers Bug #8149344" into klp-dev 
* commit '0885b291650c1b85220645943c9eab3080170aca':
  Always disable the clip for layers Bug #8149344
 2013-09-12 21:42:25 -07:00
Jeff Sharkey
156ba58f9b am cf76be71: am 95a6560f: Merge "DocumentsUI tablet support." into klp-dev 
* commit 'cf76be7195fc42ac6d72cb2d38309894fff4d368':
  DocumentsUI tablet support.
 2013-09-12 21:42:22 -07:00
Robert Greenwalt
cc7360c354 am 3d52eb7f: am 14e55996: Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev 
* commit '3d52eb7f1dde460d547fc20ec0b93465d69ec496':
  Fix Batched Scan Results to give Timestamp in uS
 2013-09-12 21:42:18 -07:00
Wink Saville
afc79c4eab am d8fcc795: am 5fbfb81d: Merge "Define config_volte_replacement_rat." into klp-dev 
* commit 'd8fcc7951f02e3c66f549937a2b1458a4352d174':
  Define config_volte_replacement_rat.
 2013-09-12 21:42:15 -07:00
Stephen Hines
93a7473092 am 7d400ead: am 9d5c33c5: Merge "Fix build break with missing VDBG." into klp-dev 
* commit '7d400eadb7340c139f35263f43fe3418d402f409':
  Fix build break with missing VDBG.
 2013-09-12 21:42:12 -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
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
Lajos Molnar
6118745be5 am ab62870c: Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev 
* commit 'ab62870c7e787323057d3b16a3ff1fd118fb5925':
  MediaFormat: add getInteger with default value convenience method
 2013-09-12 21:38:04 -07:00
Jean Chalard
4895ec3dcc am 940a2ad6: Merge "Don\'t send the same values to onUpdateSelection repeatedly" into klp-dev 
* commit '940a2ad69eaf25ef16b6f470f759f9eef28fc0c5':
  Don't send the same values to onUpdateSelection repeatedly
 2013-09-12 21:38:01 -07:00
Lajos Molnar
736469ad5d am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev 
* commit '8c16943ef3259b8194c310d41edc13a783249250':
  Fix CalledFromWrongThreadException in MediaPlayer's subtitle support
 2013-09-12 21:37:58 -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
Romain Guy
0885b29165 am 4801a4f9: Merge "Always disable the clip for layers Bug #8149344" into klp-dev 
* commit '4801a4f90710427f71b717c6869a63113846689a':
  Always disable the clip for layers Bug #8149344
 2013-09-12 21:37:32 -07:00
Jeff Sharkey
cf76be7195 am 95a6560f: Merge "DocumentsUI tablet support." into klp-dev 
* commit '95a6560f63563aeb36a56fb0384685a2f925d3c1':
  DocumentsUI tablet support.
 2013-09-12 21:37:18 -07:00
Robert Greenwalt
3d52eb7f1d am 14e55996: Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev 
* commit '14e55996722db1e74996b837c136a6e188143718':
  Fix Batched Scan Results to give Timestamp in uS
 2013-09-12 21:37:13 -07:00
Wink Saville
d8fcc7951f am 5fbfb81d: Merge "Define config_volte_replacement_rat." into klp-dev 
* commit '5fbfb81d31d452f75bc088d380711642993fef1c':
  Define config_volte_replacement_rat.
 2013-09-12 21:37:08 -07:00
Stephen Hines
7d400eadb7 am 9d5c33c5: Merge "Fix build break with missing VDBG." into klp-dev 
* commit '9d5c33c58451aac8566b8df8426265cedd3e610f':
  Fix build break with missing VDBG.
 2013-09-12 21:37:03 -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
Lajos Molnar
ab62870c7e Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev 2013-09-13 02:18:23 +00:00
Jean Chalard
940a2ad69e Merge "Don't send the same values to onUpdateSelection repeatedly" into klp-dev 2013-09-13 02:16:47 +00:00
Lajos Molnar
8c16943ef3 Merge "Fix CalledFromWrongThreadException in MediaPlayer's subtitle support" into klp-dev 2013-09-13 02:16:27 +00:00
Alan Viverette
2a65a2839e Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev 2013-09-13 01:45:10 +00:00
Svetoslav
b72ff5aa4b Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 2013-09-13 01:43:41 +00:00
Romain Guy
4801a4f907 Merge "Always disable the clip for layers Bug #8149344" into klp-dev 2013-09-13 01:18:31 +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
Jeff Sharkey
95a6560f63 Merge "DocumentsUI tablet support." into klp-dev 2013-09-13 00:21:53 +00: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
Robert Greenwalt
14e5599672 Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev 2013-09-13 00:04:30 +00: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
Wink Saville
5fbfb81d31 Merge "Define config_volte_replacement_rat." into klp-dev 2013-09-12 23:49:50 +00: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