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

22933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
64dff98e91 am 1442818a: am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 
Merge commit '1442818a10988cc011f55104e997474b5d3d2468'

* commit '1442818a10988cc011f55104e997474b5d3d2468':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
 2010-10-14 22:37:14 -07:00
Justin Ho
589bc941fd am 27023cc5: (-s ours) am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 
Merge commit '27023cc5fefc4e56f672ee264289fa319d97585b'

* commit '27023cc5fefc4e56f672ee264289fa319d97585b':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
 2010-10-14 22:13:37 -07:00
Justin Ho
292902e64a am c42d196f: (-s ours) am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background 
Merge commit 'c42d196f969e1d7f588e5e397176557c4c97575f'

* commit 'c42d196f969e1d7f588e5e397176557c4c97575f':
  Updated lockscreen asset (Hiroshi), new menu background
 2010-10-14 21:48:20 -07:00
Hung-ying Tyan
bd9276b8e0 am 8a362186: am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 
Merge commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c'

* commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c':
  SipService: mScreenOn is flipped to wrong value.
 2010-10-14 21:19:54 -07:00
Nick Pelly
63beeca752 am 9fae3ecc: am ab39f1ef: Merge "Fix build." into gingerbread 
Merge commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6'

* commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6':
  Fix build.
 2010-10-14 21:19:36 -07:00
Dianne Hackborn
c2cbc954bc am 4ce930da: am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 
Merge commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea'

* commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash
 2010-10-14 21:19:20 -07:00
Jaikumar Ganesh
e38bc55d45 am 373a6961: am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread 
Merge commit '373a69614e534ae04dddd79c92933b6d8969fad7'

* commit '373a69614e534ae04dddd79c92933b6d8969fad7':
  Bluez doesn't handle disconnect while connecting well.
 2010-10-14 21:19:04 -07:00
Nick Pelly
de3b8ebe87 am 6066da89: (-s ours) am 590b73bc: NFC API revision round 2. 
Merge commit '6066da89a464d2bd5f002f5e687d40876ed5ce21'

* commit '6066da89a464d2bd5f002f5e687d40876ed5ce21':
  NFC API revision round 2.
 2010-10-14 21:18:41 -07:00
Jason Sams
fa06278765 Merge "Fix object cast." 2010-10-14 17:58:39 -07:00
Jason Sams
648973bb1a Merge "Async type creation." 2010-10-14 17:52:31 -07:00
Chris Tate
9a0e9202ca Merge "Drag thumbnail fixes / improvements" 2010-10-14 17:14:07 -07:00
Irfan Sheriff
90390366fe Merge "Remove synchronous bluetooth callbacks" 2010-10-14 17:11:13 -07:00
Adam Cohen
c6e0d89af5 Merge "Fixing null pointer exception" 2010-10-14 16:29:29 -07:00
Adam Powell
c2d9a5be00 Merge "Holo styling and metrics; holo spinners" 2010-10-14 16:24:59 -07:00
Jaikumar Ganesh
adcc807c35 Merge "Disconnect PBAP while disconnecting HFP profile." 2010-10-14 16:18:22 -07:00
Jim Miller
540a73eb45 Merge "Fix 3024528: Add owner info to SecureSettings." 2010-10-14 15:54:21 -07:00
Justin Ho
cd4a330ad5 am dfd37a47: (-s ours) am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 
Merge commit 'dfd37a4748845273d929f24ae5d68032d19f6216'

* commit 'dfd37a4748845273d929f24ae5d68032d19f6216':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
 2010-10-14 15:43:25 -07:00
Hung-ying Tyan
70cc91cd5b am 06e55977: am 907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 
Merge commit '06e559779edd93a83100824b36c9bf67a27db178'

* commit '06e559779edd93a83100824b36c9bf67a27db178':
  Fix SipSessionGroup from throwing ConcurrentModificationException
 2010-10-14 15:29:35 -07:00
Adam Powell
a29be9f92d am 2b87dbc3: (-s ours) am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 
Merge commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9'

* commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
 2010-10-14 15:28:50 -07:00
Chet Haase
5e3eb0c093 Merge "Remove errant minus sign" 2010-10-14 15:07:30 -07:00
Romain Guy
aeec4a8942 Merge "Fix text rendering issue." 2010-10-14 14:54:58 -07:00
Shimeng (Simon) Wang
48b8bb0395 Merge "Remove not-used code." 2010-10-14 14:53:52 -07:00
Chris Tate
50ca4c0e02 Merge "Actually draw the drag thumbnail" 2010-10-14 14:44:06 -07:00
Shimeng (Simon) Wang
53ccc24675 Merge "Fixed viewport enhancement for site with viewport tag." 2010-10-14 14:30:17 -07:00
Nicolas Roard
b5be4d9598 Merge "Fix embed webview" 2010-10-14 14:12:40 -07:00
Shimeng (Simon) Wang
bda9f77061 Merge "Use real fixed viewport, and let the content width be the overview width." 2010-10-14 11:45:52 -07:00
Jaikumar Ganesh
90241a102e Merge "Add function to check for AVRCP target to send volume keys." 2010-10-14 11:03:42 -07:00
James Dong
a79369fccf Merge "Remove hard-coded color format for Nvidia's video encoder" 2010-10-14 11:01:15 -07:00
Romain Guy
9c7ccd1a20 Merge "Remove generics from Animator APIs" 2010-10-14 10:08:12 -07:00
Jaikumar Ganesh
8078459815 Merge "resolved conflicts for merge of 79a5307a to master" 2010-10-14 09:43:00 -07:00
Jaikumar Ganesh
3d9db684e5 resolved conflicts for merge of 79a5307a to master 
Change-Id: I5a524fe53e74df722db003cec6ab62451fe0f899
 2010-10-14 09:39:41 -07:00
