Romain Guy
6080940411
Merge "Add PerfHUD ES profiling capabilities"
2013-05-23 19:50:58 +00:00
Romain Guy
e9bc11f712
Add PerfHUD ES profiling capabilities
...
The eglGetSystemTimeNV extension can be used to enable profiling
in PerfHUD ES. When the delta of two calls to eglGetSystemTimeNV
equals 0, we now cancels display lists updates. This allows the
tool to redraw the same frame several times in a row to run its
analysis.
For better results profiling should only be attempted after
setting viewroot.profile_rendering to true using adb shell
setprop.
Change-Id: I02e3c237418004cff8d6cb0b9a37126efae44c90
2013-05-23 12:50:13 -07:00
Alan Viverette
ac5b347d03
Merge "Fix number picker accessibility focus."
2013-05-23 18:57:12 +00:00
Chet Haase
341ac60009
am 1bf58a5a: am cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations" into jb-mr2-dev
...
* commit '1bf58a5a4c3275a8de676046da311ec0c3c61c78':
Restore previous alpha value on noop'd DisplayList operations
2013-05-23 11:28:05 -07:00
Chet Haase
1bf58a5a4c
am cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations" into jb-mr2-dev
...
* commit 'cfbbc864da1b7a9ed64807f9072c5730c421b4ef':
Restore previous alpha value on noop'd DisplayList operations
2013-05-23 11:25:34 -07:00
Chet Haase
cfbbc864da
Merge "Restore previous alpha value on noop'd DisplayList operations" into jb-mr2-dev
2013-05-23 18:23:34 +00:00
kmccormick
664ed997a2
am e5f8b6ed: am 5482b65a: am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit 'e5f8b6ed87274171e3adcc36aec272cd3060112e':
Doc update: fix GCM TOC
2013-05-23 11:05:35 -07:00
kmccormick
e5f8b6ed87
am 5482b65a: am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '5482b65ae8d3d02fa4b07a2221b3f00079c9aa80':
Doc update: fix GCM TOC
2013-05-23 11:01:50 -07:00
kmccormick
5482b65ae8
am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '88f24e6fe8b854f43bebc77c891228a28a503cd9':
Doc update: fix GCM TOC
2013-05-23 10:56:56 -07:00
kmccormick
88f24e6fe8
am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '84fb096ee7a4f6d2af7dab6e18063ed029e0ff94':
Doc update: fix GCM TOC
2013-05-23 10:54:10 -07:00
kmccormick
84fb096ee7
am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit 'e56e2483c57f9d6a12421ca7e124e7ec0e61f0ab':
Doc update: fix GCM TOC
2013-05-23 10:51:49 -07:00
kmccormick
e56e2483c5
am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '7b1adeb80ae87e9eff90aa01bae35053fc74c66f':
Doc update: fix GCM TOC
2013-05-23 10:49:58 -07:00
kmccormick
7b1adeb80a
am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit 'c6c149aa14610925158ef1ba6320c9356e45e631':
Doc update: fix GCM TOC
2013-05-23 10:47:13 -07:00
kmccormick
c6c149aa14
Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
2013-05-23 17:45:26 +00:00
Baligh Uddin
5dbeb6521c
am bc25a20e: (-s ours) am a9a0409d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'bc25a20e3891c83e516b6e5c94b404ab85a2e150':
Import translations. DO NOT MERGE
2013-05-23 09:18:12 -07:00
Baligh Uddin
5e9fc2f0e1
Merge "Import translations. DO NOT MERGE"
2013-05-23 16:15:57 +00:00
Baligh Uddin
bc25a20e38
am a9a0409d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'a9a0409d626bc63c6cbd4b734ce8609559bb9540':
Import translations. DO NOT MERGE
2013-05-23 09:15:51 -07:00
Baligh Uddin
934fe05ebd
Merge "Import translations. DO NOT MERGE"
2013-05-23 16:14:49 +00:00
Baligh Uddin
a9a0409d62
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-23 16:14:16 +00:00
Nick Kralevich
db90a330ba
Merge "Move VelocityTracker.cpp to target build only"
2013-05-23 15:40:11 +00:00
The Android Open Source Project
f17771f2a5
am 701cf5e1: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '701cf5e1bf771953f084010fa2d73a41ce71ad6e':
Add a queue of pending finished input events.
2013-05-23 08:06:40 -07:00
The Android Open Source Project
701cf5e1bf
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I339cc5b68bd236440c5d2ccbbc800ffcd3a0e7c6
2013-05-23 08:05:15 -07:00
Chet Haase
c725903eec
Restore previous alpha value on noop'd DisplayList operations
...
Previously, when a DisplayList operation was rejected because it was not
in the clip bounds, the code would not properly restore the previous
state, leading to errors in alpha values of the noop'd op being applied
to unrelated operations later in the DisplayList.
Issue #9051935 Flash of grey background when transitioning to conversation view
Change-Id: I56645cc9ebf2e07be0228ca5e249213dbeb10d7d
2013-05-23 07:57:17 -07:00
Amith Yamasani
9a6d5fc5a1
am 77049e13: am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev
...
* commit '77049e1303bba3056c4a1353d3c03421d0ba27f7':
Fix account filtering for specific package name
2013-05-23 07:43:14 -07:00
Amith Yamasani
77049e1303
am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev
...
* commit '60b4afedbeea11983b748d0d8ea9032d177dd6e7':
Fix account filtering for specific package name
2013-05-23 07:41:09 -07:00
Amith Yamasani
60b4afedbe
Merge "Fix account filtering for specific package name" into jb-mr2-dev
2013-05-23 14:39:07 +00:00
The Android Automerger
be0e8b6700
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-23 05:55:19 -07:00
Baligh Uddin
187da85c39
Import translations. DO NOT MERGE
...
Change-Id: Iaf53e2af9ac67e74522a8e27e762c04eadf25468
Auto-generated-cl: translation import
2013-05-22 22:37:20 -07:00
Baligh Uddin
4e508f775c
Import translations. DO NOT MERGE
...
Change-Id: Ib740b1d34023b2b808a403bec217ca61cbae6e41
Auto-generated-cl: translation import
2013-05-22 22:23:39 -07:00
Baligh Uddin
b52156cd67
Import translations. DO NOT MERGE
...
Change-Id: I8af9de6adcf346f5d2b9241eceefdc42a4c42026
Auto-generated-cl: translation import
2013-05-22 22:14:01 -07:00
Craig Mautner
bfa4f5c621
Merge "Add stackId to RecentTaskInfo"
2013-05-23 02:51:19 +00:00
Amith Yamasani
e342309704
Fix account filtering for specific package name
...
Hacks to enable gms to see accounts were interfering with checking for
explicit package name.
Bug: 9095427
Change-Id: Iae65ea2a678d7403d023fa1a61c01347b77c3b5a
2013-05-22 19:41:45 -07:00
Jeff Brown
f4eef69721
Add a queue of pending finished input events.
...
Although in practice an application or IME is unlikely to fill up
the input channel with finish events, it can happen when events are
being delivered very rapidly. Handle this situation by queuing
up the pending finish events until the socket becomes writable again.
Bug: 9034301
Change-Id: I938a62a75d12106a19cff2d016ba7af0db877ecf
2013-05-22 19:12:35 -07:00
kmccormick
cd7e9ebbba
Doc update: fix GCM TOC
...
Change-Id: I38753475fdf6c33d80e0e099cb6c5dcf2f05de0b
2013-05-22 18:25:21 -07:00
Ying Wang
2d66a4182a
am 6c5b9799: am 1fa3cdf0: Merge "Move offline-pdk to where the source is." into jb-mr2-dev
...
* commit '6c5b979917b8189d7de75f9d622899ba1fb9e6d1':
Move offline-pdk to where the source is.
2013-05-22 18:03:01 -07:00
Ying Wang
6c5b979917
am 1fa3cdf0: Merge "Move offline-pdk to where the source is." into jb-mr2-dev
...
* commit '1fa3cdf0cbc9bc788a313eda5d3ca3e2ad77fcc4':
Move offline-pdk to where the source is.
2013-05-22 18:00:28 -07:00
Ying Wang
1fa3cdf0cb
Merge "Move offline-pdk to where the source is." into jb-mr2-dev
2013-05-23 00:56:20 +00:00
Craig Mautner
6d90fed076
Add stackId to RecentTaskInfo
...
Necessary for multi-stack activity overview.
Fixes bug 9092356.
Change-Id: I3d51a7b5cbca6166017759401bb5d31b4ae96f07
2013-05-22 17:23:25 -07:00
Scott Main
5404f9f1dc
am 13a4f1a2: am 9d38ba20: am cfc593d5: am 38b9aaa0: am 2cc84c63: add VID for Haier to docs
...
* commit '13a4f1a23d91ff8a3f6a446413a7b467cb5d509d':
add VID for Haier to docs
2013-05-22 17:16:46 -07:00
Scott Main
13a4f1a23d
am 9d38ba20: am cfc593d5: am 38b9aaa0: am 2cc84c63: add VID for Haier to docs
...
* commit '9d38ba200eba5973256bf0c15cb394efc9211561':
add VID for Haier to docs
2013-05-22 17:14:28 -07:00
Scott Main
9d38ba200e
am cfc593d5: am 38b9aaa0: am 2cc84c63: add VID for Haier to docs
...
* commit 'cfc593d5736b627e0fffe92e511ee326b9f6d326':
add VID for Haier to docs
2013-05-22 17:10:28 -07:00
Scott Main
cfc593d573
am 38b9aaa0: am 2cc84c63: add VID for Haier to docs
...
* commit '38b9aaa0fc1b49fa4e734bb0eba28711b6b0d165':
add VID for Haier to docs
2013-05-22 17:08:20 -07:00
Scott Main
38b9aaa0fc
am 2cc84c63: add VID for Haier to docs
...
* commit '2cc84c638a3a1048d9704a8c987d1436dd27fcd6':
add VID for Haier to docs
2013-05-22 17:06:45 -07:00
Craig Mautner
bfeb1b008e
Merge "Revert "Add stackId to RecentTaskInfo""
2013-05-22 23:15:12 +00:00
Craig Mautner
9d851de6cc
Revert "Add stackId to RecentTaskInfo"
...
Need to modify the API as well.
This reverts commit b9b9477581ce5f72a679dd1cd9a85e6c8f73944a
Change-Id: I34ea371408930b6b1bf4c53ad9ab8418b0070dbc
2013-05-22 23:14:05 +00:00
Jeff Brown
4418bed617
am e20fbc6f: am d6619ed8: Merge "Add a queue of pending finished input events." into jb-mr2-dev
...
* commit 'e20fbc6feb6709c01bf0afdf86a75882c9a0e663':
Add a queue of pending finished input events.
2013-05-22 15:48:45 -07:00
Jeff Brown
e20fbc6feb
am d6619ed8: Merge "Add a queue of pending finished input events." into jb-mr2-dev
...
* commit 'd6619ed89ff7e10b0b66aadc353cfea171929344':
Add a queue of pending finished input events.
2013-05-22 15:46:57 -07:00
Jeff Brown
d6619ed89f
Merge "Add a queue of pending finished input events." into jb-mr2-dev
2013-05-22 22:44:17 +00:00
Winson Chung
a22cbf9822
Merge "Add stackId to RecentTaskInfo"
2013-05-22 22:13:27 +00:00
Craig Mautner
b9b9477581
Add stackId to RecentTaskInfo
...
Necessary for multi-stack activity overview.
Fixes bug 9092356.
Change-Id: I91fc68ebf72114224c8e651261101ac14517ff86
2013-05-22 15:03:10 -07:00