Jamie Gennis
ba6f4ee86d
am 131006b8: am d83fdd03: Merge "Trace: add a tracing tag for video" into jb-dev
...
* commit '131006b810121c50425f727a5d879428f1709420':
Trace: add a tracing tag for video
2012-05-14 08:37:02 -07:00
Jamie Gennis
671543f762
am 592cbb83: am c9e27d4b: Merge "Surface: replace active rect with window crop" into jb-dev
...
* commit '592cbb835aa5ed104badf7de6c144a7b90300620':
Surface: replace active rect with window crop
2012-05-14 08:36:58 -07:00
Adam Powell
e60a635919
am e48c70e4: am 7fc4fbcc: Merge "Automatic persistent text selection for ListViews" into jb-dev
...
* commit 'e48c70e4d9302795d5f02d352c7907302ca5c8b6':
Automatic persistent text selection for ListViews
2012-05-14 08:36:17 -07:00
Gilles Debunne
579cc204a2
am b00ceecb: am 0ae107ff: Merge "Cut long text into multiple DL at start" into jb-dev
...
* commit 'b00ceecb96063a30bb73b13e156a6da00e3900e7':
Cut long text into multiple DL at start
2012-05-14 08:36:08 -07:00
Jeff Sharkey
d640d0641a
am f2fe4cb1: am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
...
* commit 'f2fe4cb11b2b93acf1a983e856efe26b6bb79683':
Enforce READ_EXTERNAL through Settings.Secure.
2012-05-14 08:35:42 -07:00
John Reck
e6d1d4d4bb
am 51688c51: am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev
...
* commit '51688c51c14e7e92bc6d6139a099cf701b1608b0':
Prevent updateStateTrackers from being affected by preventDefault()
2012-05-14 07:48:44 -07:00
Jeff Brown
d4bef4b786
am 47272c93: am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
...
* commit '47272c932ab6157022aaefd015e5d1df9dc5bd2f':
Minor refactoring before starting on velocity tracker changes.
2012-05-14 07:48:31 -07:00
Teng-Hui Zhu
e947752c0f
am 08df9eac: am ef279363: Merge "Fix a crash." into jb-dev
...
* commit '08df9eac6e7ef246afb5ccd9d7cccadcb131e7b2':
Fix a crash.
2012-05-14 07:48:21 -07:00
Chet Haase
7008d7b7f3
am fd086b95: am 76f08218: Merge "Fix quickReject logic for transformed views" into jb-dev
...
* commit 'fd086b95103e8c7fbe853f5702aaa7d04f2141f0':
Fix quickReject logic for transformed views
2012-05-14 07:47:59 -07:00
Jeff Brown
179817387b
am f4df93ce: am 2f095760: Rename kcm attribute to keyboardLayout.
...
* commit 'f4df93cec62861e3f185979612360c27dd80e043':
Rename kcm attribute to keyboardLayout.
2012-05-14 07:47:52 -07:00
Chet Haase
ad4fc6f764
am 4a70bc72: am 26511012: Merge "Clear animations in DisplayLists when done" into jb-dev
...
* commit '4a70bc72a87427115d9d64516145283dc96745f2':
Clear animations in DisplayLists when done
2012-05-14 07:26:23 -07:00
Romain Guy
d6a98aafab
am 30b013bf: am d303dd3d: Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev
...
* commit '30b013bfbad60e20b7f812d0c5e41893fb7503fa':
Prevent NPE in TextureView.getBitmap()
2012-05-12 16:46:55 -07:00
Teng-Hui Zhu
cffefb7062
am 9895881b: am 9ac32040: Merge "Keep the controller when video ended." into jb-dev
...
* commit '9895881b2ca944e57b625368df18f40d3feeeba8':
Keep the controller when video ended.
2012-05-12 16:46:44 -07:00
Teng-Hui Zhu
87084281ca
am b5005a54: am 6df5ca08: Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev
...
* commit 'b5005a544f779a7df9bfe960003ac135257487ef':
Avoid inline->fullscreen reload for html5 video.
2012-05-12 16:46:40 -07:00
Jamie Gennis
131006b810
am d83fdd03: Merge "Trace: add a tracing tag for video" into jb-dev
...
* commit 'd83fdd03a1daaf577d80c8abda86c7c01bf6d3bb':
Trace: add a tracing tag for video
2012-05-11 17:19:53 -07:00
Jamie Gennis
592cbb835a
am c9e27d4b: Merge "Surface: replace active rect with window crop" into jb-dev
...
* commit 'c9e27d4ba1f46eb29aa8a794685ecb7c492d5d83':
Surface: replace active rect with window crop
2012-05-11 17:19:50 -07:00
Jamie Gennis
d83fdd03a1
Merge "Trace: add a tracing tag for video" into jb-dev
2012-05-11 17:17:47 -07:00
Jamie Gennis
c9e27d4ba1
Merge "Surface: replace active rect with window crop" into jb-dev
2012-05-11 17:17:31 -07:00
Adam Powell
e48c70e4d9
am 7fc4fbcc: Merge "Automatic persistent text selection for ListViews" into jb-dev
...
* commit '7fc4fbccd6129e286a1f9c640eb3229b91792bce':
Automatic persistent text selection for ListViews
2012-05-11 16:36:11 -07:00
Adam Powell
7fc4fbccd6
Merge "Automatic persistent text selection for ListViews" into jb-dev
2012-05-11 16:34:15 -07:00
Gilles Debunne
b00ceecb96
am 0ae107ff: Merge "Cut long text into multiple DL at start" into jb-dev
...
* commit '0ae107ff34dd998dbe86736297e9325051ad5152':
Cut long text into multiple DL at start
2012-05-11 16:16:23 -07:00
Gilles Debunne
0ae107ff34
Merge "Cut long text into multiple DL at start" into jb-dev
2012-05-11 16:14:02 -07:00
Jeff Sharkey
f2fe4cb11b
am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
...
* commit 'cd5862586ab555b53ffd0a62488843838d1aa94d':
Enforce READ_EXTERNAL through Settings.Secure.
2012-05-11 15:49:00 -07:00
Jeff Sharkey
cd5862586a
Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
2012-05-11 15:47:01 -07:00
Gilles Debunne
71afc39d68
Cut long text into multiple DL at start
...
Bug 5763685
To improve performance, preventively cut the the into display
list of 3-10 lines of text. Further updates to small parts of
the text (such as adding an underline on a word) will only
invalidate and redraw the affected sub display list.
DLs are aligned with paragraphs, just like they will be during
text edition.
Change-Id: I0d60debc7fdaea8b29080a6eacb2d60205e7d547
2012-05-11 15:32:43 -07:00
Jeff Sharkey
f53857716a
Enforce READ_EXTERNAL through Settings.Secure.
...
Always defers to user-defined setting, when present.
Bug: 6389556
Change-Id: I079d2a41b772facfdac74eefc4c8072fc9284f97
2012-05-11 15:31:39 -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
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
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
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
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
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
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