OSDN Git Service
Robert Greenwalt [Wed, 12 Dec 2012 18:16:56 +0000 (10:16 -0800)]
am
4274d3f6: Merge "Removing unused INITING state."
* commit '
4274d3f6f3474a092eef2e95b636b68431bded77':
Removing unused INITING state.
Robert Greenwalt [Wed, 12 Dec 2012 18:14:17 +0000 (10:14 -0800)]
Merge "Removing unused INITING state."
Irfan Sheriff [Wed, 12 Dec 2012 17:31:12 +0000 (09:31 -0800)]
am
fdb9138c: Merge "Expose more details in broadcasts"
* commit '
fdb9138c401558e109ecdadc7acbc88b75634202':
Expose more details in broadcasts
Irfan Sheriff [Wed, 12 Dec 2012 17:29:13 +0000 (09:29 -0800)]
Merge "Expose more details in broadcasts"
The Android Open Source Project [Wed, 12 Dec 2012 15:38:48 +0000 (07:38 -0800)]
am
3c1ded16: (-s ours) am
e08791c8: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
3c1ded16643352abe1a17dd0fc53db3436df8256':
The Android Open Source Project [Wed, 12 Dec 2012 15:36:27 +0000 (07:36 -0800)]
am
e08791c8: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
e08791c8318216b7934742681edfab57b8147d78':
The Android Open Source Project [Wed, 12 Dec 2012 15:34:02 +0000 (07:34 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3041300565b33629c8d2609a75d384b731f292ce
Irfan Sheriff [Fri, 7 Dec 2012 23:51:34 +0000 (15:51 -0800)]
Expose more details in broadcasts
Expose details in broadcasts and do the necessary clean up alongside
Change-Id: I9011d51675a233aa3542f097c8a489c2095103b1
Adam Powell [Wed, 12 Dec 2012 03:14:48 +0000 (19:14 -0800)]
am
2331b423: am
dc4beb48: am
e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
* commit '
2331b42328fcdd54d3b26152f998554c610ae1b4':
Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
Adam Powell [Wed, 12 Dec 2012 03:12:45 +0000 (19:12 -0800)]
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
Adam Powell [Wed, 12 Dec 2012 03:10:45 +0000 (19:10 -0800)]
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
Adam Powell [Wed, 12 Dec 2012 02:05:53 +0000 (18:05 -0800)]
am
90f4c5c9: am
c6f05e93: am
d22843a8: Merge "Fix regression in ListView click handling"
* commit '
90f4c5c9d440a7802ecdb6c99fe7cac589122b17':
Fix regression in ListView click handling
Adam Powell [Wed, 12 Dec 2012 02:04:23 +0000 (18:04 -0800)]
am
c6f05e93: am
d22843a8: Merge "Fix regression in ListView click handling"
* commit '
c6f05e93dc37db67addcd19ff87ba013ba817035':
Fix regression in ListView click handling
Adam Powell [Wed, 12 Dec 2012 02:02:30 +0000 (18:02 -0800)]
am
d22843a8: Merge "Fix regression in ListView click handling"
* commit '
d22843a8a8d240fc09291b1b9505d62c1f0c0f8d':
Fix regression in ListView click handling
Adam Powell [Wed, 12 Dec 2012 02:00:48 +0000 (18:00 -0800)]
Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
Adam Powell [Wed, 12 Dec 2012 01:57:58 +0000 (17:57 -0800)]
Merge "Fix regression in ListView click handling"
Jason Sams [Wed, 12 Dec 2012 01:09:43 +0000 (17:09 -0800)]
am
0d0c4e13: Merge "Minor cleanup of a few RS filter ports."
* commit '
0d0c4e136a8da0b590d8c26f7f60603286362695':
Minor cleanup of a few RS filter ports.
Jason Sams [Wed, 12 Dec 2012 01:06:44 +0000 (17:06 -0800)]
Merge "Minor cleanup of a few RS filter ports."
Robert Greenwalt [Wed, 12 Dec 2012 00:56:42 +0000 (16:56 -0800)]
am
1d42a097: am
f6610e2d: am
79e0e3fd: Merge "return value of String.replace() is ignored."
* commit '
1d42a09715a17e13c4c68e133bcae40ee9935638':
return value of String.replace() is ignored.
Robert Greenwalt [Wed, 12 Dec 2012 00:54:33 +0000 (16:54 -0800)]
am
f6610e2d: am
79e0e3fd: Merge "return value of String.replace() is ignored."
* commit '
f6610e2d7d883653ef80077df649e4dd91c221c1':
return value of String.replace() is ignored.
Robert Greenwalt [Wed, 12 Dec 2012 00:52:39 +0000 (16:52 -0800)]
am
79e0e3fd: Merge "return value of String.replace() is ignored."
* commit '
79e0e3fd69ba6426da6575e0c778eff205318172':
return value of String.replace() is ignored.
Robert Greenwalt [Wed, 12 Dec 2012 00:34:35 +0000 (16:34 -0800)]
Merge "return value of String.replace() is ignored."
Christopher Tate [Wed, 12 Dec 2012 00:17:30 +0000 (16:17 -0800)]
am
1423fa30: am
1de62393: am
534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
* commit '
1423fa30c216ccdbbebbfa3fb120b3a7d17b073a':
Make immersive mode public & imply update locking
Christopher Tate [Wed, 12 Dec 2012 00:15:38 +0000 (16:15 -0800)]
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
Christopher Tate [Wed, 12 Dec 2012 00:13:51 +0000 (16:13 -0800)]
am
534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
* commit '
534de491e6522465a7ad12d7cba9b2f80deab364':
Make immersive mode public & imply update locking
Christopher Tate [Wed, 12 Dec 2012 00:10:52 +0000 (16:10 -0800)]
Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
The Android Automerger [Tue, 11 Dec 2012 23:56:27 +0000 (15:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Adam Powell [Tue, 11 Dec 2012 23:41:17 +0000 (15:41 -0800)]
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
Kenny Root [Tue, 11 Dec 2012 23:29:48 +0000 (15:29 -0800)]
am
0c312368: am
8f276515: am
ae5cc868: am
2735795f: Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev
* commit '
0c312368cb21a15f7249cad58a714c8d57408c66':
If freeCache deletes APK, give out of space error
Kenny Root [Tue, 11 Dec 2012 23:27:26 +0000 (15:27 -0800)]
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
Jeff Brown [Tue, 11 Dec 2012 23:26:15 +0000 (15:26 -0800)]
am
ace7404d: resolved conflicts for merge of
d7337fb9 to master
* commit '
ace7404de8b9a5bd7566027a8a90d36d099a46f4':
Play a tone when wireless charging begins.
Jeff Brown [Tue, 11 Dec 2012 23:21:02 +0000 (15:21 -0800)]
resolved conflicts for merge of
d7337fb9 to master
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
Kenny Root [Tue, 11 Dec 2012 23:12:49 +0000 (15:12 -0800)]
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
Kenny Root [Tue, 11 Dec 2012 23:10:47 +0000 (15:10 -0800)]
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
Kenny Root [Tue, 11 Dec 2012 23:07:53 +0000 (15:07 -0800)]
Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev
Jason Sams [Tue, 11 Dec 2012 22:27:51 +0000 (14:27 -0800)]
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
Stephen Hines [Tue, 11 Dec 2012 22:22:58 +0000 (14:22 -0800)]
am
fba73030: Merge "Test bounds on rsForEach calls."
* commit '
fba73030d674b3cd29ffe8519aa41738b54ae827':
Test bounds on rsForEach calls.
Jeff Brown [Tue, 11 Dec 2012 22:19:41 +0000 (14:19 -0800)]
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.
Stephen Hines [Tue, 11 Dec 2012 22:18:40 +0000 (14:18 -0800)]
Merge "Test bounds on rsForEach calls."
Jeff Brown [Tue, 11 Dec 2012 22:17:50 +0000 (14:17 -0800)]
am
eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
* commit '
eaae7d976a5629e064af06f0e2c10f97f1a8c462':
Play a tone when wireless charging begins.
Jeff Brown [Tue, 11 Dec 2012 22:14:54 +0000 (14:14 -0800)]
Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
Chet Haase [Tue, 11 Dec 2012 22:11:57 +0000 (14:11 -0800)]
am
8ee38721: Merge "Fix requestLayout-during-layout issue with Gallery"
* commit '
8ee38721e0775f987bc067d781f2c6d47a4968c6':
Fix requestLayout-during-layout issue with Gallery
Chet Haase [Tue, 11 Dec 2012 22:09:28 +0000 (14:09 -0800)]
Merge "Fix requestLayout-during-layout issue with Gallery"
Chet Haase [Tue, 11 Dec 2012 22:02:55 +0000 (14:02 -0800)]
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
Kenny Root [Tue, 11 Dec 2012 20:48:08 +0000 (12:48 -0800)]
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
Jeff Brown [Fri, 7 Dec 2012 21:56:34 +0000 (13:56 -0800)]
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
John Spurlock [Tue, 11 Dec 2012 20:01:32 +0000 (12:01 -0800)]
am
bbb97038: am
5ccefdd6: am
49cc9cb8: am
5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev
* commit '
bbb970386026ec16b3cff1be280d0b9160cacad4':
Fallback to default dream if the current dream is removed.
The Android Open Source Project [Tue, 11 Dec 2012 20:00:01 +0000 (12:00 -0800)]
am
4f67c751: (-s ours) am
6c0ad7a0: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
4f67c7515b79e62d2fc33233cf5a4e2b6d21fc7f':
John Spurlock [Tue, 11 Dec 2012 19:59:28 +0000 (11:59 -0800)]
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.
The Android Open Source Project [Tue, 11 Dec 2012 19:57:03 +0000 (11:57 -0800)]
am
6c0ad7a0: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
6c0ad7a0644a393e3a89a35fbd80e8f86458585c':
John Spurlock [Tue, 11 Dec 2012 19:56:56 +0000 (11:56 -0800)]
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.
The Android Open Source Project [Tue, 11 Dec 2012 19:54:15 +0000 (11:54 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I1ff629cf6a936691e18b7857c1f796a3ed55fc47
John Spurlock [Tue, 11 Dec 2012 19:53:53 +0000 (11:53 -0800)]
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.
John Spurlock [Tue, 11 Dec 2012 19:51:41 +0000 (11:51 -0800)]
Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev
Emma Sajic [Sun, 9 Dec 2012 13:32:05 +0000 (13:32 +0000)]
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>
Amith Yamasani [Tue, 11 Dec 2012 19:20:45 +0000 (11:20 -0800)]
am
03cb98ae: Move Observer test to servicetests
* commit '
03cb98aecfeef0b0894f69987f8b4a15c02501f3':
Move Observer test to servicetests
Amith Yamasani [Tue, 11 Dec 2012 19:14:58 +0000 (11:14 -0800)]
Move Observer test to servicetests
Change-Id: Ib3493af4eb3185db79004a3cad5473161ed51f71
Amith Yamasani [Tue, 11 Dec 2012 19:10:53 +0000 (11:10 -0800)]
am
e03c17f1: Merge "Move one more test."
* commit '
e03c17f1cb50a7869ef33406a2be275fdb040ea1':
Move one more test.
Amith Yamasani [Tue, 11 Dec 2012 19:08:06 +0000 (11:08 -0800)]
Merge "Move one more test."
Amith Yamasani [Tue, 11 Dec 2012 19:06:21 +0000 (11:06 -0800)]
Move one more test.
Change-Id: Iea0e0b5727746f2332db2ab1c1b216326eb50f13
Craig Mautner [Tue, 11 Dec 2012 18:53:32 +0000 (10:53 -0800)]
am
28db1975: Merge "Share the pending layout changes"
* commit '
28db1975802374985f2cb8bf4aedc7f5a9e81a22':
Share the pending layout changes
Craig Mautner [Tue, 11 Dec 2012 18:51:30 +0000 (10:51 -0800)]
Merge "Share the pending layout changes"
Amith Yamasani [Tue, 11 Dec 2012 18:46:52 +0000 (10:46 -0800)]
am
3a57213c: Merge "Fix build. Forgot to move this test."
* commit '
3a57213c2d54c5f5e7e95c944ef30e6c239162ae':
Fix build. Forgot to move this test.
Craig Mautner [Tue, 11 Dec 2012 18:46:49 +0000 (10:46 -0800)]
am
74c96718: Merge "Recouple layout and animation a bit."
* commit '
74c9671855b436816e36d407b85d781c38095a50':
Recouple layout and animation a bit.
Amith Yamasani [Tue, 11 Dec 2012 18:43:00 +0000 (10:43 -0800)]
Merge "Fix build. Forgot to move this test."
Craig Mautner [Tue, 11 Dec 2012 18:42:21 +0000 (10:42 -0800)]
Merge "Recouple layout and animation a bit."
Amith Yamasani [Tue, 11 Dec 2012 18:42:09 +0000 (10:42 -0800)]
Fix build. Forgot to move this test.
Change-Id: I06aab8ec6e2dac86b65bbeed3587444260fec2e8
Amith Yamasani [Tue, 11 Dec 2012 18:07:16 +0000 (10:07 -0800)]
am
16db3c72: Merge "Move lingering services to services.jar."
* commit '
16db3c72c09bb03b6d418893686e837fa89b601b':
Move lingering services to services.jar.
Amith Yamasani [Tue, 11 Dec 2012 18:03:38 +0000 (10:03 -0800)]
Merge "Move lingering services to services.jar."
Craig Mautner [Tue, 11 Dec 2012 17:56:29 +0000 (09:56 -0800)]
am
07ce6511: Merge "Further refine test for window gone."
* commit '
07ce6511378ef2942f8238bb34cfa5116667cbb0':
Further refine test for window gone.
Craig Mautner [Tue, 11 Dec 2012 17:54:22 +0000 (09:54 -0800)]
Merge "Further refine test for window gone."
Jeff Sharkey [Thu, 15 Nov 2012 22:01:46 +0000 (14:01 -0800)]
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
Craig Mautner [Tue, 11 Dec 2012 17:40:34 +0000 (09:40 -0800)]
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
Baligh Uddin [Tue, 11 Dec 2012 04:45:23 +0000 (20:45 -0800)]
am
151cb90c: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
151cb90c6093d5b4371b9367b507f8aa7c1a4370':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 04:42:30 +0000 (20:42 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 11 Dec 2012 04:35:27 +0000 (20:35 -0800)]
Merge "Import translations. DO NOT MERGE" into master-chromium
Baligh Uddin [Tue, 11 Dec 2012 04:34:29 +0000 (20:34 -0800)]
am
32de9220: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
32de9220e06360cf957b1bef8c973ab726278d47':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 04:32:41 +0000 (20:32 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 11 Dec 2012 04:27:51 +0000 (20:27 -0800)]
am
51b25921: (-s ours) am
fca736b8: (-s ours) am
c39adf91: am
d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
51b25921536bb8e746d9a26fbbf6166ec214aba8':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 04:26:22 +0000 (20:26 -0800)]
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
Baligh Uddin [Tue, 11 Dec 2012 04:23:59 +0000 (20:23 -0800)]
am
c39adf91: am
d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
c39adf91c9d99eea31d9e83fa3c905516ebbb37e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 04:23:19 +0000 (20:23 -0800)]
am
984e4b5a: (-s ours) am
8672f044: (-s ours) am
73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
984e4b5add34cf1f3303149d6c7e21bef22ec344':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 04:22:17 +0000 (20:22 -0800)]
am
d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
d39a0d8041cec16429331937ec81d55f18b0db72':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 04:21:39 +0000 (20:21 -0800)]
am
8672f044: (-s ours) am
73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
8672f044ffba414c6caade21cff8b55a707713f0':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 04:20:17 +0000 (20:20 -0800)]
am
73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
73f6e3f583b1ff2948fd82e68a3f813750165b14':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 04:19:06 +0000 (20:19 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Tue, 11 Dec 2012 04:17:00 +0000 (20:17 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Mita Yun [Tue, 11 Dec 2012 03:52:31 +0000 (19:52 -0800)]
am
b84b9c21: am
81f82d29: am
aa8dc2ee: Removed mCallbackLooper from WallpaperService
* commit '
b84b9c21919a067ee989f70667c1cfa2f817c46e':
Removed mCallbackLooper from WallpaperService
Mita Yun [Tue, 11 Dec 2012 03:50:11 +0000 (19:50 -0800)]
am
81f82d29: am
aa8dc2ee: Removed mCallbackLooper from WallpaperService
* commit '
81f82d29ed3c93704c4fa0cbfeb48a675b71c349':
Removed mCallbackLooper from WallpaperService
The Android Automerger [Tue, 11 Dec 2012 03:33:40 +0000 (19:33 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Christopher Tate [Thu, 15 Mar 2012 23:27:14 +0000 (16:27 -0700)]
Make immersive mode public & imply update locking
Activity.setImmersive(boolean) / android:immersive="bool" are now public.
In addition, if the foreground activity is immersive then an update lock
will be held on its behalf. This lets applications such as movie players
suppress the display of intrusive notifications, OTA-availability dialogs,
and the like while they are displaying content that ought not to be
rudely interrupted.
The update lock aspect of this mode is *advisory*, not binding -- the
update mechanism is not actually constrained; it simply uses this information
in deciding whether/when to prompt the user. It's more a guideline than
a rule.
Bug
7681380
Change-Id: I3c412a84cbf3933e3bf0168f2c71c54a86e4b7e5
Mita Yun [Tue, 11 Dec 2012 02:36:01 +0000 (18:36 -0800)]
am
aa8dc2ee: Removed mCallbackLooper from WallpaperService
* commit '
aa8dc2ee18c15a5c7fb897d2f41116950fd30fe6':
Removed mCallbackLooper from WallpaperService
Mita Yun [Tue, 11 Dec 2012 02:32:03 +0000 (18:32 -0800)]
Removed mCallbackLooper from WallpaperService
Change-Id: Icb060a9225dbe7e848bbe80e6a9ab28fcfb59969
Wink Saville [Tue, 11 Dec 2012 02:15:29 +0000 (18:15 -0800)]
am
875eef2d: am
8c0e3c23: am
74199056: Merge "Add config_speed_up_audio_on_mt_calls option"
* commit '
875eef2daa79db8058d9540f84a715b1c50cad9f':
Add config_speed_up_audio_on_mt_calls option
Wink Saville [Tue, 11 Dec 2012 02:13:29 +0000 (18:13 -0800)]
am
8c0e3c23: am
74199056: Merge "Add config_speed_up_audio_on_mt_calls option"
* commit '
8c0e3c232a9000b347b18340fa343a15d4434d7b':
Add config_speed_up_audio_on_mt_calls option
Wink Saville [Tue, 11 Dec 2012 02:11:34 +0000 (18:11 -0800)]
am
74199056: Merge "Add config_speed_up_audio_on_mt_calls option"
* commit '
7419905676db3cecb011d7e63a0eb64421e02b55':
Add config_speed_up_audio_on_mt_calls option
Stephen Hines [Thu, 29 Nov 2012 23:45:31 +0000 (15:45 -0800)]
Test bounds on rsForEach calls.
Change-Id: I1dedfda90200bac984b552d52e1ac26523085357
Alex Yakavenka [Tue, 11 Dec 2012 01:40:40 +0000 (17:40 -0800)]
am
4fee2679: am
176c7a2b: am
4d56777e: am
32b424f7: Add config_speed_up_audio_on_mt_calls option
* commit '
4fee26799ecd58634fb3419eb9a67c74914cfc64':
Add config_speed_up_audio_on_mt_calls option
Alex Yakavenka [Tue, 11 Dec 2012 01:36:45 +0000 (17:36 -0800)]
am
176c7a2b: am
4d56777e: am
32b424f7: Add config_speed_up_audio_on_mt_calls option
* commit '
176c7a2b72ff3ee6c34096cb637a48058a7b6798':
Add config_speed_up_audio_on_mt_calls option
Mita Yun [Tue, 11 Dec 2012 01:35:56 +0000 (17:35 -0800)]
am
d44280e2: resolved conflicts for merge of
ebcbfb3f to master
* commit '
d44280e28884085f014806d53413ec5a68d0ac25':
Use asynchronous messages for input method events.