Chet Haase
73437775e3
am 36d3b9dd: Merge "Clarify AnimationSet docs and behavior"
...
* commit '36d3b9ddc4afc6d961b80c4d85f6dc0587b1285c':
Clarify AnimationSet docs and behavior
2011-09-07 14:43:51 -07:00
Chet Haase
36d3b9ddc4
Merge "Clarify AnimationSet docs and behavior"
2011-09-07 14:40:29 -07:00
John Reck
0acd5e4925
am d5417040: Merge "OnTrimMemory plumbing"
...
* commit 'd5417040be69a0e2a48e4a61605d6a60b13cce8e':
OnTrimMemory plumbing
2011-09-07 14:28:56 -07:00
John Reck
d5417040be
Merge "OnTrimMemory plumbing"
2011-09-07 14:26:47 -07:00
John Reck
faa42dbede
OnTrimMemory plumbing
...
Bug: 5269460
Change-Id: I012e2eb077c3671b856d0163de6b10ad7bd4d577
2011-09-07 13:16:58 -07:00
Adam Powell
9286e01271
am 7fed567d: Merge "Fix bug 5228657 - Input method window rendered with titlebar"
...
* commit '7fed567dae2f439202bc258ecd17ae9faf32de51':
Fix bug 5228657 - Input method window rendered with titlebar
2011-09-07 11:45:53 -07:00
Adam Powell
36a97e4030
Fix bug 5228657 - Input method window rendered with titlebar
...
Use the correct Holo-based IME theme for IMEs targeting >= 11 and < ICS.
Change-Id: Id154a927ab8439c357dc44996155f92414e2c876
2011-09-07 11:27:49 -07:00
Kristian Monsen
a45d65da8c
am 727e6ba5: Merge "Fix for bug 5100096 Repeated Security Waring"
...
* commit '727e6ba5dfcf92c9522ccc74be900f47bcfeee77':
Fix for bug 5100096 Repeated Security Waring
2011-09-07 09:58:35 -07:00
Kristian Monsen
727e6ba5df
Merge "Fix for bug 5100096 Repeated Security Waring"
2011-09-07 09:56:50 -07:00
Narayan Kamath
3b083ff56c
am ddca4708: Merge "Fix two TTS bugs."
...
* commit 'ddca4708b6955c04954b9850e2fb92293ff95ebe':
Fix two TTS bugs.
2011-09-07 05:54:30 -07:00
Narayan Kamath
ddca4708b6
Merge "Fix two TTS bugs."
2011-09-07 05:53:14 -07:00
Narayan Kamath
a65c62acab
Fix two TTS bugs.
...
(a) Fix a null pointer exception, caused by a race condition
between stop / start calls.
(b) Fix a deadlock observed when multiple apps call stop() when
an item from one of those apps is currently being processed.
bug:5253061
Change-Id: I78533aecfda028588ce6aedb041009bc0a6f4620
2011-09-07 11:38:18 +01:00
Chet Haase
bea6c8ea42
am 3791dc9b: Merge "Fix issue with LayoutTransition on non-visible windows."
...
* commit '3791dc9b1c849bfacbff6de7fb53b77f414d1e4b':
Fix issue with LayoutTransition on non-visible windows.
2011-09-06 22:38:19 -07:00
Chet Haase
3791dc9b1c
Merge "Fix issue with LayoutTransition on non-visible windows."
2011-09-06 22:36:13 -07:00
Chet Haase
61158c621d
Fix issue with LayoutTransition on non-visible windows.
...
There's a problem with how LayoutTransition cleans up after itself
when the target view is in a Window that is not on the screen.
The quick fix is to always start (and therefore properly end and clear)
transitions, regardless of whether the window is in the tree.
Change-Id: I23f4f4f04176f3943e5c6e1d78acba0190a96930
2011-09-06 22:19:45 -07:00
Adam Powell
9804063e82
am 7211dbab: Merge "Bug 5249855 - Add support for content descriptions on action bar tabs"
...
* commit '7211dbabc5859c9284aa6f8930ab91a44c7d5fc0':
Bug 5249855 - Add support for content descriptions on action bar tabs
2011-09-06 21:52:44 -07:00
Adam Powell
7211dbabc5
Merge "Bug 5249855 - Add support for content descriptions on action bar tabs"
2011-09-06 21:50:56 -07:00
Adam Powell
94e56ef3b8
Bug 5249855 - Add support for content descriptions on action bar tabs
...
Add API support for supplying content descriptions on action bar tabs.
This helps accessibility in cases where no title text is shown.
Change-Id: I8fdc4c2f2b279871b9f24b0b16e5167879b22741
2011-09-06 21:23:59 -07:00
Winson Chung
44edb88e87
am 9a355fbb: Merge "Updating javadoc for StackView constructors (4554433)"
...
* commit '9a355fbb0d94d13ef586bb76590798bdd72d93a9':
Updating javadoc for StackView constructors (4554433)
2011-09-06 19:43:25 -07:00
Winson Chung
9a355fbb0d
Merge "Updating javadoc for StackView constructors (4554433)"
2011-09-06 19:41:46 -07:00
Winson Chung
abc8b50a26
Updating javadoc for StackView constructors (4554433)
...
Change-Id: I084c9535f9be4ae4e3942828d3b624d28eae4b06
2011-09-06 18:44:21 -07:00
Gilles Debunne
94cd3cdc10
am 0046199d: Merge "Fix "out of bound exception" when the span has prefix."
...
* commit '0046199daba6a089dc966cf56a8e95d80ed60831':
Fix "out of bound exception" when the span has prefix.
2011-09-06 17:53:09 -07:00
Gilles Debunne
0046199dab
Merge "Fix "out of bound exception" when the span has prefix."
2011-09-06 17:51:10 -07:00
Gilles Debunne
7a04492590
am d486bd27: Merge "Fix several issues with the "EasyEditSpan"."
...
* commit 'd486bd278959e4f70fc2d14b02621156a132c8ce':
Fix several issues with the "EasyEditSpan".
2011-09-06 17:44:32 -07:00
Gilles Debunne
d486bd2789
Merge "Fix several issues with the "EasyEditSpan"."
2011-09-06 17:42:31 -07:00
Kristian Monsen
9041d9254e
Fix for bug 5100096 Repeated Security Waring
...
Only giving the host to SslError.
Change-Id: I6112643cf25293348ff20193e67da5f52063ffa2
2011-09-07 01:37:02 +01:00
Ben Komalo
e25b4f9779
am 8e147b29: Merge "Expose getting encryptstate through IMountService"
...
* commit '8e147b29377cab139515d17fba6ef00c868e87b6':
Expose getting encryptstate through IMountService
2011-09-06 17:16:51 -07:00
Ben Komalo
8e147b2937
Merge "Expose getting encryptstate through IMountService"
2011-09-06 17:14:52 -07:00
Romain Guy
9bc7267113
am 2b72d93c: Merge "Don\'t destroy a window\'s buffers when moving it"
...
* commit '2b72d93ce3f63c186db31aac9b0d8468fa9e50b6':
Don't destroy a window's buffers when moving it
2011-09-06 17:04:26 -07:00
Romain Guy
2b72d93ce3
Merge "Don't destroy a window's buffers when moving it"
2011-09-06 17:02:43 -07:00
Romain Guy
f21c9b0f52
Don't destroy a window's buffers when moving it
...
Change-Id: Ib08608373ae4299639c1b157421ba633e4293446
2011-09-06 17:01:05 -07:00
Luca Zanolin
1564fc7c7e
Fix several issues with the "EasyEditSpan".
...
- The easy edit span was displayed twice when in extracted mode. The orignal TextView now checks if it is in extra mode, and if so it does not display any pop-up
- The easy edit span was displayed before the view was layout causing the application to crash.
New feature:
- the span is automatically hidden after a timeout
I also renamed all the fields and classes to "EasyEdit...". There were still some field/class using an old name.
Bug: 5255363
Bug: 5247453
Bug: 5246997
Change-Id: Ic9bf05d2525e2df9017c91344a687e8cb9105417
2011-09-07 00:01:28 +01:00
Fabrice Di Meglio
152f22ba27
am c6fc20a9: Merge "Fix bug #5262565 Need to remove CharCount TextDirectionHeuristics"
...
* commit 'c6fc20a91bdf6f5d8cd8784324a55e39bcb7077c':
Fix bug #5262565 Need to remove CharCount TextDirectionHeuristics
2011-09-06 15:14:26 -07:00
Fabrice Di Meglio
c6fc20a91b
Merge "Fix bug #5262565 Need to remove CharCount TextDirectionHeuristics"
2011-09-06 15:12:25 -07:00
Romain Guy
1fa3d7cf2c
am fe1aafe4: Merge "Prevent crash in View.createSnapshot if getResources() returns null Bug #5260241 "
...
* commit 'fe1aafe4acd881712384fab8e9fb5d0b01232dab':
Prevent crash in View.createSnapshot if getResources() returns null Bug #5260241
2011-09-06 15:05:28 -07:00
Romain Guy
fe1aafe4ac
Merge "Prevent crash in View.createSnapshot if getResources() returns null Bug #5260241 "
2011-09-06 15:03:06 -07:00
Romain Guy
c529d8d8c7
Prevent crash in View.createSnapshot if getResources() returns null
...
Bug #5260241
Change-Id: I90b6d5a8961a6b7b50603a9f59a6e39093646bd4
2011-09-06 15:01:39 -07:00
Luca Zanolin
2346e0117d
Fix "out of bound exception" when the span has prefix.
...
Change the behavior of the highlight marking the "suggested text" and not the differences.
Bug: 5252699
Change-Id: I4c7e9fc9bac81da8b5f643990b86a336363d7968
2011-09-06 22:56:59 +01:00
Chet Haase
c861bd778b
Clarify AnimationSet docs and behavior
...
Two problems fixed here:
- The docs for AnimationSet were too vague and incorrect: some properties of
Animation (such as duration) are pushed from the AnimationSet down to its children, as
the current docs say. Some other properties (such as repeatCount) are ignored. Other
properties (such as startOffset) apply to the Set itself, but not to the children.
Fix: clarify this behavior for each of the properties.
- The behavior for XML resources was just busted. We would set the various properties
(e.g., duration) and then forget that we did so, since we reset the flags that marked
their existence after we loaded the resource. In fact, the duration property was
always being reset to 0, regardless of what it was set to in the xml resource.
Fix: Make it work they way it always should have: respect the values read from the XML
resource and make them behave the same way they do when set at runtime.
Change-Id: I07d68876d2259105dc5a359501d5c656ecfaa8e5
2011-09-06 14:14:29 -07:00
Dianne Hackborn
da3102b15a
am 1ed7a407: Merge "Some more preloaded drawables."
...
* commit '1ed7a407fafe50b1eb0878f560bb0618706e4e82':
Some more preloaded drawables.
2011-09-06 13:23:33 -07:00
Dianne Hackborn
1ed7a407fa
Merge "Some more preloaded drawables."
2011-09-06 13:22:06 -07:00
Svetoslav Ganov
b33f4543c5
am 64368761: Merge "AbsListView does not populate accessibility events correctly."
...
* commit '6436876156b02b8c602579fe7bc7c61330d83bb0':
AbsListView does not populate accessibility events correctly.
2011-09-06 12:53:29 -07:00
Svetoslav Ganov
6436876156
Merge "AbsListView does not populate accessibility events correctly."
2011-09-06 12:52:06 -07:00
Ben Komalo
444eca2329
Expose getting encryptstate through IMountService
...
- this really just calls cryptfs cryptocomplete
- needed so that UI logic can present a factory reset option if
encryption screwed up
Bug: 3384231
Change-Id: I553de87f0d03a65851030c9c5266e85866d30fa6
2011-09-06 12:48:53 -07:00
Fabrice Di Meglio
09554adf31
am be724dbc: Merge "Fix bug #5243493 TextView selection is not working correctly when there is some RTL run into it"
...
* commit 'be724dbc45154f2c33cc789c89eb2ac2a7516cbe':
Fix bug #5243493 TextView selection is not working correctly when there is some RTL run into it
2011-09-06 11:15:11 -07:00
Fabrice Di Meglio
be724dbc45
Merge "Fix bug #5243493 TextView selection is not working correctly when there is some RTL run into it"
2011-09-06 11:13:40 -07:00
Fabrice Di Meglio
e3bf88da23
Fix bug #5262565 Need to remove CharCount TextDirectionHeuristics
...
- update unit tests too
Change-Id: I7c518f58a9f17cb679bc3913bdd38243f7ad2195
2011-09-06 11:08:45 -07:00
Dianne Hackborn
9b44aaefc0
Some more preloaded drawables.
...
More to come.
Change-Id: I28393c6e52553e960d3a765ba793cfdbf36460ff
2011-09-06 10:58:30 -07:00
Romain Guy
76e7000125
am d3462ad7: Merge "Prevent crash when using <em> or <strong> in spanned strings Bug #5258853 "
...
* commit 'd3462ad713a1ef101ee11b03a088343254faad97':
Prevent crash when using <em> or <strong> in spanned strings Bug #5258853
2011-09-06 10:58:10 -07:00
Romain Guy
d3462ad713
Merge "Prevent crash when using <em> or <strong> in spanned strings Bug #5258853 "
2011-09-06 10:55:53 -07:00