Commit Graph

1171 Commits

Author SHA1 Message Date
Joe Onorato
26a87a8e82 am 4535e405: Implement the C++ class to write the backed up file data.
Merge commit '4535e40544aeb957d44fad75fbe5676effe03689'

* commit '4535e40544aeb957d44fad75fbe5676effe03689':
  Implement the C++ class to write the backed up file data.
2009-05-15 07:55:51 -07:00
Joe Onorato
8d626d6a48 Implement the C++ class to write the backed up file data. 2009-05-15 10:37:10 -04:00
Mihai Preda
5fab5c255f am eae850ce: Allow intent resolution to be constrained by package name.
Merge commit 'eae850cefe7e149f396c9e8ca1f34ec02b20a3f0'

* commit 'eae850cefe7e149f396c9e8ca1f34ec02b20a3f0':
  Allow intent resolution to be constrained by package name.
2009-05-15 07:06:46 -07:00
svetoslavganov
9133e86058 resolved conflicts w/ 75986cf9bc57ef11ad70f36fb77fbbf5d63af6ec merge.... 2009-05-15 00:44:45 -07:00
Mathias Agopian
d717598616 Merge commit 'goog/master' into merge_master
Conflicts:
	opengl/libagl/Android.mk
	opengl/libs/Android.mk
	opengl/libs/egl_impl.h
2009-05-14 22:44:23 -07:00
Android (Google) Code Review
757a434f81 am 669ec3a6: Merge change 1747 into donut
Merge commit '669ec3a6e47248fee0a3a0f4877b46875eb42140'

* commit '669ec3a6e47248fee0a3a0f4877b46875eb42140':
  Fixes #1846038. The dirty region can sometimes be modified by SurfaceFlinger. When this happens, force the view hierarchy to ignore the dirty flags.
2009-05-14 21:50:15 -07:00
Android (Google) Code Review
dff73b85fe Merge change 1747 into donut
* changes:
  Fixes #1846038. The dirty region can sometimes be modified by SurfaceFlinger. When this happens, force the view hierarchy to ignore the dirty flags.
2009-05-14 21:49:12 -07:00
Android (Google) Code Review
5af7900d25 am 0c97c7c8: Merge change 1668 into donut
Merge commit '0c97c7c8562048135cc129044219f9bbdfc1f108'

* commit '0c97c7c8562048135cc129044219f9bbdfc1f108':
  Document exception from parse3339
2009-05-14 17:22:30 -07:00
Android (Google) Code Review
59eaf5b4ed Merge change 1668 into donut
* changes:
  Document exception from parse3339
2009-05-14 17:21:11 -07:00
Android (Google) Code Review
976ff50608 am 14ad07f6: Merge change 1708 into donut
Merge commit '14ad07f604ecd08436680a046363d37952c278f6'

* commit '14ad07f604ecd08436680a046363d37952c278f6':
  Fixes #1853550. Prevent NPE when calling the PopupWindow() and PopupWindow(int, int) constructors. Instead, throw an IllegalStateException when trying to show a popup with no content view.
2009-05-14 16:44:18 -07:00
Android (Google) Code Review
159232f08d Merge change 1708 into donut
* changes:
  Fixes #1853550. Prevent NPE when calling the PopupWindow() and PopupWindow(int, int) constructors. Instead, throw an IllegalStateException when trying to show a popup with no content view.
2009-05-14 16:42:46 -07:00
Romain Guy
0145e4eaf5 am a3519811: Fix the build, again.
Merge commit 'a35198117ed8ba356e814863066777ee9f37f8e1'

* commit 'a35198117ed8ba356e814863066777ee9f37f8e1':
  Fix the build, again.
2009-05-14 16:32:17 -07:00
Android (Google) Code Review
6290fc877d am d1f7b3a5: Merge change 1704 into donut
Merge commit 'd1f7b3a5720a4d6d92c4eea5a1fe812a790a7442'

* commit 'd1f7b3a5720a4d6d92c4eea5a1fe812a790a7442':
  New feature to track down #1846038. Adds the ability to export flags encoded in int values so as to make them human readable in HierarchyViewer.
