Commit Graph

4153 Commits

Author SHA1 Message Date
2960975f39 am da93c26a: Merge change 6271 into donut
Merge commit 'da93c26a3d2ee0b7d51561b786bde63b7b238c50'

* commit 'da93c26a3d2ee0b7d51561b786bde63b7b238c50':
  Propagating the error codes through the TtsService
2009-07-06 14:45:20 -07:00
ace82fbabd am 21509240: Merge change 6283 into donut
Merge commit '21509240b0ba00675ffc69038f20726bf8666c57'

* commit '21509240b0ba00675ffc69038f20726bf8666c57':
  Fix a bug where clicking the "more results" suggestion with the trackball
2009-07-06 14:45:16 -07:00
da93c26a3d Merge change 6271 into donut
* changes:
  Propagating the error codes through the TtsService
2009-07-06 14:38:39 -07:00
21509240b0 Merge change 6283 into donut
* changes:
  Fix a bug where clicking the "more results" suggestion with the trackball did not seem to expand to show the corpus selectors. (http://b/1906643)
2009-07-06 14:37:54 -07:00
f89946dee4 am d2882fa1: Merge change 6282 into donut
Merge commit 'd2882fa1790a976d939f29a5e39e5e7d1bc677f2'

* commit 'd2882fa1790a976d939f29a5e39e5e7d1bc677f2':
  Fixes #1963214. ProgressDialog was using the wrong indeterminate progress asset.
2009-07-06 14:33:58 -07:00
d2882fa179 Merge change 6282 into donut
* changes:
  Fixes #1963214. ProgressDialog was using the wrong indeterminate progress asset.
2009-07-06 14:32:18 -07:00
7ac6f3dac0 Fixes #1963214. ProgressDialog was using the wrong indeterminate progress asset. 2009-07-06 14:31:39 -07:00
617202a53a Fix a bug where clicking the "more results" suggestion with the trackball
did not seem to expand to show the corpus selectors. (http://b/1906643)

It turns out that when the trackball was used to select this item, onItemClick
was getting called on the listener twice in AutoCompleteTextView#onKeyUp:
once when we call onKeyUp on the DropDownListView, and once a little further
down when we call performCompletion(). In our case, performCompletion() is
useless since it was intended for normal AutoCompleteTextViews which populate
text into the TextView when an item in the list is clicked, but we do not
rely on this. So the easiest fix is just to make performCompletion() do nothing
in our SearchAutoComplete subclass.
2009-07-06 14:29:25 -07:00
47873e5526 Backup Wifi supplicant data.
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
2009-07-06 14:28:06 -07:00
a3f89295ad Propagating the error codes through the TtsService 2009-07-06 14:14:52 -07:00
78d0fdfad1 Merge change 6269
* changes:
  Revert "hand rolled out 220f4d633b due to interface changes on master, the change will need to be made again"
2009-07-06 14:14:21 -07:00
17ffe1018c am 991eec03: Merge change 6252 into donut
Merge commit '991eec03a73f8803d0f8c80b418480ea25293cfb'

* commit '991eec03a73f8803d0f8c80b418480ea25293cfb':
  Don't re-parse the framework resources all the time.
2009-07-06 14:10:36 -07:00
991eec03a7 Merge change 6252 into donut
* changes:
  Don't re-parse the framework resources all the time.
2009-07-06 14:09:16 -07:00
501eec92f9 Revert "hand rolled out 220f4d633b due to interface changes on master, the change will need to be made again"
This reverts commit f8e3ba5bfa.
2009-07-06 14:05:11 -07:00
005ae544f9 am 79ec07b3: Merge change 6241 into donut
Merge commit '79ec07b333f8982ee83de8eeb0b1927a6cb112ed'

* commit '79ec07b333f8982ee83de8eeb0b1927a6cb112ed':
  Fixes #1444844. Set a maximum fling velocity in scrollable views.
2009-07-06 13:12:36 -07:00
79ec07b333 Merge change 6241 into donut
* changes:
  Fixes #1444844. Set a maximum fling velocity in scrollable views.
2009-07-06 13:10:50 -07:00
dd3d10c865 am 56fbd8d8: Merge change 6258 into donut
Merge commit '56fbd8d86a1ea60ae42185349cf8809df24d262a'

* commit '56fbd8d86a1ea60ae42185349cf8809df24d262a':
  Fix the comment -- "charged" not "sharted."  Also, the other
2009-07-06 12:58:00 -07:00
56fbd8d86a Merge change 6258 into donut
* changes:
  Fix the comment -- "charged" not "sharted."  Also, the other strings on that screen seem to have periods.  I think that's wrong, but it's better to be consistent that right.
2009-07-06 12:56:32 -07:00
3a3b6a12bf Fix the comment -- "charged" not "sharted." Also, the other
strings on that screen seem to have periods.  I think that's
wrong, but it's better to be consistent that right.
2009-07-06 15:49:04 -04:00
b22ed4e378 am 57f2cba2: Merge change 6255 into donut
Merge commit '57f2cba2db4b5565b0f70bd5501e8d964dce3ad4'

* commit '57f2cba2db4b5565b0f70bd5501e8d964dce3ad4':
  Fix the comments for the string resources for the charge status.
2009-07-06 12:43:36 -07:00
03f8cef1a1 am 6eb987ac: Merge change 6246 into donut
Merge commit '6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2'

* commit '6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2':
  Fix bugs 1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
2009-07-06 12:43:32 -07:00
48c3064718 am 0d725f7d: Merge change 6162 into donut
Merge commit '0d725f7d5a7efd9dc63f6ddb67a619d659bb4428'

* commit '0d725f7d5a7efd9dc63f6ddb67a619d659bb4428':
  Hold a wakelock during backup/restore/clear operations
2009-07-06 12:43:28 -07:00
57f2cba2db Merge change 6255 into donut
* changes:
  Fix the comments for the string resources for the charge status.
2009-07-06 12:39:28 -07:00
55c05e3ed3 Fix the comments for the string resources for the charge status. 2009-07-06 15:38:30 -04:00
6eb987aca7 Merge change 6246 into donut
* changes:
  Fix bugs 1317754 - "Idle screen displays "Charging (100%)" even when fully charged." and 1885870 - "Shorten 'Clear notification' button to 'Clear' to match latest design"
2009-07-06 12:09:34 -07:00
1d6ec76f08 am 9479a516: Merge change 6154 into donut
Merge commit '9479a516cffd990ed3dfc209c5e768f4fb447812'

* commit '9479a516cffd990ed3dfc209c5e768f4fb447812':
  Fix bug (#1947162)
2009-07-06 12:00:23 -07:00
707f1d777a am 70421cf6: Merge change 6237 into donut
Merge commit '70421cf6b4e415fd6ce2b3bd55f945dc13b6306c'

* commit '70421cf6b4e415fd6ce2b3bd55f945dc13b6306c':
  Add a silent ringtone.
2009-07-06 12:00:20 -07:00
01737b9c94 am 87e393f1: Merge change 6227 into donut
Merge commit '87e393f1c81f190fa62d23059fc1109398a6e58b'

* commit '87e393f1c81f190fa62d23059fc1109398a6e58b':
  Adding tts result codes.
2009-07-06 12:00:17 -07:00
6231e3a778 am ef1f21b3: Merge change 6231 into donut
Merge commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7'

* commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7':
  Don't trim() in the mediascanner, as that would remove the special "sort first" character.
2009-07-06 12:00:12 -07:00
19c9137441 am 8ad422ad: Merge change 6221 into donut
Merge commit '8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab'

* commit '8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab':
  Remove links to wikipedia; fix typo; remove .vsd file (bug 1918247).
2009-07-06 12:00:08 -07:00
513d8068b4 am 899725b0: Make sure ringtones are sorted correctly.
Merge commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5'

* commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5':
  Make sure ringtones are sorted correctly.
2009-07-06 12:00:02 -07:00
c83edf47f4 Fix bugs 1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
and 1885870 - "Shorten 'Clear notification' button to 'Clear' to match latest design"
2009-07-06 14:56:53 -04:00
0d725f7d5a Merge change 6162 into donut
* changes:
  Hold a wakelock during backup/restore/clear operations
2009-07-06 11:54:34 -07:00
ff7d0e2bcc am 816cf52a: Fix the DEFAULT_SORT_ORDER value for media files. Changing this is OK, because existing app will have the old value compiled in as a literal, and so will continue to (not) work in the same way as before. Add code to media key generator to give a leading a
Merge commit '816cf52abd8f45770f0ac922bbb819184ed4b90f'

* commit '816cf52abd8f45770f0ac922bbb819184ed4b90f':
  Fix the DEFAULT_SORT_ORDER value for media files. Changing this
2009-07-06 11:54:24 -07:00
b6787f2ee5 Hold a wakelock during backup/restore/clear operations
We need to make sure we stay alive for the duration of a backup or (especially)
restore operation.  The existing Handler-based timing system was simply not
properly functional, so it's been retooled to use a repeating alarm delivering a
broastcast PendingIntent to our registered receiver.

We acquire a partial wake lock in the broadcast receiver [i.e. while the Alarm
Manager is holding one for the duration of broadcast delivery] and pass the
wakelock object to the backup thread, which eventually releases it when it's
finsihed operations.  A similar pattern is used for the threads handling restore
and clear.
2009-07-06 11:49:49 -07:00
4296fc4d32 Fixes #1444844. Set a maximum fling velocity in scrollable views. 2009-07-06 11:48:52 -07:00
9479a516cf Merge change 6154 into donut
* changes:
  Fix bug (#1947162)
2009-07-06 11:37:13 -07:00
70421cf6b4 Merge change 6237 into donut
* changes:
  Add a silent ringtone.
2009-07-06 11:34:28 -07:00
a6e45b4bb3 Add a silent ringtone. 2009-07-06 11:33:06 -07:00
c8f800edb2 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-06 11:31:10 -07:00
aa00e390c1 Fix bug (#1947162)
The bug (1947162) is caused by the fact that sometimes, surfaceChanged() is called after onCompletion().
In surfaceChanged(), start() is called automatically. The fix is to use a flag is avoid calling start()
when onCompletion() has been called already.
2009-07-06 11:30:29 -07:00
87e393f1c8 Merge change 6227 into donut
* changes:
  Adding tts result codes.
2009-07-06 11:26:15 -07:00
a95fe061c7 Merge change 6232
* changes:
  frameworks/base: Update mPdu in createFromPdu
2009-07-06 11:22:51 -07:00
395c092473 am 46841db4: Add PPTP and L2TP/IPSec PSK service dispatching
Merge commit '46841db4f2c7360d3b861a816e51f76acca0d677'

* commit '46841db4f2c7360d3b861a816e51f76acca0d677':
  Add PPTP and L2TP/IPSec PSK service dispatching
2009-07-06 11:22:45 -07:00
90a7edac29 am 1f2bb46b: Merge change 6204 into donut
Merge commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f'

* commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f':
  Migrate to new keystore with the CertTool lib.
2009-07-06 11:22:36 -07:00
71830eaeda am 3383df38: Merge change 6198 into donut
Merge commit '3383df385e208807b1dc5f2956f82a7f75f65fd8'

* commit '3383df385e208807b1dc5f2956f82a7f75f65fd8':
  keystore: Provide a generic getter for native components.
2009-07-06 11:22:25 -07:00
58c714c41a am 699ca3f2: Add password field for WiFi configuration.
Merge commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91'

* commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91':
  Add password field for WiFi configuration.
2009-07-06 11:22:18 -07:00
f6a6cff234 am 4492bcb8: Merge change 6081 into donut
Merge commit '4492bcb851f4ee862a446664eb9045045ebb7b5e'

* commit '4492bcb851f4ee862a446664eb9045045ebb7b5e':
  Migrate to the CertTool library.
2009-07-06 11:22:11 -07:00
8d85cf0cfa am 6b1ab257: Merge change 6187 into donut
Merge commit '6b1ab2572ed114beba07230f6fa9c02519cf27df'

* commit '6b1ab2572ed114beba07230f6fa9c02519cf27df':
  Fix strings.
2009-07-06 11:22:07 -07:00
522ea0d689 am 24ad29c6: Merge change 6177 into donut
Merge commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625'

* commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625':
  Two small checks in keymgmt.
2009-07-06 11:21:59 -07:00