OSDN Git Service
Conley Owens [Mon, 20 Jun 2011 20:20:49 +0000 (13:20 -0700)]
am
c1b62e3b: am
bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
* commit '
c1b62e3ba91d69dd75569b480aec55be8f808331':
Check if we are in daylight time when calculating timezone
Conley Owens [Mon, 20 Jun 2011 20:04:45 +0000 (13:04 -0700)]
am
bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
* commit '
bf5adfa5e558827fbb4771720433887bb3cbaefd':
Check if we are in daylight time when calculating timezone
Robert Greenwalt [Mon, 20 Jun 2011 19:15:24 +0000 (12:15 -0700)]
resolved conflicts for merge of
b427f0e6 to honeycomb-plus-aosp
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
Robert Greenwalt [Mon, 20 Jun 2011 18:47:49 +0000 (11:47 -0700)]
Merge "Fix tethering upstream determination." into honeycomb-LTE
Robert Greenwalt [Fri, 3 Jun 2011 00:30:47 +0000 (17:30 -0700)]
Fix tethering upstream determination.
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:
4530116
Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71
Conley Owens [Mon, 20 Jun 2011 18:01:41 +0000 (11:01 -0700)]
Merge "Check if we are in daylight time when calculating timezone"
Robert Ly [Mon, 20 Jun 2011 16:51:08 +0000 (09:51 -0700)]
am
d1a19b10: am
c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
d1a19b10ef0bb0369fa7ed9a16fb8f8d6320e05f':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Mon, 20 Jun 2011 16:50:39 +0000 (09:50 -0700)]
am
152e5f56: am
329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
152e5f56762c9db80d2b65fda8b13e3914f05d86':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Mon, 20 Jun 2011 16:44:59 +0000 (09:44 -0700)]
am
c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
c7c1ba5071456a813abbdadfdbe94287b06877e7':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Mon, 20 Jun 2011 16:44:55 +0000 (09:44 -0700)]
am
329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
329e0b9020f3b8cd1265c265cdf00b438960cbe1':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Mon, 20 Jun 2011 16:37:51 +0000 (09:37 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
Robert Ly [Mon, 20 Jun 2011 16:37:36 +0000 (09:37 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
Jean-Baptiste Queru [Mon, 20 Jun 2011 16:14:31 +0000 (09:14 -0700)]
am
ff3ead50: (-s ours) am
e3b05d09: Merge "Tweaks for forward-compatibility"
* commit '
ff3ead5072721bfb24202ff9b041cc4291f34e21':
Tweaks for forward-compatibility
Jean-Baptiste Queru [Mon, 20 Jun 2011 16:05:07 +0000 (09:05 -0700)]
am
e3b05d09: Merge "Tweaks for forward-compatibility"
* commit '
e3b05d09163257b888c86f2a560e10c48f4cf029':
Tweaks for forward-compatibility
Jean-Baptiste Queru [Sat, 18 Jun 2011 16:45:53 +0000 (09:45 -0700)]
Merge "Tweaks for forward-compatibility"
Jean-Baptiste Queru [Sat, 18 Jun 2011 16:42:04 +0000 (09:42 -0700)]
Tweaks for forward-compatibility
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
Mathias Agopian [Fri, 17 Jun 2011 01:15:19 +0000 (18:15 -0700)]
am
48294b0d: am
e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '
48294b0d9388cff632f0e6ae5220305d342c76fb':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Mathias Agopian [Fri, 17 Jun 2011 01:09:56 +0000 (18:09 -0700)]
am
e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '
e7d3ee9d81de13e992c7d063ca472d480956b0c6':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Mathias Agopian [Fri, 17 Jun 2011 00:15:51 +0000 (17:15 -0700)]
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Also revert all dependent changes:
This reverts commit
8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit
69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit
a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit
2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit
f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit
24855c09173a6caaec7dcedd0c2d7ce15121d39b.
Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
John Wang [Fri, 17 Jun 2011 00:14:28 +0000 (17:14 -0700)]
am
c6b32054: am
c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit '
c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
Revert "Do not merge. Return null id for Non-phone device."
John Wang [Thu, 16 Jun 2011 23:50:05 +0000 (16:50 -0700)]
am
c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit '
c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
John Wang [Thu, 16 Jun 2011 23:47:18 +0000 (16:47 -0700)]
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
John Wang [Thu, 16 Jun 2011 23:30:02 +0000 (16:30 -0700)]
Revert "Do not merge. Return null id for Non-phone device."
This reverts commit
cea03df201dc6659654234bc5fbfebf1b6a06e42
Maarten Hooft [Thu, 16 Jun 2011 22:55:14 +0000 (15:55 -0700)]
am
42781a11: am
d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '
42781a11ce9e346a24fbb6214f8f214845464213':
Import revised Croatian translations.
Maarten Hooft [Thu, 16 Jun 2011 22:48:55 +0000 (15:48 -0700)]
am
d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '
d76baeb4d836c33cc68cbb0c2e237c066f368529':
Import revised Croatian translations.
Maarten Hooft [Thu, 16 Jun 2011 22:41:20 +0000 (15:41 -0700)]
Merge "Import revised Croatian translations." into gingerbread
Dianne Hackborn [Thu, 16 Jun 2011 22:25:22 +0000 (15:25 -0700)]
am
9a73c4d3: am
2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '
9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c':
SDK only: integrate new sample code, deprecating along the way.
Dianne Hackborn [Thu, 16 Jun 2011 22:22:10 +0000 (15:22 -0700)]
am
2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '
2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
SDK only: integrate new sample code, deprecating along the way.
Dianne Hackborn [Thu, 16 Jun 2011 21:55:01 +0000 (14:55 -0700)]
am
f1c5dbbd: am
abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '
f1c5dbbd457bb14d3673508aaba497cdc328a1ef':
New orientation handling. Only impacts SDK (aapt dump badging).
Dianne Hackborn [Thu, 16 Jun 2011 20:31:57 +0000 (13:31 -0700)]
SDK only: integrate new sample code, deprecating along the way.
The new support library features and sample code for switching
between fragments using a TabHost now eliminates the utility of
the TabActivity class, so deprecate it. This also means there is
no longer any use in ActivityGroup or LocalActivityManager. Yay.
Also fix up things so the new support API demos are included in
the documentation.
Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
Robert Greenwalt [Thu, 16 Jun 2011 21:50:22 +0000 (14:50 -0700)]
am
62385d5e: am
6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '
62385d5e3183d35b22618fb91bb2dfa0de7e5fd4':
DO NOT MERGE
Dianne Hackborn [Thu, 16 Jun 2011 21:49:08 +0000 (14:49 -0700)]
am
abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '
abd4dffc86202d48e50bd21807574fa861854dca':
New orientation handling. Only impacts SDK (aapt dump badging).
Dianne Hackborn [Thu, 16 Jun 2011 21:47:53 +0000 (14:47 -0700)]
Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
Robert Greenwalt [Thu, 16 Jun 2011 21:44:57 +0000 (14:44 -0700)]
am
6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '
6b93f976c0cec32be39b3a17ea8195c4ac6b8052':
DO NOT MERGE
Robert Greenwalt [Thu, 16 Jun 2011 21:40:25 +0000 (14:40 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr2
Robert Greenwalt [Thu, 16 Jun 2011 21:21:04 +0000 (14:21 -0700)]
DO NOT MERGE
backport of change 113518 from honeycomb-LTE. Fixes NPE in the
statusbar.
bug:
4518551
Change-Id: I9a85e6799d12052e7bc8c54d651bee789d885a2f
Xavier Ducrohet [Thu, 16 Jun 2011 20:55:30 +0000 (13:55 -0700)]
am
d1abd94f: am
04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '
d1abd94f57c0162186c57aea98790e8fa281e0a2':
Bring in more layout lib changes from hc-mr1.
Xavier Ducrohet [Thu, 16 Jun 2011 20:39:31 +0000 (13:39 -0700)]
am
04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '
04ce81113107d2bfa0b8248b13145b4cf24cb943':
Bring in more layout lib changes from hc-mr1.
Xavier Ducrohet [Fri, 10 Jun 2011 02:14:06 +0000 (19:14 -0700)]
Bring in more layout lib changes from hc-mr1.
fe051bb2 : Change the way the layoutlib instantiate its XmlPullParser.
A lot of the init code was duplicated so I made a ParserFactory class.
Also created an extension of the KXmlPullParser to override toString().
This allows easier debugging when dealing with multiple parsers (which
is always the case).
Also added some (disabled) debugging printf to deal with parser stack
as it can be tricky figuring out which parsers are in the stack at
which point.
8969147c : Fix case where the int[] attrs doesn't directly match a styleable.
In the case of the FastScroller the int[] is a custom mix of attr
instead of a int[] that exists as R.styleable.foo.
This makes our reflection based mechanism used to find the styleable
fail, so instead we search for each attribute separately (like
we probably should have done from the beginning).
0c264b35: Fix various cases of getDimension to report error if unit is missing.
if getDimention###() is called for a string that has no unit,
then an error is output through LayoutLog, but the rendering keeps
going by using dp as a default.
0beb7eea: Make (Bridge)TypedArray.getInteger() call out to getInt()
Only getInt() resolved attribute flags/enum and I'm not sure why
there's two to begin with.
Robert Greenwalt [Thu, 16 Jun 2011 19:42:15 +0000 (12:42 -0700)]
am
5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '
5f3505121b761dbd3bba62d1603fbab49de139b9':
Reset connections AFTER we take down the network.
John Wang [Thu, 16 Jun 2011 19:34:34 +0000 (12:34 -0700)]
am
ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit '
ff42c04d15e000f6295e796e154cc60c54aa078b':
Support SIM permanently disabled state.
Robert Greenwalt [Thu, 16 Jun 2011 18:34:03 +0000 (11:34 -0700)]
Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
Robert Greenwalt [Wed, 15 Jun 2011 19:22:07 +0000 (12:22 -0700)]
Reset connections AFTER we take down the network.
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.
bug:
3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
John Wang [Thu, 16 Jun 2011 18:22:53 +0000 (11:22 -0700)]
Merge "Support SIM permanently disabled state." into honeycomb-LTE
Dianne Hackborn [Thu, 16 Jun 2011 18:11:23 +0000 (11:11 -0700)]
New orientation handling. Only impacts SDK (aapt dump badging).
This is a new way of determining whether an application requires
specific orientations, done by looking at any requirements in its
activity tags. Note that this won't catch all possible issues,
because applications can still force an orientation through Java
APIs, but the vast majority of applications that actually require
a specific orientation should be doing it this way because it the
easiest way and the only way to cleanly launch into the app from
a different orientation without doing some serious activity tricks.
Change-Id: I11d32104f6bc3d2a72aeeff1ca150b8f1c9f5588
Robert Ly [Tue, 14 Jun 2011 17:08:25 +0000 (10:08 -0700)]
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Change-Id: Ic18859f171d03f8562ad91761da40a55b59f47ea
Robert Ly [Mon, 6 Jun 2011 22:05:58 +0000 (15:05 -0700)]
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Change-Id: Ica88f38229a66bfad60cbaf5db4bf94cd99c1d19
Mathias Agopian [Thu, 16 Jun 2011 05:42:52 +0000 (22:42 -0700)]
am
0887b8c2: am
8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
* commit '
0887b8c2e583e682cd2c1bc909cb3fdbec704004':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
Mathias Agopian [Thu, 16 Jun 2011 05:40:07 +0000 (22:40 -0700)]
am
8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
* commit '
8e18668d14adf601cbe5973030c310ec23d88461':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
Mathias Agopian [Thu, 16 Jun 2011 05:12:32 +0000 (22:12 -0700)]
am
d5244e0a: am
52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
* commit '
d5244e0a88ed2f843651aa5ffdc71a45c968e0f3':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
Mathias Agopian [Thu, 16 Jun 2011 05:09:39 +0000 (22:09 -0700)]
am
52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
* commit '
52a43990880b27808bcf562afcc4209d34728e6e':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
Mathias Agopian [Thu, 16 Jun 2011 03:42:47 +0000 (20:42 -0700)]
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
This reverts commit
52a43990880b27808bcf562afcc4209d34728e6e.
Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
Mathias Agopian [Thu, 16 Jun 2011 03:41:24 +0000 (20:41 -0700)]
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
This reverts commit
af6edba59e250adbdfa5b3c3be134f70d8c38a16.
Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
Mathias Agopian [Thu, 16 Jun 2011 03:21:31 +0000 (20:21 -0700)]
am
7ecdeb6e: am
d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '
7ecdeb6e548ff71d4f70b343e30136e89eaa3e33':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Mathias Agopian [Thu, 16 Jun 2011 03:18:24 +0000 (20:18 -0700)]
am
d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '
d20d72d193ab0d7f33c839d8bf9573b55abfebdc':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Mathias Agopian [Thu, 16 Jun 2011 03:16:15 +0000 (20:16 -0700)]
Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
Mathias Agopian [Thu, 16 Jun 2011 02:20:52 +0000 (19:20 -0700)]
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Bug:
4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
Dianne Hackborn [Thu, 16 Jun 2011 00:12:45 +0000 (17:12 -0700)]
am
413b53b5: am
70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '
413b53b57d62b60e98cfe5b9359551315e7cb3a7':
We must keep up with the Joneses.
Dianne Hackborn [Thu, 16 Jun 2011 00:10:33 +0000 (17:10 -0700)]
am
70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '
70921d615496c5be8a19cbd1454378bb7d0201f3':
We must keep up with the Joneses.
Dianne Hackborn [Thu, 16 Jun 2011 00:08:04 +0000 (17:08 -0700)]
Merge "We must keep up with the Joneses." into honeycomb-mr2
Eric Fischer [Wed, 15 Jun 2011 23:47:08 +0000 (16:47 -0700)]
am
c0e84cf3: am
5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
c0e84cf3210fc6b5929d024fafbe75f08167c44e':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 23:41:44 +0000 (16:41 -0700)]
am
5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
5e451faa0c22e943fb76d812f699d51fa11c5495':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 23:38:43 +0000 (16:38 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Irfan Sheriff [Wed, 15 Jun 2011 23:35:20 +0000 (16:35 -0700)]
am
a4644307: (-s ours) am
df1734e3: Fix lease duration handling
* commit '
a464430762bad8039a598ce9af71f962d01f8eba':
Fix lease duration handling
Irfan Sheriff [Wed, 15 Jun 2011 23:29:02 +0000 (16:29 -0700)]
am
df1734e3: Fix lease duration handling
* commit '
df1734e3f57646df1fa96275cbb65bb91ac9d2ac':
Fix lease duration handling
Dianne Hackborn [Wed, 15 Jun 2011 18:41:48 +0000 (11:41 -0700)]
We must keep up with the Joneses.
Change-Id: Ifa2ab0167c09ba18b24c8b6c618db807e17519f5
Eric Fischer [Wed, 15 Jun 2011 22:06:18 +0000 (15:06 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iaff03724a335f856f7d28b1bc2c219f4208c4151
Justin Ho [Wed, 15 Jun 2011 21:58:56 +0000 (14:58 -0700)]
am
c407ef22: am
f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
* commit '
c407ef22222f8f7e6f82abd081ecb65149336f99':
Updated art for compat mode dialog.
Justin Ho [Wed, 15 Jun 2011 21:56:03 +0000 (14:56 -0700)]
am
f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
* commit '
f409604122f959653fb789e9133e94a51e369693':
Updated art for compat mode dialog.
Justin Ho [Wed, 15 Jun 2011 21:52:52 +0000 (14:52 -0700)]
Merge "Updated art for compat mode dialog." into honeycomb-mr2
Wink Saville [Wed, 15 Jun 2011 21:34:08 +0000 (14:34 -0700)]
am
1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
* commit '
1146bddf92fc91dad384bdaea740f9472bebd911':
Always clear settings when entering Inactive state.
Wink Saville [Wed, 15 Jun 2011 21:31:16 +0000 (14:31 -0700)]
Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
Jean-Baptiste Queru [Wed, 15 Jun 2011 21:25:37 +0000 (14:25 -0700)]
Merge
5137711109783dcbb20143d3e5cab2fa931218dd
Change-Id: I5046a54648bdeea6f9661c46329d7b502f2f52b9
Mathias Agopian [Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)]
am
afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
afffa8fa9f82a7343e1158bf921931fd3e3df615':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Irfan Sheriff [Wed, 15 Jun 2011 21:07:54 +0000 (14:07 -0700)]
am
5af3405f: am
ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit '
5af3405f0d24c853bd10eb239c081e31972d3e1d':
Fix lease duration handling
Irfan Sheriff [Wed, 15 Jun 2011 21:04:23 +0000 (14:04 -0700)]
am
ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit '
ecda5461603b6de77beb045dfdf82dad7ae48d61':
Fix lease duration handling
Irfan Sheriff [Wed, 15 Jun 2011 21:00:23 +0000 (14:00 -0700)]
Merge "Fix lease duration handling" into honeycomb-mr2
Wink Saville [Wed, 15 Jun 2011 20:58:20 +0000 (13:58 -0700)]
am
4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE
* commit '
4d6233b2edd24c83efe10f4403456b8d0c87241a':
Clean up some debug statements.
Wink Saville [Wed, 15 Jun 2011 20:55:06 +0000 (13:55 -0700)]
Merge "Clean up some debug statements." into honeycomb-LTE
Irfan Sheriff [Wed, 15 Jun 2011 16:28:23 +0000 (09:28 -0700)]
Fix lease duration handling
We need to convert lease duration from int to long before
converting into milliseconds
Also add basic sanity check
Bug:
4561231
Change-Id: I9bcafaa798a04c8de3f2c1897dc5b3c4ae245672
Wink Saville [Wed, 15 Jun 2011 20:45:29 +0000 (13:45 -0700)]
Clean up some debug statements.
Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
Dianne Hackborn [Wed, 15 Jun 2011 20:44:16 +0000 (13:44 -0700)]
am
3dc1b5e2: am
ed31bbf6: Clean up some edge cases in the compat mode UI:
* commit '
3dc1b5e26fac2c6a6161d617f99fd901ee2ffc9e':
Clean up some edge cases in the compat mode UI:
Daniel Sandler [Wed, 15 Jun 2011 19:00:10 +0000 (15:00 -0400)]
Updated art for compat mode dialog.
Also finalizes on the following language & ordering in the menu:
( ) Stretch to fill screen
( ) Zoom to fill screen
Bug:
4595256
Change-Id: Ie92b1e0d829341fd73043a562e78437af2b128ec
Irfan Sheriff [Fri, 10 Jun 2011 23:18:25 +0000 (16:18 -0700)]
Fix lease duration handling
Convert lease time in seconds to long before alarm
set up and add sanity check
Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
Dianne Hackborn [Wed, 15 Jun 2011 19:35:57 +0000 (12:35 -0700)]
am
ed31bbf6: Clean up some edge cases in the compat mode UI:
* commit '
ed31bbf65267c1f383dd0dff37acd034f3b9b59f':
Clean up some edge cases in the compat mode UI:
Marco Nelissen [Wed, 15 Jun 2011 19:20:57 +0000 (12:20 -0700)]
am
d8f9a83c: resolved conflicts for merge of
d027329c to gingerbread-plus-aosp
* commit '
d8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
Ignore duplicate WAP push PDU source/destination port if configured
Eric Fischer [Wed, 15 Jun 2011 19:10:52 +0000 (12:10 -0700)]
Import revised Croatian translations.
Change-Id: I9fb9bf6796d19e4b419381a0dd398f53bf2e879f
Dianne Hackborn [Wed, 15 Jun 2011 18:16:06 +0000 (11:16 -0700)]
Clean up some edge cases in the compat mode UI:
- Don't put up multiple dialogs if a switch happens between activities
that both can use compat mode.
- Remove the help dialog if the user switches away from an app that
can use compat mode.
- Don't set the "don't show" preference until the user explicitly hits
the button.
- Hide the compat mode switch UI if the compat mode button is hidden.
Change-Id: I8dd2aab1385a264232a9256284d4a75b8e058e47
Marco Nelissen [Wed, 15 Jun 2011 15:33:09 +0000 (08:33 -0700)]
resolved conflicts for merge of
d027329c to gingerbread-plus-aosp
Change-Id: I169c415bf998b9935ab36812511573db05717b91
Wink Saville [Wed, 15 Jun 2011 13:41:21 +0000 (06:41 -0700)]
Always clear settings when entering Inactive state.
Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
Daniel Sandler [Wed, 15 Jun 2011 13:25:35 +0000 (06:25 -0700)]
am
fbb09347: am
5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit '
fbb093479362865da833b89643a8f58347278bc3':
One-time-only compatibility mode explanation dialog.
Daniel Sandler [Wed, 15 Jun 2011 13:25:24 +0000 (06:25 -0700)]
am
2fdf5880: am
97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit '
2fdf5880611c333e172d4e0cc2c4259bca324699':
Final UI for compatibility mode.
Daniel Sandler [Wed, 15 Jun 2011 13:15:11 +0000 (06:15 -0700)]
am
5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit '
5994bff92472b3bdcd5754d8a9156b49269a9c1d':
One-time-only compatibility mode explanation dialog.
Daniel Sandler [Wed, 15 Jun 2011 13:15:07 +0000 (06:15 -0700)]
am
97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit '
97d5081ac331884fe0f6f2e5814d4862a974fbe3':
Final UI for compatibility mode.
Daniel Sandler [Wed, 15 Jun 2011 13:10:32 +0000 (06:10 -0700)]
Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
Daniel Sandler [Wed, 15 Jun 2011 13:10:27 +0000 (06:10 -0700)]
Merge "Final UI for compatibility mode." into honeycomb-mr2
Daniel Sandler [Wed, 15 Jun 2011 05:03:02 +0000 (01:03 -0400)]
One-time-only compatibility mode explanation dialog.
Don't miss it!
Bug:
4595256
Change-Id: I80c0949e6118e3ea3af089d4cad160ce63e7d8ce
Dianne Hackborn [Wed, 15 Jun 2011 04:50:56 +0000 (21:50 -0700)]
am
abe5bd23: am
a9551706: Testing done, compatibility mode no longer on by default.
* commit '
abe5bd23c341da035e9905d9e50c1d6bccf229dc':
Testing done, compatibility mode no longer on by default.
Dianne Hackborn [Wed, 15 Jun 2011 04:47:51 +0000 (21:47 -0700)]
am
a9551706: Testing done, compatibility mode no longer on by default.
* commit '
a9551706a279a798c91d8ef593b2acb16a30c682':
Testing done, compatibility mode no longer on by default.
Daniel Sandler [Tue, 14 Jun 2011 15:30:28 +0000 (11:30 -0400)]
Final UI for compatibility mode.
Bug:
4595256
Change-Id: Idaa96393fb809c828b5f661f29e8b687fdf3d104