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

62198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Ng
15843aa5f6 Merge "lock pattern width spec set to max" into ics-mr1 2011-11-10 14:31:09 -08:00
Peter Ng
628709f031 am 08158c55: am bce7812b: Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1 
* commit '08158c5526ded5599b183e5d8380809571e5c56a':
  Cleaning up tablet assets by deleting drawable-xlarge and large folders
 2011-11-10 22:30:51 +00:00
Peter Ng
08158c5526 am bce7812b: Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1 
* commit 'bce7812baba05e969406f8644595ef6237e16a41':
  Cleaning up tablet assets by deleting drawable-xlarge and large folders
 2011-11-10 22:28:33 +00:00
Peter Ng
bce7812bab Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1 2011-11-10 14:26:57 -08:00
Katie McCormick
7675b4cae1 am e36263be: am 49654c72: am 921afe39: Doc change: new Calendar content provider doc 
* commit 'e36263be662d8ebac260e81f1fbac356a8362691':
  Doc change: new Calendar content provider doc
 2011-11-10 22:25:37 +00:00
Katie McCormick
e36263be66 am 49654c72: am 921afe39: Doc change: new Calendar content provider doc 
* commit '49654c72344610032bbff4405024fad2b30e1100':
  Doc change: new Calendar content provider doc
 2011-11-10 22:23:25 +00:00
Peter Ng
37ae1fe005 Cleaning up tablet assets by deleting drawable-xlarge and large folders 
-keeping default wallpaper in xlarge-nodpi

Bug:5596158

Change-Id: I18ec8b0aa648fa95a1f6ebb4380c630f05e24ecb
 2011-11-10 14:22:05 -08:00
Adam Powell
9e71bb0b2f am aa771ceb: am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1 
* commit 'aa771ceb0919f2a66ba9c927e5617d15471d70e2':
  Fix access modifiers on ImageView overrides
 2011-11-10 22:20:48 +00:00
Katie McCormick
49654c7234 am 921afe39: Doc change: new Calendar content provider doc 
* commit '921afe39d6041b06c6a002b08f9dcd1561a9ae99':
  Doc change: new Calendar content provider doc
 2011-11-10 22:20:37 +00:00
Romain Guy
a958265827 Initialize egl_cache with an app writeable file 
Change-Id: I5dda234feab0fedd6e4179a80715ae20dee1c833
 2011-11-10 14:20:10 -08:00
Adam Powell
aa771ceb09 am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1 
* commit '71282a476ad57ec398f0a8d33cf67bfd469c8c55':
  Fix access modifiers on ImageView overrides
 2011-11-10 22:18:55 +00:00
Dianne Hackborn
f16cb9e510 am 8eac3b2f: am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1 
* commit '8eac3b2f1ae4b155bd159317e9f221223189ba26':
  Fix issue #5470311: Activity with android:configChanges defined...
 2011-11-10 22:17:08 +00:00
Adam Powell
71282a476a Merge "Fix access modifiers on ImageView overrides" into ics-mr1 2011-11-10 14:16:45 -08:00
Dianne Hackborn
8eac3b2f1a am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1 
* commit '0f70e482c8aa7ce9c5676b1226ff98b63fb991e7':
  Fix issue #5470311: Activity with android:configChanges defined...
 2011-11-10 22:14:33 +00:00
Dianne Hackborn
0f70e482c8 Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1 2011-11-10 14:12:25 -08:00
Adam Powell
6a939ae6fd Fix access modifiers on ImageView overrides 
Change-Id: I64cc10c877ac4adc4b79abcd7c7617480bd82906
 2011-11-10 14:11:51 -08:00
Eric Fischer
c926911386 Merge "Import revised translations." 2011-11-10 14:06:21 -08:00
Adam Powell
5d35fd79a7 am ba44080d: am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t start as expected" into ics-mr1 
* commit 'ba44080d834d23d0bc7d118a4950f837eeaca96a':
  Fix bug 5581874 - Animated drawables don't start as expected
 2011-11-10 22:01:58 +00:00
Adam Powell
ba44080d83 am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t start as expected" into ics-mr1 
* commit '67121fd7b241ceafe7339f5f154781572819f87b':
  Fix bug 5581874 - Animated drawables don't start as expected
 2011-11-10 21:58:30 +00:00
Adam Powell
67121fd7b2 Merge "Fix bug 5581874 - Animated drawables don't start as expected" into ics-mr1 2011-11-10 13:57:24 -08:00
Martijn Coenen
5a81e795cf am 7ee88289: (-s ours) am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1 
* commit '7ee88289091f8bc81dabeff62f215ba21baa8c0b':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
 2011-11-10 21:53:49 +00:00
Martijn Coenen
7ee8828909 am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1 
* commit 'c5f3fd6ef160c0f6072b14b97aa5c1d9759c682e':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
 2011-11-10 21:50:21 +00:00
Chet Haase
f458b3d39a am 68a15583: am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1 
* commit '68a15583f7438c687e3b029f83cf80ca7827ff31':
  increase the rate at which we dispatch events.
 2011-11-10 21:49:30 +00:00
Martijn Coenen
c5f3fd6ef1 Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1 2011-11-10 13:48:02 -08:00
Chet Haase
68a15583f7 am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1 
* commit '41ffab86d92622679d4d2ad8307806e8099f8170':
  increase the rate at which we dispatch events.
 2011-11-10 21:46:16 +00:00
Chet Haase
41ffab86d9 Merge "increase the rate at which we dispatch events." into ics-mr1 2011-11-10 13:44:34 -08:00
Kenny Root
0d1569c359 am f4db2fe5: am bc853c03: Merge "Close file on exception as well" into ics-mr1 
* commit 'f4db2fe56479635f8ec0a195e9e6b53a55216139':
  Close file on exception as well
 2011-11-10 21:23:24 +00:00
