Commit Graph

10978 Commits

Author SHA1 Message Date
Jim Miller
dc0f4f059c Merge "Fix 2584857: Reset grabbed state when SlidingTab visibility changes" 2010-05-26 13:22:26 -07:00
Jim Miller
5ee2a771b5 am 14f56a0b: am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken 2010-05-26 11:42:33 -07:00
Robert Greenwalt
585d6e11af Merge "resolved conflicts for merge of 3cd6a3e3 to master" 2010-05-26 11:40:53 -07:00
Robert Greenwalt
d1c3ea6a21 resolved conflicts for merge of 3cd6a3e3 to master
Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7
2010-05-26 10:37:48 -07:00
Vasu Nori
23a42230af Merge "when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it" 2010-05-26 10:27:40 -07:00
Vasu Nori
d72ec5f29d when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it
if it is not ignored AND if SQLITEStatement.execute() is called with a SELECT
or a pragma or some sql statement that returns data, caller gets an exception
with a weird error: "error code 100: unknown error"
to avoid confusion generated by this exception, just write a warning
and ignore the returned data.
Change-Id: I8f0225ceff8f92e32a58f323551e5ada6df63593
2010-05-26 10:14:41 -07:00
Jim Miller
92c1571f0a Fix 2584857: Reset grabbed state when SlidingTab visibility changes
This fixes a case where the widget is hidden while the grabbed
state is set. The result is that the host of the widget is never
informed that the grabbed state changed.

Change-Id: I78b41cff0e31e982a3b46f0319260ba59815092c
2010-05-25 19:20:36 -07:00
Jim Miller
b35cd7dde5 Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:13:18 -07:00
Jim Miller
bae698cd54 Fix 2667859: change text back to default size
This reverts a change described in the above bug where
the font size got changed to 22dip.

Change-Id: I42e2dc06e94aba003fa00032b265c986959ce939
2010-05-25 16:53:45 -07:00
Robert Greenwalt
ac53a8a135 am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable
Merge commit '88ccecf573a52648052bc9c7858f345776f76e0e' into kraken

* commit '88ccecf573a52648052bc9c7858f345776f76e0e':
  Make the NTP Cache max-age gservices-settable
2010-05-25 16:15:37 -07:00
Robert Greenwalt
88ccecf573 am d1055a25: Make the NTP Cache max-age gservices-settable
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp

* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
  Make the NTP Cache max-age gservices-settable
2010-05-25 16:13:22 -07:00
Robert Greenwalt
d1055a250c Make the NTP Cache max-age gservices-settable
Trying to make Throttle polling more energy efficient.

bug:2708119
Change-Id: I2b75639e202dcbcee11047c43407a22de04ce350
2010-05-25 15:54:52 -07:00
Daisuke Miyakawa
a14aded514 Merge "Add KDDI/Softbank to available Shift_Jis mapping." 2010-05-25 15:22:35 -07:00
Derek Sollenberger
03e4891571 Refactoring more webview zoom code into ZoomManager.
This CL is #2 of multiple CL's to remove the zoom code
from webview and place it into webkit.ZoomManager. Each
commit is only part of the entire refactoring so there
are many ZoomManager.* variables still referenced from
WebView.

Change-Id: I21f6517dff46b65a277bc67120ffabe043098e5e
http://b/2671604
2010-05-25 18:04:06 -04:00
Daisuke Miyakawa
df3f1cc3fe Add KDDI/Softbank to available Shift_Jis mapping.
Bug: 2689523
Change-Id: I5140bd02a5e30b323eb19b1b0eb2dcf17027f878
2010-05-25 14:10:09 -07:00
Wink Saville
97692e6da2 Merge "Add needsOtaServiceProvisioning to Phone." 2010-05-25 11:20:30 -07:00
Leon Scroggins
eb51f3e340 Check for null before using Layout.
Bug 2713024

