John Wang
1f8665895f
am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
...
* commit '71030e536522449f34dc584fda94f34e7be6ee19':
Add SIM PUK unlockscreen.
2011-06-07 13:16:09 -07:00
Robert Greenwalt
e139167c91
am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
Reveal some network constants.
2011-06-07 13:12:29 -07:00
John Wang
71030e5365
Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
2011-06-07 12:56:49 -07:00
Robert Greenwalt
5df69fad6e
resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Robert Greenwalt
8de47a2f25
Merge "Reveal some network constants." into honeycomb-mr2
2011-06-07 12:00:37 -07:00
John Wang
0f7b3f8ba5
Add SIM PUK unlockscreen.
...
Puk unlockscreen is implemented as SimPukUnlockScreen.
Added config_enable_puk_unlock_screen to control the display of puk unlock screen.
Using config_voice_capable to control the display of emergency call button.
bug:4384956
Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
2011-06-07 10:12:38 -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
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
Jeff Brown
c3709f2509
am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
...
* commit '277bfd7cdd889e4f59e57925b90d1899f7312c4e':
Improve browser scrolling when using the mouse wheel.
2011-06-06 20:32:02 -07:00
Jeff Brown
277bfd7cdd
am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
...
* commit 'c1830a77a7fe0f1ccd52f405cb076d40fe085e2f':
Improve browser scrolling when using the mouse wheel.
2011-06-06 20:29:08 -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
Jeff Brown
7f5b99676f
Improve browser scrolling when using the mouse wheel.
...
The way that smooth scrolling is implemented in the Browser,
repeated requests to scroll by a certain amount do not add up
to one large scroll by the cumulative amount. This makes
the mouse wheel unusable on large pages because the Browser
will scroll at a more or less constant rate no matter how often
the wheel is turned.
The fix is to not animate scrolls when using the mouse wheel.
Change-Id: I23c05cdd2383944b8730deb225b7f3f57f1729df
2011-06-06 18:59:41 -07:00
Jaikumar Ganesh
5aaed0970b
am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"
...
* commit '58ada2f3bbab749fb5a813fb8f82eee347080405':
Require bonding and encryption for PBAP server
2011-06-06 11:34:11 -07:00
Wink Saville
fc51aaec82
am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE
...
* commit '6ff5ba00b07b32f3c82bce2c412e5e8f30c202bc':
Add FileUtils.checksumCrc32
2011-06-04 06:24:40 -07:00
Wink Saville
6ff5ba00b0
Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE
2011-06-04 06:15:21 -07:00
Dianne Hackborn
7e5ca5781b
am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
...
* commit 'b4815f47e6d612da6e2d0650a2d8f103626e3ec7':
Fix to not lose state when saving a deactivated fragment.
2011-06-03 17:57:33 -07:00
Dianne Hackborn
b4815f47e6
am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
...
* commit 'bd754205d0b59315582855329649dad925a04b82':
Fix to not lose state when saving a deactivated fragment.
2011-06-03 17:54:28 -07:00
Dianne Hackborn
1333276c7a
Fix to not lose state when saving a deactivated fragment.
...
Also deactivating a fragment shouldn't put it in the exiting state.
Change-Id: I514f3589ee7bbbee131cd7b4a48803e99b212bd0
2011-06-03 17:34:45 -07:00
Wink Saville
6d25a990af
Add FileUtils.checksumCrc32
...
Change-Id: Ic6bffcb66554d7af38cea68648d9431fda8ef10d
2011-06-03 17:03:51 -07:00
Dianne Hackborn
e826feb66c
am dddd6b15: am 185e3e24: Fix when managed cursors are required.
...
* commit 'dddd6b15d5274a6138facec9f553336fac5f6de6':
Fix when managed cursors are required.
2011-06-03 16:27:36 -07:00
Dianne Hackborn
dddd6b15d5
am 185e3e24: Fix when managed cursors are required.
...
* commit '185e3e243ee1da136bcace854026b8abaf0c4c86':
Fix when managed cursors are required.
2011-06-03 16:23:15 -07:00
Dianne Hackborn
185e3e243e
Fix when managed cursors are required.
...
Only do this when we are actually restarting, not when we
are just resuming after a pause.
Change-Id: I32fd263917b03776efca8e096d0343107721398d
2011-06-03 15:26:40 -07:00
Gilles Debunne
955e8d79b1
am 00afa11c: am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
...
* commit '00afa11c1565da7ad6721db08a4da7c2ec1eacc0':
Tap timeout removed on paste. Relying on position only.
2011-06-03 10:35:58 -07:00
Gilles Debunne
00afa11c15
am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
...
* commit '0538e6217de35e418c9779fd48c8300e65cc4f1e':
Tap timeout removed on paste. Relying on position only.
2011-06-03 10:32:00 -07:00
Gilles Debunne
0538e6217d
Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
2011-06-03 10:26:18 -07:00
satok
752737076d
am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManager.java
...
* commit 'e10de072d50cbe6984151cbbdba4dd2f2e8310b9':
(Do not merge) Backport a fix for InputMethodManager.java
2011-06-02 23:25:14 -07:00
satok
e10de072d5
am be96408b: (Do not merge) Backport a fix for InputMethodManager.java
...
* commit 'be96408b801666bf196adb0eabff4839e51e63ed':
(Do not merge) Backport a fix for InputMethodManager.java
2011-06-02 23:22:35 -07:00
satok
be96408b80
(Do not merge) Backport a fix for InputMethodManager.java
...
Bug: 4517456
Original CL: Icec380f3ca05cf798cc4b82155d0cecf178633a5
Change-Id: I579fb1ee1b53d312f7cfc5c689d4500cb875352e
2011-06-03 14:48:21 +09:00
Dianne Hackborn
d247ee41d6
am 758b67b1: am b46ed763: Add new Fragment API for explicitly saving/restoring state.
...
* commit '758b67b12386a6ea52d520aef455c3150c9bae03':
Add new Fragment API for explicitly saving/restoring state.
2011-06-02 19:33:22 -07:00
Dianne Hackborn
758b67b123
am b46ed763: Add new Fragment API for explicitly saving/restoring state.
...
* commit 'b46ed7636be9341b6ce0b158b3d86f34a437e6da':
Add new Fragment API for explicitly saving/restoring state.
2011-06-02 19:30:34 -07:00
Dianne Hackborn
b46ed7636b
Add new Fragment API for explicitly saving/restoring state.
...
Also fix issue #4519821 :
Blank screen displayed on tapping "Battery Use" option in the settings
We weren't correctly doing the full Activity resume code when coming
back from delivering a new Intent or result.
And fix a fragment problem where we still weren't correctly restoring
the state of list views. (I think this was from a bad manual-merge
from master.)
Change-Id: If79dc7e998155c39ab8c04781f6c73a82238a9ef
2011-06-02 19:18:07 -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
Gilles Debunne
793a940b84
Tap timeout removed on paste. Relying on position only.
...
Change-Id: I2e2b4a68f17957a2631a545badd602e4d127cfc3
2011-06-02 16:55:15 -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
cc20b4e31e
am a5f88510: am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
...
* commit 'a5f8851019605be26dd9a628280092e27f8a5f31':
Add new supports-screen API to set maximum allowed size.
2011-06-01 22:34:31 -07:00
Dianne Hackborn
a5f8851019
am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
...
* commit '2969b51132b80c873663aa2472b21d3e95845927':
Add new supports-screen API to set maximum allowed size.
2011-06-01 22:31:26 -07:00
Dianne Hackborn
2762ff3dc8
Add new supports-screen API to set maximum allowed size.
...
Change-Id: I0a7cd4ba73a4c18558e6daee28963d5fd12c7978
2011-06-01 22:20:38 -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
Adam Powell
b30dda6b55
am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
...
* commit '036c40f443a6d83881bc336a94b5da41bbc0bbcc':
Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:53:15 -07:00
Dianne Hackborn
c11f6c3e33
am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
...
* commit '7cae137ed155f2d311f020bbb3e75730344fd5fc':
Compatibility mode never needed for normal size screens.
2011-06-01 12:51:08 -07:00
Adam Powell
036c40f443
am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
...
* commit 'fa8ee17702a79a2597670374679a0b1952f4630f':
Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:49:47 -07:00
Adam Powell
fa8ee17702
Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
2011-06-01 12:48:03 -07:00
Dianne Hackborn
7cae137ed1
am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
...
* commit '79841acb6275348b4747d30bae6d813e15b1425d':
Compatibility mode never needed for normal size screens.
2011-06-01 12:47:29 -07:00
Dianne Hackborn
b9e2f68b28
am 13e2bef4: am 80cf4e79: Merge "Fix issue #4500511 : Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
...
* commit '13e2bef4f67c5bc5ce93aade1431ae3332d361f0':
Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore
2011-06-01 12:43:35 -07:00
Dianne Hackborn
39ec8fb957
Compatibility mode never needed for normal size screens.
...
Change-Id: I3482fa692618b9272e1e19384e766a77f2a53c5d
2011-06-01 12:42:55 -07:00
Dianne Hackborn
13e2bef4f6
am 80cf4e79: Merge "Fix issue #4500511 : Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
...
* commit '80cf4e79d2acd1f94b6a9866255459c6ab2760be':
Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore
2011-06-01 12:39:36 -07:00
Dianne Hackborn
a239c84525
Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore
...
Change-Id: Iebefe924e71206f3e6388eaee64f7b1416bc3239
2011-06-01 12:30:38 -07:00