29162 Commits

Author SHA1 Message Date
Dianne Hackborn
727782053c Work on DialogFragment and docs.
- DialogFragment now has an option to not show a dialog, so you can
  use your UI somewhere else.
- Deprecated show() versions that were tied to activities.
- Added documentation to DialogFragment class.
- Added documentation to onSaveInstanceState() to explain how the
  time it is called is different than Activity's version.
- Fixed some java doc warnings.

Change-Id: If026744c368e2443030d2d9e0a9c808d820857df
2010-08-20 18:32:41 -07:00
Danica Chang
76dd2ce960 Merge "Wait for bluetooth to turn on before Bluetooth Tethering is enabled" 2010-08-20 17:42:28 -07:00
Romain Guy
29378192f7 Test setTextScaleX()
Change-Id: Iafa421def64a8f9a83b320b6cf3cc5286515c355
2010-08-20 15:49:27 -07:00
Adam Powell
f7b472fa96 Merge "Make ActionBar menus handle configuration changes gracefully." 2010-08-20 15:48:04 -07:00
Adam Powell
773b1b97fc Make ActionBar menus handle configuration changes gracefully.
Change-Id: I2c9ca846143b313ef9d2a01dff81385e0693518d
2010-08-20 15:45:27 -07:00
Jim Miller
015912e7f6 Merge "Make sure we have a native Surface in nContextSetSurface." 2010-08-20 15:14:56 -07:00
Danica Chang
8aac82a524 Wait for bluetooth to turn on before Bluetooth Tethering is enabled
Change-Id: I3fef94ea2cb102e1bb618f85e25d60c95cea1221
2010-08-20 15:12:22 -07:00
Kenny Root
485de781f6 am 06c81f29: Merge changes I8a257579,I82d16312 into gingerbread
Merge commit '06c81f29a61ad3568a77f111b6be93e1f437f5bd' into gingerbread-plus-aosp

* commit '06c81f29a61ad3568a77f111b6be93e1f437f5bd':
  Add AStorageManager API to NDK
  Reorganize MountService IPC
2010-08-20 15:09:58 -07:00
Kenny Root
06c81f29a6 Merge changes I8a257579,I82d16312 into gingerbread
* changes:
  Add AStorageManager API to NDK
  Reorganize MountService IPC
2010-08-20 15:07:34 -07:00
Adam Powell
a2af03f825 Fix SDK build - bad @link
Change-Id: Ic8831c94ae0c89d6ccc08a21f399cdd3ffba0bb2
2010-08-20 14:41:13 -07:00
Nipun Kwatra
701b710c19 am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread
Merge commit '300b0b7e2b8f0ab922e4a83755ae999da191894e' into gingerbread-plus-aosp

* commit '300b0b7e2b8f0ab922e4a83755ae999da191894e':
  setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
2010-08-20 14:18:08 -07:00
Nipun Kwatra
300b0b7e2b Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread 2010-08-20 14:16:08 -07:00
Dianne Hackborn
a3ece8bde3 am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread
Merge commit '325192593b057f4360e1abddf490b4fae7d60b12' into gingerbread-plus-aosp

* commit '325192593b057f4360e1abddf490b4fae7d60b12':
  Fix a few small battery stats problems:
2010-08-20 14:13:22 -07:00
Dianne Hackborn
325192593b Merge "Fix a few small battery stats problems:" into gingerbread 2010-08-20 14:10:41 -07:00
Nipun Kwatra
fb45748a1e setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
according to MediaRecorder::setMaxDuration documentation we should disable duration limit
when zero or negative time is passed. Currently setParamMaxFileDurationUs was treating
zero/negative as an error case. Fixed that.

Change-Id: I468c3bcc74cb5a34ee3e172cef5147550d6be096
2010-08-20 14:06:48 -07:00
Brian Carlstrom
005f0d084e am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread
Merge commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98' into gingerbread-plus-aosp

* commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98':
  Tracking merge of dalvik-dev to gingerbread
2010-08-20 13:54:28 -07:00
Brian Carlstrom
4d42ccd157 Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit 353ab63e412dd15029143de238e9590ab35eb583)
make update-api

Change-Id: I9e61616828a3a5745421350b9a2fc78ba181d388
2010-08-20 13:50:19 -07:00
Dianne Hackborn
99d0452ddc Fix a few small battery stats problems:
- Actually aggregate discharge amounts.
- Actually print the unplugged battery info when currently plugged in.

Change-Id: I22dd6feb73ac1364eb169d3239ce403b0755bb6c
2010-08-20 13:43:00 -07:00
Dianne Hackborn
8b569c8d49 am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
Merge commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960' into gingerbread-plus-aosp

* commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960':
  Fix aapt dump badging to support xlarge screens.
2010-08-20 13:42:25 -07:00
Dianne Hackborn
42f90ca54f Merge "Fix aapt dump badging to support xlarge screens." into gingerbread 2010-08-20 13:39:30 -07:00
Adam Powell
2b342f0a76 Allow ViewGroup to split MotionEvents to multiple targets during dispatch.
Use the layout xml attribute splitMotionEvents="true" or the ViewGroup
method setMotionEventSplittingEnabled(true) to enable motion event
splitting. Rules for splitting are as follows:

* Splitting is enabled per ViewGroup. When splitting is enabled any
  MotionEvent dispatched to that ViewGroup can potentially be split
  into several and dispatched to children independently.

* Each pointer is assigned a target child view when the ACTION_DOWN or
  ACTION_POINTER_DOWN event is received. That will be the pointer's
  target until it goes up, the target returns false from onTouchEvent,
  or the MotionEvents are intercepted.

* Multiple pointers may be assigned to the same target. All pointer
  data sent to a target are bundled into a single MotionEvent. Child
  views do not need to be aware that splitting has occurred.

Change-Id: I993f838e2f6b455da9812f4742a016dfcd1c4cc9
2010-08-20 13:39:28 -07:00
Kenny Root
086d084dd9 Add AStorageManager API to NDK
AStorageManager allows users of the NDK to access OBBs for now.

Change-Id: I8a25757901a175aa90a9f3e8c2a5db7873e8615e
2010-08-20 13:27:31 -07:00
Kenny Root
b90b9d54eb am 6be23712: Merge "Free created FileMap when uncompressing files" into gingerbread
Merge commit '6be237120e9673e3cfc5243da5bbca287effcf09' into gingerbread-plus-aosp

* commit '6be237120e9673e3cfc5243da5bbca287effcf09':
  Free created FileMap when uncompressing files
2010-08-20 13:18:22 -07:00
Kenny Root
be857d4284 Reorganize MountService IPC
Remove auto-generated AIDL files and replace them with manually edited
.java and .cpp/.h files so that binder calls can be made from either
Java or C++.

Update the makefiles to not attempt to generate the AIDL files and also
remove the old auto-generated .java files.

Put all the storage-related C++ things in libstorage so that we don't
pollute other libraries.

Change-Id: I82d1631295452709f12ff1270f36c3100e652806
2010-08-20 13:17:12 -07:00
Kenny Root
6be237120e Merge "Free created FileMap when uncompressing files" into gingerbread 2010-08-20 13:16:20 -07:00
Dianne Hackborn
8a44bb23c1 Update aapt to find fragment references.
Add knowledge about <fragment class="..."> for layout files
and update to reflect the change of the header tag from Header.

Change-Id: I91e2a5f204a8e222367985383c1721030c7954d8
2010-08-20 12:56:42 -07:00
Dianne Hackborn
c5794ae725 am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread
Merge commit 'baf72cd79c2a675c2265384eb704067ab24259a7' into gingerbread-plus-aosp

* commit 'baf72cd79c2a675c2265384eb704067ab24259a7':
  DO NOT MERGE 2928156  Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
2010-08-20 12:55:29 -07:00
Dianne Hackborn
baf72cd79c Merge "DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread 2010-08-20 12:53:07 -07:00
Dianne Hackborn
f43489d7d5 Fix aapt dump badging to support xlarge screens.
Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049
2010-08-20 12:44:33 -07:00
Gilles Debunne
ed23e3b879 Merge "New UI theme for EditText." 2010-08-20 12:35:31 -07:00
Gilles Debunne
ecf44e4d21 New UI theme for EditText.
Introduces new Theme.Holo and Theme.Light.Holo themes.

Change-Id: I208c0400d5e1713e24a7acb4dc3a3a6fbb4a94c3
2010-08-20 12:32:36 -07:00
Robert Greenwalt
2b05a95bcc am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp

* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
  DO NOT MERGE Fixing Connectivity
2010-08-20 12:04:07 -07:00
Robert Greenwalt
4b1bdc0209 Merge "DO NOT MERGE Fixing Connectivity" into gingerbread 2010-08-20 12:01:56 -07:00
Dianne Hackborn
5474b0f860 am 39792d22: Fix bugs with granting permissions through onNewIntent().
Merge commit '39792d2262352ae775091876d5488d2412a2ff92' into gingerbread-plus-aosp

* commit '39792d2262352ae775091876d5488d2412a2ff92':
  Fix bugs with granting permissions through onNewIntent().
2010-08-20 11:53:29 -07:00
Dianne Hackborn
39792d2262 Fix bugs with granting permissions through onNewIntent().
It would grant the permission to the temporary ActivityRecord,
not the real one, so it never got cleaned up.

