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

34962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
170a929648 Add two creation flags to OMXCodec::Create() 
o This allows to force to use software codecs or hardware codecs
o If request cannot be fullfilled, Create() returns NULL.

Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
 2010-10-25 18:21:55 -07:00
James Dong
fc6d54ea07 Merge "Remove OMX.PV.* components from OMXCodec.cpp" 2010-10-25 18:02:44 -07:00
Jean-Baptiste Queru
33c4247435 am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp 
Merge commit '55744530222288c79a5e1aa61b65f7f6b2262fab'

* commit '55744530222288c79a5e1aa61b65f7f6b2262fab':
  frameworks/base: Handle null from topRunningNonDelayedActivityLocked
 2010-10-25 17:59:49 -07:00
James Dong
5592bcc57a Remove OMX.PV.* components from OMXCodec.cpp 
Change-Id: Ie43c00a4d589e9cca6e9505a5dabd4e0d8af321a
 2010-10-25 17:59:44 -07:00
Scott Main
cd44bf9c7a Merge "resolved conflicts for merge of f0b3fa60 to master" 2010-10-25 17:56:40 -07:00
James Dong
068ee16b57 Merge "Don't change the video recording frame rate if it is not requested." 2010-10-25 17:56:14 -07:00
Scott Main
024127c11f resolved conflicts for merge of f0b3fa60 to master 
Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
 2010-10-25 17:54:33 -07:00
Adam Powell
c841ef04eb Merge "Holo: vertical dividers, group button states, default window backgrounds." 2010-10-25 17:44:35 -07:00
Adam Powell
5d2b178f5c Holo: vertical dividers, group button states, default window backgrounds. 
Change-Id: I06b1397a8026d01a2e4eca7e87ca2d1edbe4f92e
 2010-10-25 17:32:53 -07:00
Jean-Baptiste Queru
5574453022 Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-10-25 17:28:29 -07:00
Jean-Baptiste Queru
66a5d695ed resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp 
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
 2010-10-25 17:27:16 -07:00
Justin Ho
7c7ff8c84f am 41d21efd: (-s ours) am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 
Merge commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397'

* commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397':
  DO NOT MERGE - Updated ringtone assets for crespo
 2010-10-25 17:25:02 -07:00
Scott Main
f0b3fa60db am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items 
Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp

* commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
  update featured videos
 2010-10-25 17:23:10 -07:00
Scott Main
3d40cd5055 am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items 
Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread

* commit 'c9ac1079696b93a294f504c6561397ef731a46f9':
  update featured videos
 2010-10-25 17:15:50 -07:00
Jaikumar Ganesh
63f298a9b1 Merge "Fix docs builds." 2010-10-25 17:09:16 -07:00
Jaikumar Ganesh
5514029304 Fix docs builds. 
Change-Id: I764bd0f0f6994cc468b7ebbea4a3dc7a44b9f89d
 2010-10-25 17:07:51 -07:00
Gloria Wang
cbb053c3c9 resolved conflicts for merge of 965f960e to master 
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
 2010-10-25 16:56:49 -07:00
Justin Ho
41d21efd61 am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 
Merge commit '044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp

* commit '044df235c86ac69bb0e56cb4387e111ec276276e':
  DO NOT MERGE - Updated ringtone assets for crespo
 2010-10-25 16:50:34 -07:00
Justin Ho
044df235c8 Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 2010-10-25 16:44:01 -07:00
Jaikumar Ganesh
657dbfaedb Merge "Expose Vendor Specific Headset Event Intent." 2010-10-25 16:43:41 -07:00
Gloria Wang
965f960eca Merge "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-10-25 16:39:12 -07:00
Jaikumar Ganesh
9bb1278696 Merge "Make setting the adapter properties asynchronous." 2010-10-25 16:38:48 -07:00
Justin Ho
6a83d37769 DO NOT MERGE - Updated ringtone assets for crespo 
Change-Id: Ie5c6b0bfa282f976129f5e87a09512da01e6851b
 2010-10-25 16:38:41 -07:00
Jaikumar Ganesh
ff7db40be1 Make setting the adapter properties asynchronous. 
1. These involve disk operations and multiple processes.
2. onPropertyChange already informs us asychronously.
3. Settings app is the only user, will have to revisit the function
   if we make them public.

Change-Id: If019a83c05a0c9e625f27faf99063d33f369f0d8
 2010-10-25 16:36:45 -07:00
Joe Malin
39f3e380fe am 96bdc500: am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread 
Merge commit '96bdc500104c3e162495a9bfcf90799467e45c3d'

* commit '96bdc500104c3e162495a9bfcf90799467e45c3d':
  Doc Change: Revert NotePad sample test package
 2010-10-25 16:27:15 -07:00
Eric Fischer
f51964f64f am b2ddeee2: (-s ours) am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b'

* commit 'b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b':
  Import revised translations.  DO NOT MERGE
 2010-10-25 16:26:58 -07:00
Joe Malin
96bdc50010 am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread 
Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp

* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
  Doc Change: Revert NotePad sample test package
 2010-10-25 16:22:46 -07:00
