Commit Graph

2530 Commits

Author SHA1 Message Date
Android (Google) Code Review
f9660e978f am 4117fd09: Merge change 6641 into donut
Merge commit '4117fd09e619c039a2bf5eff1bdc98186329cb4d'

* commit '4117fd09e619c039a2bf5eff1bdc98186329cb4d':
  Unbreaking the build.
2009-07-09 12:53:38 -07:00
Android (Google) Code Review
eef408c45b am 65e9d228: Merge change 6629 into donut
Merge commit '65e9d2285e5d5eab6a822d4a8210ffcc45b6b0bb'

* commit '65e9d2285e5d5eab6a822d4a8210ffcc45b6b0bb':
  Rename "no" arrays.xml file to be in the correct "nb" locale.
2009-07-09 12:50:49 -07:00
Android (Google) Code Review
a2d6afa84b am 0ed81492: Merge change 6638 into donut
Merge commit '0ed81492bcc33f483671a52811125a452d23b397'

* commit '0ed81492bcc33f483671a52811125a452d23b397':
  Unhide android.gestures.
2009-07-09 12:50:40 -07:00
Mike Lockwood
a979494d21 am ed760377: Add a persistent system property to disable the adb notification.
Merge commit 'ed7603779282d416356ce3c9739056d632307275'

* commit 'ed7603779282d416356ce3c9739056d632307275':
  Add a persistent system property to disable the adb notification.
2009-07-09 12:50:37 -07:00
Android (Google) Code Review
acc46942d6 am b45451f6: Merge change 6583 into donut
Merge commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0'

* commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0':
  Adding a lock to stop so that stop will stop utterances
2009-07-09 12:50:30 -07:00
Android (Google) Code Review
56ae90daea am 3bb69233: Merge change 6620 into donut
Merge commit '3bb692338fed7f34f010398fe8b831d0de22c6e8'

* commit '3bb692338fed7f34f010398fe8b831d0de22c6e8':
  Keep Gears permissions in sync with system location settings.
2009-07-09 12:50:26 -07:00
Satish Sampath
032ff38d4d am 313ea433: Make suggestion text color change based on the item state.
Merge commit '313ea433d18e7fd5438b94c0606c496fcc7a2f88'

* commit '313ea433d18e7fd5438b94c0606c496fcc7a2f88':
  Make suggestion text color change based on the item state.
2009-07-09 12:49:53 -07:00
Android (Google) Code Review
17500c2031 am 3893da46: Merge change 6614 into donut
Merge commit '3893da46f0a97d59a7687ae2bd71ba855eb5ffe3'

* commit '3893da46f0a97d59a7687ae2bd71ba855eb5ffe3':
  Fix issue 1970108: crash in AudioFlinger::isMusicActive()
2009-07-09 12:49:43 -07:00
Eric Laurent
f99e79a60d am 5964e737: Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call
Merge commit '5964e73774b381748013b91d04dfb6fc60f533ee'

* commit '5964e73774b381748013b91d04dfb6fc60f533ee':
  Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call
2009-07-09 12:49:38 -07:00
Android (Google) Code Review
a3464976b7 am c52d55c5: Merge change 6608 into donut
Merge commit 'c52d55c5404a09a3845a322f50577fc4c125a86d'

* commit 'c52d55c5404a09a3845a322f50577fc4c125a86d':
  Move the watchdog timer to a separate thread...
2009-07-09 12:49:29 -07:00
Android (Google) Code Review
e7127cf02b am f9b7faee: Merge change 6503 into donut
Merge commit 'f9b7faee88313c4daf3e3fb34203978de20b7ce0'

* commit 'f9b7faee88313c4daf3e3fb34203978de20b7ce0':
  Hide soft keyboard in SearchDialog.dismiss()
2009-07-09 12:49:26 -07:00
Android (Google) Code Review
2ade435816 am b799616d: Merge change 6208 into donut
Merge commit 'b799616d8f0f94e866767fa730f56d82543fb49b'

* commit 'b799616d8f0f94e866767fa730f56d82543fb49b':
  Move ExifInterface to android.media package so we can reference it from MediaScanner.
2009-07-09 12:49:18 -07:00
Android (Google) Code Review
25c70c8685 am fe811d8b: Merge change 6603 into donut
Merge commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f'

* commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f':
  quick fix; utf8_codepoint_count must be utf8_length
2009-07-09 12:49:07 -07:00
Android (Google) Code Review
1b85080b2a am 8a715b4b: Merge change 5510 into donut
Merge commit '8a715b4b791db4390d12e0ded02280592634a424'

