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

33480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
94f183b1b4 Removing 'last' of red cross asset. 
Change-Id: Ie325195220f95074d8e12e64216d1b02e9b3e2af
 2010-10-07 12:07:43 -07:00
Andreas Huber
949f7d9066 Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread 2010-10-07 11:59:53 -07:00
Justin Ho
b74941e32e Merge "Fixed popup assets (background)" into gingerbread 2010-10-07 11:56:18 -07:00
Stephen Hines
b8f69ab7c6 Merge "Add RS testing for long and long long." 2010-10-07 11:42:13 -07:00
Andreas Huber
4c19bf9833 Work to support switching transport streams mid-stream and signalling discontinuities to the decoder. 
Change-Id: I7150e5e7342e1117c524856b204aadcb763e06ed
related-to-bug: 2368598
 2010-10-07 11:41:43 -07:00
Stephen Hines
1d73e57a04 Add RS testing for long and long long. 
Change-Id: I42716b1a273c79103474b2e96441e7e3eac020b9
 2010-10-07 11:40:38 -07:00
Xia Wang
afeeaf351a Port mock ril controller and tests to GB. DO NOT MERGE 
Change-Id: Ie58236ecb8648d026356610f429054cb46b8640b
 2010-10-07 11:34:46 -07:00
Adam Powell
f15dfbec5d Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread 2010-10-07 11:32:49 -07:00
Brad Fitzpatrick
6275dbbea8 Merge "Quiet unnecessary debug logging." into gingerbread 2010-10-07 11:27:56 -07:00
Brad Fitzpatrick
90bc5ee02b Quiet unnecessary debug logging. 
Change-Id: I46d8aff5790db371d60b2066acbbdd55cfad8074
 2010-10-07 11:26:57 -07:00
Adam Powell
574b37ecc2 Fix bug 3071869 - text anchors are now treated as application sub-panels. 
This places text anchors on a layer above normal application panels,
ensuring that they stay above things like the browser autocompletion
list.

Change-Id: I4ee0aea7416a2dafd7e48a7a39acf949af5db3e9
 2010-10-07 11:17:12 -07:00
James Dong
d5df1e5cfc Merge "Add two more options to "recordvideo" utility" 2010-10-07 11:00:25 -07:00
Andreas Huber
02654f01bc Merge "On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread 2010-10-07 10:57:32 -07:00
Mike Lockwood
058ad782e6 Merge "resolved conflicts for merge of 6327a9fe to master" 2010-10-07 10:57:08 -07:00
Mike Lockwood
22f41918fa resolved conflicts for merge of 6327a9fe to master 
Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64
 2010-10-07 13:55:25 -04:00
Gilles Debunne
3c88039187 Fixed popup assets (background) 
Change-Id: I8a651915119fec6a06a5f43315408b0d06c4b7d6
 2010-10-07 10:54:54 -07:00
Kenny Root
e0c5ae7b55 Merge "Eliminate MCS_GIVE_UP state" into gingerbread 2010-10-07 10:54:14 -07:00
Kenny Root
480afe70fa Eliminate MCS_GIVE_UP state 
It's basically a duplicate of MCS_UNBIND state, so just get rid of it
which simplifies the state transitions.

Bug: 3067076
Change-Id: I34111be88dd727af8ad59c9f49debd54ede827ea
 2010-10-07 10:53:01 -07:00
Joe Onorato
7d56e3d3cb Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached." 2010-10-07 10:52:30 -07:00
Gilles Debunne
e86a6b2a4d Merge "Removed unused and broken screen_progress" into gingerbread 2010-10-07 10:52:11 -07:00
Brad Fitzpatrick
30f5c8fede More DropBoxManager javadoc love. 
Change-Id: I9b14f6905533e0af66bd64fc76352ed8fc365058
 2010-10-07 10:48:20 -07:00
Brad Fitzpatrick
fd124570ce Merge "DropBox.Entry javadoc syntax fix" into gingerbread 2010-10-07 10:20:32 -07:00
Kenny Root
0145e36cad Revert "Only allow 8 OBBs to be mounted by a UID" 
This reverts commit 27358a69b33eaa268ee75ef778ec824c8085adcc.

Conflicts:

	services/java/com/android/server/MountService.java

Change-Id: Ia14be97b4f22e95daba0d191cfc62adf3d1469cd
 2010-10-07 10:14:09 -07:00
Brad Fitzpatrick
95173b14d6 DropBox.Entry javadoc syntax fix 
Change-Id: I32d055b39ca89ec9f6a7bf189263844424533b60
 2010-10-07 10:07:34 -07:00
Joe Onorato
c3f0b2d10e Merge "Don't crash if there is no phone app and someone presses the phone button." 2010-10-07 10:03:46 -07:00
John Wang
08fb5851bb Merge "Add flag to skip restoring network seletion." into gingerbread 2010-10-07 09:47:01 -07:00
John Wang
35c4c211e0 Add flag to skip restoring network seletion. 
For bug 3045366.

Change-Id: I7ad9ff89b0a77df473b638ad917b363c42de5405
 2010-10-07 09:44:19 -07:00
Robert Greenwalt
8ece274da3 am b81b89f1: (-s ours) am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread 
Merge commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6'

* commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6':
  Add supporting MCC=450(Korea)
 2010-10-07 09:25:54 -07:00
