ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
22,820 Commits 2 Branches 0 Tags 54 MiB
488a9c36ee
Commit Graph

22820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
e4a7fe28a4 Merge "Move GenerationCache to the utils directory." 2010-10-08 18:47:45 -07:00
James Dong
cf9db5798a Merge "Move Camera specific logic out from StagefrightRecorder to CameraSource" 2010-10-08 18:39:13 -07:00
Romain Guy
2e9706f7e3 Merge "Don't update 9patches on every frame." 2010-10-08 18:39:04 -07:00
Wu-cheng Li
9d121475d3 am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread 
Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'

* commit '9df140851375a977ad99390d71edf8b4a8382fd4':
  Add javadoc for display orientation.
 2010-10-08 18:28:38 -07:00
Hung-ying Tyan
f384f417f2 am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread 
Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32'

* commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
 2010-10-08 18:28:20 -07:00
Adam Powell
d6a20a90dd resolved conflicts for merge of 86b50028 to master 
Change-Id: I3468e67ac17f861c5491717337c27cd49bd5287e
 2010-10-08 18:23:49 -07:00
Dianne Hackborn
d5bac8e190 am 18e225b4: am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback 
Merge commit '18e225b42b77c48efa63f245a4137c5f74302e26'

* commit '18e225b42b77c48efa63f245a4137c5f74302e26':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
 2010-10-08 17:59:52 -07:00
Eric Fischer
10187ad4a2 am 7778173a: (-s ours) am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '7778173a32edcfccdcc31407169d2ec40916ca2f'

* commit '7778173a32edcfccdcc31407169d2ec40916ca2f':
  Import revised translations.  DO NOT MERGE
 2010-10-08 17:59:33 -07:00
Xavier Ducrohet
352c116386 am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread 
Merge commit '556866a2ea1f4758a79fe4f207153b71815ed400'

* commit '556866a2ea1f4758a79fe4f207153b71815ed400':
  Parser is optional in obtainStyledAttributes.
 2010-10-08 17:59:13 -07:00
Hung-ying Tyan
c4228f4e50 am 909a974f: am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread 
Merge commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e'

* commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e':
  SIP: Fix busy authentication loop.
 2010-10-08 17:58:55 -07:00
Dianne Hackborn
cc14d48fb8 am 55f1b0b8: am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread 
Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f'

* commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f':
  Make Activity.removeDialog() less strict.
 2010-10-08 17:58:35 -07:00
Kenny Root
3859ddecf3 am 6ed0cfd3: am 5919ac6b: OBB: track binder death observers 
Merge commit '6ed0cfd3e798e3014c9f1099631249463d25140c'

* commit '6ed0cfd3e798e3014c9f1099631249463d25140c':
  OBB: track binder death observers
 2010-10-08 17:58:15 -07:00
Kenny Root
e200a86950 am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread 
Merge commit '36455d03256024981b1bf21557722a010b5e092a'

* commit '36455d03256024981b1bf21557722a010b5e092a':
  Add MountService tests and fix a bug it found
 2010-10-08 17:57:55 -07:00
Dianne Hackborn
f9e0b45a31 am e89bf502: am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 
Merge commit 'e89bf50261902bf263887923bf95595ec8eae069'

* commit 'e89bf50261902bf263887923bf95595ec8eae069':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
 2010-10-08 17:57:35 -07:00
Gilles Debunne
574d386c2d am f960718c: (-s ours) am 1ae32bfe: New assets for buttons and notification 
Merge commit 'f960718c1c02186746873ec4a669028bb8ea9d94'

* commit 'f960718c1c02186746873ec4a669028bb8ea9d94':
  New assets for buttons and notification
 2010-10-08 17:57:16 -07:00
Dianne Hackborn
1d7a7603e9 am cef38339: am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread 
Merge commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37'

* commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37':
  Make USB mass storage hide keyguard when shown.
 2010-10-08 17:45:08 -07:00
Scott Main
92fe1af1c4 am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build 
Merge commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp

* commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
 2010-10-08 17:36:00 -07:00
Scott Main
e60bb383aa am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build 
Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread

* commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
 2010-10-08 17:27:28 -07:00
Gilles Debunne
52cdd29ecb am a827d7bc: Merge "Other improvements to text cursor movement." into gingerbread 
Merge commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9' into gingerbread-plus-aosp

* commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9':
  Other improvements to text cursor movement.
 2010-10-08 17:21:42 -07:00
Mindy Pereira
cc7fa43736 am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread 
Merge commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd' into gingerbread-plus-aosp

* commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd':
  DO NOT MERGE Limit the height of the pull glow.
 2010-10-08 17:14:56 -07:00
Gilles Debunne
c91355b2b7 Merge "Other improvements to text cursor movement." into gingerbread 2010-10-08 17:14:45 -07:00
Adam Powell
7754ca6618 Merge "Fix alert dialog layout size in landscape" 2010-10-08 17:10:24 -07:00
Mindy Pereira
e0af18ecb6 Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread 2010-10-08 17:10:21 -07:00
Chung-yih Wang
1293bb3f1d resolved conflicts for merge of 4790a2e2 to master 
Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
 2010-10-09 08:07:55 +08:00
Scott Main
97df820ba8 am 3d265b57: am 50f86c65: docs: a few style adjustments to admin doc 
Merge commit '3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp

* commit '3d265b5775a74b1d5eb726238f13cf63e8465594':
  docs: a few style adjustments to admin doc
 2010-10-08 16:43:06 -07:00