Eric Fischer
b2ddeee2d2 am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp

* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
  Import revised translations.  DO NOT MERGE
 2010-10-25 16:19:42 -07:00
Joe Malin
5016df1cfa Merge "Doc Change: Revert NotePad sample test package" into gingerbread 2010-10-25 16:19:18 -07:00
James Dong
b15f2eaa92 Don't change the video recording frame rate if it is not requested. 
o set the default video frame rate to the current frame rate being used
o add check on whether the requested frame rate is supported
o fix an issue where the hardware video encoder setting was bypassed
o increases the max frame rate from 30 t0 120 frames per second
  the actual frame rate will be clipped if the requested frame rate is too
  high when recording starts by checking the hardware encoder capabilities

Change-Id: I1b47671d74da0ebcb9601bdca390d430cc048fbc
 2010-10-25 16:16:10 -07:00
Eric Fischer
3d1ce9ec2a Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-25 16:14:47 -07:00
Gloria Wang
b8791479af resolved conflicts for merge of 9084631d to gingerbread-plus-aosp 
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
 2010-10-25 16:11:18 -07:00
Joe Malin
24fed74a34 Doc Change: Revert NotePad sample test package 
Change-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37
 2010-10-25 15:55:13 -07:00
Scott Main
c9ac107969 update featured videos 
also remove "new" tags from SDK and Resources nav items

Change-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5
 2010-10-25 15:42:03 -07:00
Eric Fischer
0820821213 Import revised translations. DO NOT MERGE 
Change-Id: I404fe29521193ca9d0a3689d4a786253dc27e2d6
 2010-10-25 15:41:31 -07:00
Romain Guy
551397d5eb Merge "Don't initialize the hw renderer without a valid surface. Bug #3054952" 2010-10-25 15:36:18 -07:00
Jean-Baptiste Queru
b4ae2f1ba4 Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked" 2010-10-25 15:32:12 -07:00
Romain Guy
c361da845a Don't initialize the hw renderer without a valid surface. 
Bug #3054952

Change-Id: I5b4074391dbd84b04a14f7d2fb1b9a4a2487e1e2
 2010-10-25 15:29:10 -07:00
Jeff Hamilton
6dc0c73fb0 am fecc5f06: am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread 
Merge commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e'

* commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e':
  Add a RHS status bar slot for NFC.
 2010-10-25 14:56:34 -07:00
Jeff Hamilton
fecc5f066d am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread 
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp

* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
  Add a RHS status bar slot for NFC.
 2010-10-25 14:49:07 -07:00
Jeff Hamilton
106165b510 Merge "Add a RHS status bar slot for NFC." into gingerbread 2010-10-25 14:46:45 -07:00
Jeff Hamilton
e0be933ec7 Add a RHS status bar slot for NFC. 
Change-Id: I62cbcec051a2c69f76fb9a5b9ff6f6bc05a8257b
 2010-10-25 16:41:41 -05:00
Adam Cohen
c18b2e504a Merge "-> Fixing a bug where AdapterViewAnimator doesn't refresh correctly -> Reduced swipe threshold for StackView Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1" 2010-10-25 14:11:00 -07:00
Adam Cohen
a9238c89a4 -> Fixing a bug where AdapterViewAnimator doesn't refresh correctly 
-> Reduced swipe threshold for StackView
Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1
 2010-10-25 14:03:11 -07:00
Mike Lockwood
8fa50d4f2d am 6c8d8d89: am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread 
Merge commit '6c8d8d8927373fdb9ad1c853396b5dbc8295f996'

* commit '6c8d8d8927373fdb9ad1c853396b5dbc8295f996':
  GPS: Disable verbose logging
 2010-10-25 14:00:38 -07:00
Mike Lockwood
6c8d8d8927 am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread 
Merge commit '8c32bddfac259543f4ed87341fce42bc5ed60506' into gingerbread-plus-aosp

* commit '8c32bddfac259543f4ed87341fce42bc5ed60506':
  GPS: Disable verbose logging
 2010-10-25 13:55:27 -07:00
Mathias Agopian
a24a519883 am e1ca532d: am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread 
Merge commit 'e1ca532d72cbfacdce794f8bb4d439e609ec9871'

* commit 'e1ca532d72cbfacdce794f8bb4d439e609ec9871':
  fix [3123221] Video sticks playing back upside down following orientation switch
 2010-10-25 13:53:33 -07:00
Mathias Agopian
affca7e481 am b4645353: am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 
Merge commit 'b4645353090f1bdd5cc1d4ab98feac7ccf966368'

* commit 'b4645353090f1bdd5cc1d4ab98feac7ccf966368':
  fix [3118445] Transform * Transform does not work as expected
 2010-10-25 13:53:26 -07:00
Daniel Sandler
cbab0413a2 Merge "Swipe up to open the settings panel. Tap anywhere to close." 2010-10-25 13:52:42 -07:00
Mike Lockwood
8c32bddfac Merge "GPS: Disable verbose logging" into gingerbread 2010-10-25 13:49:13 -07:00