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

64454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
c9295b2069 am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 
* commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4':
  Created Android University lesson for Multiple APKs.
 2011-12-13 13:10:45 -08:00
Scott Main
37191e1dc7 am 801fda54: AndroidU lesson on designing for multiple screens. 
* commit '801fda548c719a8618e7f4cd64cad8404b0970b9':
  AndroidU lesson on designing for multiple screens.
 2011-12-13 13:10:42 -08:00
Gilles Debunne
fc997b4f78 NPE in GMail / TextLine 
Bug 5753061

https://android-git.corp.google.com/g/#/c/154756/1 revealed an
other bug in SpanSet. The fitered (non empty) spans were added
in their original position instead of being indexed by count.

The nullation on recycle hence left null holes in the array.

Change-Id: If5c1435cee9a2cb88a608aa8e5f4f2f23382154c
 2011-12-13 12:37:02 -08:00
Scott Main
fc279e51c0 Merge "Created Android University lesson for Multiple APKs." into ics-mr0 2011-12-13 12:25:38 -08:00
Andreas Huber
17453336f4 am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 
* commit '22e50edddc2a13fa9cc00f7cc5a5f6471cbece24':
  DO NOT MERGE: Support for parsing of "folded" RTSP header values
 2011-12-13 12:04:35 -08:00
Andreas Huber
22e50edddc am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 
* commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514':
  DO NOT MERGE: Support for parsing of "folded" RTSP header values
 2011-12-13 12:01:46 -08:00
Andreas Huber
3ab6300840 Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 2011-12-13 11:59:50 -08:00
Dianne Hackborn
73ab6a49db Fix issue #5755172: Soft menu key disappears when menu is open 
We need to work more like before in determining whether the menu
key is needed -- in some cases look back in the window list to
determine this if we don't know the value from the current window.

This requires adding a new private flag indicating whether the
compat menu state is known for a window, which is set by
PhoneWindow as part of its existing process of computing the flag
for its own windows.

Now we can have a new API on WindowState to determine the value
of this flag for a window, which if needed walks back in the window list
to find a window the value is known for (or stops at what the policy
has determined is the top full-screen window, so we stop like we used
to at things like the lock screen or the bottom of an application).

Change-Id: I829de6d629b5af8bcb422cb85249ee4041c7205e
 2011-12-13 11:32:11 -08:00
Amith Yamasani
9413c200eb Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB." 2011-12-13 10:43:47 -08:00
Amith Yamasani
398c83cc07 Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB. 
Bug: 5738552

If value has ringer set to VIBRATE_OFF, we need to update it to the
now default, as VIBRATE_OFF is inconsistent with the new UI controls.

Make sure notification vibrate setting follows ringer vibrate setting.

Change-Id: I0f15a3d1ea8502d542e3178f732cc2503104458f
 2011-12-13 10:38:47 -08:00
Gilles Debunne
a2ea425f25 Merge "Re-synced MR1 and master for SpellChecker" 2011-12-13 10:31:38 -08:00
Selim Gurun
4f433d53c9 Merge "Move ssl callbacks to webcore thread." 2011-12-13 10:25:18 -08:00
Andreas Huber
9a023f1f8e DO NOT MERGE: Support for parsing of "folded" RTSP header values 
and some tweaks to the AMR assembler contributed by Samsung (untested).

Change-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1
related-to-bug: 5669027
 2011-12-13 10:09:48 -08:00
Selim Gurun
38f3610a29 Move ssl callbacks to webcore thread. 
Bug: 4586251

Original CL was for ics-mr1. We decided it should be in master
instead. Original CL
https://android-git.corp.google.com/g/154083

Current ssl cert logic makes callbacks to webkit from the
UI thread. This is not right. Move the callbacks to proper thread.

Change-Id: Ie3de7dbaed7780dbb6cf537ca1d29686d867b784
 2011-12-13 10:08:27 -08:00
Chris Craik
34e7ce888d am 574a1296: Merge "Update tilebenchmark to work with current drawing infrastructure" 
* commit '574a12968a24a0c24c96908568d8707a8d713d1c':
  Update tilebenchmark to work with current drawing infrastructure
 2011-12-13 08:54:45 -08:00
Chris Craik
574a12968a Merge "Update tilebenchmark to work with current drawing infrastructure" 2011-12-13 08:53:06 -08:00
Brian Colonna
9c4a02f2eb am 666e6d73: Merge "Changed how Face Unlock coordinates are specified" 
* commit '666e6d73c187ecaa771591f87b929c4dff4e84bc':
  Changed how Face Unlock coordinates are specified
 2011-12-13 06:39:50 -08:00
Brian Colonna
666e6d73c1 Merge "Changed how Face Unlock coordinates are specified" 2011-12-13 06:38:13 -08:00
The Android Open Source Project
420894c938 am 94fac16a: am da296533: Reconcile with ics-mr1-release 
* commit '94fac16acc062a7c4c889ca23ebcc7b4e8fecb4c':
 2011-12-13 05:48:36 -08:00
Ashish Sharma
1ca3470e27 am 31c5158c: Merge "Add a command option to display installerPackageName" 
* commit '31c5158c5aeb2964182f29a4ced947f5603e839e':
  Add a command option to display installerPackageName
 2011-12-13 05:48:24 -08:00
Romain Guy
8c464b79bf am 5009f65c: Merge "Optimize state changes" 
* commit '5009f65c9a676b64869e638e08ec0294e20d7e6e':
  Optimize state changes
 2011-12-13 05:48:15 -08:00
Jeff Sharkey
fa2416023f am 4dbfa44a: am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit '4dbfa44a2164724914b451ab1d6d0af8c0e9d1be':
  Avoid NPE when missing network stats.
 2011-12-13 05:48:12 -08:00
