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

108475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
c1c0e32057 add ViewGroup's layoutMode attribute to public resources 
bug: 9359960

Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
 2013-06-20 11:23:26 -07:00
Baligh Uddin
cb64e3e6d3 Merge "Import translations. DO NOT MERGE" 2013-06-20 15:18:38 +00:00
The Android Open Source Project
d9f943ff41 am 40f20235: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '40f20235380b245ec29b09e10792047b9b01d6f1':
  Revert "wifi: Get full scan results"
  add ViewGroup's layoutMode attribute to public resources bug: 9359960
 2013-06-20 07:20:16 -07:00
The Android Open Source Project
40f2023538 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6ca669228f4605710cf3c67176f982d673f5c2cd
 2013-06-20 07:18:25 -07:00
Przemyslaw Szczepaniak
e86a936afd Document the case where TTS onInit callback is called in ctor. 
Bug: 8743649
Change-Id: Ibf6002f93af9d19d809679852310561e69d57c1e
 2013-06-20 08:58:41 +00:00
Svetoslav Ganov
ff4adde573 Generate PDF from Canvas. 
This change adds simple APIs that enable an Android application
to generate a PDF document by drawing content on a canvas.

Change-Id: Ibac93d7c37b01a376ce7c48238657d8c7698d588
 2013-06-19 19:35:38 -07:00
Jeff Brown
8e1af51787 Merge "input: Handle a few extra error conditions." 2013-06-20 00:46:24 +00:00
Chris Craik
c5493fb7fa Make op outputting const, for more general logging 
Change-Id: Iaf78985ee5558e0b5d32d7bc1cd039eaffc820e5
 2013-06-19 16:58:58 -07:00
kmccormick
0db9f4ddd7 am 9551bcfd: am fb45dbeb: am 748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev 
* commit '9551bcfd82ef8d3dd516829de77a5ba379953041':
  Doc change: New class on avoiding save conflicts
 2013-06-19 16:48:14 -07:00
kmccormick
9551bcfd82 am fb45dbeb: am 748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev 
* commit 'fb45dbeb216f513905e3c2bb7a86da6558862f42':
  Doc change: New class on avoiding save conflicts
 2013-06-19 16:43:17 -07:00
kmccormick
fb45dbeb21 am 748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev 
* commit '748f6c854822c01ebf805202935037300d351104':
  Doc change: New class on avoiding save conflicts
 2013-06-19 16:41:07 -07:00
Romain Guy
fb5a41a371 Merge "Fix regression: TextureView.setAlpha() was ignored" 2013-06-19 23:40:57 +00:00
kmccormick
748f6c8548 Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev 2013-06-19 23:38:34 +00:00
Fabrice Di Meglio
ff4ea79877 Merge "Fix bug #9073962 - Carret is still on the left with an empty EditText in Arabic Locale" 2013-06-19 22:12:50 +00:00
kmccormick
71baac1358 Doc change: New class on avoiding save conflicts 
Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
 2013-06-19 15:02:58 -07:00
Fabrice Di Meglio
e631889e1a Fix bug #9073962 - Carret is still on the left with an empty EditText in Arabic Locale 
- fix StaticLayout special case with empty string or new line

Change-Id: Icb51feedce49db661ed17b6907eb0db83d0b763c
 2013-06-19 14:45:13 -07:00
Jay Shrauner
2b2450702b Merge "Add number presentation column to call log" 2013-06-19 21:14:16 +00:00
Wink Saville
50823ae908 am d11a3103: am 7f081794: am c80e3d43: TelephonyManager.listen can have notifyNow always true. 
* commit 'd11a3103046554e70023294446969a321779231a':
  TelephonyManager.listen can have notifyNow always true.
 2013-06-19 13:24:03 -07:00
Wink Saville
d11a310304 am 7f081794: am c80e3d43: TelephonyManager.listen can have notifyNow always true. 
* commit '7f081794074c1356ba347b802729adf36f06ad19':
  TelephonyManager.listen can have notifyNow always true.
 2013-06-19 13:21:41 -07:00
Wink Saville
7f08179407 am c80e3d43: TelephonyManager.listen can have notifyNow always true. 
* commit 'c80e3d434f034d8594014df2fe028e9420930ea8':
  TelephonyManager.listen can have notifyNow always true.
 2013-06-19 13:19:02 -07:00
Romain Guy
2458939b5f Fix regression: TextureView.setAlpha() was ignored 
Change-Id: I9f43eec0fe23a65dcc1cf9cd0ac1f5e8907786a7
 2013-06-19 12:17:01 -07:00
Romain Guy
cadc5bf411 Merge "Share Caches' index buffer with FontRenderer" 2013-06-19 19:16:21 +00:00
Wink Saville
c80e3d434f TelephonyManager.listen can have notifyNow always true. 
Since telepony.registry is a real system service notifyNow
parameter doesn't need to be conditional as telephony.registery
will never go away.

This is different from most of the other TelephonyManager
methods which are used to invoke methods on the phone service
which implements ITelephony and is implemented by
PhoneInterfaceManager in the phone application. Since the
phone app is not a system service it can and does go away when
it crashes.

Bug: 9393863
Change-Id: I1a8afc12b0e139e72f05820e49f3d996aec2b52a
 2013-06-19 11:28:06 -07:00
Wink Saville
1f54f9246e am 42a6682e: am a5dc5846: am cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev 
* commit '42a6682ec62b4470f2c783c015d95fdc6f64610b':
  Change default for config_show4GForLte to true.
 2013-06-19 10:17:03 -07:00
Wink Saville
42a6682ec6 am a5dc5846: am cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev 
* commit 'a5dc5846502c13edd74ffd677d11e250b88ec17a':
  Change default for config_show4GForLte to true.
 2013-06-19 10:14:25 -07:00
