27643 Commits

Author SHA1 Message Date
Mike Cleron
40efbd4060 am 323bb07f: am a5a4eb0f: am 6b922cc6: Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev
* commit '323bb07f762e5373f90e758a1146b93a3c31fe17':
  Receive a user dictionary callback from Settings application
2012-12-14 11:04:42 -08:00
Mike Cleron
323bb07f76 am a5a4eb0f: am 6b922cc6: Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev
* commit 'a5a4eb0f93d4b992a1879e26e04ba803827e24ca':
  Receive a user dictionary callback from Settings application
2012-12-14 11:01:55 -08:00
Mike Cleron
a5a4eb0f93 am 6b922cc6: Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev
* commit '6b922cc6d4d8221ad83b410c03eb4b8fb9fc78e2':
  Receive a user dictionary callback from Settings application
2012-12-14 10:59:19 -08:00
Satoshi Kataoka
0e3849af47 Receive a user dictionary callback from Settings application
Bug: 7725834

The callback is sent when the user adds a word to the user dictionary.

Change-Id: Ieee9bfd50a9adbed1a769e3cd95d9cb2815c34b4
2012-12-14 17:21:43 +09:00
Adam Cohen
3366cb2a01 Merge "Adding simple ArrayList API for collection widgets" 2012-12-13 17:50:11 -08:00
Adam Cohen
50f3d1bae8 Adding simple ArrayList API for collection widgets
Change-Id: I4d6c909d1d2c0bdd1ddc8329445cea0e78a5ce7c
2012-12-13 14:52:30 -08:00
Nick Kralevich
abe998c5e0 Remove dead code.
Android no longer supports a security manager.
System.getSecurityManager() always returns null.

Change-Id: Id44ae8e100da901f2e3054dab905376423a8ff5b
2012-12-13 10:49:28 -08:00
Przemyslaw Szczepaniak
b46533732c Set default language in new TTS clients.
A recent change altered semantics of getLanguage call to return client
language instead of service language. This solved problems
with interferences between two clients using different lanaguages.

This change created a bug - new TTS client instance have no language set.
Since reading user preferences requires additional permissions I've
added new tts service method - getClientDefaultLanguage that will return
user preferences.

I've also added new client method, getDefaultLanguage, that allow easy
access to this data.

Bug: 7666482
Change-Id: Ieb7d2ba3a99d20c513add97f054874720a1cd82e
2012-12-13 03:21:30 -08:00
Adam Powell
2331b42328 am dc4beb48: am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
* commit 'dc4beb483eb14f1b56154125c67b780802756572':
  Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
2012-12-11 19:12:45 -08:00
Adam Powell
dc4beb483e am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
* commit 'e7ec492f13355888c90b3f08fbc66e49dda7ed24':
  Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
2012-12-11 19:10:45 -08:00
Adam Powell
90f4c5c9d4 am c6f05e93: am d22843a8: Merge "Fix regression in ListView click handling"
* commit 'c6f05e93dc37db67addcd19ff87ba013ba817035':
  Fix regression in ListView click handling
2012-12-11 18:04:23 -08:00
Adam Powell
c6f05e93dc am d22843a8: Merge "Fix regression in ListView click handling"
* commit 'd22843a8a8d240fc09291b1b9505d62c1f0c0f8d':
  Fix regression in ListView click handling
2012-12-11 18:02:30 -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
Christopher Tate
1423fa30c2 am 1de62393: am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
* commit '1de623939090993d03a7c398d09e2d13950d682b':
  Make immersive mode public & imply update locking
2012-12-11 16:15:38 -08:00
Christopher Tate
1de6239390 am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
* commit '534de491e6522465a7ad12d7cba9b2f80deab364':
  Make immersive mode public & imply update locking
2012-12-11 16:13:51 -08:00
Christopher Tate
534de491e6 Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev 2012-12-11 16:11:00 -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
Jeff Brown
ace7404de8 resolved conflicts for merge of d7337fb9 to master
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
2012-12-11 15:21:02 -08:00
Jeff Brown
d7337fb97a am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
* commit '3781523becbb2d576761c2701763ff3588294a97':
  Play a tone when wireless charging begins.
2012-12-11 14:19:41 -08:00
Jeff Brown
3781523bec am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
* commit 'eaae7d976a5629e064af06f0e2c10f97f1a8c462':
  Play a tone when wireless charging begins.