2009-05-14 15:49:37 -07:00
Android (Google) Code Review
41bf4b813f Merge change 1704 into donut
* changes:
  New feature to track down #1846038. Adds the ability to export flags encoded in int values so as to make them human readable in HierarchyViewer.
2009-05-14 15:47:37 -07:00
Android (Google) Code Review
8ddcbd3eb2 am 1c9a92fd: Merge change 1690 into donut
Merge commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108'

* commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108':
  Rework some code so that it works the way it was supposed to work.
2009-05-14 15:40:01 -07:00
Android (Google) Code Review
2e43c5d48f Merge change 1690 into donut
* changes:
  Rework some code so that it works the way it was supposed to work.
2009-05-14 15:32:42 -07:00
Marco Nelissen
d1e3faddd3 am 9ea92317: Rearrange some code so it makes more sense. Thanks, findbugs.
Merge commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62'

* commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62':
  Rearrange some code so it makes more sense. Thanks, findbugs.
2009-05-14 15:21:43 -07:00
Android (Google) Code Review
58c681fdb2 am 94f70cbb: Merge change 1685 into donut
Merge commit '94f70cbbe29c3aca748df9d543c366d838f6598b'

* commit '94f70cbbe29c3aca748df9d543c366d838f6598b':
  Remove unnecessary code.
2009-05-14 14:56:55 -07:00
Marco Nelissen
3fb8a2c25f am 1746d6fe: Fix a bug that findbugs found
Merge commit '1746d6fefcb1b4869f475a81f5aec35db4695603'

* commit '1746d6fefcb1b4869f475a81f5aec35db4695603':
  Fix a bug that findbugs found
2009-05-14 14:53:36 -07:00
Android (Google) Code Review
b96a2e9e28 am 109b21ba: Merge change 1677 into donut
Merge commit '109b21bab5a9eb6c17e067b11784ade36129f24f'

* commit '109b21bab5a9eb6c17e067b11784ade36129f24f':
  Findbugs fixes.
2009-05-14 14:53:35 -07:00
Android (Google) Code Review
1bd1314552 am 2a5cfe51: Merge change 1590 into donut
Merge commit '2a5cfe519298702ef71ff8755b14f8daf6a92b2a'

* commit '2a5cfe519298702ef71ff8755b14f8daf6a92b2a':
  Add wifi multicast filter api (enable/disable).
2009-05-14 14:53:35 -07:00
Android (Google) Code Review
aebec55811 am 4a8fb93f: Merge change 1638 into donut
Merge commit '4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4'

* commit '4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4':
  fix window layout problem in ViewRoot
2009-05-14 14:53:34 -07:00
Marco Nelissen
95dda3eccb am fafb16c5: Fix typo
Merge commit 'fafb16c5ae18816bd048428e60f46aec1e993b20'

* commit 'fafb16c5ae18816bd048428e60f46aec1e993b20':
  Fix typo
2009-05-14 14:53:34 -07:00
Android (Google) Code Review
b040dcda69 am 02c1c46f: Merge change 1674 into donut
Merge commit '02c1c46fff22490f884f05520d58eadae1442db8'

* commit '02c1c46fff22490f884f05520d58eadae1442db8':
  gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
2009-05-14 14:53:34 -07:00
Romain Guy
428b8cf88c am d4103d0d: Fix the build
Merge commit 'd4103d0d143f3774a2fc9e35afb0fffc2160d7fc'

* commit 'd4103d0d143f3774a2fc9e35afb0fffc2160d7fc':
  Fix the build
2009-05-14 14:53:33 -07:00
Android (Google) Code Review
1d0ec01729 am aa642c0c: Merge changes 1591,1596 into donut
Merge commit 'aa642c0cc20293137376d44f8221876c121e5be9'

