4797 Commits

Author SHA1 Message Date
Jason Sams
399bfce299 Fix master build errors post merge with master_gl branch. 2009-07-14 13:59:23 -07:00
Jason Sams
7aa4f3a163 More test app work 2009-07-14 13:59:23 -07:00
Ravi K Yenduri
b3dfca197c Ignore pause and seek for live streaming. 2009-07-14 13:55:54 -07:00
Romain Guy
e8b165253d Fixes #1977685. Prevent crash when the soft keyboard is brought up.
ViewRoot keeps a reference to the previously focused View and use this reference
when trying to scroll the window to the focused rect. There situations however
in which the previously focused view might have been removed from the view
hierarchy. This happens on Home for instance when you trash an icon, or with
ListView's items. This change ensures the previously focused view is still part
of the view hierarchy.
2009-07-14 13:06:42 -07:00
Android (Google) Code Review
334a67740c am b82759a0: Merge change 6906 into donut
Merge commit 'b82759a051f55852dabe201ad3354ea9b7b2979d'

* commit 'b82759a051f55852dabe201ad3354ea9b7b2979d':
  location: Add sub-locality, sub-thoroughfare and premises fields to Address class
2009-07-14 12:54:41 -07:00
Dianne Hackborn
dace230043 resolved conflicts for merge of b06ea706 to master 2009-07-14 12:51:00 -07:00
Pauyl l Berman
e1dc2baee7 Fix CNAP-related NullPointerException
This will fix a CNAP-related bug where missing a call from a party with an
"Unknown" number presentation and then trying to log that call will cause
a NullPointerException to be thrown
2009-07-14 12:05:26 -07:00
Android (Google) Code Review
b82759a051 Merge change 6906 into donut
* changes:
  location: Add sub-locality, sub-thoroughfare and premises fields to Address class
2009-07-14 12:00:55 -07:00
Fred Quintana
ae4f31706f - add the DIRTY and VERSION columns to the ContactsProvider2 Groups contract
- make android.accounts.AccountAuthenticator into a public constant
2009-07-14 11:57:09 -07:00
Mike Lockwood
8cd1084ed1 location: Add sub-locality, sub-thoroughfare and premises fields to Address class
This is required for fully describing locations in Japan.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-14 14:41:22 -04:00
Dianne Hackborn
b06ea70653 Add reporting of activity movement for search manager.
This adds a new API with the activity manager to find out about movement between
activities.  For my sanity, the old IActivityWatcher is now renamed to
IActivityController, and the new activity movement interface is named
IActivityWatcher.

This changes the search manager itself to use the new API to manage its state.
Note that there are still problems when going back to the search dialog after
it was hidden -- the suggestions window no longer appears until you explicitly
dismiss and re-show it.
2009-07-14 11:37:11 -07:00
Mitsuru Oshima
ddd12535f0 Return adjusted display for WindowManager.getDefaultDisplay() 2009-07-14 11:11:17 -07:00
Android (Google) Code Review
8f779f3b70 am 3660c095: Merge change 7094 into donut
Merge commit '3660c09500a4d01eb6a733b5f0b15545855f8fe8'

* commit '3660c09500a4d01eb6a733b5f0b15545855f8fe8':
  Cleaning up TtsService
2009-07-14 10:57:46 -07:00
Android (Google) Code Review
3660c09500 Merge change 7094 into donut
* changes:
  Cleaning up TtsService
2009-07-14 10:55:57 -07:00
Charles Chen
edb4fc3076 Cleaning up TtsService 2009-07-14 10:54:36 -07:00
Android (Google) Code Review
82b43b10a0 am e8b88ac1: Merge change 7097 into donut
Merge commit 'e8b88ac15c5d93f7c28c31d62c534df4b9587712'

* commit 'e8b88ac15c5d93f7c28c31d62c534df4b9587712':
  Fix to use DP instead of pixels for Thumb drawable size.
2009-07-14 10:50:53 -07:00
Android (Google) Code Review
0d4586d326 am 9181bc9a: Merge change 7079 into donut
Merge commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5'

* commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5':
  Cleanup of unused enums
2009-07-14 10:50:49 -07:00
Android (Google) Code Review
381495d31a am df01d6b5: Merge change 7064 into donut
Merge commit 'df01d6b50b4502f12947bf4c6cc733a4a467f682'

* commit 'df01d6b50b4502f12947bf4c6cc733a4a467f682':
  Implementing utterance ID callbacks for silence and pre-recorded files
2009-07-14 10:50:32 -07:00
Android (Google) Code Review
d651822b12 Merge change 6817
* changes:
  Fix a problem in VideoView that would cause it to not start playing after prepare.
2009-07-14 10:45:55 -07:00
Android (Google) Code Review
e8b88ac15c Merge change 7097 into donut
* changes:
  Fix to use DP instead of pixels for Thumb drawable size.
2009-07-14 10:44:14 -07:00
Android (Google) Code Review
9181bc9ab7 Merge change 7079 into donut
* changes:
  Cleanup of unused enums
2009-07-14 10:41:14 -07:00
Mitsuru Oshima
a5e4415256 Fix to use DP instead of pixels for Thumb drawable size. 2009-07-14 10:37:22 -07:00
Bjorn Bringert
cc916aa691 am c1d82e68: Use activity icon when search suggestion icon is missing
Merge commit 'c1d82e68eb4aae1b575e82b08e71a87670cc1532'

* commit 'c1d82e68eb4aae1b575e82b08e71a87670cc1532':
  Use activity icon when search suggestion icon is missing
2009-07-14 10:21:47 -07:00
Android (Google) Code Review
6b316a7ff0 am 3a27b29e: Merge change 7069 into donut
Merge commit '3a27b29e41777e58fbcdca440a00676915ebea4f'

* commit '3a27b29e41777e58fbcdca440a00676915ebea4f':
  Make VPN connect even when DNS is not present and other fixes.
2009-07-14 10:21:37 -07:00
Android (Google) Code Review
a9ce57b55a am 8af55ca4: Merge change 7008 into donut
Merge commit '8af55ca4dd7eeb098b5c2e69bc7a9171c893269a'

* commit '8af55ca4dd7eeb098b5c2e69bc7a9171c893269a':
  Adding Utterance ID to the TtsService.
2009-07-14 10:21:16 -07:00
Android (Google) Code Review
70da2b5be0 am 3139297f: Merge change 7035 into donut
Merge commit '3139297f1eda3e34d17a2b182ae5d791da837542'

* commit '3139297f1eda3e34d17a2b182ae5d791da837542':
  Fixes #1972593. Updates AppSecurityPermissions styles in Theme.Light
2009-07-14 10:21:09 -07:00
Android (Google) Code Review
df01d6b50b Merge change 7064 into donut
* changes:
  Implementing utterance ID callbacks for silence and pre-recorded files (both generating and playing).
2009-07-14 09:18:46 -07:00
Dave Sparks
8978bd0174 Cleanup of unused enums 2009-07-14 08:02:37 -07:00
Bjorn Bringert
c1d82e68eb Use activity icon when search suggestion icon is missing
New left-hand side icon fallback logic in search dialog:

1. If the search dialog gets no icon column, it shows no
   icon (like before). This would handle the case of in-app
   search where the provider does not include icons.
2. If the icon column is empty, or there is an error converting
   the icon id or URI to a drawable, the search dialog identifies
   the suggestion source by looking at the
   SUGGEST_COLUMN_INTENT_COMPONENT_NAME.
3. If SUGGEST_COLUMN_INTENT_COMPONENT_NAME is empty or not set,
   the current searchable activity is considered the suggestion source.
4. Try to get the activity icon of the suggestion source.
5. Fall back to the application icon of the suggestion source
   if there is no activity icon.
6. Fall back to some generic icon if there is no application icon.