2012-12-11 14:17:50 -08:00
Chet Haase
8ee38721e0 Merge "Fix requestLayout-during-layout issue with Gallery" 2012-12-11 14:09:29 -08:00
Chet Haase
bfea76c787 Fix requestLayout-during-layout issue with Gallery
The way that the Gallery was adding views (which it does in layout)
triggered a requestLayout() because of a call to setLayoutParams()
in View.addViewInner(). This tripped up the new logic that makes
layout-in-layout work, causing layout to be called on every frame,
even when the app was not doing anything.

The fix is to call the appropriate version
of requestLayoutInner() to tell it to skip calls to requestLayout().

Issue #7714495 requestLayout in endless loop

Change-Id: Icdcd886d30e4dd972da36bc6e50732c7213530c5
2012-12-11 14:05:24 -08:00
Jeff Brown
84e2756c0f Play a tone when wireless charging begins.
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.

Use new low battery and wireless charging sounds on Mako.

Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
2012-12-11 12:55:03 -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
Jeff Sharkey
7a96c39c51 Move lingering services to services.jar.
This helps reduce the pressure on framework.jar, and makes it clear
that it should only be used by the system_server.

Bug: 7333397
Change-Id: I0858904239535380fbf30562b793e277d8c3f054
2012-12-11 09:50:50 -08:00
Mita Yun
b84b9c2191 am 81f82d29: am aa8dc2ee: Removed mCallbackLooper from WallpaperService
* commit '81f82d29ed3c93704c4fa0cbfeb48a675b71c349':
  Removed mCallbackLooper from WallpaperService
2012-12-10 19:50:11 -08:00
Christopher Tate
73c2aee40a Make immersive mode public & imply update locking
Activity.setImmersive(boolean) / android:immersive="bool" are now public.
In addition, if the foreground activity is immersive then an update lock
will be held on its behalf.  This lets applications such as movie players
suppress the display of intrusive notifications, OTA-availability dialogs,
and the like while they are displaying content that ought not to be
rudely interrupted.

The update lock aspect of this mode is *advisory*, not binding -- the
update mechanism is not actually constrained; it simply uses this information
in deciding whether/when to prompt the user.  It's more a guideline than
a rule.

Bug 7681380

Change-Id: I3c412a84cbf3933e3bf0168f2c71c54a86e4b7e5
2012-12-10 18:40:57 -08:00
Mita Yun
81f82d29ed am aa8dc2ee: Removed mCallbackLooper from WallpaperService
* commit 'aa8dc2ee18c15a5c7fb897d2f41116950fd30fe6':
  Removed mCallbackLooper from WallpaperService
2012-12-10 18:36:01 -08:00
Mita Yun
aa8dc2ee18 Removed mCallbackLooper from WallpaperService
Change-Id: Icb060a9225dbe7e848bbe80e6a9ab28fcfb59969
2012-12-10 18:32:03 -08:00
Mita Yun
d44280e288 resolved conflicts for merge of ebcbfb3f to master
Change-Id: I0658dd4a1418fbad91d9663e5b52418a979dc683
2012-12-10 16:50:22 -08:00
Adam Powell
6a7304c95b Merge "Clear SearchView query field when collapsed as an action view" 2012-12-10 15:38:33 -08:00
Mita Yun
ebcbfb3fc7 am a98cd512: Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev
* commit 'a98cd5122be643a51f563d02069e8f9409d44394':
  Use asynchronous messages for input method events.
2012-12-10 15:35:05 -08:00
Adam Powell
235ae5f6fa Preserve Spinner widget open state across instance save/restore
Also fix a bug where anchored Spinner popups would not properly move
during a layout update.

Bug 7555978

Change-Id: If8dc22b0b40b14789a4e3bdecdeb376984923899
2012-12-10 14:37:59 -08:00
Mita Yun
a98cd5122b Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev 2012-12-10 14:37:38 -08:00
Adam Powell
99d0ce9a75 Clear SearchView query field when collapsed as an action view
Bug 7679852

Change-Id: Ice1b6902670f133219569e1b1d409a152ebc7b16
2012-12-10 13:11:47 -08:00
Adam Powell
7da613fd5d am a52b4792: am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected"
* commit 'a52b4792d134c257d0e897dbd39e6c1a53e30bb5':
  Fix EventLog string class problem in onOptionMenuSelected
