Commit Graph

139 Commits

Author SHA1 Message Date
Ken Shirriff
793f0ffc23 resolved conflicts for merge of 410ea6 to master 2009-06-08 13:44:17 -07:00
Ken Shirriff
e7eb9662c3 Fix contact creation.
This was broken by my change 2934.
bug=1903820
2009-06-08 12:52:50 -07:00
Suchi Amalapurapu
76ff31b201 am d299b819: Add a new attribute to android manifest for defining the GLES version number. This attribute is parsed by the PackageParser into ConfigurationInfo. The major and minor version numbers are defined as the higher and lower order bits.
Merge commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1'

* commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1':
  Add a new attribute to android manifest for defining the GLES version number.
2009-06-05 21:17:11 -07:00
Ken Shirriff
2676375449 resolved conflicts for merge of 716b56 to master 2009-06-05 15:18:51 -07:00
Suchi Amalapurapu
d299b8194d Add a new attribute to android manifest for defining the GLES version number.
This attribute is parsed by the PackageParser into ConfigurationInfo. The major
and minor version numbers are defined as the higher and lower order bits.
2009-06-05 13:49:09 -07:00
Android (Google) Code Review
716b56817a Merge change 2934 into donut
* changes:
  Don't crash on null edit url.
2009-06-05 10:12:34 -07:00
Android (Google) Code Review
7805835e0f am 7ebda6f1: Merge change 3265 into donut
Merge commit '7ebda6f110708bdb704f8700a6b3473249b12baf'

* commit '7ebda6f110708bdb704f8700a6b3473249b12baf':
  A workaround to fix rotation issue. I'm remote now and hard to do troubleshooting (i cannot rotate emulator in nx..)
2009-06-05 00:30:10 -07:00
Mitsuru Oshima
2f5e6b2d31 A workaround to fix rotation issue. I'm remote now and hard to do troubleshooting (i cannot rotate emulator in nx..) 2009-06-04 18:06:27 -07:00
Ken Shirriff
7a9e348c07 Don't crash on null edit url.
bug=1568060
2009-06-04 15:59:48 -07:00
Fred Quintana
d8dfeb5ee8 - make it easier to add content values to the ContentProviderOperation
- add the group membership common kind as well as some IM utilities to the ContactsContract
2009-06-04 12:23:54 -07:00
Mitsuru Oshima
342d59d319 am 9189cabb: * Moved supports-density tag under manifest * Refactored Compatibility code * Added CompatibilityInfo class * Removed getApplicationScale from Context * Added Resources#getCompatibilityInfo so that RootView can get the compatibility info w/o going through Context * Expandable support * Added expandable tag under manifest * Old application w/o expandable is given the default screen size ([320, 480] x density). * The non-expandable window is centered.
Merge commit '9189cabb0b6c6c28232fe6f412b7ba7a37352a6a'

* commit '9189cabb0b6c6c28232fe6f412b7ba7a37352a6a':
  * Moved supports-density tag under manifest
2009-06-03 16:34:47 -07:00
Mitsuru Oshima
9189cabb0b * Moved supports-density tag under manifest
* Refactored Compatibility code
  * Added CompatibilityInfo class
  * Removed getApplicationScale from Context
  * Added Resources#getCompatibilityInfo so that RootView can get the compatibility info w/o going through Context
* Expandable support
  * Added expandable tag under manifest
  * Old application w/o expandable is given the default screen size  ([320, 480] x density).
  * The non-expandable window is centered.
2009-06-03 16:28:10 -07:00
Bjorn Bringert
c0cbfda0fe am 963cd006: Allow creating AssetFileDescriptors for MemoryFiles.
Merge commit '963cd006c45716b034f656bf7e7179e6476f7e4d'

* commit '963cd006c45716b034f656bf7e7179e6476f7e4d':
  Allow creating AssetFileDescriptors for MemoryFiles.
2009-06-03 04:56:49 -07:00
Bjorn Bringert
963cd006c4 Allow creating AssetFileDescriptors for MemoryFiles.
This allows content providers to use in-memory data to implement
ContentProvider.openAssetFile(), instead of just normal files
and sockets as before.

To test cross-process use of AssetFileDescriptors for MemoryFiles,
a test content provider and a client for it are added to
AndroidTests.

