Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,459 Commits 3 Branches 0 Tags
aff9ec70e22abb64149e335ae2eb519c6027eb4a
Commit Graph

744 Commits

Author SHA1 Message Date
Dianne Hackborn
77fc8b8066 am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 
* commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
  Add new landscape and portrait orientation features.
 2011-06-14 11:40:06 -07:00
Dianne Hackborn
6c0533f994 am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 
* commit 'c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
  Add new landscape and portrait orientation features.
 2011-06-14 11:36:05 -07:00
Dianne Hackborn
e289bff0ec Add new landscape and portrait orientation features. 
Updates aapt to know about these.  Also updates aapt badging to:

- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.

Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
 2011-06-14 11:23:52 -07:00
Dianne Hackborn
f51ded0f8f am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:06:07 -07:00
Dianne Hackborn
a8d7ea067c am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:02:02 -07:00
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -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
6d25a990af Add FileUtils.checksumCrc32 
Change-Id: Ic6bffcb66554d7af38cea68648d9431fda8ef10d
 2011-06-03 17:03:51 -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
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
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
Gilles Debunne
ca6c3a2bba am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2 
* commit '4ce6822bc63665ca3e9d9984766f367ce4f4d3a7':
  ExternalStorageFormatter takes an optional StorageVolume target.
 2011-05-26 15:50:13 -07:00
Gilles Debunne
4ce6822bc6 am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2 
* commit '24de44a1877be3e5d63697f90c98a87a4d88b1fb':
  ExternalStorageFormatter takes an optional StorageVolume target.
 2011-05-26 15:47:14 -07:00
Gilles Debunne
37051cdd86 ExternalStorageFormatter takes an optional StorageVolume target. 
Change-Id: Ic85689659dbf49a7fcc1b7aaf25e4a94e62848b9
 2011-05-26 11:45:17 -07:00
Mike Lockwood
49b9449b66 am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit 'd8d8470825a637843d45a3b436e80a3b85f1dd11':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:09:30 -07:00
Mike Lockwood
d8d8470825 am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit '988b6648b0138fe1294228e17164b2f1d6a4042d':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:06:47 -07:00
Mike Lockwood
a5250c9392 MountService: Add StorageVolume as extra in storage related broadcasts. 
Change-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-23 20:01:55 -04:00
Dianne Hackborn
070a19e035 am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 
* commit '5c8caba2e590792531ffb2c9f4ea924993662abd':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().
 2011-05-20 16:13:54 -07:00
Dianne Hackborn
5c8caba2e5 am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 
* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().
 2011-05-20 14:32:35 -07:00
Dianne Hackborn
ea2117bdc0 Add ParcelFileDescriptor.fromFd() and .adoptFd(). 
Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
 2011-05-20 12:48:22 -07:00
Robert Greenwalt
c41aefe1d4 am 59b1a4ed: Switch to use netd to add/remove routes. 
* commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
  Switch to use netd to add/remove routes.
 2011-05-18 16:33:16 -07:00
Robert Greenwalt
59b1a4ede7 Switch to use netd to add/remove routes. 
Also adds support for v6 routes and for removing single routes.

Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
 2011-05-18 15:25:43 -07:00
Mike Lockwood
53b988ba18 am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
  StorageVolume: Add getStorageId() accessor
 2011-05-17 16:49:40 -07:00
Mike Lockwood
fbfe555125 StorageVolume: Add getStorageId() accessor 
This ID is used for MTP as well as per volume querying in the media provider.

Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-17 17:19:37 -04:00
Mike Lockwood
fc4a3d37ef am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit 'b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:38:36 -07:00
Mike Lockwood
0a93d87552 Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 2011-05-16 12:34:02 -07:00
Mike Lockwood
2f6a388553 StorageManager: Clean up and generalize storage configuration resources 
Replace config_emulateExternalStorage, config_externalStorageRemovable,
config_externalStoragePaths, config_externalStorageDescriptions and
config_mtpReserveSpaceMegabytes resources with an XML resource file
to describe the external storages that are available.

Add android.os.storage.StorageVolume class

StorageManager.getVolumeList() now returns an array of StorageVolume

Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-16 14:29:23 -04:00
Dianne Hackborn
fbdf9df053 am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit '2a20583a5f436d66ab73cd6c0fdc73e59a3cecad':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:09:31 -07:00
Dianne Hackborn
24df0757f8 am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
* commit 'ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
 2011-05-13 18:41:04 -07:00
Dianne Hackborn
9a84983a9f DO NOT MERGE. Integrate from master: Improve activity manager debug dumps. 
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem.  Also lots of general cleanup of the am
dump output.

Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
 2011-05-13 18:38:19 -07:00
Dianne Hackborn
f9dd34f4d3 DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
And clean up some documentation.

Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
 2011-05-13 18:31:04 -07:00
Dianne Hackborn
ec85619f02 am d46849a5: am a8138732: MR2 is going to be API 13. 
* commit 'd46849a535ab64fd47fc8e9c557ca5f4da9e977b':
  MR2 is going to be API 13.
 2011-05-12 17:39:30 -07:00
Dianne Hackborn
a8138732a0 MR2 is going to be API 13. 
Change-Id: I05b65ace073b8731e85b41ac4ae63e2745cb46b5
 2011-05-12 16:26:47 -07:00
Mike Lockwood
a2a8419db8 am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
 2011-05-04 08:57:07 -07:00
Mike Lockwood
e3b498be0a DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: I8ba7e56797b0106dafaa6388393e5c629f27e6e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:19 -04:00
Mike Lockwood
d967f4664f DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: I43d5c1730b340f1288b58012234b38f801001b71
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-03 21:03:55 -04:00
Conley Owens
2d40bf91e6 am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'eac835e52e8378b33a2b34b7edb803290154588d':
  Removing dead store; it was likely a relict of debuging code.
 2011-05-03 16:14:31 -07:00
Jozef BABJAK
ad3b2e3a16 Removing dead store; it was likely a relict of debuging code. 
Change-Id: I685c6df119212f48f90dd40d01a3638a33ce2800
 2011-04-29 13:00:54 +02:00
Jeff Hamilton
a83bc16089 am 7bb236c3: am 84d34078: Make the NFC UID forward compatible. 
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
  Make the NFC UID forward compatible.
 2011-04-11 14:23:59 -07:00
Jason parks
5ee250aa74 am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:43:34 -07:00
Jeff Hamilton
7bb236c3b5 am 84d34078: Make the NFC UID forward compatible. 
* commit '84d340781b1e148ead9fb4790755737c9dcc1cde':
  Make the NFC UID forward compatible.
 2011-04-04 14:42:44 -07:00
Jason parks
1d73362597 am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 12:20:33 -07:00
Jeff Hamilton
84d340781b Make the NFC UID forward compatible. 
Change-Id: I67316ee7906c29ba11ca7c8eb36ca1b736fe59b1
 2011-04-01 13:43:28 -05:00
Jason parks
cca2f2f987 Merge "Send out a broadcast that the system is being factory reset." into gingerbread 2011-03-30 08:17:53 -07:00
Jeff Hamilton
0c691f0eb3 am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
  Update the value for the NFC shared UID.
 2011-03-29 16:28:49 -07:00
Jeff Hamilton
ad91eee277 am 9c1ef098: Update the value for the NFC shared UID. 
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
 2011-03-24 20:21:41 -07:00
Jeff Hamilton
9c1ef09883 Update the value for the NFC shared UID. 
Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
 2011-03-24 21:39:58 -05:00