2012-12-10 11:43:33 -08:00
Adam Powell
a52b4792d1 am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected"
* commit 'd692c2c6856072a3ec8bec4550466d15a9fef8d7':
  Fix EventLog string class problem in onOptionMenuSelected
2012-12-10 11:41:29 -08:00
Adam Powell
ba534dece2 Merge "Update documentation to mention compatibility versioning" 2012-12-10 11:34:19 -08:00
Adam Powell
2c8cc972c3 Update documentation to mention compatibility versioning
Mention changes involving MeasureSpec/RelativeLayout/ImageView
behavior changes when apps target SDK > 17.

Change-Id: I232492a76ac048f7b460d28a87bd84cbbec4e4d7
2012-12-10 11:02:54 -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
Satoshi Kataoka
6d29d143d9 Merge "Fix an issue on changing the keyboard locale between spellchecking supported language to non-supported language" 2012-12-09 17:34:41 -08:00
Adam Powell
e3833c2ba4 Merge "Compatibility measurement hacks when targetSdkVersion <= JB-MR1" 2012-12-07 17:23:24 -08:00
Adam Powell
7da4b73a23 Compatibility measurement hacks when targetSdkVersion <= JB-MR1
All three of these are interrelated!

* Allow broken MeasureSpec values. The long-standing implementation
  of MeasureSpec.makeMeasureSpec has been to add both values rather
  than masking/or-ing the values together. Some old code relied on
  this, such as if it mixed up size/mode params.

* Disable ImageView adjustViewBounds allowing the view to grow beyond
  its initial size. A bug in RelativeLayout in the presence of the
  above MeasureSpec fix causes this not to work properly in apps.

* Allow RelativeLayout to send overflowed/bogus MeasureSpec values
  when measured with MeasureSpec.UNSPECIFIED mode. Some apps have
  custom child views that do not properly handle UNSPECIFIED
  measurements, but the exact overflow semantics caused this to
  generate AT_MOST $REALLYBIG MeasureSpecs for those views instead if
  they were placed inside a RelativeLayout in a scrolling container.

Change-Id: I977a5f1ba5637f0cba3d26a70139e2bcd021fc9c
2012-12-07 16:30:35 -08:00
Sascha Prueter
961ce2afbf am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev
* commit '2588648b5268526bdc9ed7fb4e9eac36c8c693dc':
  Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
2012-12-07 12:40:32 -08:00
Sascha Prueter
2588648b52 am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev
* commit '203f69f0998d982205b1c9f550576024654e6bc3':
  Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
2012-12-07 12:38:15 -08:00
Adam Powell
cd252d267b am 524962c8: am ff411ddb: Merge "Framework: Use holo alert drawables"
* commit '524962c8cf796035f7578515ba48080873d46057':
  Framework: Use holo alert drawables
2012-12-07 12:24:20 -08:00
Adam Powell
461c8534e1 am d9cb3c53: am 8ea5ce15: Merge "Ensure running mTouchModeReset when AbsListView is detached"
* commit 'd9cb3c538f034c4e5137a2d2827cc72f8fbaf67e':
  Ensure running mTouchModeReset when AbsListView is detached
2012-12-07 12:24:17 -08:00
Adam Powell
524962c8cf am ff411ddb: Merge "Framework: Use holo alert drawables"
* commit 'ff411ddb40d250f075bfe8c4940931b27079f5cb':
  Framework: Use holo alert drawables
2012-12-07 12:21:41 -08:00
Adam Powell
d9cb3c538f am 8ea5ce15: Merge "Ensure running mTouchModeReset when AbsListView is detached"
* commit '8ea5ce15651ebc1249a3b80531773b37e6f49b8d':
  Ensure running mTouchModeReset when AbsListView is detached
2012-12-07 12:21:37 -08:00
Craig Mautner
4abf3f987f Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
RecentsActivity screenshots are called for very quickly after
WindowStateAnimator prepareSurface(). Without enough delay the
Surface.setLayer call does not propagate to the SurfaceFlinger
and the screenshot is incorrect (black) because it stops sampling
the layers too early.

This fix calls Surface.setSize() for each sampled Surface in
screenshots. setSize forces the SurfaceFlinger to process all
transactions queued before returning from closeTransaction.

Bug 7552304 fixed.

Change-Id: I1911dfa0b09cab713c55f5ba0c612496337a77df

Conflicts:

	services/java/com/android/server/wm/WindowManagerService.java
2012-12-07 11:21:35 -08:00