28776 Commits

Author SHA1 Message Date
Adam Powell
e305e5f68d Merge "show SELECT ALL icon with text in landscape mode" 2013-01-28 18:44:10 +00:00
Kenny Root
ebb61ca2ed Merge "Track libcore changes for OpenSSLKey" 2013-01-26 00:26:01 +00:00
Kenny Root
bf043b505c Merge "Add TLS Channel ID support to SSLCertificateSocketFactory." 2013-01-25 22:08:52 +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
Kenny Root
cc1fc6b6ad Track libcore changes for OpenSSLKey
Change-Id: I39f60c34daa9ccc633efb02988ea238a84e6bbf1
2013-01-22 15:22:56 -08:00
John Reck
6458d9b1b2 Merge "Fix for truncated sentence in "Find on Page" field" 2013-01-22 21:12:49 +00:00
Alex Klyubin
4ef6c9b6a1 Add TLS Channel ID support to SSLCertificateSocketFactory.
This adds a new method setChannelIdPrivateKey as a hidden API.

See http://tools.ietf.org/html/draft-balfanz-tls-channelid-00 for
more information about the TLS Channel ID extension.

Change-Id: I73c1905afdce01d4831de7faa55ea4496575b5a5
2013-01-18 12:50:39 -08:00
Elliott Hughes
26df61683a Track a typo fix in hidden libcore API.
Change-Id: I6fa3c2ef7f4d73bbf6557560e46c7c11bff74a32
2013-01-17 09:24:47 -08:00
Stefan Wysocki
1c15b8d896 Fix for truncated sentence in "Find on Page" field
When typing a text in find on page, then deleting it again the
default text in the field "Find on Page" is truncated by
an invisible view.

This commit fixes the problem by setting the visibility of
mMatches view changes to View.GONE instead of View.INVISIBLE.

Change-Id: I9889f22a254cdabb0cbaba72bff4b14158e5c9ff
2013-01-15 14:02:53 +01:00
Elliott Hughes
cbfece8237 Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c." 2013-01-14 17:01:52 -08:00
Elliott Hughes
4caba61ea0 Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
I removed the duplication in DateTimeView rather than fix that copy
of the code.

Bug: 7924970
Change-Id: I60c205d06ad3b50fd2f5d5fc432e4eb186f9c0e7
2013-01-14 15:48:27 -08:00
Dianne Hackborn
9fae2ecc5f Merge "Handle nested folder case" 2013-01-07 15:20:45 -08:00
Dianne Hackborn
350d5168e4 Merge "Correcting typo in doc of MEDIA_XXX intents" 2013-01-07 11:21:54 -08:00
Dianne Hackborn
d5d6f04f2a Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 2013-01-07 11:19:11 -08:00
Brian Carlstrom
91154ce658 Use most specific attributes for distinguished name display
Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
2013-01-04 15:27:24 -08:00
suyi Yuan
be7af83829 Correcting typo in doc of MEDIA_XXX intents
Correcting typo in documents of MEDIA_MOUNTED,
MEDIA_UNMOUNTED,MEDIA_UNMOUNTABLE intents, which
may be confusing to APP developers.

Change-Id: Id909b7bfad98e305b8054978f054f4fb9b705311
2013-01-04 21:21:59 +08:00
Roger Chen
1740ada533 Handle nested folder case
Change-Id: Id6d6a5899e8255d18192adbc766d8d9a0e6825d0
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-01-03 18:39:34 -08:00
Adam Powell
41bb82bece Merge "Fix NullpointException problem in onMenuItemSelected" 2013-01-03 16:46:03 -08:00
Adam Powell
7979b58a7a Merge "Memory leak due to bad destroy sequence" 2012-12-17 14:39:56 -08:00
Pawit Pornkitprasan
35e4a7029e Toast: fix force close if called from system service
If a toast is created from a system service, an application context
will not be available, use the service context instead.

Fixes
http://code.google.com/p/android/issues/detail?id=40058
http://code.google.com/p/android/issues/detail?id=40075

