Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,038 Commits 3 Branches 0 Tags
a4a2a3aaef730dbab020f7ece09149b05a399000
Commit Graph

34038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
a4a2a3aaef am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread 
Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'

* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
 2010-10-15 08:33:23 -07:00
Jean-Baptiste Queru
c182a57897 am 0982d8d0: Merge "ignore - a similar change already exists" into gingerbread-plus-aosp 
Merge commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027'

* commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027':
  Fix sometimes mExpandedView will appear while screen transforming.
 2010-10-15 08:33:12 -07:00
Dan Morrill
1785627fb3 am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread 
Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'

* commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
 2010-10-15 08:33:00 -07:00
Kenny Root
09b35d2fe5 am 89b73a75: am 361a6ad1: Merge "Handle native library deletion in scanPackage" into gingerbread 
Merge commit '89b73a75467d85c58467c5b8c080c77d25860fe0'

* commit '89b73a75467d85c58467c5b8c080c77d25860fe0':
  Handle native library deletion in scanPackage
 2010-10-15 08:32:43 -07:00
Kenny Root
733e79c240 am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread 
Merge commit '2f98a585cda066689b1b525322c51fcacbc3770b'

* commit '2f98a585cda066689b1b525322c51fcacbc3770b':
  OBB: Change documentation to reflect reality
 2010-10-15 08:32:30 -07:00
Andreas Huber
4bd4bd6fc0 am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread 
Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b'

* commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b':
  Attempt to derive the avg. bitrate of the entire stream from metadata.
 2010-10-15 08:32:06 -07:00
Ben Murdoch
d609279c33 Set the correct style for TextAppearance.Holo.SearchResult 
Values have been taken from the current TextAppearance.SearchResult
style. This was making WebTextView in the Browser show unreadable
autocomplete suggestions (pale grey text on a white background).

Change-Id: I35961e12ab96d29791c495723709b2eff5714471
 2010-10-15 10:39:11 +01:00
Andreas Huber
dc0728f6b5 am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread 
Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160'

* commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160':
  Some webcams output rtp streams but never send any rtcp data in violation of
 2010-10-15 00:08:35 -07:00
Kenny Root
9456714cfb am b4f26a9d: am e6ae5c39: Merge "Add shutdown assurance" into gingerbread 
Merge commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd'

* commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd':
  Add shutdown assurance
 2010-10-15 00:08:22 -07:00
Wink Saville
b079a10652 am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread 
Merge commit '94980e0f76295de53bd168608d11dba3c39cca9d'

* commit '94980e0f76295de53bd168608d11dba3c39cca9d':
  Fix NPE caused by Change I4df27119.
 2010-10-15 00:07:40 -07:00
Scott Main
a8d2506573 am 5cfa877e: am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494 
Merge commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e'

* commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e':
  docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
 2010-10-15 00:07:26 -07:00
Nick Pelly
232570cc33 am 67fc4af9: am 527d8bbd: Merge "Add missing native methods to fix boot." into gingerbread 
Merge commit '67fc4af9765d15c4e011c8127f9c06dfd0368bbe'

* commit '67fc4af9765d15c4e011c8127f9c06dfd0368bbe':
  Add missing native methods to fix boot.
 2010-10-15 00:05:29 -07:00
Kenny Root
4a90f93781 resolved conflicts for merge of a127c07c to master 
Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
 2010-10-14 23:58:41 -07:00
Andreas Huber
e449fceaa4 am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread 
Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'

* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
  HTTP Live content that are tagged as complete are now seekable.
 2010-10-14 23:22:21 -07:00
Leon Scroggins
af95d12b12 am c7ee44cb: am dfc07279: Line up WebTextView text with the page. 
Merge commit 'c7ee44cbe155c2272687a0e82133f3e729eac137'

* commit 'c7ee44cbe155c2272687a0e82133f3e729eac137':
  Line up WebTextView text with the page.
 2010-10-14 23:03:23 -07:00
Mike Lockwood
d7117f04d8 am 1442818a: am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 
Merge commit '1442818a10988cc011f55104e997474b5d3d2468'

