35788 Commits

Author SHA1 Message Date
Dianne Hackborn
bc4119a390 Merge "Fixe some stuff." 2010-11-08 10:52:37 -08:00
Dianne Hackborn
ab36acb399 Fixe some stuff.
Addresses these bugs:

3061847 - With no headers, PreferenceActivity crashes
2888426 - minor typo in DevicePolicyManagerService.ActiveAdmin.writeToXml()
3159155 - IllegalStateException:"Can not perform this action after
    onSaveInstanceState" while dismissing a DialogFragment
3155995 - PopupWindow.showAtLocation does not respect LayoutParams

Also tweak the new fragment APIs to use abstract classes instead of
interfaces as base classes.

Change-Id: I9c0b4337fe0e304b737b5f7c2762762372bb3020
2010-11-08 10:46:19 -08:00
Brian Carlstrom
c44960a1fa Merge "Delete used import" 2010-11-08 10:45:14 -08:00
Brian Carlstrom
ee8dd6baf8 Delete used import
Change-Id: Ic950e50565aadafd2575561eb03c8e1e2ff45593
2010-11-08 10:37:19 -08:00
Amith Yamasani
2cf17ed7d8 Merge "Change margins and font size for preference_child style. Missed in previous checkin." 2010-11-08 09:55:47 -08:00
James Dong
2122333141 am d8166a71: (-s ours) am 1653e261: Merge "Rotation support" into gingerbread
* commit 'd8166a719e192a026bf25a82b8eb6212823950a3':
  Rotation support
2010-11-08 09:51:30 -08:00
Amith Yamasani
2f63c4ef41 Change margins and font size for preference_child style. Missed in previous checkin. 2010-11-08 09:41:02 -08:00
Wu-cheng Li
3a3f24e370 Merge "Do not use CAMERA_ID_DEFAULT because it is removed." 2010-11-08 08:46:50 -08:00
Tom O'Neill
0f2d6c69f3 Merge "Remove inappropriate conversion of IOException to AssertionError" 2010-11-08 08:02:44 -08:00
Wu-cheng Li
76f15bcb8b Do not use CAMERA_ID_DEFAULT because it is removed.
bug:3173302
Change-Id: I360e55f2665b2e121c8cf017e17c4cb4dd181e88
2010-11-08 23:40:29 +08:00
Leon Scroggins
7f7bd52568 Disallow scroll intercepts while changing text selection.
Bug:3107564
Change-Id: I81d173b3d7b6fdbe335ef351917402fc01a4c52e
2010-11-08 09:36:54 -05:00
Ben Murdoch
01b04e10df Fix potential NPE in WebView
New up and initialise the data structure for tracking autofillable
form fields properly. We should not wait for the first autofill
message from WebCore as we have some special state values we need
to set.

Change-Id: Ic30b9ac69436f784d65e50dcabe6af1ef3326ff4
2010-11-08 10:49:16 +00:00
Amith Yamasani
8da3529069 Added assets for preference panel and adjusted layout margins for new spec. 2010-11-07 16:46:24 -08:00
James Dong
08caf9e84f am bb97d7bb: am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread
* commit 'bb97d7bbf33393af842de1d8fd8512a24c73b6b3':
  Add a new public API to support recording rotated videos
2010-11-06 16:25:39 -07:00
Scott Main
76b970cb93 am f80403dd: am ab3d69f6: Merge "docs: update homepage for GB" into gingerbread
* commit 'f80403dd5903e03cb51f374d042a297c84faaec4':
  docs: update homepage for GB
2010-11-06 16:25:32 -07:00
Jean-Baptiste Queru
82849afd71 am 3442611e: am 5580e44c: Merge "Support changing style parent in overlays"
* commit '3442611ee11b2987c83054fe3c7ed5521f27f052':
  Support changing style parent in overlays
2010-11-06 16:25:03 -07:00
Kenny Root
a9570ab043 am 8806fc72: am 70fc04c8: Reorganize PackageManager dump to avoid NPE
* commit '8806fc729b96bf806806ef8d82147d59abfc1536':
  Reorganize PackageManager dump to avoid NPE
2010-11-06 16:24:57 -07:00
Robert Ly
b6c6579511 am a27fc901: am 47e43feb: Doc change: Proguard tool
* commit 'a27fc901d8543c7734f70f0ef05977dcb94671f6':
  Doc change: Proguard tool
2010-11-06 16:24:52 -07:00
Hiroshi Lockheimer
d44266cec3 am 01128df3: am ce22d608: Merge "allow all 4 orientations" into gingerbread
* commit '01128df3c442b87f601d9c13ff2ebd54b015925d':
  allow all 4 orientations
2010-11-06 16:24:45 -07:00
Scott Main
5d322c09db am 3de641cb: am 4ebbfa8a: Merge "Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating." into gingerbread
* commit '3de641cbb9c825cef5cc29905ea88be98ac2ce4e':
  Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating.
2010-11-06 16:24:35 -07:00
Scott Main
41a4833bf2 am 4da6efc8: am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread
* commit '4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c':
  fix xlarge support in aapt for gingerbread
2010-11-06 16:24:28 -07:00
Scott Main
3513c3f17f am 04856d99: am 6e88c84c: docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it\'s only for system apps bug: 3128020
* commit '04856d99f8f353711f294254c1159461213684a5':
  docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it's only for system apps bug: 3128020
