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

34939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
cbb053c3c9 resolved conflicts for merge of 965f960e to master 
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
 2010-10-25 16:56:49 -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
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
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
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
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
Mathias Agopian
e1ca532d72 am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread 
Merge commit '457bed2bc6561dd67429dde238453fee8602fa9b' into gingerbread-plus-aosp

* commit '457bed2bc6561dd67429dde238453fee8602fa9b':
  fix [3123221] Video sticks playing back upside down following orientation switch
 2010-10-25 13:38:15 -07:00
Mathias Agopian
b464535309 am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 
Merge commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e' into gingerbread-plus-aosp

* commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e':
  fix [3118445] Transform * Transform does not work as expected
 2010-10-25 13:38:11 -07:00
Mike Lockwood
4a7b65e0d5 GPS: Disable verbose logging 
BUG: 3127049

Change-Id: I9efd9eb7ff69724b133f3b70c52e173f49ddfbc5
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-25 16:35:55 -04:00
Mathias Agopian
457bed2bc6 Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread 2010-10-25 13:31:11 -07:00
Mathias Agopian
ce4d36ad72 Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 2010-10-25 13:31:03 -07:00
Andreas Huber
67ef3179db Merge "We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets." 2010-10-25 13:13:04 -07:00
Daniel Sandler
8304da460f Swipe up to open the settings panel. Tap anywhere to close. 
This should help reduce false hits on the clock when typing
on an on-screen keyboard.

Change-Id: I3afab88c800873d1801b16ac79ffa3e7ddd42949
 2010-10-25 15:53:25 -04:00
Andreas Huber
cf74754f9f We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets. 
Change-Id: I02a9b4af929601c899f04cee9864d0dd0716de62
 2010-10-25 12:48:00 -07:00
Gloria Wang
9084631dba Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback" 2010-10-25 12:23:35 -07:00
Gloria Wang
d5770917a5 DRM framework support: 
- add a sniffer for DRM files
- add DRMSource and DRMExtractor for es_based DRM
- add pread in FileSource.cpp for container_based DRM
- add native DRM framework API calls in the player for
  DRM audio/video playback

Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
 2010-10-25 12:16:56 -07:00
Adam Powell
de0f98ea99 am 67bb6741: (-s ours) am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 
Merge commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e'

* commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test
 2010-10-25 12:13:56 -07:00
Marco Nelissen
760a5b7b8f Merge "Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framework. b/2764237" 2010-10-25 12:10:01 -07:00
Vasu Nori
6db925001e Merge "increase sql statement printed in finalier warnings from 100 to 1000" 2010-10-25 12:08:46 -07:00
Vasu Nori
ba42fb3a25 Merge "when printing cache-full warning, print the sql statements in cache" 2010-10-25 12:07:57 -07:00
Adam Powell
67bb674196 am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test
 2010-10-25 12:07:51 -07:00
Marco Nelissen
a6face4d40 Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framework. 
b/2764237

Change-Id: I9a20974fa0b7527230258f7d0bf829a031673a9d
 2010-10-25 12:07:07 -07:00
Daniel Sandler
23f2243088 Merge "Fix drags from the shirt pocket" 2010-10-25 12:00:40 -07:00
Vasu Nori
b73cf1cc39 increase sql statement printed in finalier warnings from 100 to 1000 
100 for sql statement seems too small for some apps (gmail is one example)

Change-Id: I4d29bffc0da5a854ca650d083b81df8769b35b77
 2010-10-25 11:55:56 -07:00
Vasu Nori
74fb2685e2 when printing cache-full warning, print the sql statements in cache 
this should help debug developers in idetifying the sql statements
taking up cache slots

Change-Id: Ibc0140c273adc5c8d58ab359d2c4d4ce14b6b63b
 2010-10-25 11:50:56 -07:00
Adam Powell
17efcde161 Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 2010-10-25 11:43:03 -07:00
Scott Main
dc28be1095 resolved conflicts for merge of 177b05d6 to master 
Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364
 2010-10-25 11:37:08 -07:00
Scott Main
177b05d614 am abb50f15: Merge "docs: fix a couple api links" into gingerbread 
Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp

* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
  docs: fix a couple api links
 2010-10-25 11:27:55 -07:00