OSDN Git Service
Amith Yamasani [Tue, 23 Apr 2013 10:52:04 +0000 (03:52 -0700)]
am
d52f2b14: Merge "Listen for brightness dialog broadcasts from all users" into jb-mr2-dev
* commit '
d52f2b14852c057fd8d94cebb7ddf8900ba1d232':
Listen for brightness dialog broadcasts from all users
Dirk Dougherty [Tue, 23 Apr 2013 10:51:58 +0000 (03:51 -0700)]
am
94aa1167: am
80177e0c: am
c2340c4d: am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
94aa1167a20560d455cf9458349c081c45531393':
Doc change: update support urls.
Nick Pelly [Tue, 23 Apr 2013 10:51:56 +0000 (03:51 -0700)]
am
edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
* commit '
edced26f162b0232338064e569fe651b8c805f93':
Add ContentValues & CursorWindow to framework.aidl
Michael Wright [Tue, 23 Apr 2013 10:51:53 +0000 (03:51 -0700)]
am
5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-mr2-dev
* commit '
5fe6e4c4c9de523fa9e74902473996ce5ee8b298':
Rewrite input handling for native applications
Svetoslav [Tue, 23 Apr 2013 10:51:50 +0000 (03:51 -0700)]
am
a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev
* commit '
a61464d7adc26c291a5f9de48c9aff8b76a56b1f':
Making new node id APIs return strings.
Jean-Michel Trivi [Tue, 23 Apr 2013 10:51:42 +0000 (03:51 -0700)]
am
fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
* commit '
fb0b6a817903b42dfc192dc8fa71f5dede024379':
Opt-in mechanism for RemoteControlClient position anti-drift check
Dianne Hackborn [Tue, 23 Apr 2013 10:51:40 +0000 (03:51 -0700)]
am
a4629b0b: Merge "JB MR2 == API 18." into jb-mr2-dev
* commit '
a4629b0b833f78481ca51baa44b0303ebe647a7c':
JB MR2 == API 18.
Philip Milne [Tue, 23 Apr 2013 10:51:29 +0000 (03:51 -0700)]
am
a7b2625d: Merge "Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
* commit '
a7b2625d43a8e83e3fb47ca261efad6e3f6fcde9':
Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets
Chris Craik [Tue, 23 Apr 2013 10:51:18 +0000 (03:51 -0700)]
am
8d3f3c06: Merge "Expand hardware accel doc" into jb-mr2-dev
* commit '
8d3f3c061709eefe202e0ff7a612fcdf8cfeeb63':
Expand hardware accel doc
Robert Greenwalt [Tue, 23 Apr 2013 10:51:08 +0000 (03:51 -0700)]
am
d0202945: Merge "Listen for network disconnect." into jb-mr2-dev
* commit '
d020294572f591007de1fe0aa9e4927dae72c0c9':
Listen for network disconnect.
Dirk Dougherty [Tue, 23 Apr 2013 10:51:05 +0000 (03:51 -0700)]
am
3acb320f: am
ab3b13eb: am
e5d47b39: am
cdfeb09d: am
10fc5e05: am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
3acb320fcb6ee03aec64220b09283a3c4efa4bb5':
Doc change: update payment detail for merch account.
Christopher Tate [Tue, 23 Apr 2013 10:50:46 +0000 (03:50 -0700)]
am
7a4ddbaa: Merge "Don\'t attempt native crash reporting for persistent apps" into jb-mr2-dev
* commit '
7a4ddbaafa9e11e190764ca0314f56651dfcb0d9':
Don't attempt native crash reporting for persistent apps
kmccormick [Tue, 23 Apr 2013 10:50:44 +0000 (03:50 -0700)]
am
47cccbd0: am
f9a152d8: am
0415ea6a: am
2aca8dbe: am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
47cccbd09d4fe2f408bf88c39faa7530d202c233':
Doc update: Fix firewall text.
Scott Main [Tue, 23 Apr 2013 10:50:42 +0000 (03:50 -0700)]
am
3fadd4c2: am
8841569f: am
b8ac12af: am
3da6ef39: am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
3fadd4c256f2f83b44cd023d4f6c95af8aeaadc0':
fix backup registration url external bug: 54539
Baligh Uddin [Tue, 23 Apr 2013 10:50:38 +0000 (03:50 -0700)]
am
b0579834: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
b0579834e7af8239b10b7f2ec8b09e62f9ad51e1':
Import translations. DO NOT MERGE
Dianne Hackborn [Tue, 23 Apr 2013 10:50:33 +0000 (03:50 -0700)]
am
3edf207a: Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev
* commit '
3edf207a922c24df349e6f9ffadb2bdc5b18d3c2':
Assign final resource IDs for JB MR2.
Scott Main [Tue, 23 Apr 2013 10:50:26 +0000 (03:50 -0700)]
am
9753ef1e: am
35ac5b08: am
abb6f472: am
24a3899c: am
1aba107d: am
c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '
9753ef1e7db65a3245c4a3c619b0778fd5e5a2de':
delete unused download page and add a couple search tags
Zhentao Sun [Tue, 23 Apr 2013 10:50:20 +0000 (03:50 -0700)]
am
c5fc9988: Made it easier to disable overlay mechanism of location components.
* commit '
c5fc9988f11acc58229fb6ae80d346277318ada4':
Made it easier to disable overlay mechanism of location components.
Amith Yamasani [Tue, 23 Apr 2013 00:46:42 +0000 (00:46 +0000)]
Merge "Listen for brightness dialog broadcasts from all users" into jb-mr2-dev
Dirk Dougherty [Tue, 23 Apr 2013 00:11:01 +0000 (17:11 -0700)]
am
80177e0c: am
c2340c4d: am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
80177e0cdb2e4178d9593f758a2bca352480e653':
Doc change: update support urls.
Dirk Dougherty [Tue, 23 Apr 2013 00:08:51 +0000 (17:08 -0700)]
am
c2340c4d: am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
c2340c4dc7cf451a5d2ab5392801974dbbf3a414':
Doc change: update support urls.
Nick Pelly [Tue, 23 Apr 2013 00:07:18 +0000 (00:07 +0000)]
Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
Dirk Dougherty [Tue, 23 Apr 2013 00:06:40 +0000 (17:06 -0700)]
am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
ecf551805ec96e050a703beb9d4033bd2757fe2e':
Doc change: update support urls.
Dirk Dougherty [Tue, 23 Apr 2013 00:05:08 +0000 (17:05 -0700)]
am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
04f3b81aad12d5d28db42db40545603c6b128c1f':
Doc change: update support urls.
Michael Wright [Tue, 23 Apr 2013 00:04:21 +0000 (00:04 +0000)]
Merge "Rewrite input handling for native applications" into jb-mr2-dev
Michael Wright [Thu, 11 Apr 2013 04:12:00 +0000 (21:12 -0700)]
Rewrite input handling for native applications
Bug:
8473020
Change-Id: Ic4353d8924ab877bec21aff8c2dba9fe725bf906
Svetoslav [Tue, 23 Apr 2013 00:01:36 +0000 (00:01 +0000)]
Merge "Making new node id APIs return strings." into jb-mr2-dev
Dirk Dougherty [Tue, 23 Apr 2013 00:01:21 +0000 (17:01 -0700)]
am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
c7523804c890cd7ed3b61f51b9f5d029320fd406':
Doc change: update support urls.
Dirk Dougherty [Mon, 22 Apr 2013 23:59:34 +0000 (16:59 -0700)]
am
00cfba95: Doc change: update support urls.
* commit '
00cfba95ce5ea3c081b9d7353998f80a7c6edbc9':
Doc change: update support urls.
Jean-Michel Trivi [Mon, 22 Apr 2013 23:41:04 +0000 (23:41 +0000)]
Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
Dianne Hackborn [Mon, 22 Apr 2013 23:37:37 +0000 (23:37 +0000)]
Merge "JB MR2 == API 18." into jb-mr2-dev
Dirk Dougherty [Mon, 22 Apr 2013 21:45:30 +0000 (14:45 -0700)]
Doc change: update support urls.
Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f
Nick Pelly [Mon, 22 Apr 2013 05:52:03 +0000 (15:52 +1000)]
Add ContentValues & CursorWindow to framework.aidl
By adding these stubs, they will be automatically added to framework.aidl
in sdk builds.
This makes it easier for unbundled apps to pass these objects across
AIDL calls.
ContentValues & CursorWindow are already public Parcelables. It is an
oversight that they were not already in framework.aidl.
There are a lot of other public Parcelables that are missing from
framework.aidl. This just fixes two commonly requested ones.
Change-Id: If61e19b1206da1680413d9ea03de87a90b6d233e
Philip Milne [Mon, 22 Apr 2013 22:26:21 +0000 (22:26 +0000)]
Merge "Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
Chris Craik [Mon, 22 Apr 2013 21:55:12 +0000 (21:55 +0000)]
Merge "Expand hardware accel doc" into jb-mr2-dev
Robert Greenwalt [Mon, 22 Apr 2013 21:33:28 +0000 (21:33 +0000)]
Merge "Listen for network disconnect." into jb-mr2-dev
Dirk Dougherty [Mon, 22 Apr 2013 21:32:46 +0000 (14:32 -0700)]
am
ab3b13eb: am
e5d47b39: am
cdfeb09d: am
10fc5e05: am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
ab3b13eb332121cdf31370dbad8a7e49aac652a3':
Doc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 21:30:24 +0000 (14:30 -0700)]
am
e5d47b39: am
cdfeb09d: am
10fc5e05: am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
e5d47b39fd748ebfe8c7fe4da6849ba70faff69a':
Doc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 21:28:21 +0000 (14:28 -0700)]
am
cdfeb09d: am
10fc5e05: am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
cdfeb09d65cb76cb23b965c1fac2bf22fcc80909':
Doc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 21:27:00 +0000 (14:27 -0700)]
am
10fc5e05: am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
10fc5e0528a7cad3f2eab0694ed471d29184ec18':
Doc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 21:25:21 +0000 (14:25 -0700)]
am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
cca235525f14ba8845ef5385036e7913c23f7dd1':
Doc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 21:22:47 +0000 (14:22 -0700)]
am
974af93d: Doc change: update payment detail for merch account.
* commit '
974af93de950b68616aed44985720e2978db5393':
Doc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 20:03:11 +0000 (13:03 -0700)]
Doc change: update payment detail for merch account.
Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
Jean-Michel Trivi [Fri, 19 Apr 2013 15:56:50 +0000 (08:56 -0700)]
Opt-in mechanism for RemoteControlClient position anti-drift check
RemoteControlClient has an interface for the framework to query
the playback position. This mechanism is used to detect
when the estimated position drifts from the real position by
having the framework regularly poll (every 15s when playing at
1x) this interface and compare against the estimation.
But this mechanism:
- should only be used when IRemoteControlDisplay implementation
care about position display
- should not be used by default because the implementation of
the position query interface might involve network traffic
in some remote media player implementation for instance.
This CL implements an opt-in mechanism to be used by
implementators of IRemoteControlDisplay, to request the
anti-drift mechanism to be turned on.
bug
8120740
Change-Id: I1baa3e515546ac41e0ac9c3a41bfa3147ecf3d7f
Robert Greenwalt [Mon, 22 Apr 2013 18:13:02 +0000 (11:13 -0700)]
Listen for network disconnect.
VPN used to just watch the interface, but that is insufficient. There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.
Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.
bug:
8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a
Dianne Hackborn [Mon, 22 Apr 2013 20:04:28 +0000 (13:04 -0700)]
JB MR2 == API 18.
Change-Id: Ia62a81f8ebc79ae0e01b181f4ef47ef192c71592
Christopher Tate [Mon, 22 Apr 2013 20:26:29 +0000 (20:26 +0000)]
Merge "Don't attempt native crash reporting for persistent apps" into jb-mr2-dev
kmccormick [Mon, 22 Apr 2013 20:16:44 +0000 (13:16 -0700)]
am
f9a152d8: am
0415ea6a: am
2aca8dbe: am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
f9a152d8fbf012f990afe02a4ef3d528853ca30b':
Doc update: Fix firewall text.
kmccormick [Mon, 22 Apr 2013 20:15:23 +0000 (13:15 -0700)]
am
0415ea6a: am
2aca8dbe: am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
0415ea6ad9a42837339ec5afc43f3defabe58e38':
Doc update: Fix firewall text.
kmccormick [Mon, 22 Apr 2013 20:13:38 +0000 (13:13 -0700)]
am
2aca8dbe: am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
2aca8dbeaf0c08e59d75c78f5b237a9cd2691784':
Doc update: Fix firewall text.
Scott Main [Mon, 22 Apr 2013 20:13:20 +0000 (13:13 -0700)]
am
8841569f: am
b8ac12af: am
3da6ef39: am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
8841569fc835bb172e06dc3fba9597c643af8b31':
fix backup registration url external bug: 54539
Scott Main [Mon, 22 Apr 2013 20:11:58 +0000 (13:11 -0700)]
am
b8ac12af: am
3da6ef39: am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
b8ac12af56a3eb33be550ade27be62ff3d0689ed':
fix backup registration url external bug: 54539
kmccormick [Mon, 22 Apr 2013 20:11:53 +0000 (13:11 -0700)]
am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
b116885c42be983732a495bb84938d290211014f':
Doc update: Fix firewall text.
Scott Main [Mon, 22 Apr 2013 20:10:21 +0000 (13:10 -0700)]
am
3da6ef39: am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
3da6ef399c5e3b42c0f5a8149b1f1d154556c1ff':
fix backup registration url external bug: 54539
kmccormick [Mon, 22 Apr 2013 20:10:04 +0000 (13:10 -0700)]
am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
ce534905a63f97766f487798fd61cb8414da04fe':
Doc update: Fix firewall text.
Scott Main [Mon, 22 Apr 2013 20:08:33 +0000 (13:08 -0700)]
am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
d07bdb6fd165b31aa9e047095e18be7e76e74502':
fix backup registration url external bug: 54539
kmccormick [Mon, 22 Apr 2013 20:08:10 +0000 (20:08 +0000)]
Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
Scott Main [Mon, 22 Apr 2013 20:06:41 +0000 (13:06 -0700)]
am
2779da87: fix backup registration url external bug: 54539
* commit '
2779da87e2414709afe462339bb3cfde7feb2965':
fix backup registration url external bug: 54539
Scott Main [Mon, 22 Apr 2013 20:03:00 +0000 (13:03 -0700)]
fix backup registration url
external bug: 54539
Change-Id: I3d4e957d8b26c7462c7228a4e4755aee88d6895c
Baligh Uddin [Mon, 22 Apr 2013 19:59:47 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Philip Milne [Mon, 22 Apr 2013 19:44:29 +0000 (12:44 -0700)]
Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets
GridLayout is working as intended here. The bug is appears to be in RelativeLayout
(and possibly LinearLayout).
The value of RelativeLayout.DEFAULT_WIDTH = Integer.MAX_VALUE/2 is 0x3FFFFFFF has bits
set in the range that is used to flag certain conditions and states by the layout system.
In View we have:
MEASURED_SIZE_MASK = 0x00ffffff
MEASURED_STATE_MASK = 0xff000000;
MEASURED_STATE_TOO_SMALL = 0x01000000
This change fixes this bug, though it looks as if that a safer solution would be to not introduce
this constant and code path in the first place - as RelativeLayout's measurement algorithm operates
in the LTR case without it.
Change-Id: I01c51ae854620f08dd63047594486a3464c86f3a
Dianne Hackborn [Mon, 22 Apr 2013 19:49:24 +0000 (19:49 +0000)]
Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev
Svetoslav [Mon, 22 Apr 2013 19:43:03 +0000 (12:43 -0700)]
Making new node id APIs return strings.
The node id does not have to be decorated with spans like spannable
so it makes no sense to have these APIs use anything else but string.
bug:
8657338
Change-Id: I2e7c31128ee9f2933bd0d58beac4ba31a498bb09
kmccormick [Mon, 22 Apr 2013 19:28:25 +0000 (12:28 -0700)]
Doc update: Fix firewall text.
Change-Id: I06c1c86f591dc82f7004b6317062580269230cda
Scott Main [Mon, 22 Apr 2013 19:21:52 +0000 (12:21 -0700)]
am
35ac5b08: am
abb6f472: am
24a3899c: am
1aba107d: am
c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '
35ac5b08e5e152eb6536bde3cd88a83cffc2ed5f':
delete unused download page and add a couple search tags
Scott Main [Mon, 22 Apr 2013 19:19:36 +0000 (12:19 -0700)]
am
abb6f472: am
24a3899c: am
1aba107d: am
c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '
abb6f472e5b3028a509a0c3cc1a841a52a9063e2':
delete unused download page and add a couple search tags
Scott Main [Mon, 22 Apr 2013 19:17:49 +0000 (12:17 -0700)]
am
24a3899c: am
1aba107d: am
c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '
24a3899cb09e6af21f7886f2e567f725a5904e43':
delete unused download page and add a couple search tags
Scott Main [Mon, 22 Apr 2013 19:15:57 +0000 (12:15 -0700)]
am
1aba107d: am
c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '
1aba107ddf8f8df33cbc84046ccc0c7f40a59352':
delete unused download page and add a couple search tags
Scott Main [Mon, 22 Apr 2013 19:14:19 +0000 (12:14 -0700)]
am
c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '
c3ae5cd6852185e5a64173d3c5b3439ad507b156':
delete unused download page and add a couple search tags
Scott Main [Mon, 22 Apr 2013 19:12:10 +0000 (19:12 +0000)]
Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
Scott Main [Mon, 22 Apr 2013 19:11:18 +0000 (12:11 -0700)]
delete unused download page and add a couple search tags
Change-Id: I8aad4703d575e2c336129e92a2b9ef448d21a4f9
Dianne Hackborn [Mon, 22 Apr 2013 17:51:42 +0000 (10:51 -0700)]
Assign final resource IDs for JB MR2.
Change-Id: I72916fb590166ea17ed1e4a2ea648c3f61d62def
Zhentao Sun [Thu, 18 Apr 2013 00:47:53 +0000 (17:47 -0700)]
Made it easier to disable overlay mechanism of location components.
Fixed b/
8276827
Vendor might want to provide their own implementation of "network
location", "fused location" and "geocoder" service. Location manager now
allows those service to be replaced by packages that have the same
signature as one of the packages in config_locationProviderPackageNames.
Such behavior might not be desirable on some devices. This change
make this behavior configurable by 3 boolean flags.
Details:
- Added three boolean flags in core/res/res/values/config.xml to enable
or disable NLP/FLP/Geocoder overlay
- Added 3 package name for the stock NLP/FLP/Geocoder. They are needed
only when overlay is disabled because LocationManagerService need to
know which package is preferred when searching for
NLP/FLP/Geocoder service.
- Made ServiceWatcher able to handle non-overlayable services.
- Fixed an NPE isue in ServiceWatcher. mPm.queryIntentServicesAsUser
might return null.
- Fixed an bug: justCheckThisPackage in bindBestPackageLocked is always
ignored.
Change-Id: Id221961ac7c3aa8ad44b894f9523f04f770ae237
Amith Yamasani [Mon, 22 Apr 2013 16:27:08 +0000 (09:27 -0700)]
Listen for brightness dialog broadcasts from all users
Fixes the problem where Settings->Display->Brightness for secondary users stopped
working after the reorganization of brightness dialog.
Bug:
8666220
Change-Id: I893954810f80383090733fc677266bfcad490703
Baligh Uddin [Mon, 22 Apr 2013 15:47:45 +0000 (08:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia215efa0e99abe3bf7eb8444d60c806d154768a1
Auto-generated-cl: translation import
Michael Wright [Sun, 21 Apr 2013 05:43:56 +0000 (22:43 -0700)]
am
abc2763e: Merge "KeyEvent: update comment"
* commit '
abc2763e4587c3326d160f25666e933cc6888884':
KeyEvent: update comment
Michael Wright [Sun, 21 Apr 2013 05:34:28 +0000 (05:34 +0000)]
Merge "KeyEvent: update comment"
Chet Haase [Sun, 21 Apr 2013 04:34:59 +0000 (21:34 -0700)]
am
339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
* commit '
339ac85483145972da010ad34cbcb29ed70cb822':
Fix quickReject logic to account for setClipChildren() setting
Dirk Dougherty [Sun, 21 Apr 2013 04:34:55 +0000 (21:34 -0700)]
am
16f654c9: am
f4f5757b: am
014513ae: am
00d20bd2: am
e0d5add7: am
3fd1a892: am
94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '
16f654c963890e0ed134560a20f2a481ae4fc7d9':
Doc change: updates for tablet checklist.
Selim Gurun [Sun, 21 Apr 2013 04:34:55 +0000 (21:34 -0700)]
am
b2d82bc0: am
8695b1af: (-s ours) am
5eebdb4a: am
a4653727: am
25e150a2: am
a6ca0a6b: am
758dfa0c: am
9d47e7b6: am
7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
* commit '
b2d82bc0ab0f201443a768e6a8b1636da370c690':
DO NOT MERGE Add a delimiter between scheme and host
Selim Gurun [Sun, 21 Apr 2013 04:34:55 +0000 (21:34 -0700)]
am
940718d8: am
a6854579: am
fa1f7d21: am
07c9c291: am
a2b0b35e: am
5fba3404: am
3c4fa654: am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
940718d8598e4b8da3009b46e8edba9d1dc6ed40':
Revert "Add a delimiter between scheme and host"
Geremy Condra [Sun, 21 Apr 2013 04:34:54 +0000 (21:34 -0700)]
am
5f49fd86: am
464be797: (-s ours) am
30504327: am
62588d79: am
8f87c5d8: am
ed1e5a87: am
b7787a31: DO NOT MERGE Merge commit \'
8225df00\' into bp
* commit '
5f49fd866105cd8d5e7355d40d1268f4cc121ef7':
Add a delimiter between scheme and host
Stephen Hines [Sun, 21 Apr 2013 04:34:54 +0000 (21:34 -0700)]
am
b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev
* commit '
b322f99476574546cad638ed8e2866ec106d51fc':
Add new error code for Debug Context work.
Jeff Brown [Sun, 21 Apr 2013 04:34:53 +0000 (21:34 -0700)]
am
a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev
* commit '
a937b8cb333d53cbbe8c0de7fb58854b77dcb3db':
Revert all recent GLSurfaceView changes.
Fabrice Di Meglio [Sun, 21 Apr 2013 04:34:53 +0000 (21:34 -0700)]
am
c3d0a81a: Merge "Fix bug #
8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
* commit '
c3d0a81a4a1809446bc1fa9abc9b5b74b01e676e':
Fix bug #
8656546 API REVIEW: android.text.bidi / android.text
Kenny Root [Sun, 21 Apr 2013 04:34:52 +0000 (21:34 -0700)]
am
b5ec8c14: Change doc comment to match API change
* commit '
b5ec8c145d467abbc6eaf3306a5f6725e348ceec':
Change doc comment to match API change
Christopher Tate [Sun, 21 Apr 2013 04:34:52 +0000 (21:34 -0700)]
am
18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
* commit '
18414c4db7a2cd7d7b872e4cd4583bc8b7a4fcc0':
Provide SharedPreferences coherence guarantees for BackupAgent
Victoria Lease [Sun, 21 Apr 2013 04:34:52 +0000 (21:34 -0700)]
am
bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
* commit '
bcf3ec96a46aacba58af62ed963ebf1c812c8179':
do not attempt to parcel unknown ParcelableSpans
Dianne Hackborn [Sun, 21 Apr 2013 04:34:51 +0000 (21:34 -0700)]
am
b3bffa80: Merge "Follow up on issue #
8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev
* commit '
b3bffa8080c4b04285897d18f913cf6385b0e9e1':
Follow up on issue #
8159072: Spinner widget should be RTL'ized
Craig Mautner [Sun, 21 Apr 2013 04:34:51 +0000 (21:34 -0700)]
am
c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
* commit '
c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec':
Improve javadoc for rotationAnimation.
Chet Haase [Sat, 20 Apr 2013 21:02:21 +0000 (21:02 +0000)]
Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
Dirk Dougherty [Sat, 20 Apr 2013 19:11:49 +0000 (12:11 -0700)]
am
f4f5757b: am
014513ae: am
00d20bd2: am
e0d5add7: am
3fd1a892: am
94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '
f4f5757b68e3b0db10c77ac9fa81d6b4d7dd8435':
Doc change: updates for tablet checklist.
Dirk Dougherty [Sat, 20 Apr 2013 19:09:42 +0000 (12:09 -0700)]
am
014513ae: am
00d20bd2: am
e0d5add7: am
3fd1a892: am
94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '
014513ae2974edd2e6102f618ca57423c543cb4f':
Doc change: updates for tablet checklist.
Dirk Dougherty [Sat, 20 Apr 2013 19:08:04 +0000 (12:08 -0700)]
am
00d20bd2: am
e0d5add7: am
3fd1a892: am
94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '
00d20bd293e75beb546ea446901cdead39180116':
Doc change: updates for tablet checklist.
Dirk Dougherty [Sat, 20 Apr 2013 19:05:45 +0000 (12:05 -0700)]
am
e0d5add7: am
3fd1a892: am
94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '
e0d5add782405fabe4d04b8eff00b565ea28a35f':
Doc change: updates for tablet checklist.
Dirk Dougherty [Sat, 20 Apr 2013 19:03:37 +0000 (12:03 -0700)]
am
3fd1a892: am
94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '
3fd1a8926ebfaaeccbaad86b7584fa534f725996':
Doc change: updates for tablet checklist.
Dirk Dougherty [Sat, 20 Apr 2013 19:01:29 +0000 (12:01 -0700)]
am
94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '
94ca86e8a019225ff376e5683e87ee3a29713f05':
Doc change: updates for tablet checklist.
Dirk Dougherty [Sat, 20 Apr 2013 18:59:02 +0000 (18:59 +0000)]
Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
Dirk Dougherty [Tue, 16 Apr 2013 18:55:12 +0000 (11:55 -0700)]
Doc change: updates for tablet checklist.
Change-Id: I0339c0d3853467da435654940d0c55a31139b736
Selim Gurun [Sat, 20 Apr 2013 07:38:34 +0000 (00:38 -0700)]
am
8695b1af: (-s ours) am
5eebdb4a: am
a4653727: am
25e150a2: am
a6ca0a6b: am
758dfa0c: am
9d47e7b6: am
7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
* commit '
8695b1aff8b4ece642796ba7b2a5faa2b8a87d60':
DO NOT MERGE Add a delimiter between scheme and host
OSDN Git Service
