Commit Graph

27999 Commits

Author SHA1 Message Date
Dianne Hackborn
6c9975b409 am e8ae8b89: Merge "Add GET_CONTENT protocol for allowing multiple selection."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'e8ae8b8982da37ca77bbaed8e98349d51dec824a':
  Add GET_CONTENT protocol for allowing multiple selection.
2013-01-29 15:59:49 -08:00
Dianne Hackborn
e8ae8b8982 Merge "Add GET_CONTENT protocol for allowing multiple selection." 2013-01-29 23:56:20 +00:00
Dianne Hackborn
9b771678ea am 7f54ffd0: Merge "Improve configuration of default preferred apps."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '7f54ffd0296ce6008b5ea949796e60248a85e2d8':
  Improve configuration of default preferred apps.
2013-01-29 15:56:13 -08:00
Dianne Hackborn
7f54ffd029 Merge "Improve configuration of default preferred apps." 2013-01-29 23:43:20 +00:00
Dianne Hackborn
8a2ed1d7c0 Improve configuration of default preferred apps.
The file that defines default preferred apps is now more
robust.  It is no longer a raw dump of the package
manager settings, but instead a more general list of a
target activity and filter.  When reading it, the remaining
information (match value, set of potential matches) is
determined dynamically.

Change-Id: I0edc6e0d2ed3dd2a6e2238992f18f7fc1f51d8d4
2013-01-29 15:18:29 -08:00
Michael Wright
414297828c am 8c47e856: Merge "Changes documention for how input buttons should be labelled"
# Via Android (Google) Code Review (1) and Michael Wright (1)
* commit '8c47e856b067057b5fcbb6eccfc79d1da4cff8f1':
  Changes documention for how input buttons should be labelled
2013-01-29 11:18:31 -08:00
Michael Wright
8c47e856b0 Merge "Changes documention for how input buttons should be labelled" 2013-01-29 19:09:09 +00:00
Svetoslav
e1c4b5c64d am e340e68f: Merge "Update JavaDoc"
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit 'e340e68f1fe9c539606ad1ec2b76a3edb8f835bd':
  Update JavaDoc
2013-01-29 03:26:29 -08:00
Svetoslav
14ff996ce8 Update JavaDoc
Change-Id: I9644677eb715de1c4ba2f1608b38980f02bdf75d
2013-01-29 03:21:37 -08:00
Guang Zhu
cf55195281 am 6b30ba86: fix the build
# Via Guang Zhu
* commit '6b30ba86a4bfdbe5d87fed29720c4b4431d3685b':
  fix the build
2013-01-29 00:45:26 -08:00
Guang Zhu
6b30ba86a4 fix the build
broken docs

Change-Id: I802d33c8ef2147adf36a495145a615cb206b9936
2013-01-29 00:36:42 -08:00
Michael Wright
6b57bde221 Changes documention for how input buttons should be labelled
Change-Id: I7920d1359950f04a3eb63c36abbcc3d54faac068
2013-01-28 20:37:03 -08:00
Svetoslav
bb71b4d159 am 91488eed: Merge changes Ie674e8b2,I0b9448c8
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '91488eed1745ea0426a73306f133e02d62580f1a':
  AccessibilityNodeINfo cache not cleared when accessibility is disabled.
  Display magnifier does not release its surface on destroy.
2013-01-28 19:23:24 -08:00
Svetoslav Ganov
984019868a am d0fd5464: Merge "Adding UI test automation APIs."
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit 'd0fd54648ca6249f56cf469c57181b5a7bbb71d0':
  Adding UI test automation APIs.
2013-01-28 19:23:22 -08:00
Svetoslav
91488eed17 Merge changes Ie674e8b2,I0b9448c8
* changes:
  AccessibilityNodeINfo cache not cleared when accessibility is disabled.
  Display magnifier does not release its surface on destroy.
2013-01-29 03:21:12 +00:00
Svetoslav Ganov
d0fd54648c Merge "Adding UI test automation APIs." 2013-01-29 03:16:40 +00:00
Jeff Brown
8dd68d794c am 5988335a: Merge "Optimize Looper JNI code."
# Via Android (Google) Code Review (1) and Jeff Brown (1)
* commit '5988335aacdbea5b60b597fa2c52583bc655e30f':
  Optimize Looper JNI code.
2013-01-28 18:18:12 -08:00
Jeff Brown
5988335aac Merge "Optimize Looper JNI code." 2013-01-29 02:14:21 +00:00
Selim Gurun
1e8b0746f8 am 393fa834: Fix public comments for SslErrorHandler.
# Via Selim Gurun
* commit '393fa83424822fca7a105a690d09d796f2241626':
  Fix public comments for SslErrorHandler.