Fixes http://b/issue?id=1871731
2009-06-03 12:53:42 +01:00
Satish Sampath
ae8c5b868f am 8dbe612d: Adding internal method replacePreferredActivity.
Merge commit '8dbe612dc60526d635e57257b58627b33a099678'

* commit '8dbe612dc60526d635e57257b58627b33a099678':
  Adding internal method replacePreferredActivity.
2009-06-03 00:05:36 -07:00
Satish Sampath
8dbe612dc6 Adding internal method replacePreferredActivity.
This was required because we need a way to set the preferred activity for a
particular intent filter based on user selection (in our case the
ACTION_WEB_SEARCH intent filter for selecting the preferred search engine from
the list of available search engines providers). The current
addPreferredActivity call was not sufficient since it leaves the existing
preferred activities in the list and does not remove them, which this call
does.
2009-06-03 07:54:42 +01:00
Fred Quintana
03d9490758 - create a new generic ISyncAdapter implementation, SyncAdapterNew
- change the applyBatch to take an ArrayList rather than an []
 - change Entity to be a final flass that contains ContentValues
 - remove the ability to update/insert Entities by a ContentProviderOperation
2009-06-01 16:17:03 -07:00
Android (Google) Code Review
7c49790cde am 162c9d0e: Merge change 2805 into donut
Merge commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47'

* commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47':
  base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
2009-06-01 10:01:08 -07:00
San Mehat
5a3a77dabd base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
Signed-off-by: San Mehat <san@google.com>
2009-06-01 09:25:28 -07:00
Christopher Tate
ad6042aa23 am 181fafaf: Retool the backup process to use a new \'BackupAgent\' class
Merge commit '181fafaf48208978b8ba2022683ffa78aaeddde1'

* commit '181fafaf48208978b8ba2022683ffa78aaeddde1':
  Retool the backup process to use a new 'BackupAgent' class
2009-05-31 19:44:35 -07:00
Christopher Tate
181fafaf48 Retool the backup process to use a new 'BackupAgent' class
Backups will be handled by launching the application in a special
mode under which no activities or services will be started, only
the BackupAgent subclass named in the app's android:backupAgent
manifest property.  This takes the place of the BackupService class
used earlier during development.

In the cases of *full* backup or restore, an application that does
not supply its own BackupAgent will be launched in a restricted
manner; in particular, it will be using the default Application
class rather than any manifest-declared one.  This ensures that the
app is not running any code that may try to manipulate its data
while the backup system reads/writes its data set.
2009-05-31 13:10:03 -07:00
Android (Google) Code Review
8e19b7c0e4 am a3d28bd5: Merge change 520 into donut
Merge commit 'a3d28bd5c278f750c70f2b87fce23df221cd4a01'

* commit 'a3d28bd5c278f750c70f2b87fce23df221cd4a01':
  Enforce permissions for PhoneStateListener events.
2009-05-29 11:49:36 -07:00
Jaikumar Ganesh
4551565943 Enforce permissions for PhoneStateListener events.
PhoneStateListener events like LISTEN_CALL_STATE_CHANGED,
have privacy information like phone numbers and hence,
need to be protected with a permission. The permission
READ_PHONE_STATE is used for this purpose. Use the permission
trick to ensure backward compatability.
2009-05-29 11:38:00 -07:00
Dianne Hackborn
385bb79ebb am b181118b: Define TARGET_CPU_ABI for finding native code in .apks
Merge commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a'

* commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a':
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 18:47:12 -07:00
Dianne Hackborn
b181118b6e Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 18:45:25 -07:00
Fred Quintana
8943737692 add ipc support to batching 2009-05-22 14:17:48 -07:00
Daisuke Miyakawa
72f3aa3762 Fix a bug in AbstractSyncableContentProvider.java and modify comments. 2009-05-20 01:39:14 +09:00
Daisuke Miyakawa
7c3e18c558 resolved conflicts w/ 842a1f4b0b merge.... 2009-05-19 23:13:14 +09:00
Daisuke Miyakawa
841ddefcb5 Hand merge from cupcake_dcm to donut, part 2.
Modify Contacts-related java files and update vCard importer code to the latest.
2009-05-19 08:26:32 +09:00
Dianne Hackborn
62da8461ed Implement compatibility support for WRITE_SDCARD permission.
Now old applications will automatically be granted it.  Also renamed it from
SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions,
and re-arranged how we do targetSdkVersion to actually be usuable for this
kind of stuff.

