Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,063 Commits 3 Branches 0 Tags
f976cf25f96c470a004b591f8bc69b5323a94de2
Commit Graph

19760 Commits

Author SHA1 Message Date
Jaikumar Ganesh
830d8c5fb3 am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '5aaed0970be451479a07b2423e709026dec6611b':
  Require bonding and encryption for PBAP server
 2011-06-06 12:56:55 -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
RoboErik
c2d5330c1c Cleanup of Calendar.java to prep for api 
Added comments. Made internal only stuff private. Added @hide to
methods only used by the provider. Added/altered methods for
consistency across contract classes.

Change-Id: I4d810995042583f1ab05b859f320828f83329e90
 2011-06-06 10:52:33 -07:00
John Reck
f7445916c5 Merge "Delay set picture if necessary" 2011-06-06 09:25:44 -07:00
Martijn Coenen
ea51a4275a Connecting to a NFC technology may fail. 
NotSupportedOperationException will be thrown in these cases,
unchecked for now.

Bug: 4195403
Change-Id: I48f4f277d43afba8bc505ae2a6c216cc387b1e97
 2011-06-06 12:43:05 +02:00
John Reck
83e5929d4c Delay set picture if necessary 
Normally this wouldn't happen as a new picture should come after
 webcore has initialized. However, now that a view state can be loaded,
 setting a new picture needs to be delayed until after everything has
 initialized.

Change-Id: I823bc17eb939eab0436d7a398ebcbe849c0fb945
 2011-06-04 19:50:29 -07:00
Wink Saville
1b9a6a6e58 resolved conflict for merge of fc51aaec to master 
Change-Id: Iee4d9ecc946dd1bbf114a70ad32db0fe47a027df
 2011-06-04 07:31:35 -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
3267d356d1 am 7e5ca578: am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit '7e5ca5781b406d4f862254dad1758b91ce89f896':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 18:02:10 -07:00
Dianne Hackborn
29bf330727 am e826feb6: am dddd6b15: am 185e3e24: Fix when managed cursors are required. 
* commit 'e826feb66c2a3690716136c24926606eafe827dc':
  Fix when managed cursors are required.
 2011-06-03 18:01:57 -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
Jeff Brown
371790b774 resolved conflicts for merge of 955e8d79 to master 
Change-Id: I90b0d523053d173b7df60ebc975de65ab387ff18
 2011-06-03 17:24:05 -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
3c43ced841 resolved conflicts for merge of d247ee41 to master 
Change-Id: I49bd932f5019ce0608e2661d5cb7f24b6122dcba
 2011-06-03 16:16:55 -07:00
Jeff Brown
ccfcf3ba6c Merge "resolved conflicts for merge of ca2b552d to master" 2011-06-03 15:51:56 -07:00
Jeff Brown
7218d830e2 resolved conflicts for merge of ca2b552d to master 
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
 2011-06-03 15:50:27 -07:00
John Reck
5944b6a42b Merge "Prevent WebKit updates in loadViewState case" 2011-06-03 15:46:35 -07:00
John Reck
95b7d6f9c2 Prevent WebKit updates in loadViewState case 
Change-Id: I466f10c308b43f8683e537620e1c3e922a2cd465
 2011-06-03 15:36:25 -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
Dianne Hackborn
9468634987 Merge "resolved conflicts for merge of cc20b4e3 to master" 2011-06-03 15:24:20 -07:00
John Reck
5e02e09565 Merge "Initial support for view state serialization" 2011-06-03 15:21:16 -07:00
Dianne Hackborn
ead40eaedb resolved conflicts for merge of cc20b4e3 to master 
Change-Id: I990368443a16a0577f7a1f5623b348cca3f81ac4
 2011-06-03 15:01:49 -07:00
Dianne Hackborn
2515db74fe am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug. 
* commit '3a80c50485809fe72d6de83dacad494c5e84ed24':
  Work around OpenFeint bug.
 2011-06-03 14:43:18 -07:00
Fabrice Di Meglio
ce08f78560 Merge "Fix default TextView gravity" 2011-06-03 14:37:23 -07:00
Fabrice Di Meglio
ea28694aee Fix default TextView gravity 
- default set to Gravity.TOP | Gravity.BEFORE instead of Gravity.TOP | Gravity.LEFT

Change-Id: I5e528fb1d0a6e3c84dd506e899df33c9b58d25f3
 2011-06-03 14:29:45 -07:00
Adam Powell
b93ffdb5d5 am b30dda6b: am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2 
* commit 'b30dda6b550fedcf5c3b15671d483205a7757e1b':
  Framework: bugfix for menu selector not showing up properly.
 2011-06-03 14:28:26 -07:00
Dianne Hackborn
9f2f3752ae am c11f6c3e: am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2 
* commit 'c11f6c3e33c9f1e3964cb2427f82509fc97e3527':
  Compatibility mode never needed for normal size screens.
 2011-06-03 14:28:18 -07:00
Dianne Hackborn
678d344bcb resolved conflicts for merge of b9e2f68b to master 
Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142
 2011-06-03 14:15:10 -07:00
Philip Milne
160cbbb9ac Merge "Response to code review for GridLayout:" 2011-06-03 13:46:34 -07:00
Philip Milne
aa616f31fe Response to code review for GridLayout: 
. Fixed spelling.
. Added comments on internal methods.
. Adopted the suggested internal name changes to improve clarity.
. Added UNDEFINED constant to public API to avoid making reference to Integer.MAX_VALUE in docs.
. Added final everywhere, then removed it.
. Make the Interval class package private so that it can be put somewhere more general later.
. Tidy code, removing maximize flag throughout.
. Remove last of allocations taking place during layout.
. Implement measureChild() etc.
. Added LinearLayout alignment compatibility mode, and made it the default.

Change-Id: I6a4ffa022d97d68138d1903d3830a20278815435
https://android-git.corp.google.com/g/#change,109891
 2011-06-03 13:22:52 -07:00
Dianne Hackborn
455591b913 am c691d7f9: am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'c691d7f9a3621d5ef9b9d48e95c644a318b36322':
  Forgot this file.
 2011-06-03 13:17:45 -07:00
Dianne Hackborn
50469db071 am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 
* commit '7322e557cfe42da42779625d69ced2db74a9df90':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
 2011-06-03 13:17:00 -07:00
John Reck
816c0defc7 Initial support for view state serialization 
Framework for serializing the view state
 Still needs to prevent sending messages to webkit (pinch
 zoom doesn't work correctly as a result)

Change-Id: Ic3f8fe19b27ff1f841b556e87f582dab2a6d903b
 2011-06-03 11:47:56 -07:00
Amith Yamasani
99ce8abc3f am 42f53c7e: am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 
* commit '42f53c7e6cec8d17a850a550c74f8dfc9435fbf7':
  Use Holo background and proper padding for App Permissions UI.
 2011-06-03 11:11:22 -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
Derek Sollenberger
df0d966d67 Merge "Add API to allow plugins to lock their orientation in full-screen mode." 2011-06-03 05:50:16 -07:00
Narayan Kamath
4b1b27a798 Merge "Language loading / availablity should repsect defaults enforcement." 2011-06-03 04:34:45 -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
satok
b1b2e2275f Merge "Update internal states stored in InputMethodManager properly" 2011-06-02 20:59:14 -07: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