* commit 'aa642c0cc20293137376d44f8221876c121e5be9':
  Get the backup calling through to the file backup helper.
  Fix typos.
  Add a new feature to android.os.Debug to add the ability to inject only specific fields when calling setFieldsOn().
  Fixes #1836075. Adds consistency checks for the View hierarchy. To enable them, you need a debug build and ViewDebug.sConsistencyCheckEnabled set to true in debug.prop. This change also lets you easily enable drawing and layout profiling in ViewRoot by setting ViewRoot.sProfileDrawing, ViewRoot.sProfileLayout and ViewRoot.sShowFps in debug.prop with a debug build.
  Add Intent.ACTION_APP_ERROR
2009-05-14 14:53:27 -07:00
Android (Google) Code Review
43a1f14172 Merge change 1685 into donut
* changes:
  Remove unnecessary code.
2009-05-14 14:44:34 -07:00
Android (Google) Code Review
28eaca75e0 Merge change 1677 into donut
* changes:
  Findbugs fixes.
2009-05-14 13:30:58 -07:00
Android (Google) Code Review
5496fc5f2f Merge change 1590 into donut
* changes:
  Add wifi multicast filter api (enable/disable). Fixes 1833432.  Automatically re-disables any request when the app exits/crashes.  Also hooked into Battery Stats for power managment analysis.
2009-05-14 13:24:52 -07:00
Android (Google) Code Review
7d79952167 Merge change 1638 into donut
* changes:
  fix window layout problem in ViewRoot  * don't scale LayoutParams (this must be app's scale).  * scale the layout params' coordinates & size only when requesting layout. In SurfaceView, window's x,y wasn't scaled before sending to window manager.
2009-05-14 13:00:05 -07:00
Android (Google) Code Review
8c560848eb Merge change 1674 into donut
* changes:
  gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
2009-05-14 12:54:09 -07:00
Android (Google) Code Review
f910bd9712 Merge changes 1591,1596 into donut
* changes:
  Add a new feature to android.os.Debug to add the ability to inject only specific fields when calling setFieldsOn().
  Fixes #1836075. Adds consistency checks for the View hierarchy. To enable them, you need a debug build and ViewDebug.sConsistencyCheckEnabled set to true in debug.prop. This change also lets you easily enable drawing and layout profiling in ViewRoot by setting ViewRoot.sProfileDrawing, ViewRoot.sProfileLayout and ViewRoot.sShowFps in debug.prop with a debug build.
2009-05-14 11:59:33 -07:00
Android (Google) Code Review
6fcd4e4b45 Merge change 1622 into donut
* changes:
  Fix typos.
2009-05-14 11:12:54 -07:00
Joe Onorato
c7bbc69ed5 Get the backup calling through to the file backup helper.
This includes some cleanup to make the parameters match
between BackupService.onBackup and FileBackupHelper.performBackup.
2009-05-14 09:39:32 -04:00
Android (Google) Code Review
289ab2c5d1 Merge change 1545 into donut
* changes:
  Add Intent.ACTION_APP_ERROR
2009-05-14 03:26:16 -07:00
Dianne Hackborn
89be15596c am b910811: am 5d6d773: AI 148824: Fix issue #1851541 (sharedUserId requ
Merge commit 'b91081113692acc87ae67f235956ae1cecab68cc'

* commit 'b91081113692acc87ae67f235956ae1cecab68cc':
  AI 148824: Fix issue #1851541 (sharedUserId requests not being checked for matching signatures on .apk).
2009-05-13 18:15:19 -07:00
Dianne Hackborn
6669b606eb am 5d6d773: AI 148824: Fix issue #1851541 (sharedUserId requests not bei
Merge commit '5d6d773fab559fdc12e553d60d789f3991ac552c' into donut

* commit '5d6d773fab559fdc12e553d60d789f3991ac552c':
  AI 148824: Fix issue #1851541 (sharedUserId requests not being checked for matching signatures on .apk).
2009-05-13 18:13:17 -07:00
Android (Google) Code Review
6e7a9c5ae7 am c4cdc7d: Merge change 1611 into donut
Merge commit 'c4cdc7d8a1a42f0ce6e28c39f70cfceeee29a781'

* commit 'c4cdc7d8a1a42f0ce6e28c39f70cfceeee29a781':
  Replace the search dialog images so that they correctly center
