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

63690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
f8e58c8b4e Reconcile with ics-mr1-release 
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8
 2012-03-01 10:11:48 -08:00
Android Git Automerger
55fbbce495 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-01 07:35:22 -08:00
Yu Shan Emily Lau
da0c4a3ea6 am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'd12347b2b4dba77b9b0b7cc33ea32f8b5a54b388':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:04:11 -08:00
Yu Shan Emily Lau
353b61a87d am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit '0ddfe24a19882bb355313b6c5c14dcb0c6608365':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:03:40 -08:00
Yu Shan Emily Lau
0ddfe24a19 am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:00:08 -08:00
Yu Shan Emily Lau
d12347b2b4 am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:00:00 -08:00
Yu Shan Emily Lau
eb4f3256b7 Set the video encoding bit rate for the media 
recorder stress test.

Change-Id: I1fa5965d2ba0e17be97ff3b9bd8df3df4e438087
 2012-02-29 15:57:21 -08:00
Jean-Baptiste Queru
f73222a39e am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" 
* commit '964955e0bd98166c16f705811ce46d0151924cc8':
  DRM framwork bug fix: add an API to release resources
 2012-02-29 15:51:30 -08:00
Jean-Baptiste Queru
f09c0c7f31 am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device" 
* commit '93920d79b7fa57ad941f5dbf33cf15ead6cd7318':
  Set width of spinner's dropdown to fit on device
 2012-02-29 15:51:28 -08:00
Jean-Baptiste Queru
dbc591e276 am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()" 
* commit 'c69d61343913848b467022ef63f2c84cbc5ec34b':
  Adds documentation for ContentResolver notifyChange()
 2012-02-29 15:51:25 -08:00
Jean-Baptiste Queru
9de7793b42 am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '4f9063622415ea083bbd639af06e98065ce7176d':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 15:51:23 -08:00
Jean-Baptiste Queru
715c78b933 am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit '225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525':
  stagefright aacenc: Safeguard against overwriting bits
 2012-02-29 15:51:19 -08:00
Jean-Baptiste Queru
964955e0bd am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" 
* commit '8a9b14d80530eccf801fa794bacf287813b5978f':
  DRM framwork bug fix: add an API to release resources
 2012-02-29 15:47:45 -08:00
Jean-Baptiste Queru
93920d79b7 am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device" 
* commit 'a66be970999c5eec1c8efb46e196f19ae563fc9b':
  Set width of spinner's dropdown to fit on device
 2012-02-29 15:47:42 -08:00
Jean-Baptiste Queru
c69d613439 am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()" 
* commit '6ae4fe945b41d4bcb3ba7d931e34d6ef184b8b45':
  Adds documentation for ContentResolver notifyChange()
 2012-02-29 15:47:38 -08:00
Jean-Baptiste Queru
4f90636224 am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '9734843102c074c56ac72e221db0f51ae2fa79ec':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 15:47:35 -08:00
Jean-Baptiste Queru
225eec8d2a am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit 'f9d4ba77f45d8f0efe97abb28247cbca12836dca':
  stagefright aacenc: Safeguard against overwriting bits
 2012-02-29 15:47:32 -08:00
Jean-Baptiste Queru
8a9b14d805 am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" 
* commit '5aeb85877a95cc12c0784757a9842983b04e8600':
  DRM framwork bug fix: add an API to release resources
 2012-02-29 15:44:41 -08:00
Jean-Baptiste Queru
a66be97099 am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device" 
* commit '11aa4cc38b646f62eb22842d7510415b61c2ef84':
  Set width of spinner's dropdown to fit on device
 2012-02-29 15:44:38 -08:00
Jean-Baptiste Queru
6ae4fe945b am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()" 
* commit '9303919d7d837dedf16f09ace0013e62670568e7':
  Adds documentation for ContentResolver notifyChange()
 2012-02-29 15:44:34 -08:00
Jean-Baptiste Queru
9734843102 am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '704131cb7e4f9cc682ea57ed569375f9f289368e':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 15:44:31 -08:00
Jean-Baptiste Queru
f9d4ba77f4 am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit '69aae36e900cf7114c5895618747906951a11730':
  stagefright aacenc: Safeguard against overwriting bits
 2012-02-29 15:44:28 -08:00
Jean-Baptiste Queru
5aeb85877a Merge "DRM framwork bug fix: add an API to release resources" 2012-02-29 15:12:48 -08:00
Jean-Baptiste Queru
11aa4cc38b Merge "Set width of spinner's dropdown to fit on device" 2012-02-29 15:09:17 -08:00
Jean-Baptiste Queru
9303919d7d Merge "Adds documentation for ContentResolver notifyChange()" 2012-02-29 14:38:59 -08:00
Jean-Baptiste Queru
704131cb7e Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* changes:
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 14:24:52 -08:00
Jean-Baptiste Queru
69aae36e90 Merge "stagefright aacenc: Safeguard against overwriting bits" 2012-02-29 14:23:38 -08:00
Eric Fischer
4917bc104d am d31da0a6: am fb393f8b: Mark configuration strings as not translatable. 
* commit 'd31da0a670a60722339faa18e1147adb9c14532d':
 2012-02-29 13:30:51 -08:00
