ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
19,028 Commits 2 Branches 0 Tags 54 MiB
6c51446d17
Commit Graph

19028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
ff8d45dcd2 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
521236627d 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
c675af2fb2 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
b9083a3521 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
84d2368969 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
b4bfd7d6b3 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
a0182e230b 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
05da721624 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
ac520689e2 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
1e572218ab 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
114758caea 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
Dianne Hackborn
7ed74e0fb2 am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread 
Merge commit '6d44456da87dccb15b4086696f5e72a5aa198926' into gingerbread-plus-aosp

* commit '6d44456da87dccb15b4086696f5e72a5aa198926':
  Make USB mass storage hide keyguard when shown.
 2010-10-07 07:13:47 -07:00
Wu-cheng Li
3c2dc49b88 Merge "Add javadoc for display orientation." into gingerbread 2010-10-07 05:49:27 -07:00
Hung-ying Tyan
6a046de26f Merge "Make SipService broadcast SIP_SERVICE_UP when it's up." into gingerbread 2010-10-06 23:11:09 -07:00
Eric Fischer
3237326c9d Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-06 17:32:17 -07:00
Xavier Ducrohet
32bafef825 Merge "Parser is optional in obtainStyledAttributes." into gingerbread 2010-10-06 17:32:10 -07:00
Hung-ying Tyan
bca588d6fc Merge "SIP: Fix busy authentication loop." into gingerbread 2010-10-06 17:29:28 -07:00
Dianne Hackborn
98fd36fe24 Merge "Make Activity.removeDialog() less strict." into gingerbread 2010-10-06 17:26:16 -07:00
Kenny Root
a135d25422 Merge "Add MountService tests and fix a bug it found" into gingerbread 2010-10-06 16:59:23 -07:00
Dianne Hackborn
84a43e7e1c Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 2010-10-06 16:56:02 -07:00
Dianne Hackborn
f1598c5442 Merge "Make USB mass storage hide keyguard when shown." into gingerbread 2010-10-06 11:19:51 -07:00
Chung-yih Wang
0422150b1a am 18c00089: Merge "Misc fixes for sim-eng build." into gingerbread 
Merge commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb' into gingerbread-plus-aosp

* commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb':
  Misc fixes for sim-eng build.
 2010-10-06 01:52:53 -07:00
Chung-yih Wang
6bc2795c1c Merge "Misc fixes for sim-eng build." into gingerbread 2010-10-06 01:50:25 -07:00
Fred Chung
39f3ecd6da am b50d5ede: am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo 
Merge commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4' into gingerbread-plus-aosp

* commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4':
  Doc change: Adding new docs for Device Admin API.
 2010-10-05 23:45:29 -07:00
Fred Chung
9211b05c40 am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo 
Merge commit '30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread

* commit '30264c9b85109ae58c1e472a747bf47464cc1632':
  Doc change: Adding new docs for Device Admin API.
 2010-10-05 23:39:23 -07:00
Fred Chung
0a95ad1e3b Merge "Doc change: Adding new docs for Device Admin API." into froyo 2010-10-05 23:26:41 -07:00
Dianne Hackborn
17ef147f51 am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread 
Merge commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9' into gingerbread-plus-aosp

* commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9':
  Fix NPE if there is no accelerometer.
 2010-10-05 19:06:04 -07:00
Dianne Hackborn
544360db82 Merge "Fix NPE if there is no accelerometer." into gingerbread 2010-10-05 19:02:52 -07:00
Dianne Hackborn
ff99ad574e am 4e6baf24: Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread 
Merge commit '4e6baf2473e522e6d53afa01348c564148bfbad7' into gingerbread-plus-aosp

* commit '4e6baf2473e522e6d53afa01348c564148bfbad7':
  Fix issue #3001368: API REVIEW: android.app.Activity
 2010-10-05 18:59:57 -07:00
Dianne Hackborn
736a4e9d21 Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread 2010-10-05 18:56:54 -07:00
Hung-ying Tyan
19f2160e32 am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 
Merge commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp

* commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc':
  CallManager/SipPhone: fix reject a ringing call
 2010-10-05 18:37:14 -07:00
