79e0e3fd69
Merge "return value of String.replace() is ignored."
2012-12-11 16:34:35 -08:00
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
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
534de491e6
Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
2012-12-11 16:11:00 -08:00
d33ef85086
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-11 15:56:27 -08:00
847be7445e
Fix regression in ListView click handling
...
Regression caused by patch a607223f34
2012-12-11 15:56:10 -08:00
ccb4c318aa
Revert "Move location provider lib to frameworks/ex - 1"
...
This reverts commit 578081f9da
2012-12-11 15:45:09 -08:00
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
ace7404de8
resolved conflicts for merge of d7337fb9 to master
...
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
2012-12-11 15:21:02 -08:00
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
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
2735795f5a
Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev
2012-12-11 15:07:54 -08:00
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
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
fba73030d6
Merge "Test bounds on rsForEach calls."
2012-12-11 14:19:10 -08:00
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
eaae7d976a
Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
2012-12-11 14:14:54 -08:00
8ee38721e0
Merge "Fix requestLayout-during-layout issue with Gallery"
2012-12-11 14:09:29 -08:00
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
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
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
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
bbb9703860
am 5ccefdd6: am 49cc9cb8: am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev
...
* commit '5ccefdd6d570a084ce708d7f4654358ef7108451':
Fallback to default dream if the current dream is removed.
2012-12-11 11:59:28 -08:00
4f67c7515b
am 6c0ad7a0: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '6c0ad7a0644a393e3a89a35fbd80e8f86458585c':
2012-12-11 11:57:03 -08:00
5ccefdd6d5
am 49cc9cb8: am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev
...
* commit '49cc9cb85376bad11611966fcdbe58dae1ab7a56':
Fallback to default dream if the current dream is removed.
2012-12-11 11:56:56 -08:00
6c0ad7a064
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I1ff629cf6a936691e18b7857c1f796a3ed55fc47
2012-12-11 11:54:15 -08:00
49cc9cb853
am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev
...
* commit '5def50da0de624abeafafe71dc72b4baf423b985':
Fallback to default dream if the current dream is removed.
2012-12-11 11:53:53 -08:00
5def50da0d
Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev
2012-12-11 11:51:41 -08:00
ef2277ec58
Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
...
Fix for Issue ID 18316. Make isEmpty() return false when getCount() returns a non-zero value. So that the list cannot be considered empty when a header or footer is present.
https://code.google.com/p/android/issues/detail?id=18316
Change-Id: Ib69201e9d5ef3efcbb68ea298b8cc8ca6e027246
Signed-off-by: Emma Sajic <esajic@effectivelateralsolutions.co.uk >
2012-12-11 19:50:58 +00:00
03cb98aecf
Move Observer test to servicetests
...
Change-Id: Ib3493af4eb3185db79004a3cad5473161ed51f71
2012-12-11 11:15:25 -08:00
e03c17f1cb
Merge "Move one more test."
2012-12-11 11:08:06 -08:00
814a8d35ae
Move one more test.
...
Change-Id: Iea0e0b5727746f2332db2ab1c1b216326eb50f13
2012-12-11 11:06:21 -08:00
28db197580
Merge "Share the pending layout changes"
2012-12-11 10:51:30 -08:00
3a57213c2d
Merge "Fix build. Forgot to move this test."
2012-12-11 10:43:45 -08:00
74c9671855
Merge "Recouple layout and animation a bit."
2012-12-11 10:42:42 -08:00
8ff9a156c0
Fix build. Forgot to move this test.
...
Change-Id: I06aab8ec6e2dac86b65bbeed3587444260fec2e8
2012-12-11 10:42:09 -08:00
16db3c72c0
Merge "Move lingering services to services.jar."
2012-12-11 10:04:07 -08:00
07ce651137
Merge "Further refine test for window gone."
2012-12-11 09:54:22 -08:00
7a96c39c51
Move lingering services to services.jar.
...
This helps reduce the pressure on framework.jar, and makes it clear
that it should only be used by the system_server.
Bug: 7333397
Change-Id: I0858904239535380fbf30562b793e277d8c3f054
2012-12-11 09:50:50 -08:00
ccc9e9b936
Further refine test for window gone.
...
Do not treat a window that is animating as being onscreen until it
has been drawn. The indication that a window was "gone" was occurring
too soon resulting in windows appearing before the status bar came
back and having to be drawn twice, with and without the status bar.
By waiting for the window to be drawn the status bar appears and the
window does not have to get redrawn.
Bug 7696315 fixed.
Change-Id: Ic93bf6eed03cf12a92a656791725a6d26e0ad0e9
2012-12-11 09:49:38 -08:00
151cb90c60
Merge "Import translations. DO NOT MERGE"
2012-12-10 20:42:38 -08:00
32de9220e0
Merge "Import translations. DO NOT MERGE"
2012-12-10 20:32:41 -08:00
51b2592153
am fca736b8: (-s ours) am c39adf91: am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'fca736b889759c585629f5cbfae6667612a326c5':
Import translations. DO NOT MERGE
2012-12-10 20:26:22 -08:00
fca736b889
am c39adf91: am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'c39adf91c9d99eea31d9e83fa3c905516ebbb37e':
Import translations. DO NOT MERGE
2012-12-10 20:23:59 -08:00
c39adf91c9
am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'd39a0d8041cec16429331937ec81d55f18b0db72':
Import translations. DO NOT MERGE
2012-12-10 20:22:17 -08:00
984e4b5add
am 8672f044: (-s ours) am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '8672f044ffba414c6caade21cff8b55a707713f0':
Import translations. DO NOT MERGE
2012-12-10 20:21:39 -08:00
8672f044ff
am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '73f6e3f583b1ff2948fd82e68a3f813750165b14':
Import translations. DO NOT MERGE
2012-12-10 20:20:17 -08:00
d39a0d8041
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2012-12-10 20:19:06 -08:00
73f6e3f583
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-12-10 20:17:14 -08:00
b84b9c2191
am 81f82d29: am aa8dc2ee: Removed mCallbackLooper from WallpaperService
...
* commit '81f82d29ed3c93704c4fa0cbfeb48a675b71c349':
Removed mCallbackLooper from WallpaperService
2012-12-10 19:50:11 -08:00