Mike Cleron
05bb6d9b9e am 12d4b3cb: am 3f69fad9: (-s ours) am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '12d4b3cb96dd7ceb9e2f742898fc6bcc263a8011':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-13 05:48:08 -08:00
Romain Guy
23d0deeb2b am da7642b3: Merge "Minimize the amount of data uploaded to draw text" 
* commit 'da7642b31bb3490655016df979b0fad95425ac5f':
  Minimize the amount of data uploaded to draw text
 2011-12-13 05:48:03 -08:00
Romain Guy
a72a3f077a am 51fbb009: Merge "Various OpenGL optimizations" 
* commit '51fbb009661e8eeb41730fe107179425e5392b6d':
  Various OpenGL optimizations
 2011-12-13 05:48:01 -08:00
Katherine Kuan
2820e17f5c am 9751190b: Merge "Add logging to country detector logic" 
* commit '9751190b85a0e74c1f3bb99d23067149a0de88da':
  Add logging to country detector logic
 2011-12-13 05:47:57 -08:00
Dianne Hackborn
05e80d03db am acd5f963: am 0ae6e171: am 359bb3b4: Final API 15. 
* commit 'acd5f963b91f481ac0ec05c4b1517cd86eb37fe7':
  Final API 15.
 2011-12-13 05:47:52 -08:00
Dianne Hackborn
a50e705b0f am df3c49ee: am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 
* commit 'df3c49ee2e00f85599348473951a208be9397829':
  SDK only: now that support lib is in SDK, we can link to it.
 2011-12-13 05:47:50 -08:00
Gilles Debunne
f8c409769e am ba364285: am 8e22ec9b: am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 
* commit 'ba3642850295ac3bdf57cb1ce9a26ec430c2b4c3':
  Prevent a memory leak in TextLine.
 2011-12-13 05:47:45 -08:00
Gilles Debunne
51e418715b am a4b1b8ab: am 7ffadba5: am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 
* commit 'a4b1b8ab3c240efe82d1018a54277f16dc03a8fa':
  Text blinking cursor hard to see.
 2011-12-13 05:47:43 -08:00
Adam Powell
6309759cf4 am f8c2abca: am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 
* commit 'f8c2abcadd5d7fbac64f84e6b31ec45102bcf3dd':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
 2011-12-13 05:47:41 -08:00
The Android Open Source Project
94fac16acc am da296533: Reconcile with ics-mr1-release 
* commit 'da29653305f299d6390492333a6360cfa78665d9':
 2011-12-13 05:40:57 -08:00
The Android Open Source Project
da29653305 Reconcile with ics-mr1-release 
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
 2011-12-13 05:11:43 -08:00
Ashish Sharma
31c5158c5a Merge "Add a command option to display installerPackageName" 2011-12-13 00:31:53 -08:00
The Android Automerger
6c9b675886 merge in ics-mr1-release history after reset to ics-mr1 2011-12-12 22:08:59 -08:00
Romain Guy
5009f65c9a Merge "Optimize state changes" 2011-12-12 20:36:22 -08:00
Romain Guy
f3a910b423 Optimize state changes 
Change-Id: Iae59bc8dfd6427d0967472462cc1994987092827
 2011-12-12 20:35:21 -08:00
Jeff Sharkey
4dbfa44a21 am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit 'f0213bf1833e49744b29be97e44c3e9eaad9449d':
  Avoid NPE when missing network stats.
 2011-12-12 20:23:47 -08:00
Jeff Sharkey
f0213bf183 am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit 'f0bbc494d638f4c77e688bf9410027f453301559':
  Avoid NPE when missing network stats.
 2011-12-12 20:21:34 -08:00
Jeff Sharkey
f0bbc494d6 Merge "Avoid NPE when missing network stats." into ics-mr1 2011-12-12 20:19:27 -08:00
Gilles Debunne
249d1e827a Re-synced MR1 and master for SpellChecker 
Some auto-merges got lost, re-syncing master with the latest
and greatest from MR1.

Change-Id: Ifc0b5d1fd2e11e68d219c3f491f37d4c047579a0
 2011-12-12 20:06:31 -08:00
Mike Cleron
12d4b3cb96 am 3f69fad9: (-s ours) am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '3f69fad9e958f867ceaab9c370b97959e3337c50':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-12 19:27:36 -08:00
Romain Guy
da7642b31b Merge "Minimize the amount of data uploaded to draw text" 2011-12-12 19:04:40 -08:00
Romain Guy
51fbb00966 Merge "Various OpenGL optimizations" 2011-12-12 19:04:32 -08:00
Romain Guy
d71dd367af Minimize the amount of data uploaded to draw text 
Change-Id: I6313ac039291c9cd93aadafe3566ad9d60cab42d
 2011-12-12 19:03:35 -08:00
Jeff Sharkey
d04ff11d6f Avoid NPE when missing network stats. 
Bug: 5750339
Change-Id: I4b739dbd076b270a5a2b2e2a1e0f6e445d8c124e
 2011-12-12 18:51:26 -08:00
Mike Cleron
3f69fad9e9 am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '840201d6e2d7d53e42a31ffeb2ef454982882d12':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-12 18:17:46 -08:00
Mike Cleron
840201d6e2 Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 2011-12-12 18:15:59 -08:00
Romain Guy
39d252a663 Various OpenGL optimizations 
Change-Id: Ib0742c96f10f5f50e7e5148b742c31b6c232d127
 2011-12-12 18:14:06 -08:00
Katherine Kuan
9751190b85 Merge "Add logging to country detector logic" 2011-12-12 18:12:37 -08:00