Change-Id: Iaad5c774fa1e16c341d481104f8fd38f7add3082
2010-05-25 11:33:03 -04:00
Kristian Monsen
02263fd2f0 Merge WebKit at r59636: Update UA string
Change-Id: Ic5b0a03ad53f2e81f5aeb6e32b2f92902b83fdb2
2010-05-25 11:11:57 +01:00
Mathias Agopian
c1600ae869 am 36893612: am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail 2010-05-24 19:13:52 -07:00
Mathias Agopian
d6ddcb7f00 fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail
force all SurfaceView to 565

Change-Id: I8ebfa1239d8e4fa097c2e544677fb92fa20b39bd
2010-05-24 19:07:08 -07:00
Wink Saville
4d8ae85b5d Add needsOtaServiceProvisioning to Phone.
By having needsOtaServiceProvisioning supported on all phones we
eliminate the need to use an if statement to discriminate phone type.
Types of phones that don't support OTASP will return false in the
default implementation in PhoneBase.

Change-Id: I8fb15a18553e314c1f8f2a00ec7f8cffd79eeb7f
2010-05-24 17:50:32 -07:00
Konstantin Lopyrev
3255823de0 Fix 2673731: Adding support for password history to Device Admin.
Change-Id: If3240048813e32b2bae79fe5cb8a73aea20ec56c
2010-05-24 17:13:18 -07:00
Adam Powell
e46c1e817c am 49551ca4: am 9a559970: am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children. 2010-05-24 16:30:16 -07:00
Adam Powell
9a559970a3 am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit 'f67c874c07d2e0ff888cc88679f884a833f89870' into kraken

* commit 'f67c874c07d2e0ff888cc88679f884a833f89870':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:26:06 -07:00
Adam Powell
f67c874c07 am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp

* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:23:53 -07:00
Adam Powell
7e5e3745cf Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Change-Id: I21b37647c5ad16e4f57fdda433e3b3ee2c7c83ad
2010-05-24 15:13:41 -07:00
Daniel Sandler
8c8634b514 am c8a041f1: am 450da449: Merge "New shadowy status bar, direct from Z\'ha\'dum." into kraken 2010-05-24 05:49:05 -07:00
Vasu Nori
4e0b1a7e9d Merge "sqlite crashes when closing the database" 2010-05-21 15:48:33 -07:00
Vasu Nori
fea6f6dcb7 sqlite crashes when closing the database
A change was made in the last CL to ask sqlite for all unfinalized statements
and then finalizing them before closing the database.
But this crashes sqlite! because sqlite's FTS3
module keeps some prepared statements around and they should not
be finalized before closing the database.
(when sqlite is asked for all unfianlized statements, it also returns
the FTS3's reserved prepared statements which should not be
finalized!!)

Change-Id: I141ab4563985b8cd1305a1228c4cb01bc7281bcb
2010-05-21 15:41:58 -07:00
Daniel Sandler
2c195f77a1 New shadowy status bar, direct from Z'ha'dum.
Artwork is FPO but serviceable enough. Many hardcoded font
colors & styles were moved to styles.xml where they belong.
AM/PM finally given the old heave-ho (but configurable in
StatusBarPolicy.java).

Notification content remains on a light-gray background for
now (so as not to screw up custom RemoteViews) but status
icons will definitely need across-the-board rework to look
better against a dark background.

Change-Id: Id9d5a699532f9336563cd6f9699bff3893735e4f
2010-05-21 15:46:54 -04:00
Ben Murdoch
fa296a4c90 Add a string for the no file chosen label, shown on a file upload control when the user has not yet picked a file.
Requires external/webkit change.

Change-Id: Idb1039a7c39b18249579794df523afb6144fba47
2010-05-21 10:18:35 +01:00
Ben Murdoch
4ae32f5f11 Allow passing of accept types from WebCore to Java for the file picker.
Requires a change in external/webkit and packages/apps/Browser.

Change-Id: I0fe5f0edb00be0f329f07e42e84f88aced543d17
2010-05-21 10:18:35 +01:00
Ben Murdoch
cc749dee63 Add a method on the JavaBridge to resolve filenames from content URIs.
Requires an external/webkit change.