2013-01-28 17:12:32 -08:00
Selim Gurun
393fa83424 Fix public comments for SslErrorHandler.
Fix documentation.

Change-Id: I56a485d2ed3b338f9acb6fa8d7e42cba88ad6291
2013-01-28 16:57:37 -08:00
Jeff Sharkey
5598e5635f am 79cb6acf: Merge "Use the resolved Context in ContentResolver."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '79cb6acf761d3940bf3619e7d1bcf987c50359f6':
  Use the resolved Context in ContentResolver.
2013-01-28 16:01:27 -08:00
Jeff Sharkey
79cb6acf76 Merge "Use the resolved Context in ContentResolver." 2013-01-28 23:58:36 +00:00
Jeff Sharkey
e564a325be Use the resolved Context in ContentResolver.
Change-Id: If62b34a9f6d6305657a02d3f807a24eee63aecf6
2013-01-28 15:52:43 -08:00
Dianne Hackborn
fdb3f094ca Add GET_CONTENT protocol for allowing multiple selection.
Change-Id: I4c14d32112523d7ab603b2a4e374849dd1c3eff6
2013-01-28 15:10:48 -08:00
Jeff Brown
864693461b Optimize Looper JNI code.
Use static native methods.

Release the native looper objects as soon as the Looper quits
instead of waiting until the GC finalizer to take care of it.

Change-Id: I02783e48782a8f972ec2138862f700ade33d8e78
2013-01-28 14:25:53 -08:00
Romain Guy
55dccf3e98 am 29e4aa7a: Merge "Reinitialize hardware renderer after eglTerminate() Bug #8066455"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '29e4aa7abe6b0c62f31fb23b8572cd5b91f08f5c':
  Reinitialize hardware renderer after eglTerminate() Bug #8066455
2013-01-28 14:10:16 -08:00
Romain Guy
29e4aa7abe Merge "Reinitialize hardware renderer after eglTerminate() Bug #8066455" 2013-01-28 22:07:25 +00:00
Romain Guy
3696779bca Reinitialize hardware renderer after eglTerminate()
Bug #8066455

ViewRootImpl was properly detecting that the renderer was not
ready to draw but would simply schedule another frame, thus sending
the systemui into an inifite redraw loop. This change reinitializes
the renderer if needed (if the renderer is requested but not enabled.)

This CL also fixes an issue caused by the default wallpaper. Since it
never calls eglTerminate(), managed contexts are never reclaimed.

Change-Id: Idb8caa672be8ee35f6e6a7e942d9abd8aa100967
2013-01-28 14:04:07 -08:00
Fabrice Di Meglio
703214e742 am 96bf00fe: Merge "Fix bug #8051633 Recent Apps thumbnails in RTL mode (Arabic / Hebrew / Farsi) should be aligned"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '96bf00fe92d824b1da4619b875ed779ed283d11d':
  Fix bug #8051633 Recent Apps thumbnails in RTL mode (Arabic / Hebrew / Farsi) should be aligned
2013-01-28 12:39:05 -08:00
Fabrice Di Meglio
96bf00fe92 Merge "Fix bug #8051633 Recent Apps thumbnails in RTL mode (Arabic / Hebrew / Farsi) should be aligned" 2013-01-28 20:33:35 +00:00
Wink Saville
81913ad0b0 am 2602030a: Merge "Add protected log methods to StateMachine"
# Via Android (Google) Code Review (1) and Wink Saville (1)
* commit '2602030a007d902ace3fc573b2820cee31eefc95':
  Add protected log methods to StateMachine
2013-01-28 11:59:12 -08:00
Wink Saville
2602030a00 Merge "Add protected log methods to StateMachine" 2013-01-28 19:56:09 +00:00
Adam Powell
6956ee026f am 9122187f: am bb74d8b9: am 783fe429: am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (3) and others
* commit '9122187fca67c7509ba2a040b602f67928fc9a98':
  show SELECT ALL icon with text in landscape mode
2013-01-28 11:52:26 -08:00
Adam Powell
9122187fca am bb74d8b9: am 783fe429: am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (2) and others
* commit 'bb74d8b9f632bdda2f5639a9516a83f58374b936':
  show SELECT ALL icon with text in landscape mode
2013-01-28 11:44:02 -08:00
Adam Powell
bb74d8b9f6 am 783fe429: am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '783fe4295372cee8d024388221414c253802c995':
  show SELECT ALL icon with text in landscape mode