Change-Id: Ic643f4557fa04476819cd2c3ee640b735eeae429
2012-12-17 18:04:17 +07:00
Elliott Hughes
c749261fea Merge "Fix DateUtils.formatElapsedTime." 2012-12-14 17:39:19 -08:00
zobject
686a805ef9 Fix NullpointException problem in onMenuItemSelected
If both title and condensed title is null,
item.getTitleCondensed() could be return null value
in onMenuItemSelected. therefore need to check
whether retun value is null or not.

Change-Id: Ib08f52b949a794aa7bd6cc25414041e820f62969
2012-12-15 08:23:26 +09:00
Elliott Hughes
2eda18485c Fix DateUtils.formatElapsedTime.
More reuse of StringBuilders, less broken home-grown formatting code.

Long-term, we should hand this over to icu4c, but they're not ready yet.

Bug: http://code.google.com/p/android/issues/detail?id=41401
Bug: 7736688
Change-Id: Ib3c1e1aad05827df646aa18645cce19dffb7551f
2012-12-14 14:29:47 -08:00
Marco Nelissen
01f42639f2 Merge "fix typo in docs" 2012-12-14 09:35:26 -08:00
Jean-Christophe PINCE
6169bcf50d Memory leak due to bad destroy sequence
During the destroy sequence, it happens that the mWebViewClassic was
set to null in the transferMessages function and consequently, the
call to WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic) is
not really removing the view from the watchdog's list; creating a
memory leak.

Change-Id: I2bae7c8d7c473e2af25e62a485699f88269d6658
Author: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 57869
2012-12-14 09:35:44 +08:00
Adam Powell
e7ec492f13 Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 2012-12-11 18:00:49 -08:00
Adam Powell
847be7445e Fix regression in ListView click handling
Regression caused by patch a607223f34

If an item click handler results in the ListView becoming detached
from the window, the performClick runnable could be executed twice.
Null out the mTouchModeReset runnable before running the click handler
so that it is not run by the detach handler.

Change-Id: I2fab60232027bb4876f9912088e0ffb9b17d308c
2012-12-11 15:56:10 -08:00
Emma Sajic
ef2277ec58 Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
Fix for Issue ID 18316. Make isEmpty() return false when getCount() returns a non-zero value. So that the list cannot be considered empty when a header or footer is present.

https://code.google.com/p/android/issues/detail?id=18316

Change-Id: Ib69201e9d5ef3efcbb68ea298b8cc8ca6e027246
Signed-off-by: Emma Sajic <esajic@effectivelateralsolutions.co.uk>
2012-12-11 19:50:58 +00:00
zobject
332944f8a0 Fix EventLog string class problem in onOptionMenuSelected
EventLog function can handle string,integer class and long class. (in android_util_EventLog.cpp)
If menu title string are used bold tag(like <b>test</b>), it'll be android.text.SpannedString.
In onOptionMenuSelected, it is using item.getTitleCondensed() function for writing event log.
therefore any android activity using tag menu string(like <b></b>) can be crashed by IllegalArgumentException.

I found this crash on GMS Application.
change locale chinese -> launch Google+ -> hangout -> menu key -> Invite(expressed chinese) click -> Google+ crash

Change-Id: I0437be81699925e29bf4510eb615ef2424432763
2012-12-10 23:19:45 +09:00
Tim Hutt
5313c9f027 Hopefully fix PendingIntent.getActivities() documentation wtf.
The first intent is the key. No wait, last! Or was it first?

I haven't actually read the code, didn't write it, and haven't tested
its behaviour, but surely it can't be both, and last is the only one
that makes sense.

Change-Id: Ie8435981f09be618c93680fb6056afd015090161
2012-12-10 12:34:19 +00:00
Adam Powell
ff411ddb40 Merge "Framework: Use holo alert drawables" 2012-12-07 11:20:08 -08:00
Sangkyu Lee
a607223f34 Ensure running mTouchModeReset when AbsListView is detached
mTouchModeReset should be executed when AbsListView is detached from window.
If not, when the AbsListView is re-attaced to window,
the child can retain a pressed state.

You can see this problem easily when you double-touch an item of
option menu very quickly.