Hung-ying Tyan
824bf846ca Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 2010-10-05 18:33:22 -07:00
Gilles Debunne
8e644c3792 am 671b2a57: Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread 
Merge commit '671b2a57bb5a2a8669d1dabe65b4080804ee350a' into gingerbread-plus-aosp

* commit '671b2a57bb5a2a8669d1dabe65b4080804ee350a':
  Fix for IndexOutOfBounds in text pasting.
 2010-10-05 18:15:12 -07:00
Gilles Debunne
ae6260ea5e Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread 2010-10-05 18:11:09 -07:00
Eric Laurent
621ceff868 am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread 
Merge commit '37947afe904220bdf0a1a85a22824d8619be8e36' into gingerbread-plus-aosp

* commit '37947afe904220bdf0a1a85a22824d8619be8e36':
  Fixed AudioFlinger not always pausing tracks
 2010-10-05 17:10:59 -07:00
Eric Laurent
2732651b34 Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread 2010-10-05 17:06:16 -07:00
Adam Powell
46dcc9b622 am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread 
Merge commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp

* commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
 2010-10-05 16:46:05 -07:00
Adam Powell
dd81078e6c Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread 2010-10-05 16:39:24 -07:00
Adam Powell
66be548f08 am 5a5fff71: Fix bug 3064143 - remove default bold on buttons 
Merge commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb' into gingerbread-plus-aosp

* commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb':
  Fix bug 3064143 - remove default bold on buttons
 2010-10-05 15:49:23 -07:00
Dianne Hackborn
2e19a3c728 am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread 
Merge commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6' into gingerbread-plus-aosp

* commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6':
  Fix issue #3056500: Problem report for ASTRO
 2010-10-05 14:45:32 -07:00
Joe Onorato
494e9e83c2 am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread 
Merge commit 'f7872780ca3dae9584251b1e3495aed12110254c' into gingerbread-plus-aosp

* commit 'f7872780ca3dae9584251b1e3495aed12110254c':
  PowerManagerService needs yet another flag...
 2010-10-05 14:45:28 -07:00
Dianne Hackborn
0202e358cf Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread 2010-10-05 14:42:04 -07:00
Joe Onorato
ade00a09c4 Merge "PowerManagerService needs yet another flag..." into gingerbread 2010-10-05 14:41:16 -07:00
Andreas Huber
6748aa80bb am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread 
Merge commit '17bc4f65324a823598e7671256c815bf32ddcc95' into gingerbread-plus-aosp

* commit '17bc4f65324a823598e7671256c815bf32ddcc95':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
 2010-10-05 14:13:16 -07:00
Andreas Huber
ec2c1c8d2c Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread 2010-10-05 14:09:32 -07:00
Kenny Root
ffeaa5c0a0 am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread 
Merge commit '2c3360fe9c03536cbfd77267170b73c120c071ac' into gingerbread-plus-aosp

* commit '2c3360fe9c03536cbfd77267170b73c120c071ac':
  Remove lingering system app native libs in /data
 2010-10-05 14:07:29 -07:00
Kenny Root
2daafa5af9 Merge "Remove lingering system app native libs in /data" into gingerbread 2010-10-05 14:04:26 -07:00
Jeff Brown
da5aa4cd99 am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread 
Merge commit '78d15acfb20269ce263ce19514a2c0e7a98409e2' into gingerbread-plus-aosp

* commit '78d15acfb20269ce263ce19514a2c0e7a98409e2':
  Make secure views tolerate IME overlays.
 2010-10-05 13:17:04 -07:00
Kenny Root
cc5b070f17 am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread 
Merge commit '8735c4cda00de26127d694bfbc81e192c4caca44' into gingerbread-plus-aosp

* commit '8735c4cda00de26127d694bfbc81e192c4caca44':
  Get correct native library path on reinstall
 2010-10-05 13:13:36 -07:00
Dianne Hackborn
54cf1d857a am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread 
Merge commit 'e02e41f484a115b5278dcc07f2d6c90819279800' into gingerbread-plus-aosp

* commit 'e02e41f484a115b5278dcc07f2d6c90819279800':
  DO NOT MERGE: Get rid of status bar's dim during night.
 2010-10-05 13:13:25 -07:00