2010-11-06 16:24:20 -07:00
James Dong
d8166a719e am 1653e261: Merge "Rotation support" into gingerbread
* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
  Rotation support
2010-11-06 14:22:05 -07:00
James Dong
bb97d7bbf3 am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread
* commit '0467b0abfc94f959163d84eadedf6941e41c1882':
  Add a new public API to support recording rotated videos
2010-11-06 14:21:53 -07:00
Scott Main
f80403dd59 am ab3d69f6: Merge "docs: update homepage for GB" into gingerbread
* commit 'ab3d69f6d5a9157438f86cf90449a5f5ce7e31e0':
  docs: update homepage for GB
2010-11-06 14:21:23 -07:00
Joe Onorato
12b1401262 Merge "Turn off the ALS when the user setting doesn't ask for automatic brightness." 2010-11-06 13:00:35 -07:00
Joe Onorato
d28f753c94 Turn off the ALS when the user setting doesn't ask for automatic brightness.
Bug: 3118027
Change-Id: I24a97adce55b7b403edcbd331bdc8b0fc593b76f
2010-11-06 12:56:53 -07:00
Ray Chen
97a4f47411 Add more EXIF tags.
Change-Id: I1844d9c87bee9feb14c4b493b4af59a1752859c7
2010-11-06 18:37:09 +08:00
Owen Lin
a726e12fb7 Merge "Add more EXIF tags." 2010-11-06 01:20:19 -07:00
Jason Chen
f5d847e8b2 Merge "resolved conflicts from merge of c3b112ba to master" 2010-11-05 20:25:05 -07:00
Jason Chen
db87c0df6f resolved conflicts from merge of c3b112ba to master
Change-Id: I76a5f88849ab617af3316d63378bf3296256e8e1
2010-11-05 20:21:29 -07:00
Adam Powell
ba8e26b7c7 Merge "Fix bug 3067895 - Popup menus clip to container windows" 2010-11-05 20:17:01 -07:00
Adam Powell
5de7b22a60 Merge "Fixed several dialog theming issues" 2010-11-05 20:16:05 -07:00
Adam Powell
56c2d337e0 Fix bug 3067895 - Popup menus clip to container windows
ListPopupWindows will now move to fit within the screen, but will not
be constrained by their parent windows.

Change-Id: I2a19ef474926f328466db32874db4191beebf626
2010-11-05 20:12:56 -07:00
Adam Powell
3320dcd049 Fixed several dialog theming issues
Change-Id: I8e83e5a35acaae63a70bef48f543e3fd82ced354
2010-11-05 20:06:02 -07:00
Gil Dobjanschi
d141305f93 Fix: FileInputStream not closed after parsing XML file
Change-Id: I8ea69738d5ba1e91c9c759f76c49a8a324c24b88
2010-11-05 17:41:42 -07:00
Gil Dobjanschi
c7481cd56f Merge "Added an export method without codec parameters." 2010-11-05 17:39:04 -07:00
James Dong
1653e261e8 Merge "Rotation support" into gingerbread 2010-11-05 16:58:51 -07:00
James Dong
0467b0abfc Merge "Add a new public API to support recording rotated videos" into gingerbread 2010-11-05 16:58:33 -07:00
James Dong
ad8f19c6b3 Add a new public API to support recording rotated videos
o changed a comment about the rotation orientation from counter-clockwise
  to clockwise.

Change-Id: I16ad73ce1a55cc627d9a516e23d1325753b3037e
2010-11-05 15:53:00 -07:00
James Dong
65a73f4e8c Rotation support
- We only support 0, 90, 180, and 270 degree clockwise rotation

- Some players are known to ignore composition matrix in the MP4 file,
  although this is part of the MP4 file standard.
  Both QT and YT are supporting the rotation

Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
2010-11-05 15:47:52 -07:00
Scott Main
ab3d69f6d5 Merge "docs: update homepage for GB" into gingerbread 2010-11-05 15:02:39 -07:00
Jeff Brown
a79cd0b7fa Merge "Rename the locked meta key constants for clarity." 2010-11-05 15:01:43 -07:00
Vasu Nori
eb0699bacd Merge "fix broken build" 2010-11-05 14:49:37 -07:00
Vasu Nori
b642518e54 fix broken build
Change-Id: If1e5639f48d5155e141bce4bf5deef9de5668c27
2010-11-05 14:47:59 -07:00
Scott Main
0bd1685bc8 docs: update homepage for GB
Change-Id: I0db90c0f42a47a62f2570f2ea835e38ab7fcd5b0
2010-11-05 14:37:47 -07:00
Mike Lockwood
1a9be66e12 Merge "MediaScanner: Fix mismatch between internal and external file paths." 2010-11-05 14:32:33 -07:00
Mike Lockwood
250528e5b2 MediaScanner: Fix mismatch between internal and external file paths.
Change-Id: If2fac90a466c4d63fc90f96e91733c9e9ca14680
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-05 17:31:03 -04:00
Gilles Debunne
70dee40dbf Merge "Revert "Rationalized the single/multiple line initialization in TextViews."" 2010-11-05 14:21:28 -07:00
Dianne Hackborn
c5b2e2d86a Merge "Fix issue #3163426: Screen corruption when using the watermark feature" 2010-11-05 14:06:59 -07:00