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

21965 Commits

Author SHA1 Message Date
Eino-Ville Talvala
d9c2601afa Add auto-white balance locking to the Camera API. 
Adds a new camera parameter for locking auto-white balance to its
current value. Also adds a function for checking if auto-white balance
lock is supported by the current platform. Lock semantics match that
of the auto-exposure lock.

Hidden for now.

Change-Id: Id59339a4be84d55c1b0b8473d765b6aa765999b2
 2011-05-17 10:52:42 -07:00
Dianne Hackborn
0305e354e1 This API change is now part of MR2. 
Change-Id: I242e66fb9c46d48244942298361f408062fb05c4
 2011-05-17 10:49:53 -07:00
Adam Powell
f95e474796 am b45b21d1: am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2 
* commit 'b45b21d13e3311c819d5fbd548ff8c859cc1dfe3':
  Turn fading edges back on for ScrollView and HorizontalScrollView.
 2011-05-17 10:07:23 -07:00
Adam Powell
143c529f28 am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2 
* commit '21f1d49f0eac47c1ebbabf82f145dc60f988d069':
  DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
 2011-05-17 09:55:53 -07:00
Adam Powell
b45b21d13e am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2 
* commit 'b4eb3acee4504ea35a43bef9dc6220560b55d2d2':
  Turn fading edges back on for ScrollView and HorizontalScrollView.
 2011-05-17 09:55:32 -07:00
Adam Powell
21f1d49f0e am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2 
* commit 'a7f52d4665967b4331d38408ba81af37ec589cb4':
  DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
 2011-05-17 09:45:29 -07:00
Adam Powell
b4eb3acee4 am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2 
* commit '79411726d5a0eb0f439b90e2f262e0b983e55d9c':
  Turn fading edges back on for ScrollView and HorizontalScrollView.
 2011-05-17 09:45:26 -07:00
Adam Powell
a7f52d4665 Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2 2011-05-17 09:41:52 -07:00
Adam Powell
79411726d5 Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2 2011-05-17 09:41:33 -07:00
Derek Sollenberger
43124d2214 Merge "Updates resulting from the Skia merge (revision 1327)" 2011-05-17 04:55:56 -07:00
Narayan Kamath
b956f37e37 Pass synthesis request params through to the TTS service. 
Change-Id: I1ffd617d8dfa0814382643e3cf6b3ab7417c742a
 2011-05-17 09:47:59 +01:00
Dianne Hackborn
9d31154d0b am b68c768d: am 41744836: am 7916ac65: Add new command line option to change global screen size. 
* commit 'b68c768ddb57407bc253230c677056329c9e4bae':
  Add new command line option to change global screen size.
 2011-05-16 21:39:47 -07:00
Dianne Hackborn
b68c768ddb am 41744836: am 7916ac65: Add new command line option to change global screen size. 
* commit '417448369c170a34d76c477aa19c5293e3caa1df':
  Add new command line option to change global screen size.
 2011-05-16 21:29:32 -07:00
Dianne Hackborn
417448369c am 7916ac65: Add new command line option to change global screen size. 
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
  Add new command line option to change global screen size.
 2011-05-16 21:21:24 -07:00
Dianne Hackborn
7916ac65dc Add new command line option to change global screen size. 
For example:

adb shell am display-size 1024x600

Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
 2011-05-16 20:55:41 -07:00
Cibu Johny
8666663e6e View horizontalDirection public attribute resolution to an internal var. 
Change-Id: Id87ab188faef27ff039cf6a400118707ee74a27d
 2011-05-16 16:03:31 -07:00
Chia-chi Yeh
917e916b1c Merge "Add a new permission for user space VPN applications." 2011-05-16 15:30:45 -07:00
Chia-chi Yeh
9f67adfc2d Add a new permission for user space VPN applications. 
Change-Id: I2b87ef34db01209dac45fbceccafd865840830d5
 2011-05-16 15:16:58 -07:00
Fabrice Di Meglio
b5dde704cd Merge "Adding horizontalDirection public attribute for View." 2011-05-16 15:13:10 -07:00
Cibu Johny
7632cb9be5 Adding horizontalDirection public attribute for View. 
Change-Id: Ic8a03447252e4e155c3ee874b1d8c8ac0bc9f7f5
 2011-05-16 15:08:27 -07:00
