Eric Fischer
a7faeb0c6b
am 3fd57b57: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '3fd57b5726bb968152457c1d5ba31a1a495146cb':
Import translations. DO NOT MERGE
2012-05-11 14:54:25 -07:00
Eric Fischer
6dfe380a85
Merge "Import translations. DO NOT MERGE"
2012-05-11 14:52:25 -07:00
Eric Fischer
3fd57b5726
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-11 14:52:11 -07:00
Irfan Sheriff
aa7b072dff
am ba1db8a5: Merge "Fix wifi direct issues" into jb-dev
...
* commit 'ba1db8a5912c989e493269b8751c7e9d312e0eae':
Fix wifi direct issues
2012-05-11 14:48:32 -07:00
Irfan Sheriff
ba1db8a591
Merge "Fix wifi direct issues" into jb-dev
2012-05-11 14:46:46 -07:00
Stephen Hines
8470381b0c
am dcc1996b: Merge "Test clamp (full and relaxed precision)." into jb-dev
...
* commit 'dcc1996b768ef36ed82f09dfd682914db1e9a2e9':
Test clamp (full and relaxed precision).
2012-05-11 14:29:00 -07:00
Adam Powell
057a585fba
Automatic persistent text selection for ListViews
...
Use View transient state tracking to allow selection to persist across
ListView-style item view recycling.
Fix some bugs with transient state tracking.
Bug 6110122
Change-Id: Ic084b8fc2289bff718b19478a37ce64459b3ed4c
2012-05-11 14:26:17 -07:00
Stephen Hines
dcc1996b76
Merge "Test clamp (full and relaxed precision)." into jb-dev
2012-05-11 14:25:56 -07:00
John Reck
51688c51c1
am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev
...
* commit 'dee9d9ab9f8843bdbc1fc5d29e92c12a2d0407b2':
Prevent updateStateTrackers from being affected by preventDefault()
2012-05-11 14:25:55 -07:00
John Reck
dee9d9ab9f
Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev
2012-05-11 14:23:18 -07:00
Eric Fischer
0d672105be
Import translations. DO NOT MERGE
...
Change-Id: I282de4f18397d3550952f7b2f887308bf27302cb
2012-05-11 14:11:40 -07:00
Eric Fischer
4de3538f2a
Import translations. DO NOT MERGE
...
Change-Id: Id093bff086183247032385b05d314ea0ef7d3b8b
2012-05-11 14:09:53 -07:00
Jeff Brown
47272c932a
am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
...
* commit 'b12b6b5116e3d76474296b45f570693bb10d6c99':
Minor refactoring before starting on velocity tracker changes.
2012-05-11 14:06:30 -07:00
Jeff Brown
b12b6b5116
Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
2012-05-11 14:03:38 -07:00
Robert Greenwalt
68ea9b08ef
Add logging for Tethering.
...
Hard to repro bug doesn't have enough info in the logs to understand.
bug:6469121
Change-Id: I31734f4e891e9b23197f2d5adb931e3891393cdd
2012-05-11 13:57:32 -07:00
Eric Fischer
c1135d1f5f
Import translations. DO NOT MERGE
...
Change-Id: Ie45349981abfc51075992ad1c316384eefac68f4
2012-05-11 13:56:55 -07:00
Eric Fischer
9f6c655236
Import translations. DO NOT MERGE
...
Change-Id: Id65875321fa8c95e5909d901c080396f702bad02
2012-05-11 13:52:02 -07:00
John Reck
387c2e8d42
Prevent updateStateTrackers from being affected by preventDefault()
...
Bug: 6477996
Calling e.preventDefault() on a javascript touch handler is apparantly
not supposed to prevent the default gesture detector, who knew?
Change-Id: I6ee36e2fbc485b289b6dbb3464d8562c88e3be49
2012-05-11 13:50:57 -07:00
Teng-Hui Zhu
08df9eac6e
am ef279363: Merge "Fix a crash." into jb-dev
...
* commit 'ef279363716706192b4da543fcae3e92cc14d27e':
Fix a crash.
2012-05-11 13:47:38 -07:00
Teng-Hui Zhu
ef27936371
Merge "Fix a crash." into jb-dev
2012-05-11 13:45:13 -07:00
Irfan Sheriff
10ca870d3b
Fix wifi direct issues
...
- BSS command is unreliable, use group owner information from p2p_find
- Fix the autonomousgroup settings
- Use group idle settings only on the p2p group interface to avoid group idle
resulting group formation failures
Bug: 6426991
Change-Id: I44fc204775580fb4fec6ce27070ddbde0751b495
2012-05-11 13:39:29 -07:00
Amith Yamasani
c3a3060db8
Update assets that didn't scale nicely from hdpi to tvdpi.
...
Bug: 6430949
Change-Id: I197043c3da0295e09abfbb4ae5582c2542ecbcd8
2012-05-11 13:31:11 -07:00
Chet Haase
fd086b9510
am 76f08218: Merge "Fix quickReject logic for transformed views" into jb-dev
...
* commit '76f082189ec451433d942fcee5ca2913f4132e6b':
Fix quickReject logic for transformed views
2012-05-11 13:02:43 -07:00
Teng-Hui Zhu
422400f92d
Fix a crash.
...
End can happen when error happens, but media controller may be not ready yet.
bug:5340224
Change-Id: I94607dfdf26d2dc4c7bbc9c2a62f98deccb8d198
2012-05-11 13:00:03 -07:00
Chet Haase
76f082189e
Merge "Fix quickReject logic for transformed views" into jb-dev
2012-05-11 12:59:41 -07:00
Jeff Brown
f4df93cec6
am 2f095760: Rename kcm attribute to keyboardLayout.
...
* commit '2f0957607411b99810226ad38d59cf18718b86d0':
Rename kcm attribute to keyboardLayout.
2012-05-11 12:59:32 -07:00
Jeff Brown
8a90e6e317
Minor refactoring before starting on velocity tracker changes.
...
Bug: 6413587
Change-Id: I5eba2bb57193bff78cb3740de5f87aca0b31d154
2012-05-11 12:32:56 -07:00
Jeff Brown
2f09576074
Rename kcm attribute to keyboardLayout.
...
Bug: 6478076
Change-Id: I7fc0d8eb36d03a628d070f8fd6ea1e1464b1a163
2012-05-11 12:32:56 -07:00
Raph Levien
7dbf4ee416
am 3816174b: Add explicit id for fontFamily attribute.
...
* commit '3816174b3bea63eb355a0aa212c6b51e9435627b':
Add explicit id for fontFamily attribute.
2012-05-11 12:10:01 -07:00
Raph Levien
bb6e3b3b1e
Merge "resolved conflicts for merge of a9cc30ce to master"
2012-05-11 12:08:44 -07:00
Craig Mautner
35d0e1d11c
Keep launcher screen from flashing over lockscreen
...
Extend the force hide period to include the animation.
Fixes bug b6471929.
Change-Id: I91daf9dc678723be4c69913aa5a3aa0e265d103e
2012-05-11 11:50:58 -07:00
Raph Levien
3816174b3b
Add explicit id for fontFamily attribute.
...
The merge for the attribute crossed in flight with making jb-dev a
release branch.
Change-Id: Ic9a2a34a8e3c54efa17a98365f58f24fe365b532
2012-05-11 11:48:57 -07:00
Brett Chabot
1b953b8fbf
Merge "Delete duplicate copies of junit source."
2012-05-11 11:14:42 -07:00
Chet Haase
1a3ab175b0
Fix quickReject logic for transformed views
...
When a parent draws its child views, each child's bounds is checked
against the current dirty region. If the view falls outside of that
region is is rejected and doesn't enter into the parent's DisplayList.
This works in general, for both transformed and untransformed views
(because we skip this check if the view is transformed). But it breaks down
when the transform properties of the view change later, since DisplayList
properties simply push these values down to the view's DisplayList without
invalidating the parent. If a view is rejected when untransformed, then there
is nothing to cause it to be considered again until something causes an
invalidate of the parent.
The fix is to note when a view is rejected and record that information.
Later, when one of the transform-related properties change, we invalidate the parent
to force the check to happen again, which will cause the view to get drawn
if it's visible.
Issue #6477730 quickRejected views must recreate their DisplayLists on transform changes
Change-Id: I70caf198005cd7e424a37bccc6ae050e09880a6c
2012-05-11 11:03:12 -07:00
Chet Haase
4a70bc72a8
am 26511012: Merge "Clear animations in DisplayLists when done" into jb-dev
...
* commit '26511012c40dbe704f4791654b28b9e0e05589d8':
Clear animations in DisplayLists when done
2012-05-11 10:59:53 -07:00
Chet Haase
26511012c4
Merge "Clear animations in DisplayLists when done" into jb-dev
2012-05-11 10:57:40 -07:00
Jamie Gennis
24dae6c611
Trace: add a tracing tag for video
...
Change-Id: If4c3c76b049a475ca99eb258dc3d432435e77dc0
2012-05-11 10:43:44 -07:00
Raph Levien
2ab6568046
resolved conflicts for merge of a9cc30ce to master
...
Change-Id: I507bd7a4650f9a7bfe6a0ad7bb8dd4067adb6a8b
2012-05-11 10:43:39 -07:00
Jamie Gennis
78b8ef3f3a
Surface: replace active rect with window crop
...
This change replaces the setActiveRectCrop method on Surface, which was called
from app processes, with the setWindowCrop method that is to be called from the
window manager.
Bug: 6299171
Change-Id: Ica51efcd8c488a526e7013b83d80df4856694519
2012-05-11 10:42:49 -07:00
Romain Guy
30b013bfba
am d303dd3d: Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev
...
* commit 'd303dd3da2af272d0beaac956a12e145b8386f45':
Prevent NPE in TextureView.getBitmap()
2012-05-11 10:27:54 -07:00
Romain Guy
d303dd3da2
Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev
2012-05-11 10:25:06 -07:00
Scott Main
be2dca02c4
Merge "add api level 16 flag for droiddoc filtering and update version code"
2012-05-11 10:14:27 -07:00
Teng-Hui Zhu
9895881b2c
am 9ac32040: Merge "Keep the controller when video ended." into jb-dev
...
* commit '9ac320406bcd0212923bfc0b4068df0b022fd4f7':
Keep the controller when video ended.
2012-05-11 10:02:15 -07:00
Teng-Hui Zhu
b5005a544f
am 6df5ca08: Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev
...
* commit '6df5ca08f192e2b831c6cf216f3a2cfe63456ad0':
Avoid inline->fullscreen reload for html5 video.
2012-05-11 10:02:12 -07:00
Romain Guy
78245f77d2
Prevent NPE in TextureView.getBitmap()
...
This crash could occur when invoking setSurfaceTexture() then getBitmap()
before the View has a chance to be drawn.
Change-Id: I25c55df15750e59b9c916e8f750de2c89718d39e
2012-05-11 10:01:42 -07:00
Teng-Hui Zhu
9ac320406b
Merge "Keep the controller when video ended." into jb-dev
2012-05-11 10:00:06 -07:00
Teng-Hui Zhu
6df5ca08f1
Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev
2012-05-11 09:59:57 -07:00
Raph Levien
641ce591a6
am c9c275fe: Merge "Add RobotoCondensed family and optimized Roboto Light." into jb-dev
...
* commit 'c9c275fe5c54f12ce66440ea0d28ff35d67ebdff':
Add RobotoCondensed family and optimized Roboto Light.
2012-05-11 09:40:04 -07:00
Raph Levien
c9c275fe5c
Merge "Add RobotoCondensed family and optimized Roboto Light." into jb-dev
2012-05-11 09:37:14 -07:00
Chris Wren
d1148756b3
am cef4dda4: am 156c7928: Merge "Don\'t allow notificaitons to be larger than 4U, even with actions. Limit BigText template to a fixed number of lines. Optimize layout of BigText and Inbox for expansion." into jb-dev
...
* commit 'cef4dda471958441bad13faceec82ae2a5e3e660':
Don't allow notificaitons to be larger than 4U, even with actions. Limit BigText template to a fixed number of lines. Optimize layout of BigText and Inbox for expansion.
2012-05-11 09:35:22 -07:00