Note that right now this results in basically all apps being given the
WRITE_SDCARD permission, because their targetSdkVersion is not set.  I will
be dealing with that in a future change.
2009-05-15 18:23:56 -07:00
Dianne Hackborn
a96cbb435d Implement compatibility support for WRITE_SDCARD permission.
Now old applications will automatically be granted it.  Also renamed it from
SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions,
and re-arranged how we do targetSdkVersion to actually be usuable for this
kind of stuff.

Note that right now this results in basically all apps being given the
WRITE_SDCARD permission, because their targetSdkVersion is not set.  I will
be dealing with that in a future change.
2009-05-15 18:02:47 -07:00
Fred Quintana
ce31b2361d enhance ContentProvider with the ability to perform batch operations 2009-05-15 13:55:32 -07:00
Mihai Preda
dd6face5a6 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
Mihai Preda
eae850cefe Allow intent resolution to be constrained by package name. 2009-05-15 12:32:07 +02:00
svetoslavganov
76879bc234 resolved conflicts w/ 75986cf9bc merge.... 2009-05-15 00:44:45 -07:00
svetoslavganov
75986cf9bc Accessibility feature - framework changes (replacing 698, 699, 700, 701 and merging with the latest Donut) 2009-05-14 23:47:05 -07:00
Android (Google) Code Review
a64b860749 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
ec2d74d40f Merge change 1545 into donut
* changes:
  Add Intent.ACTION_APP_ERROR
2009-05-14 03:26:16 -07:00
Android (Google) Code Review
5369ad6f5e 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
541ff5df00 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
a19fd7a0d6 Merge change 1466
* changes:
  define Intent.ACTION_REMOTE_INTENT, which replaces the old GTalk data messaging intent "android.intent.action.GTALK_DATA_MESSAGE_RECEIVED".
2009-05-13 13:23:45 -07:00
Wei Huang
97ecc9cbe7 define Intent.ACTION_REMOTE_INTENT, which replaces the old GTalk data messaging intent "android.intent.action.GTALK_DATA_MESSAGE_RECEIVED".
The remote intent concept shouldn't be limited to Google or GTalkService. It should be owned by the Android platform.
2009-05-13 13:20:59 -07:00
Dianne Hackborn
271cee6de8 Fix issue #1838944: Application sync settings cant be changed with auto sync on 2009-05-13 13:18:22 -07:00
Dianne Hackborn
a086a973dd am e7fe35b: Whoops fix installing. I am dumb.
Merge commit 'e7fe35b88aa77766d322b8a683995a2bdae6210d'

* commit 'e7fe35b88aa77766d322b8a683995a2bdae6210d':
  Whoops fix installing.  I am dumb.
2009-05-13 12:52:03 -07:00
Fred Quintana
6a8d5332f0 content provider entities 2009-05-13 12:49:04 -07:00
Dianne Hackborn
e7fe35b88a Whoops fix installing. I am dumb. 2009-05-13 10:54:52 -07:00
Jacek Surazski
86b6c530f9 Add Intent.ACTION_APP_ERROR
This intent is sent to the installer when an app it installed
crashes/ANRs.
2009-05-13 18:52:20 +02:00
Dianne Hackborn
d2b4929ba0 am ade3eca: Implement issue #1783881 (manifest option for adb-install-on
Merge commit 'ade3ecad94d1f4431576f53bae26c35efbf7a2c9'

* commit 'ade3ecad94d1f4431576f53bae26c35efbf7a2c9':
  Implement issue #1783881 (manifest option for adb-install-only apps)
2009-05-12 22:39:08 -07:00
Joe Onorato
d39afbdc92 Make android.content.ComponentName implement java.lang.Comparable. 2009-05-12 23:40:45 -04:00
Dianne Hackborn
ade3ecad94 Implement issue #1783881 (manifest option for adb-install-only apps)
You can now use android:testOnly="true" to not allow your .apk to be installed
as a normal app.  The only way to do so is with the pm command and giving the
-t option, which sets a new INSTALL_ALLOW_TEST flag when installing.

I also used this to clean up the install API...  actually, mostly to hide
it, since it is not accessible to apps so shouldn't be in the SDK.  We
will be doing some more work on it, so this will prevent adding yet
another backwards-compatibility-for-no-reason version.
2009-05-12 16:09:43 -07:00