Change-Id: I7cc9a1c9c544546ca4fe8a212d3d60183ad99c36
2010-05-21 10:18:35 +01:00
Vasu Nori
62697e57ed Merge "close() on anything other than database shouldn't acquire db lock." 2010-05-20 12:42:16 -07:00
Vasu Nori
6f37f83a48 close() on anything other than database shouldn't acquire db lock.
bug:2683001
implmentation details:
 1.close() on any sql statement is should simply queued up for finalization
    to be performed later. caller doesn't acquire database lock.
 2. the only effect of NOT close immediately is non-release of some memory.
 3. all such queued-up-finalizations are performed whenever there is
    another execute() of some sql statement on that database from ANY
    thread in the process.
 4. database close() automatically releases all unfinalized statements
    before closing the database.

Change-Id: If4c9c7fde6b8945a41abc6c8b992aa8c69854512
2010-05-20 12:35:17 -07:00
Daisuke Miyakawa
422017be68 Merge "Make vCard code a separated static library." 2010-05-20 11:30:26 -07:00
Daisuke Miyakawa
64545a8ced Make vCard code a separated static library.
- Move the library to a separate directory in framewokr/base, and rename its package from
  android.pim.vcard to com.android.vcard.
- Move all tests for the library under the directory.
- Confirm all tests for vCard are successful.

It would be better for us to have this directory somewhere else (like external/).
But I'll submit this here now and move it to the right place as soon as possible.
From the view of build mechanism, we can do that immediately.

BUG: 2689523
Change-Id: I435e10571b7160bfcc029bed7c37aaac1c6fd69a
2010-05-20 11:25:37 -07:00
Xia Wang
f3a6c73000 am 17530508: am cf7d2d50: am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks. 2010-05-20 11:01:54 -07:00
Xia Wang
cf7d2d50a4 am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc' into kraken

* commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc':
  If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 10:58:18 -07:00
Xia Wang
3716ea04d9 am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp

* commit '069067963cf0117cfb4a1aef99b550b126d9ca92':
  If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 10:56:13 -07:00
Xia Wang
069067963c If the network SSID is a string, it should be enclosed in double quotation marks.
bug id: 2701058

Change-Id: I40e10ba096053710d4974b005d0d2e7c309ccffe
2010-05-20 10:22:59 -07:00
Wu-cheng Li
ee714613e8 am 2ee95ad6: am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken 2010-05-20 01:50:23 -07:00
Wu-cheng Li
185cc455a8 Fix javadoc of camera focus distances API.
bug:1955650
Change-Id: I073eb533dd1d5fcebbaa430de9af2bf4335c406e
2010-05-20 16:33:51 +08:00
Dianne Hackborn
cddfa6de1f Fix sdk build.
Change-Id: I4106de6c85d69a68d80414db5dbf5cf48685ce54
2010-05-19 22:56:37 -07:00
Romain Guy
df36b0579e Prevent crash when changing adapter.
Bug #2697842

Change-Id: I3f94c7907c8881145638b9e9307458f1431d7e57
2010-05-19 21:16:02 -07:00
Dianne Hackborn
5ae74d6e89 More fragment work.
Clean up FragmentTransaction API, add more animation control, add new
Fragment APIs for hiding and showing.

Change-Id: Iffe31351024a7a63d164270b8a955a499076600e
2010-05-19 19:25:38 -07:00
Vasu Nori
8e5819662f Merge "DatabaseCorruptionHandler causes NPE" 2010-05-19 15:20:29 -07:00
Vasu Nori
85f08f9eae DatabaseCorruptionHandler causes NPE
it is trying to get attachedDb list (by executing a pragma) after closing
the database.
also added unittests.

Change-Id: I7dce665ec7354402cdef6fbe055455f5798e123c
2010-05-19 13:55:09 -07:00
Wink Saville
33c26f9fd0 am 199d3783: am 7e3b31d7: Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken 2010-05-19 13:09:11 -07:00
Wink Saville
7e3b31d786 Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken 2010-05-19 13:05:55 -07:00