Geremy Condra
7ac703fedf
Merge "Removed intent logging from SearchDialog.java"
2012-01-26 15:06:18 -08:00
Jim Miller
345d9dd3f0
Merge "Fix 5620754: don't show pattern unlock after SIM unlock if not enabled."
2012-01-26 14:30:49 -08:00
Eric Fischer
200e2c8024
Merge "Import translations. DO NOT MERGE"
2012-01-26 14:26:10 -08:00
Gilles Debunne
16b060f555
Merge "Modified algorithm to remove duplicated suggestions"
2012-01-26 14:09:20 -08:00
Gilles Debunne
9c10a1d2ac
Merge "Remove @deprecate in View's fadingEdge"
2012-01-26 14:09:00 -08:00
Stephen Hines
789e6fc09b
Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."
2012-01-26 13:55:57 -08:00
Scott Main
ed46932b49
am 2de74f5f: am 6c055bbd: docs: add action bar icons ZIP
...
* commit '2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
docs: add action bar icons ZIP
2012-01-26 11:47:35 -08:00
Scott Main
9912602489
am 6c055bbd: docs: add action bar icons ZIP
...
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
docs: add action bar icons ZIP
2012-01-26 11:44:58 -08:00
Ben Cheng
3c212e71c8
Merge "Preserve NEON callee-save registers d8-d15."
2012-01-26 11:16:59 -08:00
Scott Main
49faa9ca45
am e7ffc5a6: am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
...
* commit 'e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
docs: remove the 1.0 icon template pack
2012-01-25 18:03:20 -08:00
Scott Main
9fb836c3f8
am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
...
* commit '9ac4dd828065410efbb380992d996c7e93daf437':
docs: remove the 1.0 icon template pack
2012-01-25 18:00:42 -08:00
Scott Main
278a730b83
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
2012-01-25 17:58:54 -08:00
Scott Main
8df45f00e4
am 1f9026ca: am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
...
* commit '1f9026caf1af0f7d3eb9de81641ac290fd340b4b':
docs: remove ADL presentation PDFs to conserve site space
2012-01-25 17:54:48 -08:00
Scott Main
a4fda50a92
am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
...
* commit 'f466db14ec32fbaf08a868df40f7685a7e7df3db':
docs: remove ADL presentation PDFs to conserve site space
2012-01-25 17:52:08 -08:00
Scott Main
25120a84bb
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
2012-01-25 17:50:20 -08:00
Joe Malin
5392aebe86
am ba8dd79f: am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
...
* commit 'ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
DOC CHANGE: New Content Provider topics
2012-01-25 17:33:06 -08:00
Joe Malin
941e34e3aa
am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
...
* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
DOC CHANGE: New Content Provider topics
2012-01-25 17:30:13 -08:00
Joe Malin
0d9aecbbd8
am a2a46f62: DOC CHANGE: New Content Provider topics
...
* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
DOC CHANGE: New Content Provider topics
2012-01-25 17:27:46 -08:00
Svetoslav Ganov
6eeb4f29a4
Merge "Fixing failing focus tests"
2012-01-25 17:09:54 -08:00
Teng-Hui Zhu
ab64314928
Merge "Make sure WebView get notified before the EGL context destroyed."
2012-01-25 16:53:05 -08:00
Dianne Hackborn
df0a4caa24
Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
2012-01-25 16:15:43 -08:00
Dianne Hackborn
907e08f2de
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
...
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
2012-01-25 15:14:50 -08:00
Gilles Debunne
8b80621ed5
Merge "Unbalanced batch edit begin and end leave TextView unresponsive"
2012-01-25 15:08:29 -08:00
Fabrice Di Meglio
27ee11b062
Merge "Update Javadoc for InputConnection.deleteSurroundingText()"
2012-01-25 14:52:40 -08:00
Gilles Debunne
26ec02b9c9
Merge "TextView's display list updated on layout"
2012-01-25 14:07:08 -08:00
Wink Saville
aa1e433e56
Merge "Add additional debug"
2012-01-25 14:04:59 -08:00
Wink Saville
10abf9cd54
Merge "Fix ClassCastException"
2012-01-25 13:45:02 -08:00
Nick Pelly
058cadde46
Merge "Add API's for normalizing MIME's and URI's."
2012-01-25 12:55:58 -08:00
Dianne Hackborn
5b941d0c0c
Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs."
2012-01-25 12:29:17 -08:00
Jeff Brown
3b891312c8
Merge "Fix an inconsistent comment."
2012-01-25 11:52:48 -08:00
Robert Greenwalt
839d927da3
am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
...
* commit '109533519153307b10e2b3ae327ca4b4cd0c75d3':
Filter our v6 address from tethering dns.
2012-01-25 11:33:14 -08:00
Robert Greenwalt
424661c12a
am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
...
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
Filter our v6 address from tethering dns.
2012-01-25 11:30:39 -08:00
Robert Greenwalt
fa00205ed3
Merge "Filter our v6 address from tethering dns." into ics-mr1
2012-01-25 11:28:30 -08:00
Jean-Baptiste Queru
f3b2a34e71
am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
...
* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
stagefright aacenc: Fix type definitions for 64 bit platforms
2012-01-25 10:33:42 -08:00
Jean-Baptiste Queru
0df964696c
am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
...
* commit '64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
stagefright aacenc: Fix type definitions for 64 bit platforms
2012-01-25 10:30:31 -08:00
Jean-Baptiste Queru
105b4f71a9
am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
...
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
2012-01-25 10:27:41 -08:00
Jean-Michel Trivi
4534f5645b
Merge "Update AudioTrack.stop() javadoc"
2012-01-25 09:46:01 -08:00
Jean-Baptiste Queru
a8ed1d4f9a
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
2012-01-25 09:17:46 -08:00
Roman Nurik
ab1ac41b47
am 92aaf243: am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
...
* commit '92aaf2431ccb8d5ef1eb456646742c736fa70266':
docs: Android Design typo and grammar fixes
2012-01-25 08:57:45 -08:00
Jean-Baptiste Queru
cbafdc6c15
am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
...
* commit 'e2594b85093441e03150c7cfc540abc626884eaf':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
2012-01-25 08:57:36 -08:00
Jean-Baptiste Queru
df80c5b180
am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
...
* commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9':
stagefright aacenc: Add missing newlines at the end of files
2012-01-25 08:57:32 -08:00
Daniel Sandler
47623f569f
am 416a1c1a: am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
...
* commit '416a1c1ada0ad553613eb439823a68d3f51b1579':
Stop showing "No internet connection" when there is one.
2012-01-25 08:57:27 -08:00
Eric Laurent
6c48805c1c
am 535b0264: am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
...
* commit '535b0264a4cfa790e549bd9cd09980788f1375f4':
AudioFlinger: refine mixer sleep time logic
2012-01-25 08:57:23 -08:00
Eric Laurent
6616127218
am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
...
* commit 'dd347d515d4a4e42b2aba89a8e471392026b7824':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
2012-01-25 08:57:20 -08:00
Robert Greenwalt
0cc595295c
Merge "resolved conflicts for merge of 67cda1a0 to master"
2012-01-25 08:54:59 -08:00
George Mount
e7e77db01c
Merge "Fix auto-complete for content-editable fields."
2012-01-25 07:37:30 -08:00
Mathias Agopian
843861643e
Merge changes Ib6b6da1d,I6d9a466a
...
* changes:
improve SurfaceFlinger dumpsys
hack up frame latency measurement
2012-01-24 19:22:08 -08:00
Mathias Agopian
82d7ab6c7e
improve SurfaceFlinger dumpsys
...
It is now possible to say:
dumpsys SurfaceFlinger --latency
to print latency information about all windows
dumpsys SurfaceFlinger --latency window-name
to print the latency stats of the specified window
for instance: dumpsys SurfaceFlinger --latency SurfaceView
The data consists of one line containing global stats, followed by
128 lines of tab separated timestamps in nanosecond.
The first line currently contains the refresh period in nanosecond.
Each 128 following line contains 3 timestamps, of respectively
the app draw time, the vsync timestamp just prior the call to set and
the timestamp of the call to set.
Change-Id: Ib6b6da1d7e2e6ba49c282bdbc0b56a7dc203343a
2012-01-24 18:22:56 -08:00
Roman Nurik
1767e74ae7
am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
...
* commit 'cf077fdd79853dd4778598a623dc2f469c1a8934':
docs: Android Design typo and grammar fixes
2012-01-24 18:11:12 -08:00
Roman Nurik
1c4b467cf1
Merge "docs: Android Design typo and grammar fixes" into ics-mr1
2012-01-24 18:08:52 -08:00