Baligh Uddin
1858bfd1a5
am 90e41469: Import translations. DO NOT MERGE
...
* commit '90e41469fe99e52de2144ed24d005a1b30e5f917':
Import translations. DO NOT MERGE
2012-12-12 11:24:00 -08:00
Baligh Uddin
47d2db689d
am f1c6f1d3: Import translations. DO NOT MERGE
...
* commit 'f1c6f1d3870707c4f76261219de0bb2968bf2d31':
Import translations. DO NOT MERGE
2012-12-12 11:22:04 -08:00
Baligh Uddin
90e41469fe
Import translations. DO NOT MERGE
...
Change-Id: I19d85dc7580e4a4e20a89bc3d56fe8a434d8f585
Auto-generated-cl: translation import
2012-12-12 11:14:26 -08:00
Baligh Uddin
f1c6f1d387
Import translations. DO NOT MERGE
...
Change-Id: I6079f968a77282ed15f6a46b05dd2318c1c39ba2
Auto-generated-cl: translation import
2012-12-12 11:11:44 -08:00
Jeff Sharkey
0813894118
am 764bc0a7: am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts."
...
* commit '764bc0a7ae9c623f18aceadda2d5d894b1bf4024':
Remove unnecessary locking for screen broadcasts.
2012-12-12 11:11:13 -08:00
Jeff Sharkey
764bc0a7ae
am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts."
...
* commit 'bf8de6a349e19b32a1577080a9d8bb7f92b2301f':
Remove unnecessary locking for screen broadcasts.
2012-12-12 11:06:36 -08:00
Jamie Gennis
7efad644c5
Merge "stop using a deprecated SurfaceTextureClient ctor"
2012-12-12 10:57:20 -08:00
Jeff Sharkey
bf8de6a349
Merge "Remove unnecessary locking for screen broadcasts."
2012-12-12 10:41:20 -08:00
Nick Kralevich
4d254266a4
Remove unused code.
...
Change-Id: I6785cea91c0ab2c367645201fb8862dbf1a55773
2012-12-12 10:38:40 -08:00
Robert Greenwalt
4274d3f6f3
Merge "Removing unused INITING state."
2012-12-12 10:14:18 -08:00
Craig Mautner
ae44659f30
Call adjustWallpaperWindowsLocked once per pass.
...
Also refactor a few methods and improve logging.
Change-Id: Ic54a1ff99f6de732b31cda5c06d36e8de01a269c
2012-12-12 10:09:19 -08:00
Amith Yamasani
2d43fabaf7
Don't update global table when upgrading secondary users' database.
...
Bug: 7722149
Change-Id: I0c1373cba316b924701136579083274eb6c9b1da
2012-12-12 09:52:26 -08:00
Irfan Sheriff
fdb9138c40
Merge "Expose more details in broadcasts"
2012-12-12 09:29:13 -08:00
The Android Open Source Project
3c1ded1664
am e08791c8: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'e08791c8318216b7934742681edfab57b8147d78':
2012-12-12 07:36:27 -08:00
The Android Open Source Project
e08791c831
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I3041300565b33629c8d2609a75d384b731f292ce
2012-12-12 07:34:03 -08:00
Irfan Sheriff
3a67e2515b
Expose more details in broadcasts
...
Expose details in broadcasts and do the necessary clean up alongside
Change-Id: I9011d51675a233aa3542f097c8a489c2095103b1
2012-12-11 22:00:14 -08:00
Stephen Hines
f43ac732e1
Compatibility lib changes for IP2.
...
Bug: 7419958
Change-Id: Ibd62c06b60875e17d232e27f1845ce0ffafff834
2012-12-11 19:59:52 -08:00
Andrew Hsieh
eba8254c8c
Fix typo
...
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS
Change-Id: I3d5525d7dacbf8f007e3230e1ca87b69245a96b1
2012-12-12 11:27:44 +08:00
Adam Powell
2331b42328
am dc4beb48: am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
...
* commit 'dc4beb483eb14f1b56154125c67b780802756572':
Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
2012-12-11 19:12:45 -08:00
Adam Powell
dc4beb483e
am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
...
* commit 'e7ec492f13355888c90b3f08fbc66e49dda7ed24':
Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
2012-12-11 19:10:45 -08:00
Adam Powell
90f4c5c9d4
am c6f05e93: am d22843a8: Merge "Fix regression in ListView click handling"
...
* commit 'c6f05e93dc37db67addcd19ff87ba013ba817035':
Fix regression in ListView click handling
2012-12-11 18:04:23 -08:00
Adam Powell
c6f05e93dc
am d22843a8: Merge "Fix regression in ListView click handling"
...
* commit 'd22843a8a8d240fc09291b1b9505d62c1f0c0f8d':
Fix regression in ListView click handling
2012-12-11 18:02:30 -08:00
Adam Powell
e7ec492f13
Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
2012-12-11 18:00:49 -08:00
Adam Powell
d22843a8a8
Merge "Fix regression in ListView click handling"
2012-12-11 17:57:58 -08:00
Jason Sams
0d0c4e136a
Merge "Minor cleanup of a few RS filter ports."
2012-12-11 17:06:45 -08:00
Jamie Gennis
82bb813f11
stop using a deprecated SurfaceTextureClient ctor
...
Change-Id: Ie6196ba4896c0ab37b9aed3d1a4ffd04c99c5f80
2012-12-11 17:02:31 -08:00
Robert Greenwalt
1d42a09715
am f6610e2d: am 79e0e3fd: Merge "return value of String.replace() is ignored."
...
* commit 'f6610e2d7d883653ef80077df649e4dd91c221c1':
return value of String.replace() is ignored.
2012-12-11 16:54:33 -08:00
Robert Greenwalt
f6610e2d7d
am 79e0e3fd: Merge "return value of String.replace() is ignored."
...
* commit '79e0e3fd69ba6426da6575e0c778eff205318172':
return value of String.replace() is ignored.
2012-12-11 16:52:39 -08:00
Robert Greenwalt
79e0e3fd69
Merge "return value of String.replace() is ignored."
2012-12-11 16:34:35 -08:00
Christopher Tate
1423fa30c2
am 1de62393: am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
...
* commit '1de623939090993d03a7c398d09e2d13950d682b':
Make immersive mode public & imply update locking
2012-12-11 16:15:38 -08:00
Christopher Tate
1de6239390
am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
...
* commit '534de491e6522465a7ad12d7cba9b2f80deab364':
Make immersive mode public & imply update locking
2012-12-11 16:13:51 -08:00
Christopher Tate
534de491e6
Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
2012-12-11 16:11:00 -08:00
The Android Automerger
d33ef85086
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-11 15:56:27 -08:00
Adam Powell
847be7445e
Fix regression in ListView click handling
...
Regression caused by patch a607223f34
If an item click handler results in the ListView becoming detached
from the window, the performClick runnable could be executed twice.
Null out the mTouchModeReset runnable before running the click handler
so that it is not run by the detach handler.
Change-Id: I2fab60232027bb4876f9912088e0ffb9b17d308c
2012-12-11 15:56:10 -08:00
Laurent Tu
ccb4c318aa
Revert "Move location provider lib to frameworks/ex - 1"
...
This reverts commit 578081f9da7ddb056b9b98524c639acd9194ecb6.
2012-12-11 15:45:09 -08:00
Kenny Root
0c312368cb
am 8f276515: am ae5cc868: am 2735795f: Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev
...
* commit '8f276515ea7204f54c773c29eb14a9346f2fa973':
If freeCache deletes APK, give out of space error
2012-12-11 15:27:26 -08:00
Jeff Brown
ace7404de8
resolved conflicts for merge of d7337fb9 to master
...
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
2012-12-11 15:21:02 -08:00
Kenny Root
8f276515ea
am ae5cc868: am 2735795f: Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev
...
* commit 'ae5cc8687b4fde98449cbec1fd9a610557ff1b5d':
If freeCache deletes APK, give out of space error
2012-12-11 15:12:49 -08:00
Kenny Root
ae5cc8687b
am 2735795f: Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev
...
* commit '2735795f5aa906fbfd885dbacee1de0b41b80bf0':
If freeCache deletes APK, give out of space error
2012-12-11 15:10:47 -08:00
Kenny Root
2735795f5a
Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev
2012-12-11 15:07:54 -08:00
Jason Sams
f914db7c42
Minor cleanup of a few RS filter ports.
...
on Manta these reduce the times from
Contrast: 180ms to 21ms
Exposure: 177ms to 19ms
Change-Id: I1224ecaeaee22dc49069383e2f000a193c331b4c
2012-12-11 14:28:21 -08:00
Jeff Brown
d7337fb97a
am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
...
* commit '3781523becbb2d576761c2701763ff3588294a97':
Play a tone when wireless charging begins.
2012-12-11 14:19:41 -08:00
Stephen Hines
fba73030d6
Merge "Test bounds on rsForEach calls."
2012-12-11 14:19:10 -08:00
Jeff Brown
3781523bec
am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
...
* commit 'eaae7d976a5629e064af06f0e2c10f97f1a8c462':
Play a tone when wireless charging begins.
2012-12-11 14:17:50 -08:00
Jeff Brown
eaae7d976a
Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
2012-12-11 14:14:54 -08:00
Chet Haase
8ee38721e0
Merge "Fix requestLayout-during-layout issue with Gallery"
2012-12-11 14:09:29 -08:00
Chet Haase
bfea76c787
Fix requestLayout-during-layout issue with Gallery
...
The way that the Gallery was adding views (which it does in layout)
triggered a requestLayout() because of a call to setLayoutParams()
in View.addViewInner(). This tripped up the new logic that makes
layout-in-layout work, causing layout to be called on every frame,
even when the app was not doing anything.
The fix is to call the appropriate version
of requestLayoutInner() to tell it to skip calls to requestLayout().
Issue #7714495 requestLayout in endless loop
Change-Id: Icdcd886d30e4dd972da36bc6e50732c7213530c5
2012-12-11 14:05:24 -08:00
Kenny Root
3f96d0e127
If freeCache deletes APK, give out of space error
...
After DownloadManager has downloaded an application to cache to install
during low memory condition, we try to free cache to fit the new
application. The free cache function deletes older files first, but it
will also delete the downloaded application (since it's in cache) as a
last resort since installd has no context about it.
This just changes the error code returned in this case so that we'll
give something more meaningful to the user. A later fix should actually
make this more sane. For instance: know which file to avoid deleting,
not even trying to delete anything if it won't arrive at the desired
free space.
Bug: 7684538
Change-Id: Ide77320fc51a4f692ef8042cb0eafe17b5cd279d
2012-12-11 13:35:43 -08:00
Jeff Brown
84e2756c0f
Play a tone when wireless charging begins.
...
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.
Use new low battery and wireless charging sounds on Mako.
Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
2012-12-11 12:55:03 -08:00
You Kim
8f5691fd92
Add return after NULL check in JetPlayer
...
When pointer lpJet is NULL, it should return.
Change-Id: Ia0471173b57da8f9bf22b3a19479aa5b3c4a5acb
2012-12-12 05:34:21 +09:00