Commit Graph

4300 Commits

Author SHA1 Message Date
Android (Google) Code Review
ca2bc75aac Merge change 6361
* changes:
  Fix sim build.
2009-07-07 11:01:19 -07:00
San Mehat
856d080ae5 am 0310f9aa: WifiService: Fix build (missing import)
Merge commit '0310f9aa21ed8714acbe56afea061596fb8f1ac4'

* commit '0310f9aa21ed8714acbe56afea061596fb8f1ac4':
  WifiService: Fix build (missing import)
2009-07-07 10:52:51 -07:00
San Mehat
0310f9aa21 WifiService: Fix build (missing import)
Signed-off-by: San Mehat <san@google.com>
2009-07-07 10:50:39 -07:00
Android (Google) Code Review
0f653aeeca am b61479ae: Merge change 6314 into donut
Merge commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193'

* commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193':
  Use the current Locale as the default language when TTS settings are not
2009-07-07 10:37:17 -07:00
Android (Google) Code Review
b61479ae86 Merge change 6314 into donut
* changes:
  Use the current Locale as the default language when TTS settings are not found, rather than a hardcoded value stored in TextToSpeech.Engine.
2009-07-07 10:35:40 -07:00
San Mehat
a15dd950e5 am fa6c7111: WifiService: use wifi association state to determine if we should suspend wifi instead of the existance of an IP address.
Merge commit 'fa6c7111fe58e09a92741c7655221c3629d3220e'

* commit 'fa6c7111fe58e09a92741c7655221c3629d3220e':
  WifiService: use wifi association state to determine if we should suspend wifi instead of
2009-07-07 10:19:56 -07:00
Andy McFadden
74598566ba Fix sim build.
Looks like older gcc (4.1.x) doesn't properly handle templated
fanciness.  Apparently that's what we have on the build server.
2009-07-07 10:01:12 -07:00
San Mehat
fa6c7111fe WifiService: use wifi association state to determine if we should suspend wifi instead of
the existance of an IP address.

Signed-off-by: San Mehat <san@google.com>
2009-07-07 09:41:39 -07:00
Eric Laurent
fcc5be99e0 am 88e209dc: Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Merge commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c'

* commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c':
  Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
2009-07-07 09:36:14 -07:00
Eric Laurent
88e209dcf8 Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Store sample rate on 32 bits instead of 16 bits in audio_track_cblk_t.
Removed sampleRate() methods from AudioTrack and AudioRecord: replaced by getSampleRate().
AudioTrack::setSampleRate() no returns a status.
2009-07-07 07:10:45 -07:00
Leon Scroggins
43488fc78c Update text webcore thread's text generation number.
When the user edits text in a textfield, we increase a generation
number so we can mark changes from webkit to be out of date.  With
this change, update webcore's notion of the text generation number
in deleteSelection and replaceTextfieldText, in addition to
passToJs.  Requires a change in external/webkit.
2009-07-07 10:07:17 -04:00
Android (Google) Code Review
6e2863ec16 am 37ea7112: Merge change 6338 into donut
Merge commit '37ea71122579e9e2ad1f91b3eca5e4d436b54ea9'

* commit '37ea71122579e9e2ad1f91b3eca5e4d436b54ea9':
  septet-align UD after any UDH for GSM-7bit coding
2009-07-06 23:49:45 -07:00
Android (Google) Code Review
37ea711225 Merge change 6338 into donut
* changes:
  septet-align UD after any UDH for GSM-7bit coding
2009-07-06 23:48:25 -07:00
Tammo Spalink
0fd833a50f septet-align UD after any UDH for GSM-7bit coding 2009-07-07 14:17:28 +08:00
Mitsuru Oshima
ce3082e745 am 569076c9: widgets scaling fix. Use container\'s compatibility info and display metrics when container and widgets disagree.
Merge commit '569076c9f6bdadb4d3285a26e069634a839b5b87'

* commit '569076c9f6bdadb4d3285a26e069634a839b5b87':
  widgets scaling fix. Use container's compatibility info and display metrics when container and widgets disagree.
2009-07-06 21:24:08 -07:00
Mitsuru Oshima
569076c9f6 widgets scaling fix. Use container's compatibility info and display metrics when container and widgets disagree. 2009-07-06 21:13:39 -07:00
Mathias Agopian
94aadce3a2 trying to fix the sim, I'm not even sure this syntaxe is valid, but my compilo doesn't complain 2009-07-06 19:04:55 -07:00
Android (Google) Code Review
48f7d85d7b am dbee95ca: Merge change 6317 into donut
Merge commit 'dbee95cacff9d2faf30638e64abe26fbeb128787'

* commit 'dbee95cacff9d2faf30638e64abe26fbeb128787':
  Make enable/provisioning of the backup service a two-step process
2009-07-06 18:26:42 -07:00
Android (Google) Code Review
dbee95cacf Merge change 6317 into donut
* changes:
  Make enable/provisioning of the backup service a two-step process
2009-07-06 18:24:26 -07:00
Android (Google) Code Review
4185da5189 Merge change 6315
* changes:
  should fix sim build
