108409 Commits

Author SHA1 Message Date
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
Craig Mautner
a7cfb4f827 Merge "Fix stack transfer bug." 2013-06-18 23:57:56 +00:00
Vineeta Srivastava
c2cbd4c11b 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 16:56:02 -07:00
Craig Mautner
1d001b670e Fix stack transfer bug.
Set the focused stack to the task with the started activity. Do not refocus
when activities report resume.

Add more conditional debug.

Fixes bug 9481679.

Change-Id: Ib7134e88f9a2c8ad1703af0d43442c8bbe4e65dc
2013-06-18 16:55:48 -07:00
Fabrice Di Meglio
1cc0a6514f Merge "Fix potential NPE if there is no child in HorizontalScrollView" 2013-06-18 23:55:01 +00:00
Svetoslav
9dafebb817 Correctly update the source of recurring subtree change accessibility events.
Change-Id: I0b0fd9224a5208b274e5c889a27417ef13579849
2013-06-18 16:36:15 -07:00
Jeff Brown
0618148f90 input: Handle a few extra error conditions.
It turns out that SOCK_SEQPACKET sockets may sometimes return
ECONNREFUSED or ECONNRESET errors when the peer dies instead of
the usual EPIPE.

Bug: 9479906
Change-Id: Ia7e572b08bf63e43ba5aeda58281508beb5f8c73
2013-06-18 16:10:49 -07:00
Romain Guy
31e08e953f Share Caches' index buffer with FontRenderer
This reduces state changes when we draw 9patches and text together,
which happens *a lot*. Also disable the NV profiling extension by
default since it doesn't play nice with display lists deferrals.
To enable it set debug.hwui.nv_profiling to true.

Change-Id: I518b44b7d294e5def10c78911ceb9f01ae401609
2013-06-18 15:53:53 -07:00
Fabrice Di Meglio
f2fb76cc23 Fix potential NPE if there is no child in HorizontalScrollView
- related to the previous change for saving the scroll position
- also related to bug #9463581 NPE observed while launching News&Weather app from all apps tray

Change-Id: I9f2f8a246e793eefa1cf510e15a56a1058fb9c18
2013-06-18 15:49:16 -07:00
Jim Miller
9829016e5b Merge "Move Keyguard to the systemui process." 2013-06-18 22:41:19 +00:00
Jeff Brown
736d4ddcdc Merge "Add test for streaming display contents to an accessory." 2013-06-18 22:36:53 +00:00
Jeff Brown
9fd6d4e7dc Merge "Add an API to allow for creating private virtual displays." 2013-06-18 22:36:29 +00:00
Jeff Brown
8f3b130767 Add test for streaming display contents to an accessory.
There are two applications: a source and a sink.
They should be installed on two separate Android devices.
Then connect the source device to the sink device using
a USB OTG cable.

Bug: 9192512
Change-Id: I99b552026684abbfd69cb13ab324e72fa16c36ab
2013-06-18 15:32:41 -07:00
Jeff Brown
a506a6ec94 Add an API to allow for creating private virtual displays.
This change enables applications to create a private virtual
display that renders its content to a surface of its own creation.
The display is private in the sense that only the application
that owns the display is allowed to place windows upon it.
Mirroring and blanking is also disabled for these displays.

Bug: 9192512
Change-Id: I852ea07f0c7df1d244e354e3daca3a6960285ca0
2013-06-18 15:32:41 -07:00
Scott Main
20eac772f3 am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
* commit '334dadec751b2e51ff8a98498f02430b765aa091':
  add Arabic Google Play badges to generator bug: 7994508
2013-06-18 15:31:37 -07:00