99299 Commits

Author SHA1 Message Date
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
Amith Yamasani
3cfca67b0f Merge "Fix possible integer overflow in MtpStorage" 2013-01-28 18:09:59 +00:00
Siva Velusamy
a6a5c8f6b6 Merge "Support invoking view methods from hierarchy viewer" 2013-01-28 18:03:35 +00:00
Baligh Uddin
c83a795412 Merge "Import translations. DO NOT MERGE" into master-chromium 2013-01-28 17:57:49 +00:00
Baligh Uddin
e27ec5e53e am d7368563: (-s ours) Merge "Import translations. DO NOT MERGE"
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit 'd73685635217a88595eeaa010f92cac65bd59543':
  Import translations. DO NOT MERGE
2013-01-28 09:53:25 -08:00
Baligh Uddin
d736856352 Merge "Import translations. DO NOT MERGE" 2013-01-28 17:49:59 +00:00
Victoria Lease
c8d82dd644 am de07d41f: Merge "Annotate Locations coming from mock providers"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit 'de07d41f6396f9f040fed2b6780932d8e5dbb482':
  Annotate Locations coming from mock providers
2013-01-28 09:11:18 -08:00
Victoria Lease
de07d41f63 Merge "Annotate Locations coming from mock providers" 2013-01-28 17:07:39 +00:00
Irfan Sheriff
28a068e0bd am e6a6d838: am be3d6457: am a56711a0: am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (3) and others
* commit 'e6a6d83845d40526cab2d91d0c92b32d4267f5e1':
  Remove config_wifi_p2p_support from config.xml.
2013-01-28 08:21:23 -08:00
Irfan Sheriff
e6a6d83845 am be3d6457: am a56711a0: am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (2) and others
* commit 'be3d6457984cbb3c39ab0741fe8cb721a98139c3':
  Remove config_wifi_p2p_support from config.xml.
2013-01-28 08:18:26 -08:00
Irfan Sheriff
be3d645798 am a56711a0: am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (1) and others
* commit 'a56711a04618bbdcdaecf15e1815a5618e6b4737':
  Remove config_wifi_p2p_support from config.xml.
2013-01-28 08:16:23 -08:00
Irfan Sheriff
a56711a046 am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Gerrit Code Review (1) and Yoshihiko Ikenaga (1)
* commit '169dc398ed946edae6fffa997e92871b711561d6':
  Remove config_wifi_p2p_support from config.xml.
2013-01-28 08:13:42 -08:00
Irfan Sheriff
169dc398ed Merge "Remove config_wifi_p2p_support from config.xml." 2013-01-28 16:01:43 +00:00
Baligh Uddin
ccdc6bf45c Import translations. DO NOT MERGE
Change-Id: Icec6b5cb98bc7c93fcac9bd2d04213ce3a3fb659
Auto-generated-cl: translation import
2013-01-28 07:37:30 -08:00
Baligh Uddin
42cd04dead Import translations. DO NOT MERGE
Change-Id: Id85cf1077c4053fd9987c6a66f614503b1a616d8
Auto-generated-cl: translation import
2013-01-28 07:35:56 -08:00
Satoshi Kataoka
f1367b7e90 Do not turn on imes unexpectedly with unit tests
Bug: 7872918

Change-Id: Ie1d74c9fac27de140e7aa85f2eaefcb89aa06ea7
2013-01-28 19:25:55 +09: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
Benoit Goby
78a9687fc2 UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted
This avoids showing the confirmation dialog from the decryption screen

Bug: 8019508
Change-Id: I7ff364437f6b8aeea26fa8308aa4fe35b7ede5d7
2013-01-25 16:58:13 -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
Kenny Root
bf043b505c Merge "Add TLS Channel ID support to SSLCertificateSocketFactory." 2013-01-25 22:08:52 +00:00
Dianne Hackborn
1a54aa74f7 am b9781fe0: Merge "App ops: you can now turn off operations."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'b9781fe08c5b1afba086857aa18b46862550ae88':
  App ops: you can now turn off operations.
2013-01-25 11:37:24 -08:00
Dianne Hackborn
b9781fe08c Merge "App ops: you can now turn off operations." 2013-01-25 19:33:11 +00:00
Dianne Hackborn
5e45ee6752 App ops: you can now turn off operations.
Also add new ops for calendar and wi-fi scans, finish
implementing rejection of content provider calls, fix
issues with rejecting location calls, fix bug in the
new pm call to retrieve apps with permissions.

Change-Id: I29d9f8600bfbbf6561abf6d491907e2bbf6af417
2013-01-25 11:25:48 -08:00
Fergus Henderson
8cd9566c84 am 1c2df382: Fix logic error in Pszczepaniak\'s recent change.
# Via Fergus Henderson
* commit '1c2df38242c29cd7f359a6fb13dc13b387264310':
  Fix logic error in Pszczepaniak's recent change.
2013-01-25 07:29:24 -08:00
Fergus Henderson
1c2df38242 Fix logic error in Pszczepaniak's recent change.
Also improve wording of error message.

Bug: 7666482
Change-Id: I2d2316b10fdf394bec8963327529723cbd5fbb32
2013-01-25 14:59:59 +00:00
Sungmin Choi
f036920669 show SELECT ALL icon with text in landscape mode
Though set config_allowActionMenuItemTextWithIcon as true,
icon for the "SELECT ALL" menu on ActionBar is not shown as staring
in landscape mode.
To fix it, use "SELECT ALL" icon in onCreateActionMode() to show the
icon and text together.