2009-07-06 18:08:02 -07:00
Mathias Agopian
181a9811e4 should fix sim build 2009-07-06 18:07:26 -07:00
Jean-Michel Trivi
d478cf09df Use the current Locale as the default language when TTS settings are not
found, rather than a hardcoded value stored in TextToSpeech.Engine.
2009-07-06 18:02:08 -07:00
-b master
f6a34dd6ab resolved conflicts for merge of b7195159 to master 2009-07-06 17:44:41 -07:00
Christopher Tate
8031a3df2f Make enable/provisioning of the backup service a two-step process
This CL adds the concept of 'provisioned' to the backup manager.  No backups
will be scheduled until the user has indicated that backups are to be enabled
*and* has clicked all the way through the setup wizard.

When the user first turns on the backup system, the delay before the initial
backup pass is different from the periodic backup interval.  Currently that
initial delay is 12 hours.  The intent here is to guess at a less-active time
for performing that first backup pass.

NOTE: currently the backup service defaults to 'provisioned'.  Once the real
code goes live in Setup Wizard, this will be changed to default to
not-provisioned until the user has confirmed all the relevant UI.
2009-07-06 17:43:03 -07:00
Android (Google) Code Review
b71951591d Merge change 6287 into donut
* changes:
  Restore GPS state and ringer/vibrate toggles.
2009-07-06 17:32:09 -07:00
Amith Yamasani
70c874ba20 Restore GPS state and ringer/vibrate toggles.
Inform backup manager when sync flags change. Set ringer/vibrate mode.
2009-07-06 17:18:46 -07:00
Romain Guy
a2b5dab5b7 am 870e09fc: Fixes #1963229. Introduces Context#isRestricted().
Merge commit '870e09fcd2dfdc12ac318962efd28b0420c562bb'

* commit '870e09fcd2dfdc12ac318962efd28b0420c562bb':
  Fixes #1963229. Introduces Context#isRestricted().
2009-07-06 17:10:41 -07:00
Romain Guy
870e09fcd2 Fixes #1963229. Introduces Context#isRestricted().
A restricted Context is a special type of Context that prevents specific features
from being used. For instance, android:onClick, used by View, can be dangerous when
used from within apps widgets. By using a restricted Context to inflate apps widgets,
widgets providers are prevented from using android:onClick.
2009-07-06 16:45:17 -07:00
Android (Google) Code Review
4fad469b65 am 453dd50e: Merge change 6307 into donut
Merge commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a'

* commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a':
  Fixes a compatibility issue with users that have the old TTS
2009-07-06 16:29:05 -07:00
Android (Google) Code Review
453dd50e70 Merge change 6307 into donut
* changes:
  Fixes a compatibility issue with users that have the old TTS installed already.
2009-07-06 16:28:03 -07:00
Charles Chen
52ae06521a Fixes a compatibility issue with users that have the old TTS
installed already.
2009-07-06 16:10:32 -07:00
Android (Google) Code Review
a370b84883 am 8d07c068: Merge change 6305 into donut
Merge commit '8d07c0684619b6c30f525d25d92835254a7220a9'

* commit '8d07c0684619b6c30f525d25d92835254a7220a9':
  Fix up permissions for 'dumpsys backup'
2009-07-06 16:00:27 -07:00
Android (Google) Code Review
5af08490c5 Merge change 6256
* changes:
  Refactoring of VideoView.java class
2009-07-06 15:54:49 -07:00
Android (Google) Code Review
8d07c06846 Merge change 6305 into donut
* changes:
  Fix up permissions for 'dumpsys backup'
2009-07-06 15:49:26 -07:00
Christopher Tate
34ebd0e1bb Fix up permissions for 'dumpsys backup' 2009-07-06 15:44:54 -07:00
James Dong
fdf3ac6cdc Refactoring of VideoView.java class 2009-07-06 15:30:56 -07:00
Mathias Agopian
d8b2a6412d Merge commit 'goog/master_gl' into merge_master_gl 2009-07-06 14:52:04 -07:00
Android (Google) Code Review
d719890cab Merge change 6285
* changes:
  Make backup agent run in the system process as well.
2009-07-06 14:48:43 -07:00
Amith Yamasani
344bf682c9 Make backup agent run in the system process as well. 2009-07-06 14:47:30 -07:00
Android (Google) Code Review
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
Android (Google) Code Review
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
Android (Google) Code Review
da93c26a3d Merge change 6271 into donut
* changes:
  Propagating the error codes through the TtsService
2009-07-06 14:38:39 -07:00
Android (Google) Code Review
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
Android (Google) Code Review
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
Android (Google) Code Review
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
Romain Guy
7ac6f3dac0 Fixes #1963214. ProgressDialog was using the wrong indeterminate progress asset. 2009-07-06 14:31:39 -07:00
Mike LeBeau
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
Amith Yamasani
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
Mathias Agopian
03a9a3449a Merge commit 'goog/master' into merge_master 2009-07-06 14:16:55 -07:00
Charles Chen
a3f89295ad Propagating the error codes through the TtsService 2009-07-06 14:14:52 -07:00