Justin Ho
c407ef2222
am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
...
* commit 'f409604122f959653fb789e9133e94a51e369693':
Updated art for compat mode dialog.
2011-06-15 14:56:03 -07:00
Justin Ho
f409604122
Merge "Updated art for compat mode dialog." into honeycomb-mr2
2011-06-15 14:52:52 -07:00
Wink Saville
1146bddf92
Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
2011-06-15 14:31:16 -07:00
Irfan Sheriff
5af3405f0d
am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
...
* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
Fix lease duration handling
2011-06-15 14:04:23 -07:00
Irfan Sheriff
ecda546160
Merge "Fix lease duration handling" into honeycomb-mr2
2011-06-15 14:00:23 -07:00
Wink Saville
4d6233b2ed
Merge "Clean up some debug statements." into honeycomb-LTE
2011-06-15 13:55:06 -07:00
Wink Saville
eddc3a579c
Clean up some debug statements.
...
Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
2011-06-15 13:45:29 -07:00
Daniel Sandler
e25f8336a0
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
2011-06-15 16:14:55 -04:00
Irfan Sheriff
56878760c3
Fix lease duration handling
...
Convert lease time in seconds to long before alarm
set up and add sanity check
Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
2011-06-15 12:58:18 -07:00
Dianne Hackborn
3dc1b5e26f
am ed31bbf6: Clean up some edge cases in the compat mode UI:
...
* commit 'ed31bbf65267c1f383dd0dff37acd034f3b9b59f':
Clean up some edge cases in the compat mode UI:
2011-06-15 12:35:57 -07:00
Dianne Hackborn
ed31bbf652
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
2011-06-15 11:24:07 -07:00
Wink Saville
0e765f8b73
Always clear settings when entering Inactive state.
...
Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
2011-06-15 06:41:21 -07:00
Daniel Sandler
fbb0934793
am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
...
* commit '5994bff92472b3bdcd5754d8a9156b49269a9c1d':
One-time-only compatibility mode explanation dialog.
2011-06-15 06:15:11 -07:00
Daniel Sandler
2fdf588061
am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
...
* commit '97d5081ac331884fe0f6f2e5814d4862a974fbe3':
Final UI for compatibility mode.
2011-06-15 06:15:07 -07:00
Daniel Sandler
5994bff924
Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
2011-06-15 06:10:32 -07:00
Daniel Sandler
97d5081ac3
Merge "Final UI for compatibility mode." into honeycomb-mr2
2011-06-15 06:10:27 -07:00
Daniel Sandler
552b1f0d22
One-time-only compatibility mode explanation dialog.
...
Don't miss it!
Bug: 4595256
Change-Id: I80c0949e6118e3ea3af089d4cad160ce63e7d8ce
2011-06-15 01:03:02 -04: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
Daniel Sandler
3b0543acf1
Final UI for compatibility mode.
...
Bug: 4595256
Change-Id: Idaa96393fb809c828b5f661f29e8b687fdf3d104
2011-06-15 00:12:01 -04: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
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
027e9e28b2
am 4e04380d: Merge "Fix issue #4592768 : Xoom display does not resize when..." into honeycomb-mr2
...
* commit '4e04380d0a42347013808ee2058c786582ad548f':
Fix issue #4592768 : Xoom display does not resize when...
2011-06-14 19:19:25 -07:00
Dianne Hackborn
4e04380d0a
Merge "Fix issue #4592768 : Xoom display does not resize when..." into honeycomb-mr2
2011-06-14 19:16:46 -07:00
Robert Ly
b481a6007f
am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
...
* commit 'c7731e070e09007fdd002fd44dfe35bdeffbaac5':
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
2011-06-14 17:47:51 -07:00
Robert Ly
4963cd0bd1
am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
...
* commit '1a3e7cf259ef8eecdea236b3cba1608e1bd871e3':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
2011-06-14 17:46:07 -07:00
Robert Ly
c7731e070e
Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
2011-06-14 17:45:04 -07:00
Robert Ly
1a3e7cf259
Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
2011-06-14 17:43:38 -07:00
John Wang
b0b24b3df5
Support SIM permanently disabled state.
...
SIM card can get permanently disabled due to too many
PUK retries. The PERM_BLOCKED pin state of SIM application
represents this state.
This change decodes permanent disabled state and broadcasts it
via ICC_ABSENT intent with PERM_DISABLED reason. It also update
the lockscreen to show the prompt message.
bug:4392059
Change-Id: I5e60dd65f48f42aa2e54db4cdebf803d6e666b99
2011-06-14 16:50:03 -07:00
Dianne Hackborn
dad0e40221
Fix issue #4592768 : Xoom display does not resize when...
...
...plugging in HDMI cable connected to a HDMI monitor
Change-Id: If3394e972131aa5124db2d1abf23b2214512773a
2011-06-14 16:45:21 -07:00
Robert Ly
1dbb707592
am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
...
* commit '8467cd7f90a23c345b41cfcdcc62f1f8e3716c37':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
2011-06-14 16:38:08 -07:00
Robert Ly
17cddaf2a6
am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
...
* commit '409b9a4cad1d2dad43e647fc63a4ab1f3435d437':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
2011-06-14 16:38:05 -07:00
Robert Ly
b5c31b8a11
am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
...
* commit '194f47451ce3a0d346e362dfd8753057f41c765d':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
2011-06-14 16:38:02 -07:00
Robert Ly
8467cd7f90
Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
2011-06-14 16:36:17 -07:00
Robert Ly
409b9a4cad
Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
2011-06-14 16:35:22 -07:00
Robert Ly
194f47451c
Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
2011-06-14 16:35:12 -07:00
Amith Yamasani
eb5e633a24
am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
...
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
Stability fixes for PreferenceFragments.
2011-06-14 15:38:31 -07:00
Amith Yamasani
608a200d2e
Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
2011-06-14 15:35:13 -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
0a8a232423
Merge "Fix issue #4603422 : Compatibility mode button doesn't always update" into honeycomb-mr2
2011-06-14 15:12:01 -07:00
Robert Ly
5d730c9237
am 86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
...
* commit '86ef7977a95d6e1783f646d96992582d1dbf080a':
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
2011-06-14 15:10:07 -07:00
Robert Ly
cd944baf51
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
...
This reverts commit 1431fd98b1a9b69a8b9a03d07bc408aefe30c28e
2011-06-14 15:09:41 -07:00
Amith Yamasani
c56fc753e2
Stability fixes for PreferenceFragments.
...
Unregister the click listener as early as possible, so that clicks
don't get delivered after the activity is detached.
Bug: 4599586
This should also fix: 4603030, 4601105, 4598715, 4598712.
Change-Id: I7bcff719bed14ea61b482bd6d29ae1fa5e322e41
2011-06-14 15:07:49 -07:00
Robert Ly
86ef7977a9
Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
2011-06-14 15:06:42 -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
Robert Ly
8077b8b3bb
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
...
This reverts commit f25be17f6413417aa6a1e3a5a791302099d15008
2011-06-14 15:02:42 -07:00
Robert Ly
b658dfb8f4
am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
...
* commit 'cbd31aec9f4a7367d440bfb0c9683bd481461995':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
2011-06-14 15:01:48 -07:00
Robert Ly
cbd31aec9f
Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
2011-06-14 14:58:32 -07:00
Robert Ly
cbfab05075
am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
...
* commit 'a91d6552913c02538b3f97e774e9771cfbef9dec':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-14 14:58:11 -07:00
Robert Ly
4cd4c82073
am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
...
* commit '9fa54704492234aed15ccdb29aae9261674811e3':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-14 14:58:08 -07:00