To show or hide text is decided by updateTextButtonVisibility() of
core/java/com/android/internal/view/menu/ActionMenuItemView.java

STEPS TO REPRODUCE: (please be specific)
1. launch Browser/Chrome and go to google.com
2. rotate to landscape mode
3. long press on URL address

Bug: 8073761
Change-Id: Ie0e0aa45f0dff609ed8c03e4423b163bad5452ed
2013-01-25 22:06:55 +09:00
Yoshihiko Ikenaga
8879343c26 Remove config_wifi_p2p_support from config.xml.
"config_wifi_p2p_support" is no longer used.
It was replaced with PackageManager.FEATURE_WIFI_DIRECT.

Change-Id: Ib57c5246b2ad218e65b4cbbb77fd37c04b5d9682
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2013-01-25 11:35:33 +09:00
Irfan Sheriff
ede6a689bc am 526603b1: am 441a90dc: am 3a0acc03: am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (3) and others
* commit '526603b1d8404432256b03507187f50c6b21b31d':
  Fix WPS configuration method of BSS enrollee.
2013-01-24 16:19:01 -08:00
Irfan Sheriff
526603b1d8 am 441a90dc: am 3a0acc03: am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (2) and others
* commit '441a90dc72d05082f0d1a4b227d48420a0b99a54':
  Fix WPS configuration method of BSS enrollee.
2013-01-24 16:15:29 -08:00
Irfan Sheriff
441a90dc72 am 3a0acc03: am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (1) and others
* commit '3a0acc03bb0f57df23b2c8e859acd37b80f42620':
  Fix WPS configuration method of BSS enrollee.
2013-01-24 16:12:00 -08:00
Laurent Tu
eb3d4a3b42 am 377fc095: Merge "Fix GpsLocationProvider.enable/disable/isEnabled"
# Via Android (Google) Code Review (1) and Laurent Tu (1)
* commit '377fc095e142b160b5093ed1d3717d0b18aff0f9':
  Fix GpsLocationProvider.enable/disable/isEnabled
2013-01-24 15:44:47 -08:00
Laurent Tu
377fc095e1 Merge "Fix GpsLocationProvider.enable/disable/isEnabled" 2013-01-24 23:42:03 +00:00
Laurent Tu
7b5aeca50b Fix GpsLocationProvider.enable/disable/isEnabled
Fix the issue where GpsLocationProvider.isEnabled() returns true when it
is really false (and the other way around), when the handler hasn't
processed the enable/disable messages yet.

This can be systematically reproduced when the caller code is using the
same thread as the thread of the handler in GpsLocationProvider.

For example, this was happening in LocationManagerService.switchUser().
It would start by disabling all the providers (with
updateProviderListenersLocked()), then re-enable them in
updateProvidersLocked() only when isEnalbed()==false, which was in the
wrong state since the GpsLocationProvider.ENABLE message hadn't been
processed yet. As a result, the GpsLocationProvider was disabled upon
startup of the phone.

This is a slight problem for the enable() contract, which specifies that
getStatus() must be handled, getStatus() will be handled but might have
slighty not-up-to-date info in this case.

Bug: 8028017

Change-Id: Iff91a11cc150e9029a6db85b64a10a926e12b0ba
2013-01-24 15:26:02 -08:00
Fabrice Di Meglio
5ba8552913 am de71ce1a: Merge "Fix recent apps item text position in RTL mode"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit 'de71ce1ab3cda6030b5838f4cadb4fe974d522c2':
  Fix recent apps item text position in RTL mode
2013-01-24 13:52:54 -08:00
Fabrice Di Meglio
965ce78eb5 am 5e3b0452: Merge "Fix SystemUI navigation bar in RTL mode"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '5e3b0452667e2f73b16bfffde873334525582308':
  Fix SystemUI navigation bar in RTL mode
2013-01-24 13:51:32 -08:00
Fabrice Di Meglio
de71ce1ab3 Merge "Fix recent apps item text position in RTL mode" 2013-01-24 21:49:45 +00:00
Fabrice Di Meglio
5e3b045266 Merge "Fix SystemUI navigation bar in RTL mode" 2013-01-24 21:46:33 +00:00
Irfan Sheriff
3a0acc03bb am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Gerrit Code Review (1) and Yoshihiko Ikenaga (1)
* commit '381fb8bdd10e6426f829e90f57686103529adb77':
  Fix WPS configuration method of BSS enrollee.
2013-01-24 10:22:28 -08:00
Irfan Sheriff
381fb8bdd1 Merge "Fix WPS configuration method of BSS enrollee." 2013-01-24 17:38:51 +00:00
Wink Saville
0bfed3acae am 36b8d75f: am 311ef539: (-s ours) am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (3) and others
* commit '36b8d75f485b0dc4a87328bb88c391daefd4887f':
  frameworks: Display missing text on SimUnlockScreen
2013-01-23 20:54:04 -08:00
Wink Saville
36b8d75f48 am 311ef539: (-s ours) am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (2) and others
* commit '311ef539cffa35163eae64a93700ab049ceaf827':
  frameworks: Display missing text on SimUnlockScreen
2013-01-23 20:52:28 -08:00
Yoshihiko Ikenaga
1201dd9b70 Fix WPS configuration method of BSS enrollee.
Remove keypad from WPS configuration method of BSS enrollee
becuase JB UI does NOT support keypad, only supports pbc and
display.

Change-Id: I9ab6f1514805e8307b46e38261f1c657568aeb59
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2013-01-24 13:48:58 +09:00