Conley Owens
587e9563d6
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
2011-06-20 13:20:49 -07:00
Conley Owens
c1b62e3ba9
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
2011-06-20 13:04:45 -07:00
Robert Greenwalt
7a652bc86a
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
...
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
2011-06-20 12:15:24 -07:00
Robert Greenwalt
ccf83af101
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
2011-06-20 11:09:23 -07:00
Conley Owens
bf5adfa5e5
Merge "Check if we are in daylight time when calculating timezone"
2011-06-20 11:01:41 -07:00
Mathias Agopian
3b916233cb
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)
2011-06-16 18:15:19 -07:00
Mathias Agopian
48294b0d93
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)
2011-06-16 18:09:56 -07:00
Mathias Agopian
e7d3ee9d81
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
2011-06-16 17:22:28 -07:00
Robert Greenwalt
241b65aca9
am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
...
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
Reset connections AFTER we take down the network.
2011-06-16 12:42:15 -07:00
Robert Greenwalt
5f3505121b
Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
2011-06-16 11:34:03 -07:00
Robert Greenwalt
ec896c6a86
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
2011-06-16 11:26:54 -07:00
Mathias Agopian
35e6d6867c
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)
2011-06-15 22:42:52 -07:00
Mathias Agopian
0887b8c2e5
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)
2011-06-15 22:40:07 -07:00
Mathias Agopian
552bd67007
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"
2011-06-15 22:12:32 -07:00
Mathias Agopian
d5244e0a88
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"
2011-06-15 22:09:39 -07:00
Mathias Agopian
8e18668d14
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
...
This reverts commit 52a43990880b27808bcf562afcc4209d34728e6e.
Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
2011-06-15 20:45:32 -07:00
Mathias Agopian
52a4399088
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
...
This reverts commit af6edba59e250adbdfa5b3c3be134f70d8c38a16.
Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
2011-06-15 20:42:25 -07:00
Mathias Agopian
85c14352a4
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
2011-06-15 20:21:31 -07:00
Mathias Agopian
7ecdeb6e54
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
2011-06-15 20:18:24 -07:00
Mathias Agopian
af6edba59e
revert surfaceflinger leak fix as it uncovered a crasher on xoom
...
Bug: 4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
2011-06-15 19:31:04 -07:00
Mathias Agopian
5137711109
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)
2011-06-15 14:13:04 -07:00
Dianne Hackborn
d00bebb005
am abe5bd23: am a9551706: Testing done, compatibility mode no longer on by default.
...
* commit 'abe5bd23c341da035e9905d9e50c1d6bccf229dc':
Testing done, compatibility mode no longer on by default.
2011-06-14 21:50:56 -07:00
Dianne Hackborn
abe5bd23c3
am a9551706: Testing done, compatibility mode no longer on by default.
...
* commit 'a9551706a279a798c91d8ef593b2acb16a30c682':
Testing done, compatibility mode no longer on by default.
2011-06-14 21:47:51 -07:00
Dianne Hackborn
a9551706a2
Testing done, compatibility mode no longer on by default.
...
Change-Id: I5bcc98d2b3a1a02ca788ab61440f0aa5d4f7fb4e
2011-06-14 21:05:03 -07:00
Dianne Hackborn
27bad6f33b
am baa89d38: am f930232f: Fix a major problem in fragment lifecycle.
...
* commit 'baa89d3839f70bd31e5219c636ac24a4cc29928d':
Fix a major problem in fragment lifecycle.
2011-06-14 20:57:48 -07:00
Dianne Hackborn
baa89d3839
am f930232f: Fix a major problem in fragment lifecycle.
...
* commit 'f930232fd1c8d301d91853c8fe5dca43979ac807':
Fix a major problem in fragment lifecycle.
2011-06-14 20:54:40 -07:00
Dianne Hackborn
f930232fd1
Fix a major problem in fragment lifecycle.
...
When animating away a fragment, we were not putting it through
the last part of its lifecycle (onDestroy() etc).
Also, retained fragments that have a target were broken. Oops.
Change-Id: I5a669b77a2f24b581cde2a0959acf62edb65e326
2011-06-14 20:47:44 -07:00
Dianne Hackborn
e95c07bd8a
am 7c7f8e18: am 0a8a2324: Merge "Fix issue #4603422 : Compatibility mode button doesn\'t always update" into honeycomb-mr2
...
* commit '7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5':
Fix issue #4603422 : Compatibility mode button doesn't always update
2011-06-14 15:22:12 -07:00
Dianne Hackborn
7c7f8e18de
am 0a8a2324: Merge "Fix issue #4603422 : Compatibility mode button doesn\'t always update" into honeycomb-mr2
...
* commit '0a8a2324239d7604e2a68349585aa67b59b25f4c':
Fix issue #4603422 : Compatibility mode button doesn't always update
2011-06-14 15:14:34 -07:00
Dianne Hackborn
7d04932ef5
Fix issue #4603422 : Compatibility mode button doesn't always update
...
We now tell the system bar every time the top activity has changed for
it to re-evaluate its UI state.
Also fix issue #: 4607102 Low rider notifications. It turns out this
was due to the change in the dialog asset; the notification UI was relying
on this having a lot of padding to make it sit above the status bar.
Now we have an explicitly mechanism to set how much it overlaps (or doesn't)
the status bar.
Change-Id: Iab5ebd86e620ff4fc4cd77206e18af962ec2830e
2011-06-14 15:05:16 -07:00
Mathias Agopian
c031afc8e9
am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
...
* commit '77079399fca3e9c71e2ac06f3da26934e1c278b9':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
2011-06-13 14:15:00 -07:00
Mathias Agopian
77079399fc
am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
...
* commit 'a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
2011-06-13 14:13:21 -07:00
Mathias Agopian
afffa8fa9f
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
...
Bug: 4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
2011-06-13 13:58:34 -07:00
Mathias Agopian
a9c9a4baf2
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
...
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
2011-06-13 13:44:28 -07:00
Mike Lockwood
6d60190a31
am e502c536: am b3174c46: UsbService: Fix JNI reference leak
...
* commit 'e502c5364f8e715eb0da54441460b8f3cb76b7ff':
UsbService: Fix JNI reference leak
2011-06-09 12:50:23 -07:00
Mike Lockwood
e502c5364f
am b3174c46: UsbService: Fix JNI reference leak
...
* commit 'b3174c46ade0be4628813a74b317da538e367bc8':
UsbService: Fix JNI reference leak
2011-06-09 12:01:31 -07:00
Mike Lockwood
b3174c46ad
UsbService: Fix JNI reference leak
...
http://code.google.com/p/android/issues/detail?id=17365
Change-Id: Ice0174e0db2a785d32ac16694ebf3b7ddb1b7fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-09 14:48:11 -04:00
Dianne Hackborn
8297f66935
am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
...
* commit '3aabdeaceff8405406d90c329a6691552559556d':
Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:38:03 -07:00
Dianne Hackborn
3aabdeacef
am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
...
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:35:25 -07:00
Dianne Hackborn
48a7651823
Fix for not reporting correct "sw" in compat mode.
...
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
2011-06-08 22:26:33 -07:00
Dianne Hackborn
e2aa04908c
am a1396dfe: am 02140891: Merge "Work on issue #4518815 : Compatibility mode introduces compatibility regression..." into honeycomb-mr2
...
* commit 'a1396dfe7ad6ec6953f544be42d69d7804ab0fd4':
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
2011-06-08 20:06:40 -07:00
Dianne Hackborn
a1396dfe7a
am 02140891: Merge "Work on issue #4518815 : Compatibility mode introduces compatibility regression..." into honeycomb-mr2
...
* commit '021408910af170268cb486910d4dd5a7d838c2bb':
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
2011-06-08 20:02:43 -07:00
Dianne Hackborn
5fd2169eab
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
...
...for Market App iRunner
There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components. This addresses everything
I could find.
Unfortunately it does *not* fix this particular app. I am starting to think this
is just an issue in the app. This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.
Also a few changes here and there to get rid of $#*&^!! debug logs.
Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
2011-06-08 18:45:43 -07:00
Jeff Brown
92110af24a
am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
...
* commit '5f0b1721eece5ca614044cda638f11fbec0eab0a':
Fix swipe gesture cosine calculation. Bug: 4124987
2011-06-08 14:04:33 -07:00
Jeff Brown
5f0b1721ee
am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
...
* commit '25bd8abce993e17b382ea5c29a1cb68dd095cf45':
Fix swipe gesture cosine calculation. Bug: 4124987
2011-06-08 13:52:22 -07:00
Jeff Brown
25bd8abce9
Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
2011-06-07 16:58:06 -07:00
Jeff Brown
6674d9bf0a
Fix swipe gesture cosine calculation.
...
Bug: 4124987
Recent changes introduced a multiplication factor into the
distance calculation which ended up being absent from the
dot product calculation.
Change-Id: Ia367912b9ac09b6285d5a498a0c271563c9e9e39
2011-06-07 16:50:14 -07:00
Dianne Hackborn
816e5b7219
am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
...
* commit 'ee3de4a950a188c6a4d5fb732242249af4807837':
Remove compat mode dialog.
2011-06-07 15:56:05 -07:00
Dianne Hackborn
ee3de4a950
am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
...
* commit 'a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
Remove compat mode dialog.
2011-06-07 15:47:14 -07:00
Dianne Hackborn
a3ce0f1e6f
Merge "Remove compat mode dialog." into honeycomb-mr2
2011-06-07 15:45:14 -07:00