Also allow granting of permissions to services because...  well,
it would be really really useful.  And it introduces some
refactoring that we'll need to support cut/paste.

Change-Id: If521f509042e7baad7f5dc9bec84b6ba0d90ba09
2010-08-20 11:50:00 -07:00
James Dong
3fc01525ff am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
Merge commit 'b755e3256510ecd325565d6b461d668d224445b1' into gingerbread-plus-aosp

* commit 'b755e3256510ecd325565d6b461d668d224445b1':
  Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
2010-08-20 11:41:49 -07:00
Romain Guy
d7d4141713 Merge "GridView's pageScroll() would be offset by one item." 2010-08-20 11:40:42 -07:00
James Dong
b755e32565 Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread 2010-08-20 11:39:29 -07:00
Nipun Kwatra
727f658e81 Merge "Added downsample()" 2010-08-20 11:35:38 -07:00
Wu-cheng Li
346b6126d5 am 97a56269: Merge "Add camera fps range API." into gingerbread
Merge commit '97a56269d06770712f9da7a2a29385012ec9714e' into gingerbread-plus-aosp

* commit '97a56269d06770712f9da7a2a29385012ec9714e':
  Add camera fps range API.
2010-08-20 11:21:37 -07:00
Wu-cheng Li
97a56269d0 Merge "Add camera fps range API." into gingerbread 2010-08-20 11:19:51 -07:00
Wu-cheng Li
454630f237 Add camera fps range API.
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.

Change-Id: I38f7122ac8ec844ffd63558dc0763ffa17b0926a
2010-08-20 11:14:17 -07:00
Nipun Kwatra
96624731c3 Added downsample()
Added a downsample function which downsamples the source image
starting at an offset and skipping every few pixels. Currently
no low pass filtering is done, but it should be added later.

Change-Id: Iec34092c536bfc661a15521e6a1ef2ef3f815c61
2010-08-20 10:54:59 -07:00
Romain Guy
64d50a67f4 GridView's pageScroll() would be offset by one item.
External issue #10580

Change-Id: Ie1b3ea8e1f7890b480d6ba8ff423024a5c4cd047
2010-08-20 10:50:49 -07:00
Nipun Kwatra
437e6c49f1 Merge "const correctness, validPixel test." 2010-08-20 10:41:08 -07:00
Kristian Monsen
dba35c09e3 Java calls to get Android specific files.
This is needed for https://android-git.corp.google.com/g/#change,62114.

inputStreamForAndroidResource returns an InputStream for a given url
readFromStream is a static method that just reads from a given stream, and catches any exceptions

Change-Id: I4f744bfe851c6d13e16c8eb7f89981cf306d175c
2010-08-20 18:15:45 +01:00
Robert Greenwalt
8afddad7e7 DO NOT MERGE Fixing Connectivity
Passing Gateway addr info from telephony into ConnectivityService so it can
add/remove the default route as needed.  Fixed differently on master.

bug:2927822
Change-Id: I9a3ee7cd23c4717e7c60098f0595aa3f77c44b15
2010-08-20 10:01:55 -07:00
Cary Clark
d93ecb3fab am 581f7861: DO NOT MERGE Refactor find and select dialogs
Merge commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c' into gingerbread-plus-aosp

* commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c':
  DO NOT MERGE Refactor find and select dialogs
2010-08-20 09:33:10 -07:00
Cary Clark
581f78615a DO NOT MERGE Refactor find and select dialogs
(Merged by hand from master, based on
https://android-git.corp.google.com/g/#change,53490 )

In WebView:
- Remove the select mode, so that while text is selected,
the view may respond to scroll or zoom gestures.
- Remove the getFindIsUp() method -- let the host application
track if the dialog is visible.
- Map long press to select text if the host application does
not already intercept it.
- Draw find 'extras' during zoom animation.
- Draw select 'extras' during animation and scrolling as well.
- Distinguish between selecting text and pressing a shift key
(the shift key is still a possible select text shortcut)
- Add more public (but hidden) interfaces: setUpSelect, selectAll, etc.

In WebChromeClient, add interfaces to allow WebView to tell the host
application that selection has started or finished. A long press on
a part of the view that does not trigger a host context menu may
start the selection (if text is underneath the press), and clicking
the trackball or tapping away from the current selection may
end the selection.

Companion changes in external/webkit and packages/apps/Browser

Change-Id: I2d41662acbdb8bdaa8219b35f18a9276e34636a7
http://b/262451
2010-08-20 12:28:19 -04:00
Daniel Sandler
0dc4d15cdc Merge "Notification.fullScreenIntent support." 2010-08-20 09:15:53 -07:00