27122 Commits

Author SHA1 Message Date
Andreas Huber
af90958184 am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread
Merge commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc' into gingerbread-plus-aosp

* commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc':
  Remove stagefright foundation's incompatible logging interface and update callsites.
2010-09-21 15:17:42 -07:00
Andreas Huber
67738486d9 Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread 2010-09-21 15:14:43 -07:00
Andreas Huber
6e3fa444c5 Remove stagefright foundation's incompatible logging interface and update callsites.
Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
2010-09-21 15:12:19 -07:00
Kenny Root
c1558df777 am 34d3aeaf: Merge "Add image creator helper script for OBBs" into gingerbread
Merge commit '34d3aeaf7f5dd744f46220f7730913468256ae9c' into gingerbread-plus-aosp

* commit '34d3aeaf7f5dd744f46220f7730913468256ae9c':
  Add image creator helper script for OBBs
2010-09-21 15:06:08 -07:00
Steve Howard
8bf158f6ba am 34a7f080: Merge "Un-@hide ability to download without a running notification." into gingerbread
Merge commit '34a7f0807ee93eaefe83a9192ebc774fb1560875' into gingerbread-plus-aosp

* commit '34a7f0807ee93eaefe83a9192ebc774fb1560875':
  Un-@hide ability to download without a running notification.
2010-09-21 15:02:53 -07:00
Kenny Root
34d3aeaf7f Merge "Add image creator helper script for OBBs" into gingerbread 2010-09-21 15:00:30 -07:00
Steve Howard
34a7f0807e Merge "Un-@hide ability to download without a running notification." into gingerbread 2010-09-21 14:58:05 -07:00
Steve Howard
3104775b53 Un-@hide ability to download without a running notification.
Change-Id: Iaf4d86f05e1f98a894a480d7e2e0ecabb42116c4
2010-09-21 14:18:19 -07:00
Adam Powell
f38c7e7531 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
447c677e97 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
1e646b55a5 Merge "Add mdpi text select anchor asset" into gingerbread 2010-09-21 14:04:13 -07:00
Mindy Pereira
1139b326d2 Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread 2010-09-21 14:04:00 -07:00
Chet Haase
458c1383ea 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
e920477e86 Merge "do not merge" into gingerbread 2010-09-21 13:42:56 -07:00
Mindy Pereira
40d35794ca DO NOT MERGE Tweaked EdgeGlow to better match user expectations.
Change-Id: I7864dd4d3e15a9dc11429d5d3268f9b078f3eaad
Constants updated to match user testing.
Recede no longer flashes out but degrades all the way to zero.
Growth of the absorb flash is now quadratic as this better
matches the "physics" of the user flicking the list.
Size of the pull and absorb graphics changed to give the user
a more dramatic indication of what has happened.
2010-09-21 13:15:56 -07:00
Chet Haase
39d1ee558d do not merge
updated assets: pull-my-thumb/unlock (partially complete), 3g status, expander_ic_min/max changes

Change-Id: I1cb4601ec7eb2da7689fa58cb56c294f786ea4e6
2010-09-21 13:10:29 -07:00
Steve Howard
f1166513f5 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
d404a9be14 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
ff0ea5eaf1 Merge "Support for download manager "queue for wifi" dialogs" into gingerbread 2010-09-21 12:49:36 -07:00
Steve Howard
f176681ecc Support for download manager "queue for wifi" dialogs
New DB column and new secure setting for recommended max download size
over mobile.