* commit '1442818a10988cc011f55104e997474b5d3d2468':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
 2010-10-14 22:37:14 -07:00
Justin Ho
6948369ac8 am 27023cc5: (-s ours) am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 
Merge commit '27023cc5fefc4e56f672ee264289fa319d97585b'

* commit '27023cc5fefc4e56f672ee264289fa319d97585b':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
 2010-10-14 22:13:37 -07:00
Justin Ho
d738407ce4 am c42d196f: (-s ours) am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background 
Merge commit 'c42d196f969e1d7f588e5e397176557c4c97575f'

* commit 'c42d196f969e1d7f588e5e397176557c4c97575f':
  Updated lockscreen asset (Hiroshi), new menu background
 2010-10-14 21:48:20 -07:00
Hung-ying Tyan
4fe18a4998 am 8a362186: am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 
Merge commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c'

* commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c':
  SipService: mScreenOn is flipped to wrong value.
 2010-10-14 21:19:54 -07:00
Nick Pelly
734b8b8cb8 am 9fae3ecc: am ab39f1ef: Merge "Fix build." into gingerbread 
Merge commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6'

* commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6':
  Fix build.
 2010-10-14 21:19:36 -07:00
Dianne Hackborn
912932c2d9 am 4ce930da: am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 
Merge commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea'

* commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash
 2010-10-14 21:19:20 -07:00
Jaikumar Ganesh
c8e87e3ce6 am 373a6961: am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread 
Merge commit '373a69614e534ae04dddd79c92933b6d8969fad7'

* commit '373a69614e534ae04dddd79c92933b6d8969fad7':
  Bluez doesn't handle disconnect while connecting well.
 2010-10-14 21:19:04 -07:00
Nick Pelly
22b0eade14 am 6066da89: (-s ours) am 590b73bc: NFC API revision round 2. 
Merge commit '6066da89a464d2bd5f002f5e687d40876ed5ce21'

* commit '6066da89a464d2bd5f002f5e687d40876ed5ce21':
  NFC API revision round 2.
 2010-10-14 21:18:41 -07:00
Nick Pelly
f36c6db108 NFC API revision round 2. 
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>

Conflicts:

	Android.mk
	CleanSpec.mk
	core/java/android/app/ContextImpl.java
 2010-10-14 19:16:35 -07:00
Jason Sams
639017920f Merge "Fix object cast." 2010-10-14 17:58:39 -07:00
Jason Sams
9c25aee526 Fix object cast. 
Change-Id: Idcf1b43392d43b6b46040b59551b73df6d6e42a9
 2010-10-14 17:57:30 -07:00
Jason Sams
c900a79b95 Merge "Async type creation." 2010-10-14 17:52:31 -07:00
Jason Sams
3b9c52ab8c Async type creation. 
Change-Id: I4d98446fabbf7e8a98c97f85b573a58c8a0c58c2
 2010-10-14 17:48:46 -07:00
Chris Tate
9ba608331e Merge "Drag thumbnail fixes / improvements" 2010-10-14 17:14:07 -07:00
Irfan Sheriff
4910b99d4d Merge "Remove synchronous bluetooth callbacks" 2010-10-14 17:11:13 -07:00
Irfan Sheriff
cdf8edeec2 Remove synchronous bluetooth callbacks 
Also, fixed an issue with disabling bluetooth coexistence

Change-Id: Ia7f68dfe6e8d587101ba8513783a0123ff0561a1
 2010-10-14 17:06:18 -07:00
Chris Tate
6b3912865c Drag thumbnail fixes / improvements 
* Properly wipe the thumbnail canvas before handing it to the app for
  its contents to be drawn

* Provide a getView() method in DragThumbnailBuilder that allows
  clients or subclasses to get at the associated view.  This is
  especially for clients that want to draw entire (sub)layouts as
  the drag thumbnail, by overriding onDrawThumbnail(Canvas c)
  like this:

  // Override specifically for drawing a whole ViewGroup into
  // the drag thumbnail canvas
  @Override
  public void onDrawThumbnail(Canvas c) {
      getView().dispatchDraw(c);
  }

