13929 Commits

Author SHA1 Message Date
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
Steve Howard
7dda67a8a1 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
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
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
Doug Zongker
c2f8a45876 recovery just takes a filename as an argument now
(Cherrypicked from gingerbread.)

Change-Id: I0deb8494465e1036280ac92730e537fd3f38a9fb
2010-09-21 12:33:25 -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
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
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
Vasu Nori
4d76d0b832 STOPSHIP follow up to Change-Id: I392875b62ed270741633f5bffa519932e4a9f985
adding back an object that originally existed (when the bug appeared randomly)

Change-Id: Ie6fef529e7b366aaecaace5d3409f2cdc551c8ae
2010-09-21 11:28:49 -07:00
Neal Nguyen
c64c6a99fb 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
e0c1acbcad Merge "add new param to device config properties: db connection pool size" 2010-09-21 11:06:45 -07:00
Vasu Nori
627b331b32 add new param to device config properties: db connection pool size
connection pool = number of database connections opened when the app opens
a database. These pooled connections are used by readers only and they
use the sqlite write-ahead-logging option to increase reader
concurrency.
The size of this connection pool depends on the number of CPUs, RAM etc.
On most single-core devices, this can be set to 1.
But on some multi-core devices with more RAM, pool size can be
more than 1.
On a device with more resources, here are the results of a test (in
coretests/src/android/database/sqlite/SQLiteDatabaseTest.java)
which measures the reader-parallelism achieved for different connection
pool sizes.
connpool-size = 1
  num xacts by writer = 467
  num-reads-in-xact/NOT-in-xact by reader1 = 1358/14542, by reader2 = 1431/14269
connpool-size = 2
  num xacts by writer = 473
  num-reads-in-xact/NOT-in-xact by reader1 = 5703/35227, by reader2 = 6222/35898
connpool-size = 3
  num xacts by writer = 542
  num-reads-in-xact/NOT-in-xact by reader1 = 6531/32329, by reader2 = 6252/32728
connpool-size = 4
  num xacts by writer = 578
  num-reads-in-xact/NOT-in-xact by reader1 = 6009/32701, by reader2 = 5977/32953
connpool-size = 5
  num xacts by writer = 547
  num-reads-in-xact/NOT-in-xact by reader1 = 6554/31186, by reader2 = 5318/31022
connpool-size = 6
  num xacts by writer = 534
  num-reads-in-xact/NOT-in-xact by reader1 = 5317/31463, by reader2 = 5413/31537
connpool-size = 7
  num xacts by writer = 549
  num-reads-in-xact/NOT-in-xact by reader1 = 5396/28004, by reader2 = 5214/28496

seems like connection pool size of 3 is optimal on this device.

Change-Id: I348ff5a31783c31b5e3e5ac78b7c2cea54ef114a
2010-09-21 11:05:39 -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
Jesse Wilson
0acddc582b 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
Wu-cheng Li
d276720edb 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
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
Adam Cohen
35ae9ca5bf Modifying PendingIntent APIs for collection widgets
Change-Id: Ib8e3b46542389afe93e74358a9138b1935634e90
2010-09-21 09:39:29 -07:00
Cary Clark
e37a365bef Merge "In clearView(), see if native exists before calling it." 2010-09-21 09:36:50 -07:00
Shimeng (Simon) Wang
01ef9eab3b Merge "Use dimension value instead of fixed constant in code." 2010-09-21 09:36:35 -07:00
Shimeng (Simon) Wang
bcfd23a56d Merge "Use max of content width and initial preferred width as the viewport." 2010-09-21 09:29:32 -07:00
Wink Saville
6e80997a9a Cleanup copyright dates add missing method.
Change-Id: I2d8fe0b705e7c90efabb8b3427a539a4a1056874
2010-09-21 09:16:38 -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
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
f1f5361e32 MTP host: Use Java longs for storage and object IDs
This avoids problems with unsigned 32 bit numbers with cameras that use
storage and object IDs > 0x7FFFFFFF

Change-Id: I615f2d468851e9d6ff8882d22966d3687697d8eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-21 10:41:33 -04:00
Cary Clark
a3bec150bf In clearView(), see if native exists before calling it.
Change-Id: I069678ef8f4dbdb6b62109c53b352127f5eec7cf
http://b/2999966
2010-09-21 10:10:29 -04:00
Neal Nguyen
df7a865bbf Adding more DL Manager tests.
Change-Id: I87bf91fdd7dbd058c8d619200d2826ba5e7f76fb
2010-09-20 20:40:56 -07:00
Scott Main
cd155a0672 am aac4630c: am a4270e7e: am 73e150c8: provide link to backup guide above the fold
Merge commit 'aac4630cc5b3076e3cd6f65c52c8ff5f8f921957'

* commit 'aac4630cc5b3076e3cd6f65c52c8ff5f8f921957':
  provide link to backup guide above the fold
2010-09-20 19:33:15 -07:00
Dianne Hackborn
48a781a0a5 am 4b187e80: am 8e1b84e7: Merge "Some battery improvements:" into gingerbread
Merge commit '4b187e804fdfdbc825e17646e82e0218e316a339'

* commit '4b187e804fdfdbc825e17646e82e0218e316a339':
  Some battery improvements:
2010-09-20 19:33:06 -07:00
Mindy Pereira
5b138e5984 am ee632159: am d3301e9f: Add mdpi images for overscroll EdgeGlow.
Merge commit 'ee63215903db7ddd32f165f0a5a771700041f1ed'

* commit 'ee63215903db7ddd32f165f0a5a771700041f1ed':
  Add mdpi images for overscroll EdgeGlow.
2010-09-20 19:32:32 -07:00
Steve Howard
9759df072e am 4735be02: am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread
Merge commit '4735be0211a996f791accc77aeb399df2258ab4c'

* commit '4735be0211a996f791accc77aeb399df2258ab4c':
  New error status for "destination file already exists".
2010-09-20 19:32:19 -07:00
Shimeng (Simon) Wang
77fdaaa3af Use max of content width and initial preferred width as the viewport.
issue: 3003933
Change-Id: I4a901219674b575e8228d44381efbaa159912465
2010-09-20 18:12:30 -07:00
Romain Guy
399542a7a3 Merge "Add support for SweepGradient in the GL renderer." 2010-09-20 17:55:58 -07:00
Romain Guy
ee916f14cb Add support for SweepGradient in the GL renderer.
Change-Id: I7aa397ed4e34655ead9ba1f5b4ce087665e0f022
2010-09-20 17:54:17 -07:00
Mike Lockwood
f7399b4790 Merge "MTP: Fix typo that resulted in the MTP provider returning thumb format for object format" 2010-09-20 16:52:06 -07:00
Scott Main
aac4630cc5 am a4270e7e: am 73e150c8: provide link to backup guide above the fold
Merge commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp

* commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa':
  provide link to backup guide above the fold
2010-09-20 16:40:46 -07:00
Scott Main
a4270e7e1e am 73e150c8: provide link to backup guide above the fold
Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread

* commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed':
  provide link to backup guide above the fold
2010-09-20 16:37:32 -07:00
Dianne Hackborn
4b187e804f am 8e1b84e7: Merge "Some battery improvements:" into gingerbread
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements:
2010-09-20 16:34:45 -07:00
Dianne Hackborn
8e1b84e765 Merge "Some battery improvements:" into gingerbread 2010-09-20 16:29:42 -07:00