Romain Guy
f75d843e9d
am 47becf78: am 596bcc23: Merge "Optimize tiling management Bug #7186819 " into jb-mr1-dev
...
* commit '47becf788c9878cc10e39e3fb4813d5a671341c7':
Optimize tiling management Bug #7186819
2012-09-20 20:28:07 -07:00
Mathias Agopian
b46abb9f2a
am ad8f2386: am 0aac9b7d: Merge "GLSurfaceView defaults to 888 instead of 565" into jb-mr1-dev
...
* commit 'ad8f23867a50df617528307c38d81b22f6766ce8':
GLSurfaceView defaults to 888 instead of 565
2012-09-20 20:28:04 -07:00
Jeff Brown
4b307a32a2
am 0596d2d5: am b4c33679: Merge "Disentangle input manager service startup." into jb-mr1-dev
...
* commit '0596d2d54f057457215821bea8010128ddf7d4ba':
Disentangle input manager service startup.
2012-09-20 20:28:00 -07:00
Jeff Brown
b3ce5f3224
am d00110c1: am ddfaa3f5: Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev
...
* commit 'd00110c18b66046be285f716a0ed356752b083d5':
Provide a debugging option to force enable wifi display.
2012-09-20 20:27:57 -07:00
John Reck
6a05111556
am 45e84330: am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev
...
* commit '45e843304f6f60e45d4371ce637e2fa442f4f28a':
Use less static synchronized
2012-09-20 20:27:53 -07:00
Fabrice Di Meglio
9158c9f508
am 91e44b96: am a21ad1a3: Merge "Fix bug #7198224 TimePicker widget shouldn\'t be completely RTL" into jb-mr1-dev
...
* commit '91e44b960720ccfa6dd4a8d217bdcf26749d8898':
Fix bug #7198224 TimePicker widget shouldn't be completely RTL
2012-09-20 20:27:49 -07:00
Eric Laurent
116ad74808
am 2af42833: am 6730c3c6: Merge "Fix safe volume warning message flickering" into jb-mr1-dev
...
* commit '2af4283374015d2d44433e628259f94a53e111e9':
Fix safe volume warning message flickering
2012-09-20 20:27:46 -07:00
Zhihai Xu
8bd9e0cdc1
am 03a896b6: am 77f6677b: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
...
* commit '03a896b6d8971e54a72e90d9373d162f6a4d8f40':
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
2012-09-20 20:27:42 -07:00
Baligh Uddin
4db5dbc25e
am 9c0da59f: (-s ours) am 2f98008d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '9c0da59fa98371f1edd3c42ced167ae8e133597f':
Import translations. DO NOT MERGE
2012-09-20 20:27:39 -07:00
Christopher Tate
61b03a04ee
am 820c12c1: am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev
...
* commit '820c12c1cb6e6f275fb6beb0706d8ac3abe38f5f':
Multiuser awareness in content observer infrastructure
2012-09-20 20:27:35 -07:00
Dan Morrill
e4ab16ad98
New method returning user metadata.
...
Change-Id: Ic1a42cf54152fe2e6bcd01b1bd9f1edb77d1710e
2012-09-20 20:25:55 -07:00
Dianne Hackborn
e40950d78c
am d3724b95: Merge "Don\'t load views before onResume called." into jb-mr1-dev
...
* commit 'd3724b951e1fdd48bd5accc29e5dff2102efdf3e':
Don't load views before onResume called.
2012-09-20 20:24:12 -07:00
Fabrice Di Meglio
eedda1d1c6
am 8da91a69: Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev
...
* commit '8da91a699cefccb8d9abf2b72221bc8c1f1874fc':
Fix bug #7205072 Text inside popup window is too close to the edge
2012-09-20 20:24:09 -07:00
Jeff Brown
2872e01929
am f2eb2e3e: Merge "Fix javadoc." into jb-mr1-dev
...
* commit 'f2eb2e3e0343da98f8bfe29a6c61d85f1cd7fbd8':
Fix javadoc.
2012-09-20 20:24:04 -07:00
Joe Fernandez
4e482b9791
am b4544d68: am c098ff66: am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev
...
* commit 'b4544d68b04b98642a3799207c7a28838c865739':
docs: Systrace tool documentation
2012-09-20 20:24:00 -07:00
Jean-Baptiste Queru
0552210bfd
am 91254a02: am fea72d3b: Ignore 12496bfc into jb-dev-plus-aosp
...
* commit '91254a025b984890851d270eadedbf6b0ea3e7db':
Add --output-text-symbols option to aapt. do not merge.
2012-09-20 20:23:57 -07:00
Adam Cohen
836739a341
am 11a6450e: Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev
...
* commit '11a6450e543d5c178c60ce2216fad1b29bf15457':
Fixing partiallyUpdateAppWidget to cache the new changes
2012-09-20 20:23:46 -07:00
Irfan Sheriff
53c6afc94b
am 957fadc5: Merge "Use min group owner intent for concurrency" into jb-mr1-dev
...
* commit '957fadc5001be0f0b4d004dbed8c57b6e1f5b46a':
Use min group owner intent for concurrency
2012-09-20 20:23:43 -07:00
Jason Sams
d4a6a3e559
am da6f7ab3: Merge "Fix aprox fs function names bug b206696" into jb-mr1-dev
...
* commit 'da6f7ab34c23a6cbe31734e5d562baa224e3d3d6':
Fix aprox fs function names bug b206696
2012-09-20 20:23:39 -07:00
Romain Guy
47becf788c
am 596bcc23: Merge "Optimize tiling management Bug #7186819 " into jb-mr1-dev
...
* commit '596bcc23a7cbf07d1465cfc8caa33b6c87fe6a16':
Optimize tiling management Bug #7186819
2012-09-20 20:23:36 -07:00
Mathias Agopian
ad8f23867a
am 0aac9b7d: Merge "GLSurfaceView defaults to 888 instead of 565" into jb-mr1-dev
...
* commit '0aac9b7d53946c6e5d8d3855afb3d993aee14519':
GLSurfaceView defaults to 888 instead of 565
2012-09-20 20:23:32 -07:00
Jeff Brown
0596d2d54f
am b4c33679: Merge "Disentangle input manager service startup." into jb-mr1-dev
...
* commit 'b4c33679cbdec9e12369fb49469ce33ed83ed25c':
Disentangle input manager service startup.
2012-09-20 20:23:29 -07:00
Jeff Brown
d00110c18b
am ddfaa3f5: Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev
...
* commit 'ddfaa3f55638db2e3d7c9928b605c2e6b90facae':
Provide a debugging option to force enable wifi display.
2012-09-20 20:23:25 -07:00
John Reck
45e843304f
am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev
...
* commit 'e6ff47840fc6d8ac5ba551101684011e328b4caa':
Use less static synchronized
2012-09-20 20:23:22 -07:00
Fabrice Di Meglio
91e44b9607
am a21ad1a3: Merge "Fix bug #7198224 TimePicker widget shouldn\'t be completely RTL" into jb-mr1-dev
...
* commit 'a21ad1a39423a22921511432f61dbfe2f4b3e58b':
Fix bug #7198224 TimePicker widget shouldn't be completely RTL
2012-09-20 20:23:18 -07:00
Eric Laurent
2af4283374
am 6730c3c6: Merge "Fix safe volume warning message flickering" into jb-mr1-dev
...
* commit '6730c3c69f84d799198365e0692b79be72b0eeb7':
Fix safe volume warning message flickering
2012-09-20 20:23:15 -07:00
Zhihai Xu
03a896b6d8
am 77f6677b: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
...
* commit '77f6677bcddad7c626ef5432eead4031c24f4685':
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
2012-09-20 20:23:11 -07:00
Baligh Uddin
9c0da59fa9
am 2f98008d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2f98008d06cbe48f0f5619d16f59988952c9b2ca':
Import translations. DO NOT MERGE
2012-09-20 20:22:27 -07:00
Christopher Tate
820c12c1cb
am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev
...
* commit '58e7f73c6e2d6583be0beabc95e7ac430bef0eb4':
Multiuser awareness in content observer infrastructure
2012-09-20 20:22:21 -07:00
Michael Jurka
20c41d5382
Add support for changing status widget on security screen
...
Change-Id: I080fd89eb84445604c602b6e807b55153a7ee129
2012-09-20 19:19:41 -07:00
Dianne Hackborn
d3724b951e
Merge "Don't load views before onResume called." into jb-mr1-dev
2012-09-20 19:13:56 -07:00
Fabrice Di Meglio
8da91a699c
Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev
2012-09-20 18:51:23 -07:00
Jeff Brown
f2eb2e3e03
Merge "Fix javadoc." into jb-mr1-dev
2012-09-20 18:47:50 -07:00
Fabrice Di Meglio
3e27c34e0e
Fix bug #7205072 Text inside popup window is too close to the edge
...
- if targetSDK is pre JB-MR1 then we really need to use the User padding
when it is defined and valid
Change-Id: If416fbc181b8784de446e9171529147ab03c9373
2012-09-20 18:27:17 -07:00
Joe Fernandez
b4544d68b0
am c098ff66: am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev
...
* commit 'c098ff668bf9ff9abd15a2b7352e0c498fa38e3f':
docs: Systrace tool documentation
2012-09-20 18:17:51 -07:00
Jean-Baptiste Queru
91254a025b
am fea72d3b: Ignore 12496bfc into jb-dev-plus-aosp
...
* commit 'fea72d3b1a35470489b07f4fd552b3da9f1ad80d':
Add --output-text-symbols option to aapt. do not merge.
2012-09-20 18:17:48 -07:00
Adam Cohen
11a6450e54
Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev
2012-09-20 18:09:11 -07:00
Irfan Sheriff
957fadc500
Merge "Use min group owner intent for concurrency" into jb-mr1-dev
2012-09-20 18:05:22 -07:00
Jim Miller
c0d2b5ed7f
Tweak keyguard security flip animation timing.
...
This cuts the timing in half to give keyguard a snappier
response and allow the user to enter their credentials quicker.
Change-Id: I81cfb17d254cff34415bc3aa2d5de9f24faa9cc6
2012-09-20 17:56:23 -07:00
Jason Sams
da6f7ab34c
Merge "Fix aprox fs function names bug b206696" into jb-mr1-dev
2012-09-20 17:56:02 -07:00
Jeff Brown
a95a3b494f
Fix javadoc.
...
Bug: 7172727
Change-Id: I55ee0099ea2e61f5f0a9de7b434fb8fb858ad5f9
2012-09-20 17:49:47 -07:00
Romain Guy
596bcc23a7
Merge "Optimize tiling management Bug #7186819 " into jb-mr1-dev
2012-09-20 17:40:39 -07:00
Romain Guy
57b5268708
Optimize tiling management
...
Bug #7186819
Change-Id: Iebc42a6e9c96ad5605fbbe1539aa887695d2e829
2012-09-20 17:38:46 -07:00
Jason Sams
36fa5a42ba
Fix aprox fs function names
...
bug b206696
Change-Id: I64c092c1f6b8d990783bf5d31db37e12a4dbdb82
2012-09-20 17:30:34 -07:00
Irfan Sheriff
99766cf40e
Use min group owner intent for concurrency
...
Our device only supports STA & GC concurrency
Change-Id: I4f16c959a6f4e7ad5610dcae67be830d741f162c
2012-09-20 17:18:20 -07:00
Mathias Agopian
0aac9b7d53
Merge "GLSurfaceView defaults to 888 instead of 565" into jb-mr1-dev
2012-09-20 17:09:43 -07:00
Jeff Brown
b4c33679cb
Merge "Disentangle input manager service startup." into jb-mr1-dev
2012-09-20 17:03:52 -07:00
Jeff Brown
ddfaa3f556
Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev
2012-09-20 17:02:27 -07:00
John Reck
e6ff47840f
Merge "Use less static synchronized" into jb-mr1-dev
2012-09-20 16:55:40 -07:00
Fabrice Di Meglio
a21ad1a394
Merge "Fix bug #7198224 TimePicker widget shouldn't be completely RTL" into jb-mr1-dev
2012-09-20 16:54:08 -07:00