Martijn Coenen
0946fe5be3 Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE). 
This reverts commit 562dfff65ac79590c0b7c50019cd3d107e8b4e0e. These API's are still used
by GMM in the version that ships with MR1, so we need them to keep Beam working for
GMM. Note that these APIs are hidden.

From version 5.13 onwards GMM will use the new API's.

Change-Id: I316a9c9b7d0052a14f6c1df70f2ed463bca61800
 2011-11-10 13:22:27 -08:00
Kenny Root
f4db2fe564 am bc853c03: Merge "Close file on exception as well" into ics-mr1 
* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
  Close file on exception as well
 2011-11-10 21:20:28 +00:00
Kenny Root
bc853c0344 Merge "Close file on exception as well" into ics-mr1 2011-11-10 13:18:24 -08:00
Tom Taylor
fb894276b1 am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 
* commit '0bbd151e1dab043226725d23f0ca26f4d09ee76f':
  Revert "Add new secure setting for controlling Messaging notifications"
 2011-11-10 21:16:54 +00:00
Tom Taylor
0bbd151e1d am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 
* commit 'faa81c82103e89a3f2c86c4e737d9beb7e557402':
  Revert "Add new secure setting for controlling Messaging notifications"
 2011-11-10 21:13:42 +00:00
Tom Taylor
faa81c8210 Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 2011-11-10 13:11:16 -08:00
Andreas Huber
4d7dff1706 DO NOT MERGE: Instead of asserting, remove active streams if their sockets 
return failure

Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug: 5593654
 2011-11-10 12:41:51 -08:00
Andreas Huber
57cc14fcc1 Instead of asserting, signal a runtime error if the session doesn't contain 
any playable tracks at all.

Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
 2011-11-10 12:40:30 -08:00
Eino-Ville Talvala
dce3af33a5 am 22c2d1d6: am c1c5d4fa: Merge "Add a sound-playing method to Camera API." into ics-mr1 
* commit '22c2d1d6ae48c348f4c331361a6e3f2c63b2aa8f':
  Add a sound-playing method to Camera API.
 2011-11-10 20:10:47 +00:00
Eino-Ville Talvala
22c2d1d6ae am c1c5d4fa: Merge "Add a sound-playing method to Camera API." into ics-mr1 
* commit 'c1c5d4faa22a7d22b8225b2bbf83206698b83763':
  Add a sound-playing method to Camera API.
 2011-11-10 20:08:29 +00:00
Eino-Ville Talvala
c1c5d4faa2 Merge "Add a sound-playing method to Camera API." into ics-mr1 2011-11-10 12:07:05 -08:00
James Dong
77c500c9a1 Add support for retrieving location information in mp4/3gpp files 
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug: 5560253
 2011-11-10 11:40:11 -08:00
Mathias Agopian
c925a654b1 am e1d50e0c: am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1 
* commit 'e1d50e0ccb95f06d1d60aa83822b486828148483':
  handle EINTR when calling sensor HAL's poll function
 2011-11-10 19:39:53 +00:00
John Reck
2c7db013bc am 0f077739: am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1 
* commit '0f0777399defe6bca965d9c33e9dfe256eb56fee':
  Pause drawing when not visible
 2011-11-10 19:39:46 +00:00
Andreas Huber
62c0c3215d am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1 
* commit '9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
  Send RTSP control connection keep-alive requests
 2011-11-10 19:39:38 +00:00
Andreas Huber
58941d8dcb am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1 
* commit '2dff5cdc362ff6026e71d4b96faea8f2d7bd7063':
  Don't believe the PV decoder's lies...
 2011-11-10 19:39:36 +00:00
Andreas Huber
2276b1774a am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1 
* commit 'ec04f4ac23e5fe8f90267d09ddda8c0aa684c147':
  There's no point in trying to continue to decode after an error was signalled.
 2011-11-10 19:39:34 +00:00
George Mount
021d33817b am 8645ff3d: (-s ours) am c60baec7: Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 
* commit '8645ff3d00d22abaf74b5985a036bffc7843825e':
  DO NOT MERGE Set the initial scroll position for RTL.
 2011-11-10 19:39:31 +00:00
Eric Laurent
7707cd9920 am 58f3a712: am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1 
* commit '58f3a7123d0da6d35424429f3c0bbfbd32c00117':
  Fix problems in tablet silent mode.
 2011-11-10 19:39:29 +00:00
Wink Saville
2f87ca01c7 am 99d858b0: am a092ba56: am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0 
* commit '99d858b04b27b51e346fb5d3860e6953cee64ecd':
  [maguro] Update COMPREHENSION-TLV parser in CAT
 2011-11-10 19:39:27 +00:00
Gilles Debunne
9704a14eeb am 2e97db49: am e5504ba1: Merge "Visual glitches when starting extracted text" into ics-mr1 
* commit '2e97db4981e7773e84deee37c394748076b1aafd':
  Visual glitches when starting extracted text
 2011-11-10 19:39:16 +00:00
Dave Burke
071f1ca094 am 26c84db4: (-s ours) am b5dbf66c: am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0 
* commit '26c84db47da032a3fc1a56aa6bd82d610dde2dca':
  Actually 59 fps DO NOT MERGE
 2011-11-10 19:39:12 +00:00
Dave Burke
fe9f00bcf4 am 65a9ac43: am ab22f862: Merge "Back to 59fps" into ics-mr1 
* commit '65a9ac43c687d9011279c09210adaa04eb4a5502':
  Back to 59fps
 2011-11-10 19:39:11 +00:00