Marco Nelissen
a061ef6c5f
am f9800a01: am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev
...
* commit 'f9800a01fe3690bac64bff0ba734a39f8a7f8ada':
Ensure we compute display name when needed
2012-06-06 15:51:19 -07:00
Marco Nelissen
f9800a01fe
am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev
...
* commit '08b3090848ad211e043a561b6bb774adf3a7bba1':
Ensure we compute display name when needed
2012-06-06 15:47:28 -07:00
Marco Nelissen
08b3090848
Merge "Ensure we compute display name when needed" into jb-dev
2012-06-06 15:44:20 -07:00
Craig Mautner
409a1a5402
am fd62576f: am a9144ffd: Merge "Disable automatic screen dimming." into jb-dev
...
* commit 'fd62576f06c05d6aab687892b9fcccfed3899021':
Disable automatic screen dimming.
2012-06-06 15:32:36 -07:00
Craig Mautner
fd62576f06
am a9144ffd: Merge "Disable automatic screen dimming." into jb-dev
...
* commit 'a9144ffd6466a914a9138dabab8bc331fdc70e2f':
Disable automatic screen dimming.
2012-06-06 15:28:37 -07:00
Craig Mautner
a9144ffd64
Merge "Disable automatic screen dimming." into jb-dev
2012-06-06 15:24:36 -07:00
Dianne Hackborn
b51e5bd666
am ecc42f8b: am 4ca17df3: Fix build.
...
* commit 'ecc42f8bdcd7279c6804bda3b4feeaea51019d48':
Fix build.
2012-06-06 15:15:24 -07:00
Dianne Hackborn
ecc42f8bdc
am 4ca17df3: Fix build.
...
* commit '4ca17df3802cad87a4d07b804823ad9c11e090ea':
Fix build.
2012-06-06 15:10:33 -07:00
Dianne Hackborn
4ca17df380
Fix build.
...
Change-Id: I42c3f6466d926258bbd303f2082de7207734451a
2012-06-06 15:02:25 -07:00
Craig Mautner
a4e96d5a6e
Disable automatic screen dimming.
...
Done by setting the dimming period to Integer.MAX_VALUE. While it
doesn't technically disable dimming it will take 248 days to get to
any target value.
Fixes bug 6616423.
Change-Id: I5b753286b9d93664fbff79021be38adf4d8a007d
2012-06-06 14:49:44 -07:00
Craig Mautner
dd749e05c1
am 55ab60cd: am 8c4b40ec: Merge "Set screen brightness to match sensor at power on." into jb-dev
...
* commit '55ab60cd7fe97d95f997d5f0761a5e571a88aa14':
Set screen brightness to match sensor at power on.
2012-06-06 14:45:56 -07:00
Craig Mautner
55ab60cd7f
am 8c4b40ec: Merge "Set screen brightness to match sensor at power on." into jb-dev
...
* commit '8c4b40eceba39a493a1d01ed83decc8b43fbfb5d':
Set screen brightness to match sensor at power on.
2012-06-06 14:42:06 -07:00
Craig Mautner
8c4b40eceb
Merge "Set screen brightness to match sensor at power on." into jb-dev
2012-06-06 14:39:29 -07:00
Dianne Hackborn
9a8eed3a4d
am 18aa041a: am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev
...
* commit '18aa041a62d36b9f2d4ead8ca0945ec87af582b4':
Fix some divide by zero errors that could crash the system.
2012-06-06 14:22:43 -07:00
Dianne Hackborn
18aa041a62
am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev
...
* commit '6cd19e0266b3f4277f13dab7e9a86ebdd9905ee9':
Fix some divide by zero errors that could crash the system.
2012-06-06 14:17:54 -07:00
Dianne Hackborn
6cd19e0266
Merge "Fix some divide by zero errors that could crash the system." into jb-dev
2012-06-06 14:16:05 -07:00
Craig Mautner
3793368f72
Set screen brightness to match sensor at power on.
...
Use the first sensor value received after screen on to set the screen
brightness. Do this setting immediately rather than animate to the
target brightness.
Fixes bug 6612418.
Change-Id: I6c24c55e0bd35ef58a6494d3b5e449954241fd00
2012-06-06 14:13:39 -07:00
Jake Hamby
965de2ce2b
am f2fb9044: (-s ours) am e60a35c1: Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
...
* commit 'f2fb9044c58407ac305cad3e2ac3a186634f8041':
DO NOT MERGE: Remove SMS shortcode warning feature.
2012-06-06 14:08:34 -07:00
Jake Hamby
f2fb9044c5
am e60a35c1: Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
...
* commit 'e60a35c156ac9a354ad6434da483b43af20ae4a2':
DO NOT MERGE: Remove SMS shortcode warning feature.
2012-06-06 14:04:07 -07:00
Jake Hamby
e60a35c156
Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
2012-06-06 14:01:24 -07:00
Marco Nelissen
81e85bbf67
Ensure we compute display name when needed
...
Since the media scanner no longer uses an in memory cache, it always
found an entry for files inserted via MTP, which made it follow a
different code path than before, which in turn made the media
provider skip computing the display name column.
By clearing the row id in the media scanner when handling an mtp
request, we steer it back to the correct code path.
b/6297105
b/6525450
Change-Id: I624522b176a0057d246ce3040598af255b00a141
2012-06-06 13:59:24 -07:00
Eric Fischer
736d1c6b7b
am 2c7f1325: (-s ours) am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev
...
* commit '2c7f1325e1c3cd58d16e3b42bc8a752d089fb6c9':
Revert "Import translations. DO NOT MERGE"
2012-06-06 13:58:49 -07:00
Jake Hamby
004ff5ad2a
DO NOT MERGE: Remove SMS shortcode warning feature.
...
Fix jb-dev build. The SMS shortcode warning feature has some usability
limitations which need to be resolved before shipping. Remove the code
for JellyBean. It will be added back to a future release when the
feature is complete.
Bug: 6605549
Change-Id: Ic8a68dc0b1ad038618962185f5ee680d5281ca21
2012-06-06 13:56:50 -07:00
Eric Fischer
2c7f1325e1
am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev
...
* commit '5ddf003cb2957672038bf1db397422402dce930a':
Revert "Import translations. DO NOT MERGE"
2012-06-06 13:54:56 -07:00
Eric Fischer
5ddf003cb2
Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev
2012-06-06 13:53:00 -07:00
Eric Fischer
25dcc321f7
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 6a6f746ece453c43aa92808cd140012866c8eb5c
2012-06-06 13:51:50 -07:00
Michael Jurka
202c3b8457
am f330b539: am a2c628fb: Merge "Fix bug 6499508" into jb-dev
...
* commit 'f330b53955461e0fca01a5ca6f6d90429815a30a':
Fix bug 6499508
2012-06-06 13:38:01 -07:00
Dianne Hackborn
20e14948f2
am 82811d45: am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
...
* commit '82811d45ed21ccdff77d11495fa2045c7942bd6d':
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
2012-06-06 13:37:57 -07:00
Jean-Michel Trivi
bab1ae4ce6
am b8da1c90: am 88a89b29: Merge "Always queue A2DP connection state message with wakelock held" into jb-dev
...
* commit 'b8da1c90c42ffb15b967915986ec2f59d40d3185':
Always queue A2DP connection state message with wakelock held
2012-06-06 13:37:54 -07:00
Michael Jurka
f330b53955
am a2c628fb: Merge "Fix bug 6499508" into jb-dev
...
* commit 'a2c628fb402610ce65371fb06d5adaf7eaf9df9b':
Fix bug 6499508
2012-06-06 13:33:45 -07:00
Dianne Hackborn
82811d45ed
am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
...
* commit '533fce25a22718c491a86c31866b7751f1f582b7':
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
2012-06-06 13:33:43 -07:00
Jean-Michel Trivi
b8da1c90c4
am 88a89b29: Merge "Always queue A2DP connection state message with wakelock held" into jb-dev
...
* commit '88a89b29112a41885c31ddd7195f5d26981d4d11':
Always queue A2DP connection state message with wakelock held
2012-06-06 13:33:41 -07:00
Michael Jurka
a2c628fb40
Merge "Fix bug 6499508" into jb-dev
2012-06-06 13:31:59 -07:00
Dianne Hackborn
533fce25a2
Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
2012-06-06 13:31:59 -07:00
Jean-Michel Trivi
88a89b2911
Merge "Always queue A2DP connection state message with wakelock held" into jb-dev
2012-06-06 13:31:53 -07:00
Daniel Sandler
9d9fb5e325
am 5926668f: am 622976ba: Merge "New background for notification panel header." into jb-dev
...
* commit '5926668f2e7dc7f245db13b194e0595cd1c1d82d':
New background for notification panel header.
2012-06-06 13:03:55 -07:00
Daniel Sandler
5926668f2e
am 622976ba: Merge "New background for notification panel header." into jb-dev
...
* commit '622976ba775ed2b2cebe83ec1e60e1db6db89e2a':
New background for notification panel header.
2012-06-06 13:00:01 -07:00
Daniel Sandler
622976ba77
Merge "New background for notification panel header." into jb-dev
2012-06-06 12:58:35 -07:00
Eric Fischer
f59a02242a
am 8e62634a: (-s ours) am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '8e62634acd0a0baa6390038565247f757ed99906':
Import translations. DO NOT MERGE
2012-06-06 12:44:07 -07:00
Eric Fischer
8e62634acd
am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '38987073c1b1a993a727210f981601217d30b899':
Import translations. DO NOT MERGE
2012-06-06 12:40:11 -07:00
Eric Fischer
404de74c49
Merge "Import translations. DO NOT MERGE"
2012-06-06 12:39:39 -07:00
Eric Fischer
38987073c1
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-06 12:37:51 -07:00
Eric Fischer
4328d8bb22
Import translations. DO NOT MERGE
...
Change-Id: I531d75aff0713a0664110bf2c138305b30c84722
2012-06-06 12:08:20 -07:00
Eric Fischer
6a6f746ece
Import translations. DO NOT MERGE
...
Change-Id: I5a8719c293a25460058ad5b62069ea80c33da110
2012-06-06 12:02:00 -07:00
Dianne Hackborn
cdadee630e
Fix some divide by zero errors that could crash the system.
...
Change-Id: I66273df84e45de59b5b161f4d13de67a9e0f46d5
2012-06-06 11:48:46 -07:00
Dianne Hackborn
636fd528f7
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
...
Okay this isn't entirely docs. I have un-hidden the new permission
for binding to accessibility services; we were going to go out with
it hidden since it didn't go into factory ROM, but now that we are
doing other things we might as well expose it.
Also changed a log from E to W, since it is not an error.
Change-Id: I9226c95e3b63e12218fe41dc3f4290d9824a9e5c
2012-06-06 11:36:49 -07:00
Jean-Michel Trivi
e12c39bb9c
Always queue A2DP connection state message with wakelock held
...
Messages for changes to A2DP connection state are intended to be
queued in AudioService after acquiring a wake lock, which is
released after the message has been handled.
This was correctly done for connection messages when the system
is up and running, but wasn't when the BluetoothProfile service
listener gets an onServiceConnected() event, which is the case
the the device boots.
This change correctly uses the queueMsgUnderWakeLock() method
whenever a MSG_SET_A2DP_CONNECTION_STATE is to be sent.
Bug 6616292
Change-Id: Ie337a4641a89c522e2d233bccaac4e08ce324117
2012-06-06 11:33:48 -07:00
Svetoslav Ganov
5fccbbebdf
am cf27a374: am 538252cd: Merge "Removing leftover code to sync accessibility and input focus." into jb-dev
...
* commit 'cf27a3743941d9ccb1d20a294085819049fac028':
Removing leftover code to sync accessibility and input focus.
2012-06-06 11:02:13 -07:00
Svetoslav Ganov
cf27a37439
am 538252cd: Merge "Removing leftover code to sync accessibility and input focus." into jb-dev
...
* commit '538252cd37945612a4761ff03d87022d56e33b96':
Removing leftover code to sync accessibility and input focus.
2012-06-06 10:57:50 -07:00
Svetoslav Ganov
538252cd37
Merge "Removing leftover code to sync accessibility and input focus." into jb-dev
2012-06-06 10:55:12 -07:00