Scott Main
1965b2da51 am 50f86c65: docs: a few style adjustments to admin doc 
Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread

* commit '50f86c65206072be0ca924f03b8d460365199bcd':
  docs: a few style adjustments to admin doc
 2010-10-08 16:39:08 -07:00
Scott Main
2bd20112a5 am 72552887: am 2e5a22aa: docs: remove old "new" tags from side nav 
Merge commit '7255288755661587958d384338d4808e76959d86' into gingerbread-plus-aosp

* commit '7255288755661587958d384338d4808e76959d86':
  docs: remove old "new" tags from side nav
 2010-10-08 16:37:51 -07:00
Scott Main
a0f02af69d am 2e5a22aa: docs: remove old "new" tags from side nav 
Merge commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d' into gingerbread

* commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d':
  docs: remove old "new" tags from side nav
 2010-10-08 16:30:47 -07:00
Andreas Huber
ed8a950343 am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread 
Merge commit 'beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp

* commit 'beffefa24f398b610d58dd583d9f5613dc529c28':
  RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
 2010-10-08 15:55:44 -07:00
Scott Main
2808b8a800 am d7170b2a: am 65e62f4f: docs: new web apps dev guides 
Merge commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4' into gingerbread-plus-aosp

* commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4':
  docs: new web apps dev guides
 2010-10-08 15:55:40 -07:00
Romain Guy
732d47e848 Merge "Better cache for layers, reduce memory usage and increase framerate." 2010-10-08 15:52:02 -07:00
Brad Fitzpatrick
70c8c54767 am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread 
Merge commit 'a4682ed7547e895605d102ab17fc5c134b4ab38f' into gingerbread-plus-aosp

* commit 'a4682ed7547e895605d102ab17fc5c134b4ab38f':
  Minor SharedPreference clean-up.
 2010-10-08 15:51:32 -07:00
Andreas Huber
313ecd5352 Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread 2010-10-08 15:49:48 -07:00
Scott Main
08302f0a0f am 65e62f4f: docs: new web apps dev guides 
Merge commit '65e62f4f908394fc469cf535fef7c16035a428a2' into gingerbread

* commit '65e62f4f908394fc469cf535fef7c16035a428a2':
  docs: new web apps dev guides
 2010-10-08 15:43:44 -07:00
Brad Fitzpatrick
8623f94279 Merge "Minor SharedPreference clean-up." into gingerbread 2010-10-08 15:35:45 -07:00
Mike Dodd
8f6db42d1a Merge "HardwareRenderer: When throwing an exception because of an EGL error, include the specific error." 2010-10-08 15:33:45 -07:00
Dianne Hackborn
f54a0e101a am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread 
Merge commit '62d8874eb74045b37140857ea3b31f198f0adffa' into gingerbread-plus-aosp

* commit '62d8874eb74045b37140857ea3b31f198f0adffa':
  Fix retaining of granted permissions when updating of system app.
 2010-10-08 15:24:30 -07:00
Dianne Hackborn
9c331df44c Merge "Fix retaining of granted permissions when updating of system app." into gingerbread 2010-10-08 15:21:49 -07:00
Joe Onorato
2a650b4a4f Merge "Allow notifications to not specify a contentIntent." 2010-10-08 15:16:14 -07:00
Dianne Hackborn
0aeef9c1d8 am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread 
Merge commit 'db56b9bd39e739474684987b83f386f50596aa5d' into gingerbread-plus-aosp

* commit 'db56b9bd39e739474684987b83f386f50596aa5d':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
 2010-10-08 15:12:55 -07:00
Dianne Hackborn
292ec505a3 Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread 2010-10-08 15:09:23 -07:00
Alex Sakhartchouk
c4435df84c Merge "Removing fixed size arrays." 2010-10-08 15:04:29 -07:00
Gil Dobjanschi
839e38de8e Merge "Hide project media by creating the .nomedia file" 2010-10-08 14:57:05 -07:00
Vasu Nori
fddc45e351 Merge "when printing requery on UI warning, include additional info" 2010-10-08 14:50:59 -07:00
Steve Howard
7b082a34b9 am d8d60da6: Merge "Update DownloadManager API to support bulk actions." into gingerbread 
Merge commit 'd8d60da616343b3520b666c385d0005db860be83' into gingerbread-plus-aosp

* commit 'd8d60da616343b3520b666c385d0005db860be83':
  Update DownloadManager API to support bulk actions.
 2010-10-08 14:44:42 -07:00
Gilles Debunne
ecd641b891 am 50662f5f: Merge "TextView cursor and selection improvements." into gingerbread 
Merge commit '50662f5f04d69b9ec0335f17cfbf6c035bd86577' into gingerbread-plus-aosp

* commit '50662f5f04d69b9ec0335f17cfbf6c035bd86577':
  TextView cursor and selection improvements.
 2010-10-08 14:44:38 -07:00
Steve Howard
ef74539961 Merge "Update DownloadManager API to support bulk actions." into gingerbread 2010-10-08 14:42:43 -07:00
Gilles Debunne
31a7f2409b Merge "TextView cursor and selection improvements." into gingerbread 2010-10-08 14:42:42 -07:00
Dianne Hackborn
be32100059 am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread 
Merge commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead' into gingerbread-plus-aosp

* commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead':
  Fix issue #3074745: Crash in system process
 2010-10-08 14:12:20 -07:00
Irfan Sheriff
edeee9ccd1 Merge "Use LinkProperties for IP and proxy configuration" 2010-10-08 14:09:49 -07:00