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

17966 Commits

Author SHA1 Message Date
Christopher Tate
ffccff0864 Merge "Implement shared-storage full backup/restore" 2011-06-07 12:25:06 -07:00
Alon Albert
55f18e1832 Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter) Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates." 2011-06-07 12:16:28 -07:00
Christopher Tate
b0628bfd5a Implement shared-storage full backup/restore 
Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes.  This is an approximation
of "internal + the external card".  This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.

Also fixed a bug in the handling of files/dirs with spaces in
their names.

Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
 2011-06-07 12:16:27 -07:00
Mike Lockwood
a8be99f8ae Merge "Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED" 2011-06-07 11:25:27 -07:00
Mike Lockwood
7e4db3767b Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED 
Change-Id: I3c42393c79424217d6b44cccef9de9e06da58193
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-07 11:24:29 -07:00
Mike Lockwood
98c185e694 Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED" 2011-06-07 11:02:58 -07:00
Alon Albert
866f40aeda Add columns: 
Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event
  Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter)
  Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates.

Change-Id: I5c153fb9cbf43dd1def0267c2f912a59038b28c1
 2011-06-07 11:01:49 -07:00
Mike Lockwood
da85e524c7 Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED 
Change-Id: I7261959462422cf241a46a5ada6fbd98d655db3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-07 10:59:04 -07:00
Wu-cheng Li
a4a48a484f Merge "Improve android.hardware.Camera.Area javadoc." 2011-06-07 04:05:35 -07:00
Wu-cheng Li
bde61a5731 Improve android.hardware.Camera.Area javadoc. 
bug:4553469
Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
 2011-06-07 19:00:03 +08:00
Svetoslav Ganov
8643aa0179 Interrogation of the view hierarchy from an AccessibilityService. 
1. Views are represented as AccessibilityNodeInfos to AccessibilityServices.

2. An accessibility service receives AccessibilityEvents and can ask
   for its source and gets an AccessibilityNodeInfo which can be used
   to get its parent and children infos and so on.

3. AccessibilityNodeInfo contains some attributes and actions that
   can be performed on the source.

4. AccessibilityService can request the system to preform an action
   on the source of an AccessibilityNodeInfo.

5. ViewAncestor provides an interaction connection to the
   AccessibiltyManagerService and an accessibility service uses
   its connection to the latter to interact with screen content.

6. AccessibilityService can interact ONLY with the focused window
   and all calls are routed through the AccessibilityManagerService
   which imposes security.

7. Hidden APIs on AccessibilityService can find AccessibilityNodeInfos
   based on some criteria. These API go through the AccessibilityManagerServcie
   for security check.

8. Some actions are hidden and are exposes only to eng builds for UI testing.

Change-Id: Ie34fa4219f350eb3f4f6f9f45b24f709bd98783c
 2011-06-06 18:46:03 -07:00
Fabrice Di Meglio
a556abfb3d Merge "Rename Gravity BEFORE/AFTER to START/END" 2011-06-06 16:48:30 -07:00
Fabrice Di Meglio
9e3b002d3f Rename Gravity BEFORE/AFTER to START/END 
- following spec proposal for having CSS3 like naming

Change-Id: Id5e316a2d9b54b9f20bbcb168fea6a3a83882e1b
 2011-06-06 16:41:16 -07:00
Ben Komalo
98ded72258 Merge "Makes SSLCertificateSocketFactory more flexible" 2011-06-06 15:50:10 -07:00
Ben Komalo
1b52806e21 Makes SSLCertificateSocketFactory more flexible 
Specifically, this adds support for specifying custom
{Trust,Key}Managers in the socket factory.

Change-Id: I1fdf6587064c71ae0520f73821923dcad8d140ad
 2011-06-06 15:10:33 -07:00
Martijn Coenen
4e75dbb94d Merge "Connecting to a NFC technology may fail." 2011-06-06 13:46:47 -07:00
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