OSDN Git Service
Joe Fernandez [Thu, 13 Dec 2012 20:25:09 +0000 (12:25 -0800)]
am
33b7978c: am
3042da88: am
b2aa3a74: am
54091f87: am
538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
* commit '
33b7978cf4ac280581108a88edc013a7b32d5112':
docs: NDK r8d Release Notes
Joe Fernandez [Thu, 13 Dec 2012 20:23:50 +0000 (12:23 -0800)]
am
3042da88: am
b2aa3a74: am
54091f87: am
538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
* commit '
3042da88095760005a4a2424f188cb0392ab064a':
docs: NDK r8d Release Notes
Joe Fernandez [Thu, 13 Dec 2012 20:21:39 +0000 (12:21 -0800)]
am
2398d4d9: am
1f69c3b2: am
86841bd5: am
700f9ea3: am
82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
* commit '
2398d4d9821310ef1f9886fd10ef098bfed81468':
docs: SDK r21.0.1 Release Notes
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:19:36 +0000 (12:19 -0800)]
am
1f69c3b2: am
86841bd5: am
700f9ea3: am
82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
* commit '
1f69c3b27658d00b6b581e8ecdd14910fbc25053':
docs: SDK r21.0.1 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:42:39 +0000 (11:42 -0800)]
am
933cf8d3: am
2a87c9da: am
c49ffcde: am
f83ab33c: am
095d6947: docs: explain that layout height/width must be used to override include layouts
* commit '
933cf8d3d23db08830f94fe1603ddecf351f72f6':
docs: explain that layout height/width must be used to override include layouts
Scott Main [Thu, 13 Dec 2012 19:40:14 +0000 (11:40 -0800)]
am
2a87c9da: am
c49ffcde: am
f83ab33c: am
095d6947: docs: explain that layout height/width must be used to override include layouts
* commit '
2a87c9da129d23930a4e5fc7c7a34d933129840d':
docs: explain that layout height/width must be used to override include layouts
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
Nick Kralevich [Thu, 13 Dec 2012 18:57:53 +0000 (10:57 -0800)]
am
abe998c5: Remove dead code.
* commit '
abe998c5e0550f37d27f9c03dbaf56cc07a03dcb':
Remove dead code.
Nick Kralevich [Thu, 13 Dec 2012 18:49:28 +0000 (10:49 -0800)]
Remove dead code.
Android no longer supports a security manager.
System.getSecurityManager() always returns null.
Change-Id: Id44ae8e100da901f2e3054dab905376423a8ff5b
Joe Fernandez [Tue, 11 Dec 2012 21:25:20 +0000 (13:25 -0800)]
docs: NDK r8d Release Notes
Change-Id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696
Przemyslaw Szczepaniak [Thu, 13 Dec 2012 11:24:36 +0000 (03:24 -0800)]
am
b4653373: Set default language in new TTS clients.
* commit '
b46533732c40c6aa4d0d7357176835a33d863234':
Set default language in new TTS clients.
Przemyslaw Szczepaniak [Tue, 4 Dec 2012 14:57:58 +0000 (14:57 +0000)]
Set default language in new TTS clients.
A recent change altered semantics of getLanguage call to return client
language instead of service language. This solved problems
with interferences between two clients using different lanaguages.
This change created a bug - new TTS client instance have no language set.
Since reading user preferences requires additional permissions I've
added new tts service method - getClientDefaultLanguage that will return
user preferences.
I've also added new client method, getDefaultLanguage, that allow easy
access to this data.
Bug:
7666482
Change-Id: Ieb7d2ba3a99d20c513add97f054874720a1cd82e
Jeff Brown [Thu, 13 Dec 2012 00:52:05 +0000 (16:52 -0800)]
am
d90a56fa: Merge "Track app and display wakelocks separately."
* commit '
d90a56fadcdf3b367de5cfee8067f44f55508a34':
Track app and display wakelocks separately.
Jeff Brown [Thu, 13 Dec 2012 00:49:30 +0000 (16:49 -0800)]
Merge "Track app and display wakelocks separately."
Jeff Brown [Wed, 12 Dec 2012 23:43:31 +0000 (15:43 -0800)]
Track app and display wakelocks separately.
Change the power manager to use two different kernel wakelocks
to distinguish between an application or the display keeping the
CPU alive. This may help make the output of "dumpsys batteryinfo"
easier to interpret.
Bug:
7726759
Change-Id: Iaff96ad74030d00200617b459679ea16390a8da5
Craig Mautner [Wed, 12 Dec 2012 23:38:33 +0000 (15:38 -0800)]
am
6cf1a663: Merge "Call adjustWallpaperWindowsLocked once per pass."
* commit '
6cf1a66348731ea10a835fd852f379ebbea41ee9':
Call adjustWallpaperWindowsLocked once per pass.
Craig Mautner [Wed, 12 Dec 2012 23:35:57 +0000 (15:35 -0800)]
Merge "Call adjustWallpaperWindowsLocked once per pass."
Stephen Hines [Wed, 12 Dec 2012 23:05:03 +0000 (15:05 -0800)]
am
a52b503b: Merge "Compatibility lib changes for IP2."
* commit '
a52b503b2e992973b81d87bed5353e7fd47d9528':
Compatibility lib changes for IP2.
Stephen Hines [Wed, 12 Dec 2012 23:02:51 +0000 (15:02 -0800)]
Merge "Compatibility lib changes for IP2."
Nick Kralevich [Wed, 12 Dec 2012 20:46:08 +0000 (12:46 -0800)]
am
0490f02e: Merge "Remove unused code."
* commit '
0490f02eb72adcfd652f5e8373bf0a6c99592d54':
Remove unused code.
Nick Kralevich [Wed, 12 Dec 2012 20:43:29 +0000 (12:43 -0800)]
Merge "Remove unused code."
Nick Kralevich [Wed, 12 Dec 2012 20:43:34 +0000 (12:43 -0800)]
am
ddb622e7: Merge "Add new protected broadcasts"
* commit '
ddb622e7287921d2260d083e565f1dc9af9dfa22':
Add new protected broadcasts
Nick Kralevich [Wed, 12 Dec 2012 20:41:12 +0000 (12:41 -0800)]
Merge "Add new protected broadcasts"
Amith Yamasani [Wed, 12 Dec 2012 19:48:53 +0000 (11:48 -0800)]
am
912f0186: am
68c30860: am
73f24ae1: am
9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev
* commit '
912f01865ab879314ac86dc9a61b62e2e7bd5911':
Don't update global table when upgrading secondary users' database.
Amith Yamasani [Wed, 12 Dec 2012 19:46:41 +0000 (11:46 -0800)]
am
68c30860: am
73f24ae1: am
9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev
* commit '
68c308607b01bafd31c91572a81f4563e2199260':
Don't update global table when upgrading secondary users' database.
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:36:50 +0000 (11:36 -0800)]
Merge "Import translations. DO NOT MERGE" into master-chromium
Baligh Uddin [Wed, 12 Dec 2012 19:36:59 +0000 (11:36 -0800)]
am
ca059d6d: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
ca059d6d1f62db8c094ce9d1451cc7a386d04aaf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 19:34:33 +0000 (11:34 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 12 Dec 2012 19:30:16 +0000 (11:30 -0800)]
am
a60f5545: (-s ours) am
cd281b79: (-s ours) am
1858bfd1: am
90e41469: Import translations. DO NOT MERGE
* commit '
a60f5545cac932341ff5bf96f3dd3b398850e757':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 19:28:12 +0000 (11:28 -0800)]
am
cd281b79: (-s ours) am
1858bfd1: am
90e41469: Import translations. DO NOT MERGE
* commit '
cd281b7929b208126ccc17c7cca4aeedf934b3ea':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 19:26:45 +0000 (11:26 -0800)]
am
f0a2ae27: (-s ours) am
47d2db68: (-s ours) am
f1c6f1d3: Import translations. DO NOT MERGE
* commit '
f0a2ae27a7d7218f768a24fb68c4740589773b03':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 19:26:40 +0000 (11:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iab95a8df67a8ebc2bc668974f1080732b38c7c46
Auto-generated-cl: translation import
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:31 +0000 (11:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2aacaa12b308eaa3813d6793a78ec24177bc88fc
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Dec 2012 19:24:29 +0000 (11:24 -0800)]
am
47d2db68: (-s ours) am
f1c6f1d3: Import translations. DO NOT MERGE
* commit '
47d2db689d52ead99799272b104cf6c8cd8a889a':
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
Jeff Sharkey [Wed, 12 Dec 2012 19:13:39 +0000 (11:13 -0800)]
am
08138941: am
764bc0a7: am
bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts."
* commit '
08138941189e42829b39824162447483cc9b4858':
Remove unnecessary locking for screen broadcasts.
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:11:13 +0000 (11:11 -0800)]
am
764bc0a7: am
bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts."
* commit '
764bc0a7ae9c623f18aceadda2d5d894b1bf4024':
Remove unnecessary locking for screen broadcasts.
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.
Jamie Gennis [Wed, 12 Dec 2012 19:00:18 +0000 (11:00 -0800)]
am
7efad644: Merge "stop using a deprecated SurfaceTextureClient ctor"
* commit '
7efad644c5e2bd30d5d0bf2337521f7895f71d0a':
stop using a deprecated SurfaceTextureClient ctor
Jamie Gennis [Wed, 12 Dec 2012 18:57:20 +0000 (10:57 -0800)]
Merge "stop using a deprecated SurfaceTextureClient ctor"
Jeff Sharkey [Wed, 12 Dec 2012 18:41:20 +0000 (10:41 -0800)]
Merge "Remove unnecessary locking for screen broadcasts."
Nick Kralevich [Wed, 12 Dec 2012 18:38:40 +0000 (10:38 -0800)]
Remove unused code.
Change-Id: I6785cea91c0ab2c367645201fb8862dbf1a55773
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."
Craig Mautner [Fri, 7 Dec 2012 03:05:05 +0000 (19:05 -0800)]
Call adjustWallpaperWindowsLocked once per pass.
Also refactor a few methods and improve logging.
Change-Id: Ic54a1ff99f6de732b31cda5c06d36e8de01a269c
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
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
Stephen Hines [Tue, 11 Dec 2012 01:36:53 +0000 (17:36 -0800)]
Compatibility lib changes for IP2.
Bug:
7419958
Change-Id: Ibd62c06b60875e17d232e27f1845ce0ffafff834
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."
Jamie Gennis [Wed, 12 Dec 2012 01:00:29 +0000 (17:00 -0800)]
stop using a deprecated SurfaceTextureClient ctor
Change-Id: Ie6196ba4896c0ab37b9aed3d1a4ffd04c99c5f80
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