Eric Fischer
b145e363ff am ba62da99: am fb393f8b: Mark configuration strings as not translatable. 
* commit 'ba62da99666c9ca590cde49ff00c06d3d50ca0a7':
  Mark configuration strings as not translatable.
 2012-02-29 13:28:52 -08:00
Eric Fischer
ba62da9966 am fb393f8b: Mark configuration strings as not translatable. 
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
 2012-02-29 13:26:13 -08:00
Eric Fischer
d31da0a670 am fb393f8b: Mark configuration strings as not translatable. 
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
 2012-02-29 13:26:08 -08:00
Eric Fischer
fb393f8bd7 Mark configuration strings as not translatable. 
Change-Id: I041a6a951dfe70881a095d7ef085b0246a9d4c3b
 2012-02-29 13:19:58 -08:00
Roman Nurik
62b4e4a83e am 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit '86ca108c65c3f8400e750d639b71d6a3cef5b600':
 2012-02-29 12:49:31 -08:00
Roman Nurik
b96ad49a3a am c47369d7: am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit 'c47369d7c5d3a588d7b0c655878f0bc7dd2ffedc':
  docs: Android Design downloads section, linkable H2s.
 2012-02-29 12:45:16 -08:00
Roman Nurik
86ca108c65 am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.
 2012-02-29 12:43:29 -08:00
Roman Nurik
c47369d7c5 am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.
 2012-02-29 12:42:39 -08:00
Roman Nurik
a53b3bfaad docs: Android Design downloads section, linkable H2s. 
Change-Id: I4ed3006117efd740ff5f3bc93df2ac75c2dfd2f9
 2012-02-29 12:15:32 -08:00
Kei Takahashi
6225df0103 DRM framwork bug fix: add an API to release resources 
When DrmManagerClient object is created and released many times,
the process suddenly crashes.
The case can happen when we make many thumbnails of
DRM-encrypted contents.

The problem is caused by shortage of file descriptors.
DrmManagerClient releases references of file descriptors
only when GC runs. So file descriptors are kept long time
even after the reference of DrmManagerClient are released.

By introducing DrmManagerClient#release() API,
the problem is solved. An application call this API
when we no longer need to use DrmManagerClient object.

Changes are made by SEMC and Sony.

Change-Id: Ie0bbc29cc33872449824285a8d67b1c3cdd8082b
 2012-02-29 12:59:53 +09:00
SeongJae Park
95148495fc Set width of spinner's dropdown to fit on device 
Commit for issue at
http://code.google.com/p/android/issues/detail?id=25916&colspec=ID%20Type%20Status%20Owner%20Summary%20Stars&start=100

[Problem]
Dropdown popup of Spinner become wider than device's width if selected
item's content's width is larger than device's screen.

[Cause]
Spinner just display dropdown popup with measured content's width
although measured content's width is wider than device's screen.

[Solution]
If calculated content's width is wider than device's screen, set width
of spinner's dropdown popup to fit on device.

Change-Id: I3276e5ff745c6ba1437c07fc55645d6b53fef89a
Signed-off-by: SeongJae Park <sj38.park@gmail.com>
 2012-02-29 10:48:11 +09:00
Robert Ly
246a1bee9d am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'edfc6a0d709afdf75284ecfc1e680c27fda8b9a9':
 2012-02-28 15:43:52 -08:00
Robert Ly
61a9a83ac0 am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit '40226da7aeb705fb823517f74739bf2f25fa86f3':
  fix bug 5911175
 2012-02-28 15:42:32 -08:00
Robert Ly
edfc6a0d70 am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
 2012-02-28 15:39:55 -08:00
Robert Ly
40226da7ae am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
 2012-02-28 15:39:39 -08:00
Robert Ly
f4994b3eb0 Merge "fix bug 5911175" into ics-mr1 2012-02-28 15:37:21 -08:00
Dianne Hackborn
11f343c6b1 am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit 'c221d6ec2fbaa73f82cd219e2d5ab078697070ab':
 2012-02-28 15:16:20 -08:00
The Android Automerger
b3453d7db1 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:14:55 -08:00
Dianne Hackborn
4953ec1c71 am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit 'a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:07:43 -08:00
Dianne Hackborn
a2e0e3b5f6 am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:03:28 -08:00
Dianne Hackborn
c221d6ec2f am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:03:18 -08:00
Dianne Hackborn
27e20ccd9a Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 2012-02-28 15:01:05 -08:00