Change-Id: Ib43ddd7cf1d44faf2d7f6ba79f102bc3c7f14596
 2010-10-14 16:43:39 -07:00
Adam Cohen
6eb4122c2d Merge "Fixing null pointer exception" 2010-10-14 16:29:29 -07:00
Adam Cohen
6f279627cf Fixing null pointer exception 
Change-Id: I902dfc9baa1be7fb07110ccde7a3c0e0049e4417
 2010-10-14 16:25:23 -07:00
Adam Powell
302166c0fc Merge "Holo styling and metrics; holo spinners" 2010-10-14 16:24:59 -07:00
Adam Powell
89edde3efa Holo styling and metrics; holo spinners 
Change-Id: Ib6d80e5e1a79b7a4ff208df8dbc097e7b9228d13
 2010-10-14 16:20:47 -07:00
Jaikumar Ganesh
5b9895c016 Merge "Disconnect PBAP while disconnecting HFP profile." 2010-10-14 16:18:22 -07:00
Jaikumar Ganesh
2beaf7316f Disconnect PBAP while disconnecting HFP profile. 
PBAP profile is associated with HFP profile. Disconnect PBAP
profile while disconnecting HFP profile. We ever never doing this
and were expecting the remote end to do it. So when the user
disconnects a headset, we will end up with the ACL link still up
because PBAP has not been disconnected.

This is little bit of a hack till PBAP profile is converted to
use the new profile APIs.

Change-Id: I04821daae6588955fbfea01472e6a1b6f9212608
 2010-10-14 16:14:38 -07:00
Jim Miller
66ad9e7207 Merge "Fix 3024528: Add owner info to SecureSettings." 2010-10-14 15:54:21 -07:00
Jim Miller
253a5ef886 Fix 3024528: Add owner info to SecureSettings. 
Change-Id: Ibed62aa8881c795f0d48007fc04beac0e9c1d4a0
 2010-10-14 15:51:55 -07:00
Justin Ho
6ed0c3ecf3 am dfd37a47: (-s ours) am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 
Merge commit 'dfd37a4748845273d929f24ae5d68032d19f6216'

* commit 'dfd37a4748845273d929f24ae5d68032d19f6216':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
 2010-10-14 15:43:25 -07:00
Hung-ying Tyan
379694f528 am 06e55977: am 907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 
Merge commit '06e559779edd93a83100824b36c9bf67a27db178'

* commit '06e559779edd93a83100824b36c9bf67a27db178':
  Fix SipSessionGroup from throwing ConcurrentModificationException
 2010-10-14 15:29:35 -07:00
Adam Powell
45a2033ce9 am 2b87dbc3: (-s ours) am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 
Merge commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9'

* commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
 2010-10-14 15:28:50 -07:00
Chet Haase
3a64f241fe Merge "Remove errant minus sign" 2010-10-14 15:07:30 -07:00
Chet Haase
51b3227c2e Remove errant minus sign 
Change-Id: I39a76484884615aa86f4a845eb4637467ec5abc7
 2010-10-14 14:59:39 -07:00
Romain Guy
c65217e4ec Merge "Fix text rendering issue." 2010-10-14 14:54:58 -07:00
Shimeng (Simon) Wang
51969178b2 Merge "Remove not-used code." 2010-10-14 14:53:52 -07:00
Shimeng (Simon) Wang
c42f8b8332 Remove not-used code. 
issue: 3003933
Change-Id: I3221fb253fe6fbfe9e24368426d7e4a2c1e3502b
 2010-10-14 14:52:28 -07:00
Romain Guy
d2a1ff003b Fix text rendering issue. 
The local clip rect could be off by one pixel when a 3D transform
was applied to a text primitive. This would cause small rendering
glitches in Launcher in particular.

Change-Id: I1254f6a5838c26810cbe969b096679d40b8dd504
 2010-10-14 14:49:34 -07:00
Chris Tate
ba7aad209f Merge "Actually draw the drag thumbnail" 2010-10-14 14:44:06 -07:00