ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
21,596 Commits 2 Branches 0 Tags 54 MiB
8f6bab0b8f
Commit Graph

21596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shimeng (Simon) Wang
9923a69032 Merge "Make the reading level scale at least 0.5f apart from overview level." 2010-09-21 14:37:49 -07:00
Doug Zongker
4647d84857 Merge "recovery just takes a filename as an argument now" 2010-09-21 14:18:36 -07:00
Adam Powell
ef516edd5c am 1e646b55: Merge "Add mdpi text select anchor asset" into gingerbread 
Merge commit '1e646b55a5fd8c4f88d22a53b4b922f16ab0bfc0' into gingerbread-plus-aosp

* commit '1e646b55a5fd8c4f88d22a53b4b922f16ab0bfc0':
  Add mdpi text select anchor asset
 2010-09-21 14:09:02 -07:00
Mindy Pereira
868fca7d00 am 1139b326: Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread 
Merge commit '1139b326d2cf95e2917ed23d79f795d64379d188' into gingerbread-plus-aosp

* commit '1139b326d2cf95e2917ed23d79f795d64379d188':
  DO NOT MERGE Tweaked EdgeGlow to better match user expectations.
 2010-09-21 14:08:55 -07:00
Adam Powell
45983b287b Merge "Add mdpi text select anchor asset" into gingerbread 2010-09-21 14:04:13 -07:00
Mindy Pereira
13603aaaef Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread 2010-09-21 14:04:00 -07:00
Chet Haase
058a27ad83 am 458c1383: (-s ours) am e920477e: Merge "do not merge" into gingerbread 
Merge commit '458c1383ea0e672473feabf1852cee4dbca7211d'

* commit '458c1383ea0e672473feabf1852cee4dbca7211d':
  do not merge
 2010-09-21 13:49:39 -07:00
Chet Haase
a766851582 am e920477e: Merge "do not merge" into gingerbread 
Merge commit 'e920477e862b90778cdc8e2e221a20d8f3a86878' into gingerbread-plus-aosp

* commit 'e920477e862b90778cdc8e2e221a20d8f3a86878':
  do not merge
 2010-09-21 13:46:05 -07:00
Chet Haase
18f159fb99 Merge "do not merge" into gingerbread 2010-09-21 13:42:56 -07:00
Steve Howard
998056d2d3 am f1166513: am ff0ea5ea: Merge "Support for download manager "queue for wifi" dialogs" into gingerbread 
Merge commit 'f1166513f596c4ffad41429b10ba1d20c65f6d6c'

* commit 'f1166513f596c4ffad41429b10ba1d20c65f6d6c':
  Support for download manager "queue for wifi" dialogs
 2010-09-21 13:12:56 -07:00