2013-01-28 11:41:03 -08:00
Adam Powell
783fe42953 am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit 'e305e5f68df8338cb3c4bdcf099d23ec9abce564':
  show SELECT ALL icon with text in landscape mode
2013-01-28 11:37:41 -08:00
Wink Saville
58c73c3f76 Add protected log methods to StateMachine
This allow child classes to Override the logging and
have consistent behavior across StateMachines.

Change-Id: I7e23a44d08ca304ade2d7830fd0e307f63f1879e
2013-01-28 10:52:34 -08:00
Adam Powell
e305e5f68d Merge "show SELECT ALL icon with text in landscape mode" 2013-01-28 18:44:10 +00:00
Siva Velusamy
bc0ed2ce8b am a6a5c8f6: Merge "Support invoking view methods from hierarchy viewer"
# Via Android (Google) Code Review (1) and Siva Velusamy (1)
* commit 'a6a5c8f6b66c0750a28d2ad9cba18d0c730c4393':
  Support invoking view methods from hierarchy viewer
2013-01-28 10:12:04 -08:00
Siva Velusamy
a6a5c8f6b6 Merge "Support invoking view methods from hierarchy viewer" 2013-01-28 18:03:35 +00:00
Fabrice Di Meglio
306fe5cc0e Fix bug #8051633 Recent Apps thumbnails in RTL mode (Arabic / Hebrew / Farsi) should be aligned
Basically RelativeLayout was broken in a very stubtle way.

RelativeLayout needs in onMeasure() to have a width in RTL mode when "myWidth=-1" (meaning "not
defined") so that the rest of the onMeasure() computation can be done (children positioning and
width computation).

As there is no way to get its width apart from running the code, in RTL mode we set its width
arbitrary to the screen width for doing the width computation and children positoning.

Then, as a last pass, we will update and fix the children position (no need to do anything with
the computed width because it is correctly computed  already).

Change-Id: I426af3327160e751ef63ed3845aad5bab6dad661
2013-01-25 18:43:42 -08:00
Kenny Root
668f9c188e am 572ec703: am a6472811: am 2e99d3c9: am ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Android Git Automerger (3) and others
* commit '572ec703d5b647cb7de4f30f2db4dc35a5e1a17e':
  Track libcore changes for OpenSSLKey
2013-01-25 17:18:44 -08:00
Kenny Root
8a2af56548 am e7e0a072: am 4dca3946: am df1498dc: am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Android Git Automerger (3) and others
* commit 'e7e0a072704a5dec3d709fce60762e515382ee42':
  Add TLS Channel ID support to SSLCertificateSocketFactory.
2013-01-25 17:18:40 -08:00
Kenny Root
572ec703d5 am a6472811: am 2e99d3c9: am ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Android Git Automerger (2) and others
* commit 'a647281109584d96ba2265c0faa14432deeb9815':
  Track libcore changes for OpenSSLKey
2013-01-25 17:12:08 -08:00
Kenny Root
e7e0a07270 am 4dca3946: am df1498dc: am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Android Git Automerger (2) and others
* commit '4dca3946177aaea54d78d39273324caacf74a7bb':
  Add TLS Channel ID support to SSLCertificateSocketFactory.
2013-01-25 17:11:57 -08:00
Kenny Root
a647281109 am 2e99d3c9: am ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Android Git Automerger (1) and others
* commit '2e99d3c9646861ca92faf6708c18e36c7530fd93':
  Track libcore changes for OpenSSLKey
2013-01-25 16:41:33 -08:00
Kenny Root
2e99d3c964 am ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit 'ebb61ca2ed20472d684ab1490b61482392121051':
  Track libcore changes for OpenSSLKey
2013-01-25 16:39:33 -08:00
Kenny Root
ebb61ca2ed Merge "Track libcore changes for OpenSSLKey" 2013-01-26 00:26:01 +00:00
Kenny Root
4dca394617 am df1498dc: am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Alex Klyubin (1) and others
* commit 'df1498dcbac86018b719cda8bf2e9ff3a6dedec8':
  Add TLS Channel ID support to SSLCertificateSocketFactory.
2013-01-25 14:32:04 -08:00
Kenny Root
df1498dcba am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Alex Klyubin (1) and Gerrit Code Review (1)
* commit 'bf043b505c945403752227d89b74bacd7fbcd608':
  Add TLS Channel ID support to SSLCertificateSocketFactory.
2013-01-25 14:25:36 -08:00