Joe Onorato
d37870af20 Don't crash if there is no phone app and someone presses the phone button. 
The phone button probably doesn't exist on products without phone apps,
but the monkeys still know how to find it.

Change-Id: I36aca53506c8d7d7565df8674aff9d59745139e0
 2010-10-07 12:22:56 -04:00
Eric Rowe
82aacddef9 am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 
Merge commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6' into gingerbread-plus-aosp

* commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
 2010-10-07 09:19:37 -07:00
Andreas Huber
1e19416383 On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume. 
Change-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c
related-to-bug: 3070094
 2010-10-07 09:19:25 -07:00
Wink Saville
2e99245e0e am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread 
Merge commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc' into gingerbread-plus-aosp

* commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc':
  Changed handling of onQueryCompelete to not use mimeType.
 2010-10-07 09:16:54 -07:00
Eric Rowe
f8d2acdc57 Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 2010-10-07 09:06:30 -07:00
Eric Rowe
8bcc744e1b DO NOT MERGE Initialize bluetooth profiles in BT stress tests 
Change-Id: I0a8b75c8686d9d6969db51d618c1ddeacb2aba87
 2010-10-07 18:01:23 +02:00
Wink Saville
bbc80d3436 Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread 2010-10-07 08:34:01 -07:00
Wink Saville
2e27a0be78 Changed handling of onQueryCompelete to not use mimeType. 
Using mimeType causes an IPC request to contacts which can
be slow. This can cause an ANR of the Phone app. This change
parses the URL and to decide which column to use for the person_id
and thus should not cause an ANR.

bug: 3060704
Change-Id: I750c72746c7269e162f0338c0a3e00230a600519
 2010-10-07 08:28:34 -07:00
James Dong
cf2bdd1fd8 Merge "0-memcpy video recording framework" 2010-10-07 08:11:26 -07:00
satok
7f35c8cc88 Show "more" button in the dialog of InputMethodSubtypePicker 
- Handle subtypes correctly in InputMethodPicker

Change-Id: I0ff9baec46724ca9dee2a7943fee69d4b204589e
 2010-10-07 23:59:18 +09:00
Wu-cheng Li
9df1408513 am 29332971: Merge "Add javadoc for display orientation." into gingerbread 
Merge commit '29332971ddbace4ae3d645a67f28f717df8b1dbd' into gingerbread-plus-aosp

* commit '29332971ddbace4ae3d645a67f28f717df8b1dbd':
  Add javadoc for display orientation.
 2010-10-07 07:18:39 -07:00
Hung-ying Tyan
841d6ff9e0 am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread 
Merge commit '62ec9834a09c9037d195c306fd838b4c0425e7e2' into gingerbread-plus-aosp

* commit '62ec9834a09c9037d195c306fd838b4c0425e7e2':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
 2010-10-07 07:18:27 -07:00
Adam Powell
86b500289b am fbb3b476: Fix bug 3066313 - integrate new text anchor assets. 
Merge commit 'fbb3b4768e858f004fe9a87e83b066244c829d87' into gingerbread-plus-aosp

* commit 'fbb3b4768e858f004fe9a87e83b066244c829d87':
  Fix bug 3066313 - integrate new text anchor assets.
 2010-10-07 07:18:21 -07:00
Dianne Hackborn
18e225b42b am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback 
Merge commit 'bfba7cab94cd9cf28e561159dbbe934dc83a6f0a' into gingerbread-plus-aosp

* commit 'bfba7cab94cd9cf28e561159dbbe934dc83a6f0a':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
 2010-10-07 07:18:08 -07:00
Eric Fischer
7778173a32 am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp

* commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c':
  Import revised translations.  DO NOT MERGE
 2010-10-07 07:16:56 -07:00
Xavier Ducrohet
556866a2ea am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread 
Merge commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp

* commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a':
  Parser is optional in obtainStyledAttributes.
 2010-10-07 07:16:51 -07:00
Hung-ying Tyan
909a974f8e am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread 
Merge commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387' into gingerbread-plus-aosp

* commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387':
  SIP: Fix busy authentication loop.
 2010-10-07 07:16:45 -07:00
Dianne Hackborn
55f1b0b82f am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread 
Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp

* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
  Make Activity.removeDialog() less strict.
 2010-10-07 07:16:34 -07:00
Kenny Root
6ed0cfd3e7 am 5919ac6b: OBB: track binder death observers 
Merge commit '5919ac6b4188285324646772501ef4b97b353cf4' into gingerbread-plus-aosp

* commit '5919ac6b4188285324646772501ef4b97b353cf4':
  OBB: track binder death observers
 2010-10-07 07:16:18 -07:00
Kenny Root
36455d0325 am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread 
Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp

* commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed':
  Add MountService tests and fix a bug it found
 2010-10-07 07:16:08 -07:00
Dianne Hackborn
e89bf50261 am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 
Merge commit 'ef083ec008a3ec69180340912e7f0137472c97d9' into gingerbread-plus-aosp

* commit 'ef083ec008a3ec69180340912e7f0137472c97d9':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
 2010-10-07 07:15:57 -07:00
Gilles Debunne
f960718c1c am 1ae32bfe: New assets for buttons and notification 
Merge commit '1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp

* commit '1ae32bfebf5102774cbf6424885f84e4630925c4':
  New assets for buttons and notification
 2010-10-07 07:15:05 -07:00