Fixes http://b/issue?id=1905757
2009-07-14 13:52:01 +01:00
Mathias Agopian
fad6c94872 another attempt to fix the sim 2009-07-14 02:08:27 -07:00
Android (Google) Code Review
3a27b29e41 Merge change 7069 into donut
* changes:
  Make VPN connect even when DNS is not present and other fixes.
2009-07-14 01:53:56 -07:00
Hung-ying Tyan
85646c1df3 Make VPN connect even when DNS is not present and other fixes.
* Changes:
  + As title.
  + Add two new states to VpnState: UNKNOWN and UNUSABLE.
  + Add more debug messages when stopping a service and when DNS being
    overridden.
2009-07-14 16:29:22 +08:00
Mathias Agopian
ac2dd4d82f first attempt to fix the sim 2009-07-13 22:58:25 -07:00
Mathias Agopian
fb4f266a1b add a ctor to Mutex to specify the type, which can be shared. This is used by sf and af an soon will allow some optimization in the kernel for non shared mutexes 2009-07-13 22:06:36 -07:00
Android (Google) Code Review
3a5351e443 Merge change 6898
* changes:
  implement Mutex and Condition with pthread instead of calling futex directly.
2009-07-13 21:27:38 -07:00
Charles Chen
3ab2076d65 Implementing utterance ID callbacks for silence and pre-recorded files
(both generating and playing).
2009-07-13 21:21:01 -07:00
Android (Google) Code Review
a533f85ec6 Merge change 7043
* changes:
  fix [1964315] crash in the surface.cpp while browsing
2009-07-13 18:34:46 -07:00
Mathias Agopian
8d9a5eff42 fix [1964315] crash in the surface.cpp while browsing 2009-07-13 18:29:59 -07:00
Android (Google) Code Review
8af55ca4dd Merge change 7008 into donut
* changes:
  Adding Utterance ID to the TtsService.
2009-07-13 18:25:01 -07:00
Android (Google) Code Review
3139297f1e Merge change 7035 into donut
* changes:
  Fixes #1972593. Updates AppSecurityPermissions styles in Theme.Light
2009-07-13 17:52:59 -07:00
Romain Guy
17606f8852 Fixes #1972593. Updates AppSecurityPermissions styles in Theme.Light 2009-07-13 17:52:19 -07:00
Charles Chen
78c9d0d2c5 Adding Utterance ID to the TtsService. 2009-07-13 17:46:19 -07:00
Eric Fischer
0805604b82 Fix build breakage caused by automerge of translations. 2009-07-13 17:03:56 -07:00
Android (Google) Code Review
e41cc497f0 Merge change 6812
* changes:
  Implemented the tracking of the metadata updates.
2009-07-13 16:37:55 -07:00
Android (Google) Code Review
e375fc5cac Merge change 6787
* changes:
  AbstractSyncableContentProvider must only call onAccountsChanged with GAIA accounts
2009-07-13 16:35:58 -07:00
Android (Google) Code Review
1dcdce6db7 am c353268c: Merge change 6968 into donut
Merge commit 'c353268c20a8ea425ac9f1e328684855cfc805e0'

* commit 'c353268c20a8ea425ac9f1e328684855cfc805e0':
  Import new translations
2009-07-13 16:32:17 -07:00
Android (Google) Code Review
c353268c20 Merge change 6968 into donut
* changes:
  Import new translations
2009-07-13 16:30:16 -07:00
Android (Google) Code Review
2a71ee7129 Merge change 7007
* changes:
  Update name getCdmaMIN to getCdmaMin
2009-07-13 16:24:55 -07:00
Fred Quintana
0f4e1ab773 - remove an un-needed constant
- add a content provider helper that manages a table for storing sync state by account
- add contact definitions to Contacts access the sync state
2009-07-13 16:02:09 -07:00
Android (Google) Code Review
586d110ad4 am 35eea54a: (-s ours) Merge change 6935 into donut
Merge commit '35eea54a405cfeb88e48fed4bfa59687351c49a0'

* commit '35eea54a405cfeb88e48fed4bfa59687351c49a0':
  DO NOT MERGE: backporting from master:
2009-07-13 15:47:23 -07:00