OSDN Git Service
Quddus Chong [Fri, 14 Dec 2012 19:54:03 +0000 (11:54 -0800)]
am
cac633c7: am
dc167dc6: am
9b7cb6f0: docs: Fixing broken IABv3 internal links
* commit '
cac633c7316b6dd569864ee70e45fcbb36653066':
docs: Fixing broken IABv3 internal links
Quddus Chong [Fri, 14 Dec 2012 19:51:27 +0000 (11:51 -0800)]
am
dc167dc6: am
9b7cb6f0: docs: Fixing broken IABv3 internal links
* commit '
dc167dc6c756697aba317d41b4f53504be7eae83':
docs: Fixing broken IABv3 internal links
Quddus Chong [Fri, 14 Dec 2012 19:48:13 +0000 (11:48 -0800)]
am
9b7cb6f0: docs: Fixing broken IABv3 internal links
* commit '
9b7cb6f03b2b5492b26fdffd0dddcadb74e8e239':
docs: Fixing broken IABv3 internal links
Quddus Chong [Fri, 14 Dec 2012 19:22:29 +0000 (11:22 -0800)]
docs: Fixing broken IABv3 internal links
Change-Id: Ia0c087645e72a879c9883b9d62bf997afb407ce4
Mike Cleron [Fri, 14 Dec 2012 19:01:55 +0000 (11:01 -0800)]
am
a5a4eb0f: am
6b922cc6: Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev
* commit '
a5a4eb0f93d4b992a1879e26e04ba803827e24ca':
Receive a user dictionary callback from Settings application
Mike Cleron [Fri, 14 Dec 2012 18:59:19 +0000 (10:59 -0800)]
am
6b922cc6: Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev
* commit '
6b922cc6d4d8221ad83b410c03eb4b8fb9fc78e2':
Receive a user dictionary callback from Settings application
Mike Cleron [Fri, 14 Dec 2012 18:57:29 +0000 (10:57 -0800)]
Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev
John Spurlock [Fri, 14 Dec 2012 18:31:16 +0000 (10:31 -0800)]
am
7739a5ca: am
f5df689a: Fix NPE inside DreamManagerService.
* commit '
7739a5ca673ba2264295641466569b2a1c788fe9':
Fix NPE inside DreamManagerService.
John Spurlock [Fri, 14 Dec 2012 18:29:32 +0000 (10:29 -0800)]
am
f5df689a: Fix NPE inside DreamManagerService.
* commit '
f5df689aa65682ce9217405e4a6b686e94129e8f':
Fix NPE inside DreamManagerService.
Joe Malin [Fri, 14 Dec 2012 18:29:32 +0000 (10:29 -0800)]
am
5e1f7f08: am
2fc4182b: am
3252eb96: am
cad9660f: am
7eef172e: am
ba34f097: Android Training: Loading Data in the Background
* commit '
5e1f7f08c8d9111f285cbb54e3408fc01825d24d':
Android Training: Loading Data in the Background
Joe Malin [Fri, 14 Dec 2012 18:27:40 +0000 (10:27 -0800)]
am
2fc4182b: am
3252eb96: am
cad9660f: am
7eef172e: am
ba34f097: Android Training: Loading Data in the Background
* commit '
2fc4182b854036593d71e78c6b8de43dac86c967':
Android Training: Loading Data in the Background
John Spurlock [Fri, 14 Dec 2012 18:12:43 +0000 (13:12 -0500)]
Fix NPE inside DreamManagerService.
Bug:
7741911
Change-Id: Icfc39b2d89f57bba79866030df85b822e3f73ae2
Satoshi Kataoka [Thu, 13 Dec 2012 05:37:19 +0000 (14:37 +0900)]
Receive a user dictionary callback from Settings application
Bug:
7725834
The callback is sent when the user adds a word to the user dictionary.
Change-Id: Ieee9bfd50a9adbed1a769e3cd95d9cb2815c34b4
Joe Malin [Fri, 14 Dec 2012 02:13:05 +0000 (18:13 -0800)]
am
3252eb96: am
cad9660f: am
7eef172e: am
ba34f097: Android Training: Loading Data in the Background
* commit '
3252eb96577d9e7080542804129cbdb197c768a9':
Android Training: Loading Data in the Background
Joe Malin [Fri, 14 Dec 2012 02:08:02 +0000 (18:08 -0800)]
am
cad9660f: am
7eef172e: am
ba34f097: Android Training: Loading Data in the Background
* commit '
cad9660fe739df5ec6b919f8f5e94a222a3a83e9':
Android Training: Loading Data in the Background
Joe Malin [Fri, 14 Dec 2012 02:03:38 +0000 (18:03 -0800)]
am
7eef172e: am
ba34f097: Android Training: Loading Data in the Background
* commit '
7eef172e9b1c4ffc97cb7b9ea4216c718a832926':
Android Training: Loading Data in the Background
Joe Malin [Fri, 14 Dec 2012 01:58:19 +0000 (17:58 -0800)]
am
ba34f097: Android Training: Loading Data in the Background
* commit '
ba34f097df278ce1861ebfecdaf634f519ba1f36':
Android Training: Loading Data in the Background
Joe Malin [Tue, 6 Nov 2012 01:22:24 +0000 (17:22 -0800)]
Android Training: Loading Data in the Background
Change-Id: Ibb469cd068068b37ea95371afb7e4dca4535ba94
Joe Malin [Fri, 14 Dec 2012 00:24:25 +0000 (16:24 -0800)]
am
803abe6e: am
35ef45a7: am
28cb6150: am
7096a17e: am
718c7484: am
f0f5efbe: Android Training: Run in a Background Service
* commit '
803abe6e4b251e29bf7fe3c015cfb7e110d495ba':
Android Training: Run in a Background Service
Joe Malin [Fri, 14 Dec 2012 00:22:43 +0000 (16:22 -0800)]
am
35ef45a7: am
28cb6150: am
7096a17e: am
718c7484: am
f0f5efbe: Android Training: Run in a Background Service
* commit '
35ef45a7a05840a42b83698564aa098ccc07644e':
Android Training: Run in a Background Service
Joe Malin [Fri, 14 Dec 2012 00:20:25 +0000 (16:20 -0800)]
am
28cb6150: am
7096a17e: am
718c7484: am
f0f5efbe: Android Training: Run in a Background Service
* commit '
28cb615003b1f96f7e9e579a7859094f4598e580':
Android Training: Run in a Background Service
Joe Malin [Fri, 14 Dec 2012 00:18:19 +0000 (16:18 -0800)]
am
7096a17e: am
718c7484: am
f0f5efbe: Android Training: Run in a Background Service
* commit '
7096a17e953d7e126e6ac8952b38920e0ea7e7e1':
Android Training: Run in a Background Service
Joe Malin [Fri, 14 Dec 2012 00:16:54 +0000 (16:16 -0800)]
am
718c7484: am
f0f5efbe: Android Training: Run in a Background Service
* commit '
718c7484cf008d45f8501ae7d0cd57b31f935934':
Android Training: Run in a Background Service
Joe Malin [Fri, 14 Dec 2012 00:15:36 +0000 (16:15 -0800)]
am
f0f5efbe: Android Training: Run in a Background Service
* commit '
f0f5efbea206fd0fbac655519f3f535620ed74cc':
Android Training: Run in a Background Service
Joe Malin [Sat, 27 Oct 2012 18:16:19 +0000 (11:16 -0700)]
Android Training: Run in a Background Service
Change-Id: I002af57c65eccd0a624e00ef4b1607469199ce6b
Fabrice Di Meglio [Thu, 13 Dec 2012 20:33:35 +0000 (12:33 -0800)]
am
5c0d6f99: am
9de88dad: Merge "Fix bug #
7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev
* commit '
5c0d6f9980ed4684cbeefc28036dd9eeac474375':
Fix bug #
7724071 ImageView drawable is not loaded correctly when changing Locale
Fabrice Di Meglio [Thu, 13 Dec 2012 20:31:17 +0000 (12:31 -0800)]
am
9de88dad: Merge "Fix bug #
7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev
* commit '
9de88dad29d89ec81c5e6b0df5aa92a04c8ce781':
Fix bug #
7724071 ImageView drawable is not loaded correctly when changing Locale
Fabrice Di Meglio [Thu, 13 Dec 2012 20:28:06 +0000 (12:28 -0800)]
Merge "Fix bug #
7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev
Joe Fernandez [Thu, 13 Dec 2012 20:20:09 +0000 (12:20 -0800)]
am
b2aa3a74: am
54091f87: am
538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
* commit '
b2aa3a74754299488acdff3843763f46ca571d2e':
docs: NDK r8d Release Notes
Joe Fernandez [Thu, 13 Dec 2012 20:18:00 +0000 (12:18 -0800)]
am
54091f87: am
538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
* commit '
54091f8730850772606ab2d4b4591bb902c52b44':
docs: NDK r8d Release Notes
Joe Fernandez [Thu, 13 Dec 2012 20:17:31 +0000 (12:17 -0800)]
am
86841bd5: am
700f9ea3: am
82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
* commit '
86841bd5c1d537da40e076e6850a09bdc884ded5':
docs: SDK r21.0.1 Release Notes
Joe Fernandez [Thu, 13 Dec 2012 20:15:51 +0000 (12:15 -0800)]
am
538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
* commit '
538c8d0a467187008b5e2249fdbea153d598f462':
docs: NDK r8d Release Notes
Joe Fernandez [Thu, 13 Dec 2012 20:15:24 +0000 (12:15 -0800)]
am
700f9ea3: am
82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
* commit '
700f9ea300f92da69800a48a2325a7f93a82e8cb':
docs: SDK r21.0.1 Release Notes
Joe Fernandez [Thu, 13 Dec 2012 20:13:34 +0000 (12:13 -0800)]
Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
Joe Fernandez [Thu, 13 Dec 2012 20:13:16 +0000 (12:13 -0800)]
am
82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
* commit '
82703ea4e842f59bda38cfb101ebaa3a8986aae3':
docs: SDK r21.0.1 Release Notes
Joe Fernandez [Thu, 13 Dec 2012 20:10:58 +0000 (12:10 -0800)]
Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
Scott Main [Thu, 13 Dec 2012 19:38:19 +0000 (11:38 -0800)]
am
c49ffcde: am
f83ab33c: am
095d6947: docs: explain that layout height/width must be used to override include layouts
* commit '
c49ffcdee87d185c6857bdad94f7cf53f04f6a65':
docs: explain that layout height/width must be used to override include layouts
Scott Main [Thu, 13 Dec 2012 19:36:23 +0000 (11:36 -0800)]
am
f83ab33c: am
095d6947: docs: explain that layout height/width must be used to override include layouts
* commit '
f83ab33c57f22f040fdb6ae546a3aae39a1b2b4c':
docs: explain that layout height/width must be used to override include layouts
Scott Main [Thu, 13 Dec 2012 19:34:14 +0000 (11:34 -0800)]
am
095d6947: docs: explain that layout height/width must be used to override include layouts
* commit '
095d69474b8d9fbe2507f6015d0ef6821af31ae0':
docs: explain that layout height/width must be used to override include layouts
Scott Main [Thu, 13 Dec 2012 18:59:58 +0000 (10:59 -0800)]
docs: explain that layout height/width must be used to override include layouts
Change-Id: I7ee63f2f05b2e9a8cd424dfb2e7c9bead9d5efc6
Joe Fernandez [Wed, 12 Dec 2012 23:06:09 +0000 (15:06 -0800)]
docs: SDK r21.0.1 Release Notes
Change-Id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
Joe Fernandez [Tue, 11 Dec 2012 21:25:20 +0000 (13:25 -0800)]
docs: NDK r8d Release Notes
Change-Id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696
Fabrice Di Meglio [Wed, 12 Dec 2012 19:52:03 +0000 (11:52 -0800)]
Fix bug #
7724071 ImageView drawable is not loaded correctly when changing Locale
aapt is not generating the correct CONFIG_LAYOUTDIR bit when a Drawable has a
LTR and RTL version. It was generating instead the wrong CONFIG_SCREEN_LAYOUT bit.
This was linked to the fact that the layout direction bits are contained into the
screen layout bit.
So now make sure that we are generating the correct CONFIG_LAYOUTDIR bit.
Change-Id: If17c84d31e6c128721ed97ee6711660b131bf941
Amith Yamasani [Wed, 12 Dec 2012 19:43:21 +0000 (11:43 -0800)]
am
73f24ae1: am
9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev
* commit '
73f24ae1d9992cf70cb05bc319d12478b2c49566':
Don't update global table when upgrading secondary users' database.
Amith Yamasani [Wed, 12 Dec 2012 19:41:14 +0000 (11:41 -0800)]
am
9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev
* commit '
9a1473406f634ea541bd1643dc70d9aae8c10e77':
Don't update global table when upgrading secondary users' database.
Amith Yamasani [Wed, 12 Dec 2012 19:38:38 +0000 (11:38 -0800)]
Merge "Don't update global table when upgrading secondary users' database." into jb-mr1.1-dev
Baligh Uddin [Wed, 12 Dec 2012 19:26:13 +0000 (11:26 -0800)]
am
1858bfd1: am
90e41469: Import translations. DO NOT MERGE
* commit '
1858bfd1a5d951b8c14f81b11172dfed84f5d87f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 19:24:00 +0000 (11:24 -0800)]
am
90e41469: Import translations. DO NOT MERGE
* commit '
90e41469fe99e52de2144ed24d005a1b30e5f917':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 19:22:04 +0000 (11:22 -0800)]
am
f1c6f1d3: Import translations. DO NOT MERGE
* commit '
f1c6f1d3870707c4f76261219de0bb2968bf2d31':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 19:14:26 +0000 (11:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I19d85dc7580e4a4e20a89bc3d56fe8a434d8f585
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Dec 2012 19:11:44 +0000 (11:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6079f968a77282ed15f6a46b05dd2318c1c39ba2
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 12 Dec 2012 19:06:36 +0000 (11:06 -0800)]
am
bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts."
* commit '
bf8de6a349e19b32a1577080a9d8bb7f92b2301f':
Remove unnecessary locking for screen broadcasts.
Jeff Sharkey [Wed, 12 Dec 2012 18:41:20 +0000 (10:41 -0800)]
Merge "Remove unnecessary locking for screen broadcasts."
Amith Yamasani [Wed, 12 Dec 2012 17:52:26 +0000 (09:52 -0800)]
Don't update global table when upgrading secondary users' database.
Bug:
7722149
Change-Id: I0c1373cba316b924701136579083274eb6c9b1da
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
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: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"
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: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: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
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.
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
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 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>
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: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: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
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: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
Alex Yakavenka [Tue, 11 Dec 2012 01:08:58 +0000 (17:08 -0800)]
am
4d56777e: am
32b424f7: Add config_speed_up_audio_on_mt_calls option
* commit '
4d56777e678ab17379ec54a0875a14299817da8e':
Add config_speed_up_audio_on_mt_calls option
Alex Yakavenka [Tue, 11 Dec 2012 01:06:44 +0000 (17:06 -0800)]
am
32b424f7: Add config_speed_up_audio_on_mt_calls option
* commit '
32b424f7240580e3948f44559050262e18de99d8':
Add config_speed_up_audio_on_mt_calls option
Wink Saville [Tue, 11 Dec 2012 01:03:46 +0000 (17:03 -0800)]
Merge "Add config_speed_up_audio_on_mt_calls option"
Alex Yakavenka [Thu, 6 Dec 2012 22:53:58 +0000 (14:53 -0800)]
Add config_speed_up_audio_on_mt_calls option
Bug:
7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
Mita Yun [Mon, 10 Dec 2012 23:35:05 +0000 (15:35 -0800)]
am
a98cd512: Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev
* commit '
a98cd5122be643a51f563d02069e8f9409d44394':
Use asynchronous messages for input method events.
The Android Open Source Project [Mon, 10 Dec 2012 23:19:31 +0000 (15:19 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I2d8ac7dc080c9f3c400d4a7bde4df1dd892ffba4
John Spurlock [Mon, 10 Dec 2012 23:15:07 +0000 (18:15 -0500)]
Fallback to default dream if the current dream is removed.
To minimize fix size, return only valid dreams from the service api.
Settings will "just work" with no changes.
Bug:
7699398
Change-Id: I3eb88237a8ccc421fdb68d1de19820614b13d7b8
Wink Saville [Mon, 10 Dec 2012 22:48:21 +0000 (14:48 -0800)]
am
e22217c2: Merge "Telephony: Use IccUtils from uicc package"
* commit '
e22217c2787b0f4967b357d080d49a7f095b2db9':
Telephony: Use IccUtils from uicc package
Mita Yun [Mon, 10 Dec 2012 22:37:26 +0000 (14:37 -0800)]
Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev
Wink Saville [Mon, 10 Dec 2012 22:13:18 +0000 (14:13 -0800)]
Merge "Telephony: Use IccUtils from uicc package"
The Android Automerger [Mon, 10 Dec 2012 21:06:04 +0000 (13:06 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Adam Powell [Mon, 10 Dec 2012 19:41:29 +0000 (11:41 -0800)]
am
d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected"
* commit '
d692c2c6856072a3ec8bec4550466d15a9fef8d7':
Fix EventLog string class problem in onOptionMenuSelected