11668 Commits

Author SHA1 Message Date
Kenny Root
511d9ec363 am 0a21801f: am a5402dab: Merge "OBB API for PackageManager" into gingerbread
Merge commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b'

* commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b':
  OBB API for PackageManager
2010-07-08 19:09:06 -07:00
Jeff Brown
1a33274d28 resolved conflicts for merge of 167449e5 to master
Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67
2010-07-08 19:01:13 -07:00
Adam Powell
6f10db885f Merge "Fix some issues with smooth scrolling ListViews" 2010-07-08 18:39:42 -07:00
Dianne Hackborn
53c67c8dfd Fix build.
Change-Id: I60185df6150d13d704a28933bc919527da173307
2010-07-08 18:27:42 -07:00
Adam Powell
371133174b Fix some issues with smooth scrolling ListViews
Change-Id: I8b0f3d318eb0508ed12b92584c368e6f0edeb0be
2010-07-08 18:21:48 -07:00
Dianne Hackborn
c801768e4d Integrate Loader support in to Activity/Fragment.
Introduces a new LoaderManager class that takes care of
most of what LoaderManagingFragment does.  Every Fragment
and Activity can have one instance of this class.  In the
future, the instance will be retained across config changes.

Also various other cleanups and improvement.

Change-Id: I3dfb406dca46bda7f5acb3c722efcbfb8d0aa9ba
2010-07-08 15:17:22 -07:00
Mike Lockwood
2951c6d057 Merge "MTP: Use media provider database to implement MTP device support." 2010-07-08 14:29:59 -07:00
Vasu Nori
07e1b1dd16 Merge "reduce java locking on SQLiteDatabase if sql is already compiled" 2010-07-08 14:10:16 -07:00
Mike Lockwood
d21eac9c70 MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.

The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.

Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-08 16:21:09 -04:00
Romain Guy
26be805f42 Merge "Do not draw the fade areas when it's not necessary." 2010-07-08 12:54:25 -07:00
Vasu Nori
b2d2ddc5ac reduce java locking on SQLiteDatabase if sql is already compiled
Change-Id: I6c2c593ba69aad201cedf097384d0b5d835c0839
2010-07-08 12:53:22 -07:00
Romain Guy
dac5f9f3ca Do not draw the fade areas when it's not necessary.
Prior to this change, every singleLine TextView would create, draw
and compose a layer on every draw dispatch. This was unnecessary and
expensive.

Change-Id: Ia4f79d7fc8f485784fe6b795f0f196d38d579838
2010-07-08 12:52:25 -07:00
Vasu Nori
a3dcc4cc7e Merge "STOPSHIP CL in master - make sqlite WAL default for all apps" 2010-07-08 11:43:24 -07:00
Vasu Nori
57feb5d9a7 STOPSHIP CL in master - make sqlite WAL default for all apps
for testing the sqlite WAL feature in the next few weeks.

Change-Id: I07234647b5e90d9e3bb0a5310b6cc449d58db428
2010-07-08 11:41:52 -07:00
Adam Powell
661c908e4e ActionBar tab mode using fragments; needs styles.
Change-Id: I8f931dae447e7b64de827d3c17766e5f8ad794e2
2010-07-08 10:38:31 -07:00
Ben Murdoch
31a4dbf5ca Fix NPE in the webruntime after the splash screen has been dismissed.
Change-Id: I91a01cf34f54ef07d4f175a3e5cd3b40086a6f07
2010-07-08 12:26:50 +01:00
Dan Tasse
768d98e5f3 am 7017e0d5: am f3f25bf8: Added some javadoc to Camera.takePicture()
Merge commit '7017e0d5c372db1e470d9881c46b15eade051d76'

* commit '7017e0d5c372db1e470d9881c46b15eade051d76':
  Added some javadoc to Camera.takePicture()
2010-07-07 20:55:47 -07:00
Fabrice Di Meglio
07b236edce Merge "Fix bug #2779582 (Columns cleanup for the Calendars table)" 2010-07-07 18:46:10 -07:00
Kenny Root
0a21801f5f am a5402dab: Merge "OBB API for PackageManager" into gingerbread
Merge commit 'a5402dabec84eabcdb9008dc343dd67de325bbac' into gingerbread-plus-aosp

* commit 'a5402dabec84eabcdb9008dc343dd67de325bbac':
  OBB API for PackageManager