Change-Id: I5aaa1fd5b95847efb2f5f1b5ec7cabe8eb85b237
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
2012-12-07 17:06:15 +09:00
Irfan Sheriff
1612e29826 Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 2012-12-05 20:33:37 -08:00
Hai Guo
4a68e3c26d fix typo in docs
description of 'android/hardware/Camera.Parameters.html#
    setPreviewFpsRange(int, int)' not right

Change-Id: Ic83c0f404710a0125138df1e2b7663994301aee7
2012-12-05 21:50:28 +08:00
Adam Powell
05c8f17f05 Merge "resolver list is not cleared on rebuild" 2012-12-03 11:04:21 -08:00
Elliott Hughes
9ed4abd875 Merge "Fix AndroidHttpClient documentation error." 2012-11-29 09:23:54 -08:00
Elliott Hughes
820b3e29ca Merge "Make transactGetSockaddr locale safe" 2012-11-29 08:50:23 -08:00
Elliott Hughes
d2dcd7ada3 Fix AndroidHttpClient documentation error.
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.

Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
2012-11-29 08:32:13 -08:00
Chet Haase
d8a6b5445c am 21243369: Merge "Fix infinite recursive loop"
* commit '2124336984cb6c189f03c271636a1cc8babb2371':
  Fix infinite recursive loop
2012-11-27 09:37:23 -08:00
Chet Haase
2124336984 Merge "Fix infinite recursive loop" 2012-11-27 08:34:18 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
2012-11-27 08:21:11 -08:00
Johan Redestig
636c0ff499 Make transactGetSockaddr locale safe
Explicitly use Locale.US transactGetSockaddr to avoid
unexpected results in some locales.

Change-Id: If8316e543e21e133dc0c821cc390a2b55fe6fcdf
2012-11-23 11:19:20 +01:00
László Dávid
c5d43f76fd Fix infinite recursive loop
FindBugs description:

There is an apparent recursive loop at IntProperty.java
in method set(Object, Integer)

This method unconditionally invokes itself. This would seem
to indicate an infinite recursive loop that will result in a stack overflow.

Change-Id: I2f52dd3689198cb948925aa65dd9c95be7888fe7
2012-11-23 00:26:22 +01:00
You Kim
43a5070e06 resolver list is not cleared on rebuild
Refactoring ResolverActivity.java

Change-Id: I84e6420ff98ddcafd27a52b041ddb1c50e7d7362
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-11-21 23:23:45 +09:00
Adam Powell
6e8c1495f6 Merge "Re-read shortcut labels if the language has changed" 2012-11-20 13:59:45 -08:00
Svetoslav Ganov
7018cfdc05 Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
This reverted change was adjusting the min and max values for the NumberPicker
which is not desirable since it changes behavior and it will be possible for
an app that works on the current platform to crash on an older one. Also the
adjustment was not implemented correctly.

Updated the documentation to clarify the reltionship between the min value,
max value, and the displayed values array.

Bug:7518172

This reverts commit a1410e6789ce72bc423793315a51aea8b6bad6c7

Change-Id: I109f1b1f54c1e609941243cabab9241871b6b12b
2012-11-19 15:20:27 -08:00
Mattias Falk
eb573418a7 Re-read shortcut labels if the language has changed
The shortcut label isn't updated to the current language
if the phone's language has changed.

The problem was that the shortcut label is stored in a
static variable which is set once and kept throughout the
life time of the process.

Change-Id: I89c5875fbf28fb82e073166c472ca205d28674fb
2012-11-19 09:31:19 +01:00
Björn Lundén
1129a85203 Framework: Use holo alert drawables
Replaces the current usage of the GB alert
drawable with theme-consistent holo ones.

Change-Id: I8594ef8276db5bb0e192f3a541937d7281321043
2012-11-15 15:32:02 +01:00
Kenny Root
6b77645aa9 Switch keystore to binder
Change-Id: I9fa1fc05068bee1eed3f618fb32f70cf3d4c05d4
2012-11-14 08:45:52 -08:00
Joe Malin
4422596ddb am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
  Notification.java javadoc: addAction
2012-11-13 14:25:09 -08:00