* commit '8a715b4b791db4390d12e0ded02280592634a424':
  Add useful functions to String8, which enables users to convert between UTF-8 and UTF-32
2009-07-09 12:48:56 -07:00
Dianne Hackborn
06e30d949e resolved conflicts for merge of 2af632f8 to master 2009-07-09 12:15:46 -07:00
Android (Google) Code Review
f232d4e1f5 Merge change 6641 into donut
* changes:
  Unbreaking the build.
2009-07-09 11:59:32 -07:00
Android (Google) Code Review
70986332a7 Merge change 6629 into donut
* changes:
  Rename "no" arrays.xml file to be in the correct "nb" locale.
2009-07-09 11:54:52 -07:00
Android (Google) Code Review
7235b22261 Merge change 6638 into donut
* changes:
  Unhide android.gestures.
2009-07-09 11:48:12 -07:00
Android (Google) Code Review
3652429a4e Merge change 6583 into donut
* changes:
  Adding a lock to stop so that stop will stop utterances that are just starting up.
2009-07-09 11:05:18 -07:00
Android (Google) Code Review
5452f3a916 Merge change 6620 into donut
* changes:
  Keep Gears permissions in sync with system location settings.
2009-07-09 10:59:22 -07:00
Android (Google) Code Review
6bdaf7dd18 Merge change 6609
* changes:
  Fix couple of bugs in the meminfo report.  . added the new "/data/dalvik-cache/" to dalvik heap  . shortened the starting line's length from 40 to 30 to handle the case where there is no name  . fixed the pri/shared for others. It was swapped.
2009-07-09 09:42:44 -07:00
Android (Google) Code Review
7c4d746e29 Merge change 6614 into donut
* changes:
  Fix issue 1970108: crash in AudioFlinger::isMusicActive()
2009-07-09 08:47:59 -07:00
Android (Google) Code Review
29b5f3bc4b Merge change 6356
* changes:
  Add fullscreen support back in.
2009-07-09 06:39:47 -07:00
Eric Laurent
b025ca0c83 Fix issue 1970108: crash in AudioFlinger::isMusicActive()
Protected calls to MixerThread::isMusicActive() by AudioFlinger::mLock
2009-07-09 03:20:57 -07:00
Android (Google) Code Review
35da5ddb6b Merge change 6608 into donut
* changes:
  Move the watchdog timer to a separate thread...
2009-07-09 00:29:53 -07:00
Android (Google) Code Review
0a65f798b8 Merge change 6503 into donut
* changes:
  Hide soft keyboard in SearchDialog.dismiss()
2009-07-09 00:29:38 -07:00
Android (Google) Code Review
a59ad5f47a Merge change 6208 into donut
* changes:
  Move ExifInterface to android.media package so we can reference it from MediaScanner. Also hide public constructor and wrap common use cases as atomic operation to avoid race condition in jhead native codes.
2009-07-08 23:04:34 -07:00
Android (Google) Code Review
3ccdc56ae0 Merge change 6603 into donut
* changes:
  quick fix; utf8_codepoint_count must be utf8_length
2009-07-08 21:07:09 -07:00
Daisuke Miyakawa
3228a10923 quick fix; utf8_codepoint_count must be utf8_length 2009-07-09 13:05:24 +09:00
Android (Google) Code Review
0d5eee3784 Merge change 5510 into donut
* changes:
  Add useful functions to String8, which enables users to convert between UTF-8 and UTF-32 It will be used in SQL functions in external/sqlite/android. See https://android-git.corp.google.com/g/Gerrit#change,5511 for example.
2009-07-08 18:27:01 -07:00
Android (Google) Code Review
10ac7d0075 am 4af0a709: Merge change 6555 into donut
Merge commit '4af0a709ee08e8ae43f49d8fc5c9cae142aaf2c4'

* commit '4af0a709ee08e8ae43f49d8fc5c9cae142aaf2c4':
  Make it so the notification manager doesn't mysteriously
2009-07-08 17:30:05 -07:00
Android (Google) Code Review
a600565c9d am 7dd042e3: Merge change 6543 into donut
Merge commit '7dd042e32ee1e59227aafc4fbbc886c8ea0d0df9'

* commit '7dd042e32ee1e59227aafc4fbbc886c8ea0d0df9':
  Adding a missing catch
2009-07-08 17:30:01 -07:00
Android (Google) Code Review
b70b71187b Merge change 6560
* changes:
  resolved conflicts for merge of 04c7d0f8 to master
