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

26390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
ddfd24c329 am 4dc96b85: am f7d2b4a2: Use fullScreenIntent to show the USB mass storage dialog. 
Merge commit '4dc96b8513ad3d3af54321716251f789769a11b4'

* commit '4dc96b8513ad3d3af54321716251f789769a11b4':
  Use fullScreenIntent to show the USB mass storage dialog.
 2010-07-08 19:09:42 -07:00
Xia Wang
eff55802b5 am f3bfd841: am 98738272: Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread 
Merge commit 'f3bfd841019b404f98a67fc307240031790344c9'

* commit 'f3bfd841019b404f98a67fc307240031790344c9':
  Remove voice mail number verification for testing on no-sim device
 2010-07-08 19:09:28 -07:00
Scott Main
9df613a7df am 717b517a: am 1082ae03: am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo 
Merge commit '717b517ab319b336a406d6df0926b30a1ea84bf8'

* commit '717b517ab319b336a406d6df0926b30a1ea84bf8':
  docs: add caution about adt in eclipse 3.6
 2010-07-08 19:09:23 -07:00
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
Kenny Root
28e230352b am d481cdd4: am c9535de8: Merge "Add OBB file helper class" into gingerbread 
Merge commit 'd481cdd4c0305f8afd857fe3ec3fbf189b744370'

* commit 'd481cdd4c0305f8afd857fe3ec3fbf189b744370':
  Add OBB file helper class
 2010-07-08 19:08:57 -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
Mike Lockwood
6d9e1e63a4 Merge "MTP: remove separate audio table from prototype MTP database" 2010-07-08 13:09:17 -07:00
Mike Lockwood
2d6c9e9c4e MTP: remove separate audio table from prototype MTP database 
Change-Id: I5e4b49b741a0a3c6ddf5afcbb20a0d7c9515c8ce
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-08 16:02:16 -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
Romain Guy
818505aa30 Merge "Create FBOs in LayerCache." 2010-07-08 11:48:34 -07:00
Romain Guy
f18fd99b5c Create FBOs in LayerCache. 
This moves a bit of code away from OpenGLRenderer and matches
what happens with the TextureCache.

Change-Id: I3c67f54f83d7240770daa015861c0e75a1dd8c42
 2010-07-08 11:45:51 -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
Daniel Sandler
4dc96b8513 am f7d2b4a2: Use fullScreenIntent to show the USB mass storage dialog. 
Merge commit 'f7d2b4a2e096ae1f8ac3a2ed8b2f0e30a237f732' into gingerbread-plus-aosp

* commit 'f7d2b4a2e096ae1f8ac3a2ed8b2f0e30a237f732':
  Use fullScreenIntent to show the USB mass storage dialog.
 2010-07-08 10:29:26 -07:00
Daniel Sandler
f7d2b4a2e0 Use fullScreenIntent to show the USB mass storage dialog. 
Note that this is not a FLAG_HIGH_PRIORITY notification. In
immersive mode the UMS dialog will be suppressed entirely
(but an icon will still appear in the status bar).

Bug: 2821219
Change-Id: I21f910c8830aff8d0633deda4eb59dbda13262ed
 2010-07-08 13:07:41 -04: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
Eric Laurent
98449546fa am b91881fd: am dacabf97: Merge "Added Visualizer effect." into gingerbread 
Merge commit 'b91881fdd1608cc922f105ec552b5505da1fecb9'

* commit 'b91881fdd1608cc922f105ec552b5505da1fecb9':
  Added Visualizer effect.
 2010-07-07 20:55:40 -07:00
Xia Wang
f3bfd84101 am 98738272: Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread 
Merge commit '98738272e3b680559e1e0a7b665a0ebb4038f684' into gingerbread-plus-aosp

* commit '98738272e3b680559e1e0a7b665a0ebb4038f684':
  Remove voice mail number verification for testing on no-sim device
 2010-07-07 19:05:48 -07:00
Xia Wang
98738272e3 Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread 2010-07-07 19:04:03 -07:00
Jason Sams
9c959e77f1 Merge "Fix image processing resource problem for non high-density devices. Protect include file." 2010-07-07 18:52:21 -07:00
Jason Sams
f26d01a7ce Merge "Add boolean support for setVar." 2010-07-07 18:52:03 -07:00
Fabrice Di Meglio
07b236edce Merge "Fix bug #2779582 (Columns cleanup for the Calendars table)" 2010-07-07 18:46:10 -07:00
Scott Main
717b517ab3 am 1082ae03: am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo 
Merge commit '1082ae033dbe7d278b3fef6e4fd9af149d360fc1' into gingerbread-plus-aosp

* commit '1082ae033dbe7d278b3fef6e4fd9af149d360fc1':
  docs: add caution about adt in eclipse 3.6
 2010-07-07 18:45:14 -07:00
Xia Wang
374fe5c446 Remove voice mail number verification for testing on no-sim device 
Change-Id: Iaf9e419b8d03e330864d64c05aee730d33994003
 2010-07-07 18:43:17 -07:00
Scott Main
1082ae033d am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo 
Merge commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8' into gingerbread

* commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8':
  docs: add caution about adt in eclipse 3.6
 2010-07-07 18:43:10 -07:00
Scott Main
5183ae3b0f Merge "docs: add caution about adt in eclipse 3.6" into froyo 2010-07-07 18:37:48 -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
d481cdd4c0 am c9535de8: Merge "Add OBB file helper class" into gingerbread 
Merge commit 'c9535de8e398d766c95144f9a831f34b2cecfd91' into gingerbread-plus-aosp

* commit 'c9535de8e398d766c95144f9a831f34b2cecfd91':
  Add OBB file helper class
 2010-07-07 18:16:01 -07:00
Kenny Root
a5402dabec Merge "OBB API for PackageManager" into gingerbread 2010-07-07 18:14:25 -07:00
Kenny Root
c9535de8e3 Merge "Add OBB file helper class" into gingerbread 2010-07-07 18:14:13 -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
Jason Sams
6c8c2f22e9 Fix image processing resource problem for non high-density devices. 
Protect include file.

Change-Id: I5c6721033b37e35261b9fe424d74d3aef0620791
 2010-07-07 17:08:07 -07:00
Jason Sams
0b9a22cf78 Add boolean support for setVar. 
Change-Id: Id64f3b2e43e19fc2a2d5fd81bb98d9ca67aae843
 2010-07-07 17:08:07 -07:00