36736 Commits

Author SHA1 Message Date
Elliott Hughes
c749261fea Merge "Fix DateUtils.formatElapsedTime." 2012-12-14 17:39:19 -08: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
Elliott Hughes
2eca1b53ae Merge "Add return after NULL check in JetPlayer" 2012-12-14 09:19:45 -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
You Kim
8f5691fd92 Add return after NULL check in JetPlayer
When pointer lpJet is NULL, it should return.

Change-Id: Ia0471173b57da8f9bf22b3a19479aa5b3c4a5acb
2012-12-12 05:34:21 +09: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
Wink Saville
7419905676 Merge "Add config_speed_up_audio_on_mt_calls option" 2012-12-10 17:03:46 -08:00
Adam Powell
d692c2c685 Merge "Fix EventLog string class problem in onOptionMenuSelected" 2012-12-10 11:09:32 -08:00
Nick Kralevich
261bc70411 Merge "convert jint to uint32_t." 2012-12-10 09:44:24 -08: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
Nick Kralevich
7353cf305e convert jint to uint32_t.
This works around a compiler bug, and is probably more
correct anyway.

Change-Id: I1c49064bd64c31dafae560e416c665de0449f245
2012-12-07 16:56:47 -08: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
Alex Yakavenka
7eabbd552d Add config_speed_up_audio_on_mt_calls option
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
2012-12-06 14:53:58 -08: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
Roger Chen
56dc91f7ce Change the text color of timer in MediaController
The color of timer and backgroud in MediaController
are too closer to distinguish.

Change-Id: Id60ecbc26233857c7ef291ef891c9d4720309dfa
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2012-11-30 08:58:43 -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
Baligh Uddin
f7f1c6a78e Import translations. DO NOT MERGE
Change-Id: I9f2a464733eb765385c3f8f83bbcd1a1e33b0e26
Auto-generated-cl: translation import
2012-11-22 21:52:46 -08: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
Baligh Uddin
0edbc0eb76 Import translations. DO NOT MERGE
Change-Id: Ia01f5cbaa9a00034cf6bd277cb483bf0465d12e6
Auto-generated-cl: translation import
2012-11-20 22:35:34 -08:00
Adam Powell
6e8c1495f6 Merge "Re-read shortcut labels if the language has changed" 2012-11-20 13:59:45 -08:00
Svetoslav Ganov
e9812bae0e Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev 2012-11-19 15:50:19 -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
Daniel Sandler
aaec726948 Notification vibration improvements: [DO NOT MERGE]
- When notifications vibrate as a fallback (that is,
   because they want to play a sound but the device is in
   vibrate mode), this no longer requires the VIBRATE
   permission.
 - As a bonus, if your notifications use DEFAULT_VIBRATE,
   you don't need the VIBRATE permission either.
 - If you specify a custom vibration pattern, you'll still
   need the VIBRATE permission for that.
 - Notifications vibrating in fallback mode use same
   vibration pattern but can be changed easily in future.
 - The DEFAULT_VIBRATE and fallback vibrate patterns are now
   specified in config.xml.

Bug: 7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6
2012-11-19 15:12:24 -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
Baligh Uddin
9d45abd4aa Import translations. DO NOT MERGE
Change-Id: I90b5f538f6faf18d571907acaa96372894619c87
Auto-generated-cl: translation import
2012-11-16 13:49:29 -08: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
Baligh Uddin
2303f4242f Import translations. DO NOT MERGE
Change-Id: I44ee12f2a6399347b884f91259117be4774b964b
Auto-generated-cl: translation import
2012-11-14 10:11:28 -08: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
Joe Malin
ce37f1da36 am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction
2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594 am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction
2012-11-13 14:20:54 -08:00
John Spurlock
4299f63e54 am b340fe4f: am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
* commit 'b340fe4f88226ec35f0a4058f514b764b0f3977d':
  Disable navbar searchlight if search assist not available.
2012-11-12 07:58:09 -08:00
John Spurlock
b340fe4f88 am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
* commit 'f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb':
  Disable navbar searchlight if search assist not available.
2012-11-12 07:55:24 -08:00
John Spurlock
f6f47e950d Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 2012-11-12 07:52:08 -08:00
Baligh Uddin
fadf669344 Import translations. DO NOT MERGE
Change-Id: Ic0e6487087282230326fbd20063b47ad9205ee53
Auto-generated-cl: translation import
2012-11-12 07:40:52 -08:00
Andy McFadden
9d42794dde am a7113f70: am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev
* commit 'a7113f70c55517b5dbf3c54827c4559304faff4f':
  Reduce emulator logspam
2012-11-09 22:45:26 -08:00
Andy McFadden
a7113f70c5 am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev
* commit '798de53cf454595a3a494d26dfa3f08518c24e55':
  Reduce emulator logspam
2012-11-09 22:41:51 -08:00
Jean-Baptiste Queru
e499803e82 Re-merge translations - do not merge
Change-Id: I52f28841a2c2411a331352b8d0da51ae4c7b707b
2012-11-09 07:32:57 -08:00