Jeff Sharkey
18f6f9a085
am 3509e373: am f63ca02f: am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev
...
* commit '3509e3731649a99b426b97363f06c7288e5d33e2':
Migrate more System and Secure settings to Global.
2012-10-02 14:05:44 -07:00
Chris Wren
5772c1946e
am 097891f2: am eb3a02da: am 6ac833c9: Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev
...
* commit '097891f2d61480a592e6821aa3fb6b239e11ffd4':
re-use status bar DateView in QuickSettings.
2012-10-02 14:05:41 -07:00
Jeff Sharkey
3509e37316
am f63ca02f: am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev
...
* commit 'f63ca02f9fce6aedd7a03e9f8a95e2e2d6bf9eac':
Migrate more System and Secure settings to Global.
2012-10-02 14:04:22 -07:00
Chris Wren
097891f2d6
am eb3a02da: am 6ac833c9: Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev
...
* commit 'eb3a02da03ac273b3f752737789b4219eed5ca63':
re-use status bar DateView in QuickSettings.
2012-10-02 14:04:19 -07:00
Jeff Sharkey
f63ca02f9f
am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev
...
* commit 'c12dd973724f5aab44814b31650b4b47314e952b':
Migrate more System and Secure settings to Global.
2012-10-02 14:00:24 -07:00
Chris Wren
eb3a02da03
am 6ac833c9: Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev
...
* commit '6ac833c9e3ccdf586c24ccf18560d5e223ba0734':
re-use status bar DateView in QuickSettings.
2012-10-02 14:00:21 -07:00
Jeff Sharkey
c12dd97372
Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev
2012-10-02 13:57:30 -07:00
Chris Wren
6ac833c9e3
Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev
2012-10-02 13:57:30 -07:00
Michael Jurka
51fe45d3b2
am 04827755: am 94424ad3: am fb4a113a: Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
...
* commit '04827755aa5cdc2d2e999b04321adef5d4a62279':
Fix jump cut when dismissing items in Recents
2012-10-02 13:56:57 -07:00
Jeff Sharkey
6e2bee75ce
Migrate more System and Secure settings to Global.
...
Includes telephony, WindowManager, PackageManager, and debugging
settings. Update API to point towards moved values.
Bug: 7231764, 7231252, 7231156
Change-Id: I5828747205708872f19f83a5bc821ed0a801cb79
2012-10-02 13:55:15 -07:00
Michael Jurka
04827755aa
am 94424ad3: am fb4a113a: Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
...
* commit '94424ad3ed98e6ec86bf619b06367f0eb9f7fa17':
Fix jump cut when dismissing items in Recents
2012-10-02 13:55:03 -07:00
Michael Jurka
94424ad3ed
am fb4a113a: Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
...
* commit 'fb4a113a29f432b69b5ec9e3cc3143674c67ffac':
Fix jump cut when dismissing items in Recents
2012-10-02 13:53:02 -07:00
Michael Jurka
fb4a113a29
Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
2012-10-02 13:49:57 -07:00
Svetoslav Ganov
bdd58430ca
am 6a757519: am cc723173: am 0944d625: Merge "Touch explorer and magnifier do not work well together." into jb-mr1-dev
...
* commit '6a7575194d100a8be3b6bfc9d553210e55278e90':
Touch explorer and magnifier do not work well together.
2012-10-02 13:22:14 -07:00
Svetoslav Ganov
6a7575194d
am cc723173: am 0944d625: Merge "Touch explorer and magnifier do not work well together." into jb-mr1-dev
...
* commit 'cc72317334d33fbaffc099e5286b9a3d3c33f904':
Touch explorer and magnifier do not work well together.
2012-10-02 13:20:11 -07:00
Svetoslav Ganov
cc72317334
am 0944d625: Merge "Touch explorer and magnifier do not work well together." into jb-mr1-dev
...
* commit '0944d625448209185452eb4e800daec49de51986':
Touch explorer and magnifier do not work well together.
2012-10-02 13:17:09 -07:00
Svetoslav Ganov
0944d62544
Merge "Touch explorer and magnifier do not work well together." into jb-mr1-dev
2012-10-02 13:14:06 -07:00
Kenny Root
955d65f543
am f0771b19: am cee11240: am 07b4339b: Merge "Change androidfw tests to native test target"
...
* commit 'f0771b192c5530681ca407bdf3c1b21fd519c897':
Change androidfw tests to native test target
2012-10-02 13:13:03 -07:00
Kenny Root
f0771b192c
am cee11240: am 07b4339b: Merge "Change androidfw tests to native test target"
...
* commit 'cee1124052202c7f2a1956a54e5aa538d82197a7':
Change androidfw tests to native test target
2012-10-02 13:10:59 -07:00
Raph Levien
5472070c4a
am 912c3780: am ad3cc4bb: am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev
...
* commit '912c37802cd2e3e10495ea4b7c9dc3ccdd1702e5':
Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
2012-10-02 13:09:22 -07:00
Kenny Root
cee1124052
am 07b4339b: Merge "Change androidfw tests to native test target"
...
* commit '07b4339b2a2f39c17194b21dc301c0c026a2f197':
Change androidfw tests to native test target
2012-10-02 13:08:45 -07:00
Raph Levien
912c37802c
am ad3cc4bb: am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev
...
* commit 'ad3cc4bb5eda9b5c56a82e8da0ff3e286bd30cfe':
Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
2012-10-02 13:07:01 -07:00
Raph Levien
ad3cc4bb5e
am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev
...
* commit '217ca3b0d310472e4df1aa4af72769d7c7a5becb':
Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
2012-10-02 13:04:52 -07:00
Raph Levien
217ca3b0d3
Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev
2012-10-02 13:02:31 -07:00
Michael Jurka
858e145bb1
am 7558d647: am 5ead8e2e: am f175525b: Merge "Fix bug 7138446: Icon blips in during Recents animation" into jb-mr1-dev
...
* commit '7558d647caf0e591d3be49fb73ecfe49c6497000':
Fix bug 7138446: Icon blips in during Recents animation
2012-10-02 12:34:57 -07:00
Raph Levien
832815cb53
Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
...
This bug was triggered by user code concurrently mutating the character
array while calling into a drawText method in another thread. When the
value of the array changed, it caused inconsistent state, leading to
assert failures.
This is arguably bad behavior by the user code, but it shouldn't cause a
native crash. The fix is to do a defensive copy of the text into the
key, so the value is guaranteed to remain constant throughout the text
layout process. The change is mostly deletion of code, because there was
an optimization to try to avoid such a copy. That optimization was not
actually effective, however, because the indexOfKey() operation in the
KeyedVector underlying the TextLayoutCache did the copy anyway. Thus,
even though this change looks like it's introducing a copy where there
wasn't one before, the actual performance impact should be nil.
Note that the ability to handle a mutating argument is now part of the
contract for TextLayoutEngine::getValue(), and is now documented. That
contract may change, as the result of future optimization. Also, care
was taken to only use the value after the copy.
Other performance issues with TextLayoutCache are tracked in bug
7271109.
Change-Id: I9c90e8e4d501f3f37e2f22a7851f032808d46fbe
2012-10-02 12:32:40 -07:00
Michael Jurka
7558d647ca
am 5ead8e2e: am f175525b: Merge "Fix bug 7138446: Icon blips in during Recents animation" into jb-mr1-dev
...
* commit '5ead8e2ede4333c184964997e6a5b3a1a8036d5c':
Fix bug 7138446: Icon blips in during Recents animation
2012-10-02 12:32:38 -07:00
Michael Jurka
5ead8e2ede
am f175525b: Merge "Fix bug 7138446: Icon blips in during Recents animation" into jb-mr1-dev
...
* commit 'f175525be4107649581259d04711f9ead905d447':
Fix bug 7138446: Icon blips in during Recents animation
2012-10-02 12:31:07 -07:00
Michael Jurka
841594b2db
Fix jump cut when dismissing items in Recents
...
(fixing horizontal scroll view in this CL... whoops).
Bug: 7070897
Change-Id: I3a63799ce7f3d9a50869755ee3289e641fa82fa4
2012-10-02 21:30:35 +02:00
Michael Jurka
f175525be4
Merge "Fix bug 7138446: Icon blips in during Recents animation" into jb-mr1-dev
2012-10-02 12:28:38 -07:00
Michael Jurka
9f2453ba1d
am 668a4e13: am c10124ed: am 141efcb5: Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
...
* commit '668a4e1369ef1ebd62cec2150fe18d54c0a52b0b':
Fix jump cut when dismissing items in Recents
2012-10-02 12:28:09 -07:00
Michael Jurka
668a4e1369
am c10124ed: am 141efcb5: Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
...
* commit 'c10124ed4cbe713befa7c72285c2458f710e18ce':
Fix jump cut when dismissing items in Recents
2012-10-02 12:25:45 -07:00
Michael Jurka
c10124ed4c
am 141efcb5: Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
...
* commit '141efcb5b633f76056260f6763652270931853f3':
Fix jump cut when dismissing items in Recents
2012-10-02 12:24:16 -07:00
Michael Jurka
141efcb5b6
Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
2012-10-02 12:22:13 -07:00
Michael Jurka
9bdaada95c
Fix bug 7138446: Icon blips in during Recents animation
...
Add animation where icon and description of the
primary activity fades and translates in
Change-Id: Ie21b5302ac9e58ee6af219b7cde98d12a8e82697
2012-10-02 21:18:26 +02:00
Svetoslav Ganov
91aef0cfc4
am 913883d3: am 87779f63: am 87d7d946: Merge "Accessibility focus should not scroll automatically." into jb-mr1-dev
...
* commit '913883d30200d33ffaf712953f05ce3990202440':
Accessibility focus should not scroll automatically.
2012-10-02 12:12:15 -07:00
Svetoslav Ganov
913883d302
am 87779f63: am 87d7d946: Merge "Accessibility focus should not scroll automatically." into jb-mr1-dev
...
* commit '87779f63c718a494f97cbf22b6b1dedad7e4ce8b':
Accessibility focus should not scroll automatically.
2012-10-02 12:10:09 -07:00
Kenny Root
4476018159
am 2293f924: am bad71217: am 77728b01: Merge "Change installd tests to native test target"
...
* commit '2293f9247b1b9329b58114bd67f3871e5387b91b':
Change installd tests to native test target
2012-10-02 12:08:54 -07:00
Svetoslav Ganov
87779f63c7
am 87d7d946: Merge "Accessibility focus should not scroll automatically." into jb-mr1-dev
...
* commit '87d7d94673512c9572fa62c2842ce20bc87bf8b9':
Accessibility focus should not scroll automatically.
2012-10-02 12:08:45 -07:00
Kenny Root
07b4339b2a
Merge "Change androidfw tests to native test target"
2012-10-02 12:06:08 -07:00
Kenny Root
2293f9247b
am bad71217: am 77728b01: Merge "Change installd tests to native test target"
...
* commit 'bad71217b75df49245092bc0f32e4ddaeb2b3732':
Change installd tests to native test target
2012-10-02 12:06:05 -07:00
Svetoslav Ganov
87d7d94673
Merge "Accessibility focus should not scroll automatically." into jb-mr1-dev
2012-10-02 12:05:49 -07:00
Kenny Root
bad71217b7
am 77728b01: Merge "Change installd tests to native test target"
...
* commit '77728b010e34069a904c9e8a40e03b8829cfb8ae':
Change installd tests to native test target
2012-10-02 12:03:34 -07:00
Svetoslav Ganov
45af84a483
Touch explorer and magnifier do not work well together.
...
1. If tocuh exploration and screen magnification are enabled and the screen
is currently magnified, gesture detection does not work well. The reason
is because we are transforming the events if the screen is magnified before
passing them to the touch explorer to compensate for the magnification so
the user can poke what he thinks he pokes. However, when doing gesture
detection/velocity computing this compensating shrinks the gestured shape/
decreases velocity leading to poor gesture reco/incorrect velocity.
This change adds a onRawMotionEvent method in the event transformation chain
which will process the raw touch events. In this method of the touch explorer
we are passing events to the gesture recognized and the velocity tracker.
2. Velocity tracker was not cleared on transitions out of touch exploring state
which is the only one that uses velocity.
bug:7266617
Change-Id: I7887fe5f3c3bb6cfa203b7866a145c7341098a02
2012-10-02 12:02:05 -07:00
Kenny Root
f3f286df4d
Change androidfw tests to native test target
...
Change the androidfw tests to the BUILD_NATIVE_TEST target so they end
up in the correct directory. Also remove the module tags and C include
paths. The include paths are automatically added when the library is
used.
Change-Id: Ia47f6c25130c5068b89d6dc067e5d9c714a6d08a
2012-10-02 11:54:01 -07:00
Chris Wren
9c022dff03
re-use status bar DateView in QuickSettings.
...
Bug: 7221083
Change-Id: Ic1cb7118d8e5f83a8e5e1101a609791a1e0fbab1
2012-10-02 14:48:42 -04:00
Adam Cohen
27ce122311
am 0114639d: am c546c40d: am bebefaac: Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev
...
* commit '0114639dea6d0ca23fdbc8e90c52289c468de802':
Fixing up keyguard widget pager layouts
2012-10-02 11:35:50 -07:00
Adam Cohen
0114639dea
am c546c40d: am bebefaac: Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev
...
* commit 'c546c40da84a7576e3f5b2cc1441edf02b6d0df2':
Fixing up keyguard widget pager layouts
2012-10-02 11:33:50 -07:00
Adam Cohen
c546c40da8
am bebefaac: Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev
...
* commit 'bebefaac17801a375244fca0ae856f4c2f56f702':
Fixing up keyguard widget pager layouts
2012-10-02 11:31:24 -07:00
Svetoslav Ganov
a85236e510
Accessibility focus should not scroll automatically.
...
1. We use auto scroll when a view gets accessibility focus.
Pros: Having magnification and TalkBack enabled together (not a common use case)
will have the accessibility focused view on the screen (it is auto panned).
Cons: A blind user can get stuck in a very lock scroll view - not good.
2. We do not auto scroll when a view gets accessibility focus.
Pros: A blind user cannot get stuck in a long scroll view as he has to explicitly
scroll.
Cons: The magnified area will not pan to ensure the accessibility focused view
is visible.
Option one is the better trade off and this change removes the auto scrolling.
bug:7265773
Change-Id: I209b54ed18acad36c1f35b4c09b980e45ec9bbff
2012-10-02 11:31:18 -07:00