Robert Greenwalt
0e0a759734
am 1d6ffd73: Merge "Restrict access to protected networks." into honeycomb-LTE
...
* commit '1d6ffd7339c3dfa53de19e27ca09e57233cc25ef':
Restrict access to protected networks.
2011-06-23 08:19:48 -07:00
Robert Greenwalt
50393202f3
Restrict access to protected networks.
...
Some networks should only be brought up and controlled by system apps.
bug: 4585677
Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b
2011-06-22 16:35:12 -07:00
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
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
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
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
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
2947826931
Remove compat mode dialog.
...
Change-Id: I37bccdf9d3e7c56048633da5731ad111910e530f
2011-06-07 15:44:22 -07:00
Jeff Brown
8b2c00144a
am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
...
* commit 'b3536145725250401d25ffa00cda85d222dfc21e':
Touch pad improvements. Bug: 4124987
2011-06-06 20:34:38 -07:00
Irfan Sheriff
5e4d020648
am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
...
* commit 'b400184ad6277676048a30b042ed0667de662ad8':
Handle AsyncChannel disconnect in WifiService
2011-06-06 20:34:35 -07:00
Jeff Brown
b353614572
am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
...
* commit 'ed48fa89a8e31b04681347a9235c2a566e7dbb8e':
Touch pad improvements. Bug: 4124987
2011-06-06 20:32:25 -07:00
Irfan Sheriff
b400184ad6
Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
2011-06-06 20:31:55 -07:00
Jeff Brown
ed48fa89a8
Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
2011-06-06 20:30:47 -07:00
Jeff Brown
bb3fcba0ca
Touch pad improvements.
...
Bug: 4124987
Only show one spot per touch point instead of one spot per
finger for multitouch gestures.
Tweaked the pointer acceleration curves.
Dissociated the hover/tap timeouts from the "tap" timeout
since they mean very different things.
Change-Id: I7c2cbd30feeb65ebc12f6c7e33a67dc9a9f59d4c
2011-06-06 19:23:05 -07:00
Dianne Hackborn
4bd505883d
am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687 : At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
...
* commit 'fc3fa5dc1045a8f25fc1982443e05873edf028df':
Fix issue #4539687 : At least one compatibility-mode app (Androminion)...
2011-06-06 18:18:34 -07:00
Dianne Hackborn
fc3fa5dc10
am 1b405592: Merge "Fix issue #4539687 : At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
...
* commit '1b405592550c719aa5dd93178705ae08b4e84a2f':
Fix issue #4539687 : At least one compatibility-mode app (Androminion)...
2011-06-06 17:33:59 -07:00
Dianne Hackborn
bc7386c261
Fix issue #4539687 : At least one compatibility-mode app (Androminion)...
...
...will only launch when held in portrait mode.
There was a bug in the window manager that caused all of the careful code to
update the configuration in sync with movements between activities to break.
Now it is fixed, so this app works, and we no longer see the bad slow orientation
changes when switching between activities that want to be in different
orientations.
Change-Id: I5d93f99649849bdaca2e8bebade6b91b8b6cf645
2011-06-06 17:29:10 -07:00
Irfan Sheriff
6da83d5868
Handle AsyncChannel disconnect in WifiService
...
Backport change I928544a0 to LTE branch and also handle
disconnect on WifiStateMachine channel
Bug: 4473750
Change-Id: I556330c10243a1805555f6bf6dcc7e43b78e3bfd
2011-06-06 15:17:58 -07:00
TK MUN
51704fc9c2
am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection
...
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
Allow control over search order for tethering upstream interface selection
2011-06-06 11:51:22 -07:00
Andy Stadler
daac9dd974
am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
...
* commit 'c22d145a9f26314e23ea678e96766755268e878b':
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
2011-06-03 10:33:13 -07:00
Andy Stadler
c22d145a9f
am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
...
* commit '3148557c42aaa8abf4001dc6fd759e911ba55280':
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
2011-06-03 10:28:45 -07:00
Andy Stadler
3148557c42
Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
2011-06-03 10:24:27 -07:00
Jeff Brown
ca2b552d98
am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
...
* commit 'c8812761609e532cceb400b112ed9982149c2490':
Add a preference panel for mouse speed.
2011-06-02 17:34:03 -07:00
Jeff Brown
c881276160
am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
...
* commit 'e1718de61c20c8d401633f83589f18d2c0c652db':
Add a preference panel for mouse speed.
2011-06-02 17:28:07 -07:00
Andy Stadler
237574444b
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
...
Due to a copy/paste typo, getStorageEncryption() was protected by
getActiveAdminForCallerLocked(), which made the API unreadable if the
caller is not an admin. This doesn't match the rest of the DPM API which
allows the "get" calls to be made anonymously.
This fix supercedes the proposed workaround CL in the DPM ApiDemo sample.
Backport of: If1a6237634e97ced09a7c6a8876bb6b0f60c9be9
Change-Id: I728b2d85878b7c73a063c906529f0d973e166b49
2011-06-02 16:37:39 -07:00
Jeff Brown
1a84fd1fb7
Add a preference panel for mouse speed.
...
Bug: 4124987
Change-Id: I3ce175d268a1d043cf5878481261b1049a15a149
2011-06-02 15:39:21 -07:00
Dianne Hackborn
3a80c50485
am 8b9a2b6c: am e6676351: Work around OpenFeint bug.
...
* commit '8b9a2b6cbd9cf37e9f5aa1bfc7106c67a5e89202':
Work around OpenFeint bug.
2011-06-01 19:08:53 -07:00
Dianne Hackborn
8b9a2b6cbd
am e6676351: Work around OpenFeint bug.
...
* commit 'e66763516a9c27c192adaba417616371a1c3c9bf':
Work around OpenFeint bug.
2011-06-01 18:29:50 -07:00
Dianne Hackborn
e66763516a
Work around OpenFeint bug.
...
Change-Id: Ib8320e50bb63fc56dc0118d5c8e9e328dbd3fcb1
2011-06-01 16:52:36 -07:00
Dianne Hackborn
7322e557cf
am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672 : Wrong xml resources used for homescreen widgets." into honeycomb-mr2
...
* commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1':
Fix issue #4502672 : Wrong xml resources used for homescreen widgets.
2011-05-31 18:11:29 -07:00