2010-07-07 18:16:05 -07:00
Kenny Root
a5402dabec Merge "OBB API for PackageManager" into gingerbread 2010-07-07 18:14:25 -07:00
Romain Guy
132f22590a Merge "Add support to draw 9patches in OpenGL." 2010-07-07 17:57:12 -07:00
Romain Guy
deba785f12 Add support to draw 9patches in OpenGL.
This change only adds the necessary API and stubs. The implementation
will be added in another change.

Change-Id: Ie50b8aff5868e78796cee331df15bdbf990d2ea1
2010-07-07 17:55:03 -07:00
Chris Tate
167449e5f8 am b17f4dcf: Merge "More native input dispatch work." into gingerbread
Merge commit 'b17f4dcfb3edba25bd8c30e60449b9bbcd600a57' into gingerbread-plus-aosp

* commit 'b17f4dcfb3edba25bd8c30e60449b9bbcd600a57':
  More native input dispatch work.
2010-07-07 17:45:21 -07:00
Chris Tate
b17f4dcfb3 Merge "More native input dispatch work." into gingerbread 2010-07-07 17:43:12 -07:00
Fabrice Di Meglio
36f7784a4c Fix bug #2779582 (Columns cleanup for the Calendars table)
- suppress deprecated "url" column
- replace eventsUrl / editUrl / selfUrl columns by sync1 / sync2 / sync3

Change-Id: I2bff61a90655c98ee0964a880934c514b42ac342
2010-07-07 17:28:52 -07:00
Dan Tasse
7017e0d5c3 am f3f25bf8: Added some javadoc to Camera.takePicture()
Merge commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692' into gingerbread-plus-aosp

* commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692':
  Added some javadoc to Camera.takePicture()
2010-07-07 17:21:46 -07:00
Dan Tasse
f3f25bf80b Added some javadoc to Camera.takePicture()
Change-Id: I62597a1417647eeac7611eaccd0df3bda210e3e7
2010-07-07 17:17:06 -07:00
Vasu Nori
9bf225ef7b documentation about not using journal_mode if using WAL
apps should not setting journal_mode if the application is
using a connection pool for readers by calling the method
SQLiteDatabase.enableWriteAheadLogging()

Change-Id: I9ddb32638171c6277ca94381a1b5d4b39b92b386
2010-07-07 16:38:28 -07:00
Vasu Nori
35111ee4a4 Merge "for WAL to work, can't keep prepared SQL stmt_id in SQLiteStatement" 2010-07-07 15:35:26 -07:00
Vasu Nori
2827d6d974 for WAL to work, can't keep prepared SQL stmt_id in SQLiteStatement
Some (including the Contacts app) do the following:
  1. Open database
  2. As part of database_connection.onCreate(),
       Create some SQLiteStatement objects to cache them in the process
  3. attach databases
WAL doesn't work with attached databases. so, apps doing the above
should enable WAL only if there are no attached databases.

But we would like to enable WAL automatically for all apps after step #1 above
and disable WAL if the app subsequently does 'attach database' SQL.

this works only if there are no SQLiteStatement objects created in step # 2,
because SQLiteStatements cwmaintain a hard-reference to the database connection
for life and also to the prepared SQL statement id.
It is quite difficult to disable WAL in step # 3
    if it is enabled in step # 1
    and then a connection pool gets used by step # 2

would make WAL disabling easier if SQLiteStatement refers to prepared SQL
statement id only when it is needed (during binding and execute calls)
and thus NOT tied to a spacific database conenction.

also, from the standpoint of not blocking readers, it helps NOT to have
SQLiteStatement be married to a database connection and prepared SQL statement
id for life.

Change-Id: I464d57042965a28d2bde88e0f44b66ec119b40dc
2010-07-07 15:33:42 -07:00
Joe Onorato
52c1dc2fd9 buttons on the bottom
Change-Id: I52184ad2752c38bcc4c7646b404f3f305e0ac4b6
2010-07-07 18:33:14 -04:00
Kenny Root
6cfbb37957 Merge "Support bidi layout for drawTextOnPath." 2010-07-07 14:59:09 -07:00
Doug Felt
4beb8ff717 Support bidi layout for drawTextOnPath.
Change-Id: Ie5867fdb66fe15336774e20d65fa63e0d05bf6fe
2010-07-07 14:58:03 -07:00
Vasu Nori
7fbee2f73e Merge "unittests for DatabaseConnectionPool (and fix bugs)" 2010-07-07 14:27:43 -07:00
Vasu Nori
6ac21d30be unittests for DatabaseConnectionPool (and fix bugs)
Change-Id: I6f251b4bdd472bd840ea1be6497660f8c31cd3e3
2010-07-07 14:26:10 -07:00
Mathias Agopian
3038f47d1c am 3b09d64a: am ef52b568: Merge "More improvements to the SensorManager documentation" into gingerbread
Merge commit '3b09d64a20732c2f8f65f191899b991417cad51c'