Change-Id: If87acda62140ad6d8f923a000a5ff9232021e1a3
2010-09-21 12:48:09 -07:00
Irfan Sheriff
0859b76471 Make wifi scan async. (don't auto-merge)
When an entity (NLP for example) acquires
a WifiLock and initiates a scan, scan can
get blocked until driver starts.

scan returns no useful info, scan results
are broadcast when obtained.

Bug: 2964633
Change-Id: Iaefc32bb6b82f0718285a18ac600e6bbbb096e77
2010-09-21 12:38:09 -07:00
Vasu Nori
b745ec9542 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
173ea0912a Merge "DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'" into gingerbread 2010-09-21 12:22:10 -07:00
Vasu Nori
9540a8d320 DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
output now looks like the following
  SQL
                  heap:      551          MEMORY_USED:      551
    PAGECACHE_OVERFLOW:      113          MALLOC_SIZE:       50

 DATABASES
    pgsz   dbsz   Lookaside(b)  Dbname
       1    148           500  contacts2.db
       1      8             0    (attached) presence_db
       1     18            31  :memory:SQL

Change-Id: I8bb65a522fd9478ff2f6a8c27e69f9e6c10aef8a
2010-09-21 12:07:24 -07:00
Cary Clark
100cc263b4 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
b5631f59d3 Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread 2010-09-21 11:47:38 -07:00
James Dong
7e8a16e884 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
bd1578fb68 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
d3c9fce36c Merge "Allow record to set input color format as a command line option" into gingerbread 2010-09-21 11:34:26 -07:00
Cary Clark
2fddc21a46 Do not merge : cancel text select mode when pressing back, etc.
This was taken from scroggo's excellent change
https://android-git.corp.google.com/g/#change,68114

Change-Id: Idd18e08f1aaeb2fee47bfeed9e7d57e38cb1c62f
http://b/3000317
2010-09-21 14:33:11 -04:00
Doug Zongker
eb4d5b2537 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
abb45e6720 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
b9881e6b94 Merge "Adding more DL Manager tests." into gingerbread 2010-09-21 11:02:29 -07:00
Eric Laurent
96d5c17e78 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
Eric Laurent
8d1513e13c Merge "Made audio effect control panel intents public." into gingerbread 2010-09-21 10:47:17 -07:00
Eric Laurent
92cf2d6085 Made audio effect control panel intents public.
Change-Id: If927606a24966605eb3e02788b2477937349d518
2010-09-21 10:45:41 -07:00
Jesse Wilson
2121ec9bca 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
8217eac0a0 Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 2010-09-21 10:30:39 -07:00
Doug Zongker
4baf641e7d recovery just takes a filename as an argument now (do not merge)
Change-Id: I900cb3e7392c38b40f8c08ae5282cd5c05a4a009
2010-09-21 10:27:54 -07:00
Jesse Wilson
c59a662382 Fix double-checked locking bug in LocalSocket.
This code uses a try/finally to maintain the old behavior of setting
implCreated even if creation fails.

Change-Id: Ieac05568477db4908cd4087714cf00a9addd1d20
2010-09-21 10:26:57 -07:00
James Dong
e436ef09d2 am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread
Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
  Another attempt for fixing AAC+/eAAC+ related issue
2010-09-21 10:24:10 -07:00
Jean-Baptiste Queru
925f94b788 am 7869f08c: Merge "MOTOYA Japanese fonts"
Merge commit '7869f08c55d774b0006c2260e87747ff5e0746f2' into gingerbread-plus-aosp

* commit '7869f08c55d774b0006c2260e87747ff5e0746f2':
  MOTOYA Japanese fonts
2010-09-21 10:21:37 -07:00
James Dong
e520669417 Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 2010-09-21 10:19:22 -07:00
Kenny Root
30c1102fec Add image creator helper script for OBBs
Change-Id: Id3f2b158077e8d104582e0ac720c2428c3ba4d97
2010-09-21 10:13:19 -07:00
Jean-Baptiste Queru
7869f08c55 Merge "MOTOYA Japanese fonts" 2010-09-21 10:09:12 -07:00
Wu-cheng Li
2ad1ebcaab am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp

* commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
2010-09-21 08:57:15 -07:00
Mike Lockwood
e65735aff0 am 92630c78: Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread
Merge commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9' into gingerbread-plus-aosp

* commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9':
  SystemUI: Use new USB notifications to detect USB disconnect.
2010-09-21 08:48:15 -07:00
Wu-cheng Li
d45cb72ac0 Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
This constant is not public yet. Continuous autofocus should
behave differently in still camera and camcorder. In camcorder,
lens movement may be more smooth. And the triggers to start a
new focus search may be different. If there is a need,
FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future.

Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a
2010-09-21 08:46:32 -07:00
Mike Lockwood
92630c787d Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 2010-09-21 08:45:34 -07:00
Robert Greenwalt
f532e9583e am 6548f395: Merge "Inet status bug fix" into gingerbread
Merge commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp

* commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef':
  Inet status bug fix
2010-09-21 08:22:59 -07:00