Wink Saville
a5dc584650 am cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev 
* commit 'cc892d68c897f51b8998f7de11302bb9b9cebbff':
  Change default for config_show4GForLte to true.
 2013-06-19 10:11:49 -07:00
Wink Saville
cc892d68c8 Merge "Change default for config_show4GForLte to true." into jb-mr2-dev 2013-06-19 17:09:28 +00:00
Baligh Uddin
1819d6acfa Import translations. DO NOT MERGE 
Change-Id: Ic2175fd4d7e57f6184cc0d75de07c340042aebb2
Auto-generated-cl: translation import
 2013-06-19 09:55:38 -07:00
Baligh Uddin
04c6aa9289 Merge "Import translations. DO NOT MERGE" 2013-06-19 16:45:27 +00:00
Stephen Hines
65333af7db am c3e2a616: am 6e0e9b48: am 713c4bca: Update RenderScript doxygen reference manual. 
* commit 'c3e2a61608e0d2d2b1d268c12ab760db5cdbab59':
  Update RenderScript doxygen reference manual.
 2013-06-19 09:38:19 -07:00
Stephen Hines
c3e2a61608 am 6e0e9b48: am 713c4bca: Update RenderScript doxygen reference manual. 
* commit '6e0e9b48d0722ff96cfc69af1474572ee194da68':
  Update RenderScript doxygen reference manual.
 2013-06-19 09:36:27 -07:00
Stephen Hines
6e0e9b48d0 am 713c4bca: Update RenderScript doxygen reference manual. 
* commit '713c4bca939b8cd6ae4915c4ccf464eed7a8b6a6':
  Update RenderScript doxygen reference manual.
 2013-06-19 09:35:06 -07:00
Stephen Hines
713c4bca93 Update RenderScript doxygen reference manual. 
Change-Id: I0ba8f1c6c9b727b337708a3001964a7ee323483c
 2013-06-19 08:54:42 -07:00
Nick Kralevich
b1c5945a55 Merge "NativeCrashListener: fix file descriptor leak." 2013-06-19 15:35:48 +00:00
Torne (Richard Coles)
03ce9b3e69 Enable preloading of the appropriate WebView. 
Allow the appropriate WebView to be preloaded in the zygote by
constructing the currently selected WebViewFactoryProvider when the
WebViewFactory is preloaded. At runtime, if the preloaded provider is
still the current selection, the preloaded instance is used, otherwise
the provider is loaded at that time.

This change also removes "graceful" fallback from the experimental
WebView to the classic implementation: if the option to use the
experimental WebView is selected and it could not be loaded
successfully at the time a WebView is created, an exception will be
thrown, rather than allowing execution to continue with the classic
implementation, as the fallback may mislead developers who do not
examine logcat output in detail.

Change-Id: I0cd01c784d7048abeac55ab5863ca16b8fd9ecf2
 2013-06-19 15:03:08 +01:00
Vineeta Srivastava
b301684e95 Revert "wifi: Get full scan results" 
This reverts commit 67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.

Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713

Conflicts:
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java
 2013-06-18 19:11:13 -07:00
Scott Main
c931032da0 add ViewGroup's layoutMode attribute to public resources 
bug: 9359960

Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
 2013-06-18 19:11:06 -07:00
Jason Sams
4b77dbb206 Merge "Fix docs" 2013-06-19 01:54:02 +00:00
Jason Sams
9274384ff0 Fix docs 
Change-Id: Ie6563f633481951d97f319aefd282b15c049e281
 2013-06-18 18:52:42 -07:00
Jason Sams
7d58bed5c7 Merge "Update histogram docs." 2013-06-19 01:24:33 +00:00
Jason Sams
137d0420b4 Merge "Allow single channel and float convolve." 2013-06-19 01:24:07 +00:00
Jason Sams
1a3edb00c5 Update histogram docs. 
Change-Id: I6cfedb5cac459befb083f352f43ed33f4418145a
 2013-06-18 18:23:37 -07:00
Iliyan Malchev
9c5c31d228 am 2a155213: am 66acbc22: am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev 
* commit '2a155213c85f84a944551c09c0eefde3368267db':
  Revert "wifi: Get full scan results"
 2013-06-18 18:21:50 -07:00
Iliyan Malchev
2a155213c8 am 66acbc22: am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev 
* commit '66acbc221b750a645a1c9581f4a5bbe52e38729c':
  Revert "wifi: Get full scan results"
 2013-06-18 18:20:41 -07:00
Iliyan Malchev
66acbc221b am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev 
* commit '0dff78aa32d8e7bc2eb057f2878a9e010417e42a':
  Revert "wifi: Get full scan results"
 2013-06-18 18:18:21 -07:00
Iliyan Malchev
0dff78aa32 Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev 2013-06-19 01:16:23 +00:00
Nick Kralevich
1b2d59500a NativeCrashListener: fix file descriptor leak. 
Sending thousands of crashes can result in the system
eventually running out of file descriptors. Close file
descriptors after we're done with them.

Change-Id: I09ae9ce36426ded3fd591dda9a3550a19c2f01d3
 2013-06-18 17:56:28 -07:00
Jason Sams
048c978ae5 Allow single channel and float convolve. 
Change-Id: If448ea2ae38de2f8b95fc884ea0dbf8222964012
 2013-06-18 17:39:10 -07:00
Jason Sams
8ace2acbf1 Add support for vec2 histogram 
Change-Id: I30ab758a44485a8ea30043c4cd782c3560074c58
 2013-06-18 17:34:34 -07:00
Jason Sams
109c46b8ea Merge "Add histogram intrinsic" 2013-06-19 00:26:38 +00:00