drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,142 Commits 1 Branch 0 Tags
Commit Graph

21324 Commits

Author SHA1 Message Date
Eric Fischer
e34ed24f4d am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
  Import revised translations.  DO NOT MERGE
 2011-06-06 11:50:16 -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
Eric Fischer
e9d32283e4 am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
  Import revised translations.  DO NOT MERGE
 2011-06-06 10:54:41 -07:00
Eric Fischer
b16b020dd3 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-06 10:38:42 -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
Eric Fischer
b5c6212de1 Import revised translations. DO NOT MERGE 
Change-Id: I4bfd9ec60da3b224c71406851f0a7f8bbf0c1120
 2011-06-03 17:24:55 -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
79841acb62 Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2 2011-06-01 12:43:56 -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
80cf4e79d2 Merge "Fix issue #4500511: Holo effect background doesn't reach top of screen anymore" into honeycomb-mr2 2011-06-01 12:34:48 -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
Justin Koh
3c7b96a346 Framework: bugfix for menu selector not showing up properly. 
Menu selector wasn't showing up properly because selector state wasn't updated after touch mode.  Added this to resurrectselection call.

http://b/issue?id=4372583

TESTED = runs on M4.

Change-Id: I349c3b86f4e8a1a02a20494b547859d0c12867ee
 2011-06-01 11:22:01 -07:00
Adam Powell
d19fbe34e3 am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 
* commit 'ca234a0765e3b43ab202f29caceba68b7c5363df':
  Fix bug 4501658 - adjust toast frame padding
 2011-06-01 10:33:46 -07:00
Adam Powell
ca234a0765 am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 
* commit '8656ba1298da98dde9ff6517aa06b86317a65bf7':
  Fix bug 4501658 - adjust toast frame padding
 2011-06-01 10:29:58 -07:00
Adam Powell
8656ba1298 Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 2011-06-01 10:27:54 -07:00
Dianne Hackborn
c691d7f9a3 am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'b8d109318f6fc88d1a59ca0e6e362963cd06960c':
  Forgot this file.
 2011-05-31 18:33:00 -07:00
Dianne Hackborn
b8d109318f am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'fd20656067c611d3fed3bce31c757691ca0abaf4':
  Forgot this file.
 2011-05-31 18:30:01 -07:00