OSDN Git Service
Svetoslav [Tue, 23 Apr 2013 18:16:05 +0000 (11:16 -0700)]
am
7bf02d12: am
a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev
* commit '
7bf02d1255e86becb225ba70ca3ea8b2af90c166':
Making new node id APIs return strings.
Jean-Michel Trivi [Tue, 23 Apr 2013 18:16:03 +0000 (11:16 -0700)]
am
cb315af3: am
fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
* commit '
cb315af34be49859a0bfda6ee808550671a5e416':
Opt-in mechanism for RemoteControlClient position anti-drift check
Dianne Hackborn [Tue, 23 Apr 2013 17:56:23 +0000 (10:56 -0700)]
resolved conflicts for merge of
8c3cb811 to master
Change-Id: I1cd4186b6b2dcb3d1d7d21c346384dbcc6e6a8df
Philip Milne [Tue, 23 Apr 2013 11:46:31 +0000 (04:46 -0700)]
am
089a75be: am
a7b2625d: Merge "Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
* commit '
089a75be5e33e13071754a727902224b6db60168':
Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets
Chris Craik [Tue, 23 Apr 2013 11:46:28 +0000 (04:46 -0700)]
am
4837ea99: am
8d3f3c06: Merge "Expand hardware accel doc" into jb-mr2-dev
* commit '
4837ea99c46e792e5f4d55e895c63d415888f1b4':
Expand hardware accel doc
Robert Greenwalt [Tue, 23 Apr 2013 11:46:25 +0000 (04:46 -0700)]
am
f12afa99: am
d0202945: Merge "Listen for network disconnect." into jb-mr2-dev
* commit '
f12afa9913ac75af724d9700ff85dc68b1e0cd45':
Listen for network disconnect.
Dirk Dougherty [Tue, 23 Apr 2013 11:46:23 +0000 (04:46 -0700)]
am
afd80ab6: am
3acb320f: am
ab3b13eb: am
e5d47b39: am
cdfeb09d: am
10fc5e05: am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
afd80ab6a60e57011fa218c930bcfa8345c88a4e':
Doc change: update payment detail for merch account.
Christopher Tate [Tue, 23 Apr 2013 11:46:20 +0000 (04:46 -0700)]
am
4c6f2a54: am
7a4ddbaa: Merge "Don\'t attempt native crash reporting for persistent apps" into jb-mr2-dev
* commit '
4c6f2a54109c3f75deca1f2b43736dcd9c965768':
Don't attempt native crash reporting for persistent apps
kmccormick [Tue, 23 Apr 2013 11:46:17 +0000 (04:46 -0700)]
am
7fccb942: am
47cccbd0: am
f9a152d8: am
0415ea6a: am
2aca8dbe: am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
7fccb94248514fc1037985330e6f4f0b0cc5ce3f':
Doc update: Fix firewall text.
Scott Main [Tue, 23 Apr 2013 11:46:15 +0000 (04:46 -0700)]
am
5ced567d: am
3fadd4c2: am
8841569f: am
b8ac12af: am
3da6ef39: am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
5ced567d768ae68796e017a2e1e5e72f7f22fef3':
fix backup registration url external bug: 54539
Baligh Uddin [Tue, 23 Apr 2013 11:46:12 +0000 (04:46 -0700)]
am
1aaef016: am
b0579834: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
1aaef016fade071b7bd61763bf4ffb5a2b853713':
Import translations. DO NOT MERGE
Dianne Hackborn [Tue, 23 Apr 2013 11:46:09 +0000 (04:46 -0700)]
am
e89dcf33: am
3edf207a: Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev
* commit '
e89dcf33e12ee9d57636adf1ccc37aca44d3c311':
Assign final resource IDs for JB MR2.
Scott Main [Tue, 23 Apr 2013 11:46:06 +0000 (04:46 -0700)]
am
c87dd640: 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 '
c87dd6409253b4dfdc90c9d4f053f4c508d8cdfa':
delete unused download page and add a couple search tags
Zhentao Sun [Tue, 23 Apr 2013 11:46:03 +0000 (04:46 -0700)]
am
04375db6: am
c5fc9988: Made it easier to disable overlay mechanism of location components.
* commit '
04375db65302fabcf7101ecc4e1e6e38700baba5':
Made it easier to disable overlay mechanism of location components.
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.
Michael Jurka [Tue, 23 Apr 2013 10:05:25 +0000 (10:05 +0000)]
Merge "Update animation helper class to most recent version"
Todd Poynor [Sat, 20 Apr 2013 00:39:04 +0000 (17:39 -0700)]
BatteryService: Fix compile warning
Add unhandled enum constant in switch.
Change-Id: I3c7635d9cf1fa1e57b139b9b66103bf660afe3a4
Todd Poynor [Fri, 19 Apr 2013 19:57:09 +0000 (12:57 -0700)]
BatteryService: Fix detection of missing sysfs attributes
Recent conversion from char* to String8 broke these.
Change-Id: I4528c3e4b90614cddbc173ee996c7fc1febb2cf5
Svetoslav [Tue, 23 Apr 2013 00:01:36 +0000 (00:01 +0000)]
Merge "Making new node id APIs return strings." into jb-mr2-dev
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
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
Baligh Uddin [Mon, 22 Apr 2013 20:07:25 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 22 Apr 2013 20:06:42 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE"
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 20:00:11 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Baligh Uddin [Mon, 22 Apr 2013 19:58:28 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Craig Mautner [Mon, 22 Apr 2013 18:01:02 +0000 (18:01 +0000)]
Merge "Move idle handling from ActivityStack to Supervisor"
Craig Mautner [Mon, 22 Apr 2013 17:55:53 +0000 (10:55 -0700)]
Move idle handling from ActivityStack to Supervisor
Along with mFinishingActivities, mStartingUsers and
mCancelledThumbnails.
Change-Id: Ia354225d72e694b7ac68b0869fcab903a3d06436
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
Craig Mautner [Mon, 22 Apr 2013 16:32:04 +0000 (16:32 +0000)]
Merge "Refactoring Activity Manager."
Craig Mautner [Mon, 22 Apr 2013 15:58:54 +0000 (08:58 -0700)]
Refactoring Activity Manager.
Mid-course corrections.
- Simplify ActivityStackSupervisor and ActivityStack constructors to
get passed parameters from ActivityManagerService.
- Store WindowManagerService referecne locally in
ActivityStackSupervisor and ActivityStack.
- Rename getTopStack to getFocusedStack in ActivityStackSupervisor
and ActivityManagerService.
- Move mWaitingActivityLaunched/reportActivityLaunchedLocked and
mWaitingActivityVisible/reportActivityVisibleLocked from ActivityStack
to ActivityStackSupervisor.
- Moved reportResumedActivity to ActivityStackSupervisor.
- Added a Handler to ActivityStackSupervisor. Will populate it on next
CL.
Change-Id: I1bbe5eb737c5cac6b896bc9748f329891e94d00f
Baligh Uddin [Mon, 22 Apr 2013 16:07:22 +0000 (09:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6ac969ffc6fbffeb262ec79b14a4155f2123d82d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Apr 2013 16:06:52 +0000 (09:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2c873a6a5a8ea2f505412cdf2ce603741758608
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Apr 2013 15:55:44 +0000 (08:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idaf684b05e56ffa3a1085fc1a5bbc141fbd55f86
Auto-generated-cl: translation import
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
Baligh Uddin [Mon, 22 Apr 2013 15:45:25 +0000 (08:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia0c52e6aef99399156b84920f185d03b55f746b1
Auto-generated-cl: translation import
Michael Jurka [Mon, 22 Apr 2013 13:11:58 +0000 (15:11 +0200)]
Update animation helper class to most recent version
Most updated version is currently in Launcher2
Michael Wright [Sun, 21 Apr 2013 05:48:08 +0000 (22:48 -0700)]
am
076e1f4c: am
abc2763e: Merge "KeyEvent: update comment"
* commit '
076e1f4c560df7db54755b006acbea9b6eba0b76':
KeyEvent: update comment
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:37:23 +0000 (21:37 -0700)]
am
371d4ccc: am
339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
* commit '
371d4cccde56ec4d26e51f8e82ef68f196169a3d':
Fix quickReject logic to account for setClipChildren() setting
Dirk Dougherty [Sun, 21 Apr 2013 04:37:20 +0000 (21:37 -0700)]
am
0b97c8cd: 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 '
0b97c8cd0ff41a9c122cb83a1b0b33bd150cb7ff':
Doc change: updates for tablet checklist.
Selim Gurun [Sun, 21 Apr 2013 04:37:18 +0000 (21:37 -0700)]
am
bf67c6bb: 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 '
bf67c6bbd94f6401344777daa6ef795ddd560218':
DO NOT MERGE Add a delimiter between scheme and host
Selim Gurun [Sun, 21 Apr 2013 04:37:15 +0000 (21:37 -0700)]
am
20113c0b: 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 '
20113c0b4dc6f5d6bebaf3175bfc99ce89cc2388':
Revert "Add a delimiter between scheme and host"
Geremy Condra [Sun, 21 Apr 2013 04:37:12 +0000 (21:37 -0700)]
am
0052e789: 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 '
0052e7899fe60c7231bb4ae200904e17fac8804c':
Add a delimiter between scheme and host
Stephen Hines [Sun, 21 Apr 2013 04:37:10 +0000 (21:37 -0700)]
am
4a84af89: am
b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev
* commit '
4a84af896c830d6ef613d1baa607d472cf865073':
Add new error code for Debug Context work.
Jeff Brown [Sun, 21 Apr 2013 04:37:07 +0000 (21:37 -0700)]
am
e2155712: am
a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev
* commit '
e215571284006497cd917ade06cf2b9163564772':
Revert all recent GLSurfaceView changes.
Fabrice Di Meglio [Sun, 21 Apr 2013 04:37:04 +0000 (21:37 -0700)]
am
b241f60f: am
c3d0a81a: Merge "Fix bug #
8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
* commit '
b241f60fe76677d106d472d4118d1e6959563331':
Fix bug #
8656546 API REVIEW: android.text.bidi / android.text
Kenny Root [Sun, 21 Apr 2013 04:37:01 +0000 (21:37 -0700)]
am
0f70770b: am
b5ec8c14: Change doc comment to match API change
* commit '
0f70770be83b02c36262ad7e05ac5b2040de3fec':
Change doc comment to match API change
OSDN Git Service