Irfan Sheriff
78d74f90f3 am d404a9be: (-s ours) am 0859b764: Make wifi scan async. (don\'t auto-merge) 
Merge commit 'd404a9be14715efdea447ec4ed3e7677ab72e641'

* commit 'd404a9be14715efdea447ec4ed3e7677ab72e641':
  Make wifi scan async. (don't auto-merge)
 2010-09-21 13:10:30 -07:00
Gil Dobjanschi
832ed74215 Merge "Added the behavior paramter to transition constructors" 2010-09-21 13:09:49 -07:00
Steve Howard
ad1674e06e am ff0ea5ea: Merge "Support for download manager "queue for wifi" dialogs" into gingerbread 
Merge commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f' into gingerbread-plus-aosp

* commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f':
  Support for download manager "queue for wifi" dialogs
 2010-09-21 13:02:06 -07:00
Irfan Sheriff
1311fffca0 am 0859b764: Make wifi scan async. (don\'t auto-merge) 
Merge commit '0859b764719735e4b9aea5df6051ece13e212841' into gingerbread-plus-aosp

* commit '0859b764719735e4b9aea5df6051ece13e212841':
  Make wifi scan async. (don't auto-merge)
 2010-09-21 12:59:34 -07:00
Steve Howard
76d0d482c5 Merge "Support for download manager "queue for wifi" dialogs" into gingerbread 2010-09-21 12:49:36 -07:00
Vasu Nori
ed5ebb6c83 am b745ec95: (-s ours) am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread 
Merge commit 'b745ec954272a3c09cca354ad84e2e08b54c8544'

* commit 'b745ec954272a3c09cca354ad84e2e08b54c8544':
  DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
 2010-09-21 12:30:12 -07:00
Vasu Nori
50874ebb79 am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread 
Merge commit '173ea0912af296c6e80d14b764046534b316d21f' into gingerbread-plus-aosp

* commit '173ea0912af296c6e80d14b764046534b316d21f':
  DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
 2010-09-21 12:25:39 -07:00
Vasu Nori
da75035d23 Merge "DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'" into gingerbread 2010-09-21 12:22:10 -07:00
Cary Clark
c407b117e8 am 100cc263: (-s ours) am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread 
Merge commit '100cc263b465242c01dc9eb280d77ffaadbddd39'

* commit '100cc263b465242c01dc9eb280d77ffaadbddd39':
  Do not merge : cancel text select mode when pressing back, etc.
 2010-09-21 11:54:51 -07:00
Cary Clark
fe6d79386a am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread 
Merge commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d' into gingerbread-plus-aosp

* commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d':
  Do not merge : cancel text select mode when pressing back, etc.
 2010-09-21 11:51:23 -07:00
Cary Clark
205097dd3c Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread 2010-09-21 11:47:38 -07:00
James Dong
d19d530ebf am 7e8a16e8: am d3c9fce3: Merge "Allow record to set input color format as a command line option" into gingerbread 
Merge commit '7e8a16e884632c85a54dc351c0b4f79aea116237'

* commit '7e8a16e884632c85a54dc351c0b4f79aea116237':
  Allow record to set input color format as a command line option
 2010-09-21 11:41:16 -07:00
Doug Zongker
a534a63a43 am bd1578fb: (-s ours) am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread 
Merge commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063'

* commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063':
  recovery just takes a filename as an argument now (do not merge)
 2010-09-21 11:41:11 -07:00
James Dong
5d45c887a0 am d3c9fce3: Merge "Allow record to set input color format as a command line option" into gingerbread 
Merge commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3' into gingerbread-plus-aosp

* commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3':
  Allow record to set input color format as a command line option
 2010-09-21 11:37:20 -07:00
Doug Zongker
39d2c2cc33 am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread 
Merge commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae' into gingerbread-plus-aosp

* commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae':
  recovery just takes a filename as an argument now (do not merge)
 2010-09-21 11:37:15 -07:00
James Dong
9d11ca7cea Merge "Allow record to set input color format as a command line option" into gingerbread 2010-09-21 11:34:26 -07:00
Doug Zongker
ab7fb91df5 Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread 2010-09-21 11:32:01 -07:00
Neal Nguyen
efc1160a85 am abb45e67: am b9881e6b: Merge "Adding more DL Manager tests." into gingerbread 
Merge commit 'abb45e6720a035e909644941b8ef7f92faeb6f34'

* commit 'abb45e6720a035e909644941b8ef7f92faeb6f34':
  Adding more DL Manager tests.
 2010-09-21 11:09:52 -07:00
Vasu Nori
1def791a0e Merge "add new param to device config properties: db connection pool size" 2010-09-21 11:06:45 -07:00
Neal Nguyen
a409a6e227 am b9881e6b: Merge "Adding more DL Manager tests." into gingerbread 
Merge commit 'b9881e6b94607334673566493c904f6741087938' into gingerbread-plus-aosp

* commit 'b9881e6b94607334673566493c904f6741087938':
  Adding more DL Manager tests.
 2010-09-21 11:05:32 -07:00
Neal Nguyen
5e4ddbc025 Merge "Adding more DL Manager tests." into gingerbread 2010-09-21 11:02:29 -07:00
Eric Laurent
18fde01aa3 am 96d5c17e: am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread 
Merge commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f'

* commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f':
  Made audio effect control panel intents public.
 2010-09-21 10:56:30 -07:00
Mathias Agopian
86372461a8 Merge "fix [3018216] UI shrinks / stretches while using apps with IME" 2010-09-21 10:54:55 -07:00
Mathias Agopian
e44d21a247 fix [3018216] UI shrinks / stretches while using apps with IME 
Change-Id: Ie4c5d8a434b4489355ed8c52af96eb931b4d7167
 2010-09-21 10:52:42 -07:00
Eric Laurent
6efdfa4936 am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread 
Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp

* commit '8d1513e13c1e3d0142423570c0028e147bf0ea37':
  Made audio effect control panel intents public.
 2010-09-21 10:52:27 -07:00
Jesse Wilson
b34c14db66 am 2121ec9b: am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 
Merge commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b'

* commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b':
  Fix double-checked locking bug in LocalSocket.
 2010-09-21 10:49:23 -07:00
Eric Laurent
acb57b13d7 Merge "Made audio effect control panel intents public." into gingerbread 2010-09-21 10:47:17 -07:00
James Dong
62adc4c3a1 am e436ef09: am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 
Merge commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193'

* commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193':
  Another attempt for fixing AAC+/eAAC+ related issue
 2010-09-21 10:45:13 -07:00
Jean-Baptiste Queru
78bc57e5c9 am 925f94b7: am 7869f08c: Merge "MOTOYA Japanese fonts" 
Merge commit '925f94b788f5856025aa8218ee2e705c14f58281'

* commit '925f94b788f5856025aa8218ee2e705c14f58281':
  MOTOYA Japanese fonts
 2010-09-21 10:45:09 -07:00
Wu-cheng Li
5355b02be1 am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO. 
Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd'

* commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
 2010-09-21 10:44:38 -07:00
Mike Lockwood
b96a9585fa am e65735af: am 92630c78: Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 
Merge commit 'e65735aff0f09a1c19b79c6d2b98ef39123da1d4'

* commit 'e65735aff0f09a1c19b79c6d2b98ef39123da1d4':
  SystemUI: Use new USB notifications to detect USB disconnect.
 2010-09-21 10:44:33 -07:00
Robert Greenwalt
ecf711cc6c am f532e958: am 6548f395: Merge "Inet status bug fix" into gingerbread 
Merge commit 'f532e9583ec0111b1c198e895ed1b2fd83c3d5cf'

* commit 'f532e9583ec0111b1c198e895ed1b2fd83c3d5cf':
  Inet status bug fix
 2010-09-21 10:44:26 -07:00
Dianne Hackborn
280600436a am e665698f: am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread 
Merge commit 'e665698ffe539bdb99122dcf83e19844ebea92b8'

* commit 'e665698ffe539bdb99122dcf83e19844ebea92b8':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
 2010-09-21 10:44:13 -07:00
Chung-yih Wang
80e0849b32 am 83af4fbb: am 4c571a62: Fix the build. 
Merge commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb'

* commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb':
  Fix the build.
 2010-09-21 10:43:47 -07:00
Dianne Hackborn
178d387e77 am 2d19a676: am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread 
Merge commit '2d19a676860bf773c984315fe03d9568913f9314'

* commit '2d19a676860bf773c984315fe03d9568913f9314':
  Fix #2999258: ANR in Settings after every reboot
 2010-09-21 10:43:36 -07:00
Chung-yih Wang
aa89c11bab am 232bc085: am 708e4251: Merge "Revert the ANSWERING state." into gingerbread 
Merge commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7'

* commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7':
  Revert the ANSWERING state.
 2010-09-21 10:43:24 -07:00
Jesse Wilson
7cabd289a1 am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 
Merge commit '8217eac0a0b6d394139eefa85d5f467240427e98' into gingerbread-plus-aosp

* commit '8217eac0a0b6d394139eefa85d5f467240427e98':
  Fix double-checked locking bug in LocalSocket.
 2010-09-21 10:33:53 -07:00
Jesse Wilson
3848410fdd Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 2010-09-21 10:30:39 -07:00
Robert Greenwalt
bc6a5e7693 Merge "resolved conflicts for merge of 749e6bc5 to master" 2010-09-21 10:30:13 -07:00
Stephen Hines
4df9ec1164 Merge "Add support for Float64 (double) to RenderScript." 2010-09-21 10:29:48 -07:00