Adam Powell
aff08381a3 Turn fading edges back on for ScrollView and HorizontalScrollView. 
Change-Id: Iba880fef0083d36d105b387e4184c57a5fd62486
 2011-05-16 14:04:31 -07:00
Adam Powell
b07f943273 DO NOT MERGE Use action bar overflow menus on large configurations as 
well as xlarge.

ICS will have a more intelligent way of determining this.

Change-Id: I1ba6460dec09b8259db858c78a9157bb7742c85d
 2011-05-16 13:46:38 -07:00
Dianne Hackborn
60e13114eb am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 
* commit '1d340a3c24913d8750900355cd92ef5742eea11f':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
 2011-05-16 13:16:45 -07:00
Dianne Hackborn
1d340a3c24 am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
 2011-05-16 13:13:00 -07:00
Dianne Hackborn
0eac092766 Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 2011-05-16 13:10:23 -07:00
Dianne Hackborn
68066c2f38 DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked. 
Not yet working, so turned off.

Also fix a bug where the display size configuration became inconsistent
after a configuration change -- we now figure out everything about the
display size when computing a new configuration.

Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
 2011-05-16 13:08:07 -07:00
Dianne Hackborn
63446167b9 am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit 'fddd927fb78bb206287203f4f447a416b525115a':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:04:49 -07:00
Dianne Hackborn
fddd927fb7 am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:02:57 -07:00
Dianne Hackborn
f97ed77197 am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 13:01:38 -07:00
Dianne Hackborn
9d0f2c6d97 Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 2011-05-16 13:01:07 -07:00
Dianne Hackborn
29735689ce DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation. 
Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a
 2011-05-16 12:57:38 -07:00
Dianne Hackborn
d90a2c4d44 am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 12:57:00 -07:00
Dianne Hackborn
1e662c3294 Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 2011-05-16 12:54:22 -07:00
Mike Lockwood
8fa5b03c1b resolved conflicts for merge of fc4a3d37 to master 
Change-Id: I40f603ba9330c3e882f4d58398095f4094725b21
 2011-05-16 15:49:53 -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
b822d2464d am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit '0a93d875527c52183080b63a0b19d567856952af':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:36:29 -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
Derek Sollenberger
d39d1affe8 Updates resulting from the Skia merge (revision 1327) 
Change-Id: I2a8f5869dbe95bb594f2ba5d7278f9b330e6f17a
 2011-05-16 15:30:40 -04:00
Dianne Hackborn
ac8dea12c1 DO NOT MERGE. Integrate from master: Rework display size access. 
Applications now get the display size from the window manager.  No
behavior should be changed yet, this is just prep for some real
changes.

Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
 2011-05-16 11:58:27 -07:00
Romain Guy
51d6eb7dcf Fix crash when using a SimpleCursorAdapter initialized with a null Cursor. 
Change-Id: Ia7d078db8ab941c830663e6af7cbb07d7bad24a8
 2011-05-16 11:55:08 -07:00
Romain Guy
0c0b768e15 Fix NPE when calling PopupWindow's default constructor. 
Change-Id: I5317b052236d758fd3b9055c9940fbb10ec7b123
 2011-05-16 11:54:09 -07:00
Romain Guy
02739a8eec Fix javadoc issues 
Change-Id: Ife66a8664955ac1a79b6ffd0080000c820f24632
 2011-05-16 11:53:31 -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
Gilles Debunne
056054f7c5 Merge "Links in Environment javadoc" 2011-05-16 11:14:41 -07: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
2a20583a5f am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit '700ab1c75862babba90f54e02bdc877becd4f4fc':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:06:28 -07:00
Fabrice Di Meglio
35844a3a4e Merge "Fix bug #4415576 Gmail text looks broken" 2011-05-16 11:00:02 -07:00
Fabrice Di Meglio
8fb507171f Fix bug #4415576 Gmail text looks broken 
- pass correct "contextCount" when needed

Change-Id: I56ebd9486e99e6ca5a3973ec403cf1ced874b4c3
 2011-05-13 18:58:59 -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
ed9321ab5d am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
 2011-05-13 18:39:01 -07:00