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
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
Jason Sams
da6f7ab34c
Merge "Fix aprox fs function names bug b206696" into jb-mr1-dev
2012-09-20 17:56:02 -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
Eric Laurent
6730c3c69f
Merge "Fix safe volume warning message flickering" into jb-mr1-dev
2012-09-20 16:53:10 -07:00
Eric Laurent
0516a9ecb0
Fix safe volume warning message flickering
...
Do not display a new warning message when one is already showing.
Bug 7064975.
Change-Id: I920656c6d742a969c29e8f42a438ecbc794d1114
2012-09-20 16:48:44 -07:00
Jeff Brown
a9d131c308
Disentangle input manager service startup.
...
We will be adding additional callbacks for other components.
This change makes it clearer how the input manager is started
and where the callbacks are initialized.
Bug: 6548391
Change-Id: I4b2a61482126a12b7cf11fafe513f846c76c11e5
2012-09-20 16:48:17 -07:00
Jeff Brown
bbd28a293f
Provide a debugging option to force enable wifi display.
...
Bug: 7179627
Change-Id: I84c7605a1cee5ed723341eebdcec4a824e7e4d38
2012-09-20 16:47:15 -07:00
Joe Fernandez
c098ff668b
am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev
...
* commit 'bbdfada0a97b779bde0c43b63979bf7edb94d94d':
docs: Systrace tool documentation
2012-09-20 16:43:21 -07:00
Zhihai Xu
77f6677bcd
Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
2012-09-20 16:41:02 -07:00
Jean-Baptiste Queru
fea72d3b1a
Ignore 12496bfc into jb-dev-plus-aosp
...
Change-Id: Ibd43b178907f547e87b4a6b0608a676b649a236a
2012-09-20 16:33:09 -07:00
Baligh Uddin
2f98008d06
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-20 15:55:06 -07:00
Baligh Uddin
416f6ec572
Import translations. DO NOT MERGE
...
Change-Id: I454f0cd3a9289b271206d7eeec89773c66ec199b
Auto-generated-cl: translation import
2012-09-20 15:46:33 -07:00
Christopher Tate
58e7f73c6e
Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev
2012-09-20 15:43:57 -07:00
Tsu Chiang Chuang
40e80c6345
am 6cc5d7fc: Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev
...
* commit '6cc5d7fc0b23305fb7a3216b814d96d1ebab76d7':
fix broken user build: do not throw an error when in user flavor.
2012-09-20 15:37:26 -07:00
Tsu Chiang Chuang
6cc5d7fc0b
Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev
2012-09-20 15:35:00 -07:00
Tsu Chiang Chuang
0cfb73de1c
fix broken user build: do not throw an error when in user flavor.
...
Change-Id: I43d210f1b342707acbdb79f9ef6c924b43684dd3
2012-09-20 15:27:23 -07:00
John Reck
9f9d34552f
Use less static synchronized
...
Bug: 6482144
Change-Id: I86161e3298101c10a112add406615001561e649e
2012-09-20 15:25:16 -07:00
Adam Cohen
fbe44b7d5e
Fixing partiallyUpdateAppWidget to cache the new changes
...
-> This is a good change to the widget framework that I've wanted to
make for a while, but issue 7174198 triggered the immediate need.
Change-Id: I3f267e0e67f2d9f28920bb53973af365a3c9e0ba
2012-09-20 15:18:47 -07:00
Joe Fernandez
bbdfada0a9
Merge "docs: Systrace tool documentation" into jb-dev
2012-09-20 15:13:01 -07:00
Tsu Chiang Chuang
af2c015f2c
am c1ec220c: Merge "Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode." into jb-mr1-dev
...
* commit 'c1ec220c4b3f518d74be91b7a69fb42af6642ad1':
Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode.
2012-09-20 15:06:56 -07:00
Tsu Chiang Chuang
c1ec220c4b
Merge "Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode." into jb-mr1-dev
2012-09-20 15:04:10 -07:00
Tsu Chiang Chuang
35fae68cc3
Change the way how airplane mode is set, since it has been moved to
...
Settings.Global namespace. Also run as a system app, since only system
apps can change airplane mode.
Change-Id: I317f9c94361cfca182356fd292e5b0b41553d1ab
2012-09-20 14:58:48 -07:00
Dianne Hackborn
b79d01edb2
am 6de76d21: Merge "Implement multi-user PackageMonitor." into jb-mr1-dev
...
* commit '6de76d21ff60818f8b296fc8f645897203f475da':
Implement multi-user PackageMonitor.
2012-09-20 14:56:54 -07:00
Dianne Hackborn
6de76d21ff
Merge "Implement multi-user PackageMonitor." into jb-mr1-dev
2012-09-20 14:54:10 -07:00