2009-07-08 17:28:14 -07:00
Dave Sparks
9f1234e460 resolved conflicts for merge of 04c7d0f8 to master 2009-07-08 17:26:05 -07:00
Android (Google) Code Review
5fac82d6ec Merge change 6555 into donut
* changes:
  Make it so the notification manager doesn't mysteriously beep during boot.
2009-07-08 17:09:54 -07:00
Android (Google) Code Review
e97a5a1b7e Merge change 6549
* changes:
  Add strings needed by the new contacts provider.
2009-07-08 17:06:27 -07:00
Daisuke Miyakawa
9f220247f6 Add useful functions to String8, which enables users to convert between UTF-8 and UTF-32
It will be used in SQL functions in external/sqlite/android.
See https://android-git.corp.google.com/g/Gerrit#change,5511 for example.

Related internal bug id: 1707173
2009-07-09 09:06:13 +09:00
Android (Google) Code Review
77eeb874e7 Merge change 6544
* changes:
  Add a virtual destructor to the TtsEngine class.
2009-07-08 16:56:19 -07:00
Android (Google) Code Review
af3368a78c Merge change 6543 into donut
* changes:
  Adding a missing catch
2009-07-08 16:44:22 -07:00
Android (Google) Code Review
47a97daf3b Merge change 6525 into donut
* changes:
  Add timestamps to video frames to improve A/V sync. Bug 1927069.
2009-07-08 16:40:12 -07:00
Marco Nelissen
d43b2e4b75 Add a virtual destructor to the TtsEngine class. 2009-07-08 16:24:38 -07:00
Dave Sparks
f72d640b7c Add timestamps to video frames to improve A/V sync.
Bug 1927069.
2009-07-08 15:59:25 -07:00
Mitsuru Oshima
9e76a23f59 am 1ecf5d28: Re-implementation of large screen support using window manager. * added background filler surface to fill the outer rim. Using the same layer as dim surface because they never co-exists (in the same window) * clean up the obsolete code in Compatibilt
Merge commit '1ecf5d28817f0a051e77488380dcd5bc622ea169'

* commit '1ecf5d28817f0a051e77488380dcd5bc622ea169':
  Re-implementation of large screen support using window manager.
2009-07-08 15:59:16 -07:00
Android (Google) Code Review
022c64a9ef Merge change 6092
* changes:
  Remove duplicate code in Sim/Ruim card, handle IccCardStatus.
2009-07-08 15:22:56 -07:00
Android (Google) Code Review
877b1750ec am 7761920b: Merge change 6507 into donut
Merge commit '7761920b2a2efc76d08c63d5be1b3ce829746e4b'

* commit '7761920b2a2efc76d08c63d5be1b3ce829746e4b':
  Remove unused definitions for default language in TextToSpeech as
2009-07-08 14:45:16 -07:00
Romain Guy
da3f6c71bc am 6de4aed1: Fixes #1933428. Call onPrepareDialog() on managed dialogs after their onCreate() is finished.
Merge commit '6de4aed1c67263269f83f579ec5b06263d173ef3'

* commit '6de4aed1c67263269f83f579ec5b06263d173ef3':
  Fixes #1933428. Call onPrepareDialog() on managed dialogs after their onCreate() is finished.
2009-07-08 14:45:11 -07:00
Android (Google) Code Review
820fe3c750 Merge change 6507 into donut
* changes:
  Remove unused definitions for default language in TextToSpeech as the default language is determined by the current Locale, not a hardcoded value. Add a value for the default TTS engine to use.
2009-07-08 14:43:40 -07:00
Android (Google) Code Review
2fa117395e am 1bd3e0fb: Merge change 6504 into donut
Merge commit '1bd3e0fb7e87f1daa983d06bc396393a788181b0'

* commit '1bd3e0fb7e87f1daa983d06bc396393a788181b0':
  Don't invoke the transport if doBackup supplied no data
2009-07-08 13:55:58 -07:00
Android (Google) Code Review
5712950dd9 Merge change 6504 into donut
* changes:
  Don't invoke the transport if doBackup supplied no data
2009-07-08 13:54:07 -07:00
Android (Google) Code Review
b53f06a85b am 91b0a701: Merge change 6284 into donut
Merge commit '91b0a7013e4b6d170087cb4c9a3c35b787f92a6b'

* commit '91b0a7013e4b6d170087cb4c9a3c35b787f92a6b':
  Run search UI on its own thread.
2009-07-08 13:52:26 -07:00