2009-05-13 17:43:49 -07:00
Android (Google) Code Review
d78bfa8c5e am 2b52b3e: Merge change 1610 into donut
Merge commit '2b52b3ed46c50befcc1111ad0f4afe294a878b22'

* commit '2b52b3ed46c50befcc1111ad0f4afe294a878b22':
  Revert dividers back to their original translucent versions but add new opaque dividers to improve the speed of lists.
2009-05-13 17:43:49 -07:00
Android (Google) Code Review
92b02667d7 Merge change 1611 into donut
* changes:
  Replace the search dialog images so that they correctly center the microphone and magnifying glass (they were all off by 1 pixel).
2009-05-13 17:35:11 -07:00
Android (Google) Code Review
a7da9d15e4 Merge change 1610 into donut
* changes:
  Revert dividers back to their original translucent versions but add new opaque dividers to improve the speed of lists.
2009-05-13 17:34:15 -07:00
Scott Main
c0c68f30bc am 3a5ce8a: am 04c72b4: AI 148812: revise the AppWidget developer guide
Merge commit '3a5ce8a92965db6d6f59517aef3d7bc02ce117ed'

* commit '3a5ce8a92965db6d6f59517aef3d7bc02ce117ed':
  AI 148812: revise the AppWidget developer guide documentation
2009-05-13 16:51:34 -07:00
Scott Main
3ce292a493 am 04c72b4: AI 148812: revise the AppWidget developer guide documentatio
Merge commit '04c72b47d877c9f3b45caa1ddc7f640b02e7be4c' into donut

* commit '04c72b47d877c9f3b45caa1ddc7f640b02e7be4c':
  AI 148812: revise the AppWidget developer guide documentation
2009-05-13 16:48:50 -07:00
Bill Napier
261d738c5c am 55d7bd3: am 4ce6430: AI 148803: Update 1.xml and 2.xml for methods th
Merge commit '55d7bd33e3621c0b870d8d84daeb4bf7a8279568'

* commit '55d7bd33e3621c0b870d8d84daeb4bf7a8279568':
  AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs.  This will allow the CTS Signature Test to be run against older android releases.
2009-05-13 15:35:32 -07:00
Bill Napier
e6a3761483 am 7567a74: AI 148803: Update 1.xml and 2.xml for methods that take Gene
Merge commit '7567a7453e853eca75a7162bbb87bfd0d7a5aafe'

* commit '7567a7453e853eca75a7162bbb87bfd0d7a5aafe':
  AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs.  This will allow the CTS Signature Test to be run against older android releases.
2009-05-13 15:35:28 -07:00
Bill Napier
43c52008ac am 4ce6430: AI 148803: Update 1.xml and 2.xml for methods that take Gene
Merge commit '4ce643074874dd79cc3a9219bdfefe63f2400ed7' into donut

* commit '4ce643074874dd79cc3a9219bdfefe63f2400ed7':
  AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs.  This will allow the CTS Signature Test to be run against older android releases.
2009-05-13 15:30:25 -07:00
Android (Google) Code Review
59062e6de0 am 541ff5d: Merge change 1566 into donut
Merge commit '541ff5df00984580e0245b3ae2c89b93e76b7c08'

* commit '541ff5df00984580e0245b3ae2c89b93e76b7c08':
  Fix issue #1838944: Application sync settings cant be changed with auto sync on
2009-05-13 15:26:55 -07:00
Android (Google) Code Review
4f5405c140 Merge change 1566 into donut
* changes:
  Fix issue #1838944: Application sync settings cant be changed with auto sync on
2009-05-13 15:25:35 -07:00
Android (Google) Code Review
a04d0df605 am 6063a9c: Merge change 1491 into donut
Merge commit '6063a9c9ee91a647680653a4520dfcad83985592'

* commit '6063a9c9ee91a647680653a4520dfcad83985592':
  Make pressing the search button within an app that does not support
2009-05-13 14:29:12 -07:00
Android (Google) Code Review
626fde1319 Merge change 1491 into donut
* changes:
  Make pressing the search button within an app that does not support search bring up global search. This still respects the case where an app has chosen to disable search entirely by overriding onSearchRequested() to return false.
2009-05-13 14:26:45 -07:00