* commit '3b09d64a20732c2f8f65f191899b991417cad51c':
  More improvements to the SensorManager documentation
2010-07-07 13:33:41 -07:00
Mathias Agopian
3b09d64a20 am ef52b568: Merge "More improvements to the SensorManager documentation" into gingerbread
Merge commit 'ef52b5682d8c6ab3a384da5151f0e4dd6e9a5506' into gingerbread-plus-aosp

* commit 'ef52b5682d8c6ab3a384da5151f0e4dd6e9a5506':
  More improvements to the SensorManager documentation
2010-07-07 13:09:07 -07:00
Mathias Agopian
ef52b5682d Merge "More improvements to the SensorManager documentation" into gingerbread 2010-07-07 13:06:57 -07:00
Kenny Root
93565c4b32 OBB API for PackageManager
Simple API for tracking .obb files associated with packages. Stores the
path in the PackageSettings. No verification of file content is done
now since the PackageManagerService can't read the SD card where these
files will likely live.

Change-Id: Ibeaf26ba0526b6d60f401137e58f46ee9faff39e
2010-07-07 09:57:51 -07:00
Gilles Debunne
0bad0c4c87 Merge "Fixed bug in getTextRunCursor." 2010-07-07 09:40:48 -07:00
Dianne Hackborn
97250d5c4a am e24901d3: am 68267415: Add new native Looper API.
Merge commit 'e24901d3adb28fff72821d4e8e2ccc25b2184550'

* commit 'e24901d3adb28fff72821d4e8e2ccc25b2184550':
  Add new native Looper API.
2010-07-07 09:14:57 -07:00
Dianne Hackborn
e24901d3ad am 68267415: Add new native Looper API.
Merge commit '682674154e3fe88f6061245145f934f25f1a2eb8' into gingerbread-plus-aosp

* commit '682674154e3fe88f6061245145f934f25f1a2eb8':
  Add new native Looper API.
2010-07-07 09:04:19 -07:00
Kristian Monsen
6f9a6a316d Merge "Merge WebKit at r61871: Update UA string to match WebKit version." 2010-07-06 02:05:59 -07:00
Jeff Brown
00fa7bdd69 More native input dispatch work.
Removed old input dispatch code.
Refactored the policy callbacks.
Pushed a tiny bit of the power manager state down to native.
Fixed long press on MENU.
Made the virtual key detection and cancelation a bit more precise.

Change-Id: I5d8c1062f7ea0ab3b54c6fadb058c4d5f5a9e02e
2010-07-03 19:23:01 -07:00
Vasu Nori
59d60420ba deprecate method returning prepared sql statement id
this method causes sql statement in a SQLiteProgram object to be never
re-compiled. thats not desirable, is it?
there should be no need for this method.

Change-Id: I207fad6415c1e2ef4097ee65a3ff347b5435b994
2010-07-03 16:31:35 -07:00
Vasu Nori
2776d57403 Merge "fix broken build: renaming a testfile" 2010-07-03 16:00:59 -07:00
Vasu Nori
7af57126b5 fix broken build: renaming a testfile
Change-Id: I973f604f4f87792b3f8734a6aea4a73d29e0b34b
2010-07-03 15:59:09 -07:00
Vasu Nori
d960ef8469 Merge "change name of a test to be more accurate" 2010-07-03 15:40:23 -07:00
Vasu Nori
709493707c change name of a test to be more accurate
Change-Id: Ie8c7d6ab4b80ae0446f9d67c8a04cef436948692
2010-07-03 15:36:27 -07:00
Gilles Debunne
312cd58039 Fixed bug in getTextRunCursor.
When auto-correction is used, the text is modified to underline the corrected word, which
modifies mGapLength and mGapStart. The mGapLength shift was not properly handled in getTextRunCursor.

Bug 2807595

Change-Id: I43ee216f6780270e452aa9199ffd892fe7ab6c3f
2010-07-02 22:01:44 -07:00