Alex Sakhartchouk
c072fc9ff6 Merge "Changing scenegraph sample to use arrays." 2010-10-14 09:34:56 -07:00
Ben Murdoch
4607aedaab Merge "Add support for the complete set of AutoFill profile data." 2010-10-14 07:48:28 -07:00
Steve Block
2898441ad7 Merge "Implement LayoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey')" 2010-10-14 04:46:42 -07:00
Jeff Brown
d360cccfc8 am 7eb67fb4: am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread 
Merge commit '7eb67fb44098bf4b26a1a2d20516f632ab747805'

* commit '7eb67fb44098bf4b26a1a2d20516f632ab747805':
  Add text selection handles to preloaded drawables.
 2010-10-13 23:36:10 -07:00
Andy Stadler
e626383be8 am 8a703c77: am 8e2be267: Add versionCode and versionName to dumpsys packages 
Merge commit '8a703c772ef233998fccfbdb159c8879c72fa5d3'

* commit '8a703c772ef233998fccfbdb159c8879c72fa5d3':
  Add versionCode and versionName to dumpsys packages
 2010-10-13 23:35:12 -07:00
Adam Powell
f3086059e3 am 4af1de39: am fb6431c0: Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 
Merge commit '4af1de39ab36cbff08075e654db516526ff9038d'

* commit '4af1de39ab36cbff08075e654db516526ff9038d':
  Fix bug 3064135 - do not allow text handles on TextViews in sub windows.
 2010-10-13 23:34:54 -07:00
Irfan Sheriff
fe0c4b1957 am a9c2ef84: (-s ours) am e22eb863: Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 
Merge commit 'a9c2ef8464f6678c21e0cdf9f4cd8f4e1fd20d2e'

* commit 'a9c2ef8464f6678c21e0cdf9f4cd8f4e1fd20d2e':
  fix start driver for corner cases DO NOT MERGE
 2010-10-13 23:34:41 -07:00
Joe Onorato
503d2d4a08 am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread 
Merge commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96'

* commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96':
  Remove dead code, and make the animation a setting.
  turn off the electron beam
 2010-10-13 23:34:21 -07:00
Wink Saville
6c4ca2b630 am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbread 
Merge commit '090ac9f7dd883aa75c899745182471d409a2b762'

* commit '090ac9f7dd883aa75c899745182471d409a2b762':
  Remove some PII.
 2010-10-13 19:40:16 -07:00
Dirk Dougherty
c71bbd269b Doc change: Merge commit 'd555e264' into manualmerge 
Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I473bc026fe24caf6a851e8f282b1874c75ef5a30
 2010-10-13 19:32:02 -07:00
John Wang
84e4fbb9a2 am 7a26ebdf: am 844a6b3c: Turn off additional debug. 
Merge commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef'

* commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef':
  Turn off additional debug.
 2010-10-13 19:14:56 -07:00
Leon Scroggins
7b809a0f50 am 00c50b2e: am f348502c: Merge "Allow TextView to do its thing." into gingerbread 
Merge commit '00c50b2e49dbb3537a3ee553dc79d6e34cd00065'

* commit '00c50b2e49dbb3537a3ee553dc79d6e34cd00065':
  Allow TextView to do its thing.
 2010-10-13 19:14:19 -07:00
Romain Guy
7714e36818 Merge changes If2f987fe,Iedf42cbc 
* changes:
  Fix layer rendering glitch.
  Don't draw TextView's alpha layers when not needed.
 2010-10-13 18:54:37 -07:00
Brad Fitzpatrick
bbbf33a676 am 4711d21a: am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread 
Merge commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc'

* commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc':
  StrictMode: link to designing for responsiveness ANR docs
 2010-10-13 17:03:10 -07:00
Jeff Brown
29ba9b8d3e am 4b255a23: am 03aa28fb: Merge "Improve the input policy handling a bit." into gingerbread 
Merge commit '4b255a23041225103a6870e77a236f78c2816eda'

* commit '4b255a23041225103a6870e77a236f78c2816eda':
  Improve the input policy handling a bit.
 2010-10-13 17:02:48 -07:00
Chung-yih Wang
f0164f441e am b99db0c7: am 4367ab00: Set the wifi-only for SIP service as the default config. 
Merge commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03'

* commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03':
  Set the wifi-only for SIP service as the default config.
 2010-10-13 17:02:24 -07:00
Hung-ying Tyan
05328eedea am f5b7c855: am f5201ab7: Keep original phone number in SipConnection. 
Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784'

* commit 'f5b7c855fbb69e8614dab5ca15639228a2428784':
  Keep original phone number in SipConnection.
 2010-10-13 17:02:08 -07:00
Jeff Brown
5d0d23dba9 am b05632aa: am a28d5aff: Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread 
Merge commit 'b05632aae37ea3a3573aabf10e6868733546de96'

* commit 'b05632aae37ea3a3573aabf10e6868733546de96':
  Fix a bug synthesizing cancelation events for motions.
 2010-10-13 17:01:53 -07:00
Hung-ying Tyan
05b479b4d1 am c74d3917: am ece7e11b: Merge "SipService: fix a missing switch-case break." into gingerbread 
Merge commit 'c74d39173e1071dbffe713e008b95784ac4312bc'

* commit 'c74d39173e1071dbffe713e008b95784ac4312bc':
  SipService: fix a missing switch-case break.
 2010-10-13 17:01:38 -07:00