Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,629 Commits 3 Branches 0 Tags
3cdff8133b96b672523c330bbc1adcab59125b9f
Commit Graph

1896 Commits

Author SHA1 Message Date
Android (Google) Code Review
c8050f8dd7 am 6cdc4f9c: Merge change 6880 into donut 
Merge commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3'

* commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3':
  Fixing TTS breakage.
 2009-07-13 09:27:44 -07:00
Android (Google) Code Review
6cdc4f9c00 Merge change 6880 into donut 
* changes:
  Fixing TTS breakage.
 2009-07-13 09:25:20 -07:00
Joe Onorato
186b3eaedd Make the backup manager do nothing when backup is turned off. 2009-07-13 09:08:59 -07:00
Android (Google) Code Review
769ebaaa31 am 5c04841e: Merge change 6912 into donut 
Merge commit '5c04841ee36ba93c9a8998e7668320d74adc3d22'

* commit '5c04841ee36ba93c9a8998e7668320d74adc3d22':
  JavaDoc for SearchableInfo.getActivityMetaData()
 2009-07-13 09:06:16 -07:00
Android (Google) Code Review
3b76d3867f Merge change 6918 
* changes:
  Make the backup manager do nothing when backup is turned off.
 2009-07-13 09:04:50 -07:00
Android (Google) Code Review
5c04841ee3 Merge change 6912 into donut 
* changes:
  JavaDoc for SearchableInfo.getActivityMetaData()
 2009-07-13 09:04:25 -07:00
Joe Onorato
9bcccba6dc Make the backup manager do nothing when backup is turned off. 2009-07-13 09:03:55 -07:00
Bjorn Bringert
13b24b7904 JavaDoc for SearchableInfo.getActivityMetaData() 
See http://b/editIssue?id=1968025
 2009-07-13 15:29:59 +01:00
Android (Google) Code Review
e50f1fa605 am 506dd3fc: Merge change 6907 into donut 
Merge commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf'

* commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf':
  Initialize searchmanager on demand
 2009-07-13 06:13:06 -07:00
Bjorn Bringert
9bc75cb9c2 Initialize searchmanager on demand 
The initialization of SearchManagerService is delayed, which caused
problems when other services (e.g. GlobalSearch) start up.
This change makes the SearchManagerService components
initialize when they are first needed, or when the server thread
is done with its other processing, whichever comes first.

Fixes http://b/issue?id=1970975
 2009-07-13 13:23:23 +01:00
Mitsuru Oshima
a62e3e4d0f am ba3ba579: * Use cached resources for widgets 
Merge commit 'ba3ba57921dedaaef669719c0359c0caf60e008b'

* commit 'ba3ba57921dedaaef669719c0359c0caf60e008b':
  * Use cached resources for widgets
 2009-07-12 21:56:30 -07:00
Android (Google) Code Review
602bee5bf2 am cf29e116: Merge change 6867 into donut 
Merge commit 'cf29e116129f38309c18ba14b9893b079a712289'

* commit 'cf29e116129f38309c18ba14b9893b079a712289':
  CLOSE_SYSTEM_DIALOGS can't be protected.
 2009-07-12 21:56:02 -07:00
Android (Google) Code Review
8a72cd9c7d am 1c9fb40c: Merge change 6845 into donut 
Merge commit '1c9fb40cb6dbfeee58c41a43852c5b94a1b83613'

* commit '1c9fb40cb6dbfeee58c41a43852c5b94a1b83613':
  Use MeasureSpec.getWidth instead of default display in lock pattern widget.
 2009-07-12 06:06:49 -07:00
Android (Google) Code Review
38a34b2c75 am 2d791055: Merge change 6820 into donut 
Merge commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7'

* commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7':
  Fixed NPE bugs in Uri. Fixes internal issue #1724719.
 2009-07-12 06:06:31 -07:00
Satish Sampath
17596e3adc am b1665f2e: Fix regression in handling the \'Go\' button 
Merge commit 'b1665f2e15439f693b1ef75cb1c07593f99edde7'

* commit 'b1665f2e15439f693b1ef75cb1c07593f99edde7':
  Fix regression in handling the 'Go' button
 2009-07-12 06:06:21 -07:00
Android (Google) Code Review
93153beb3d am a11fe86d: Merge change 6813 into donut 
Merge commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93'

* commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93':
  Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.
 2009-07-12 06:06:08 -07:00
Android (Google) Code Review
dcbe8d7055 am 59d299ce: Merge change 6789 into donut 
Merge commit '59d299ce8d66f6f3091fca33d3741c0b24d678f6'

* commit '59d299ce8d66f6f3091fca33d3741c0b24d678f6':
  Add support in TextToSpeech for an audio stream type param and utterance
 2009-07-12 06:06:03 -07:00
Mitsuru Oshima
ba3ba57921 * Use cached resources for widgets 2009-07-11 21:50:16 -07:00
Charles Chen
630a8de44f Fixing TTS breakage. 2009-07-10 20:58:15 -07:00
Dianne Hackborn
4554f30c83 CLOSE_SYSTEM_DIALOGS can't be protected. 2009-07-10 17:30:50 -07:00
Android (Google) Code Review
48e61cf545 Merge change 6841 
* changes:
  resolved conflicts for merge of 889c2d37 to master
 2009-07-10 16:46:26 -07:00
Android (Google) Code Review
9cf012a9fc Merge change 6823 
* changes:
  wifi: Keep the WLAN network interface up whenever wifi is enabled.
 2009-07-10 16:29:20 -07:00
Android (Google) Code Review
1c9fb40cb6 Merge change 6845 into donut 
* changes:
  Use MeasureSpec.getWidth instead of default display in lock pattern widget.
 2009-07-10 16:28:03 -07:00
Karl Rosaen
6a109b4874 Use MeasureSpec.getWidth instead of default display in lock pattern widget. 2009-07-10 16:10:10 -07:00
Dianne Hackborn
54a26bc85f resolved conflicts for merge of 889c2d37 to master 2009-07-10 16:05:59 -07:00
Android (Google) Code Review
2d7910555a Merge change 6820 into donut 
* changes:
  Fixed NPE bugs in Uri. Fixes internal issue #1724719. Modified getQueryParameter() to use the encoded query string. Fixes internal issue #1749094.
 2009-07-10 15:12:57 -07:00
Bob Lee
5621f0d928 Fixed NPE bugs in Uri. Fixes internal issue #1724719. 
Modified getQueryParameter() to use the encoded query string. Fixes internal issue #1749094.
 2009-07-10 14:54:08 -07:00
Satish Sampath
b1665f2e15 Fix regression in handling the 'Go' button 
This was introduced in CL https://android-git.corp.google.com/g/6460.
Bug: http://b/issue?id=1970776
 2009-07-10 22:35:48 +01:00
Mike Lockwood
0900f36576 wifi: Keep the WLAN network interface up whenever wifi is enabled. 
We now only bring it down briefly and bring it back up again when
we want to reset the interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-07-10 17:24:07 -04:00
Bob Lee
c8e852da32 resolved conflicts for merge of ad94a983 to master 2009-07-10 14:13:37 -07:00
Android (Google) Code Review
a11fe86d77 Merge change 6813 into donut 
* changes:
  Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.
 2009-07-10 14:12:17 -07:00
Romain Guy
ef0e9ae0dd Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView. 
Add several checks to make sure there's at least one child.
 2009-07-10 14:11:26 -07:00
Android (Google) Code Review
59d299ce8d Merge change 6789 into donut 
* changes:
  Add support in TextToSpeech for an audio stream type param and utterance ID specified as a hashmap param in the synthesis calls. Fix a bug where the cached parameters were not passed to the service when synthesizing to a file.
 2009-07-10 13:54:58 -07:00
Jean-Michel Trivi
a981013aa7 Add support in TextToSpeech for an audio stream type param and utterance 
ID specified as a hashmap param in the synthesis calls.
Fix a bug where the cached parameters were not passed to the service
when synthesizing to a file.
 2009-07-10 13:45:47 -07:00
Android (Google) Code Review
889c2d37f7 Merge change 6718 into donut 
* changes:
  Fix bug #1873249i: Apps can DoS/brick device
 2009-07-10 13:42:51 -07:00
Android (Google) Code Review
ad94a98364 Merge change 6801 into donut 
* changes:
  Uri.EMPTY.toString() was returning null due to an initialization order bug. Fixes internal issue #1957015.
 2009-07-10 13:40:02 -07:00
Bob Lee
b8b8f044f4 Uri.EMPTY.toString() was returning null due to an initialization order bug. Fixes internal issue #1957015. 2009-07-10 13:34:37 -07:00
Android (Google) Code Review
2d070543bb Merge change 6783 
* changes:
  turn restore back in in eclair
 2009-07-10 11:05:45 -07:00
Joe Onorato
da3cb6a9d5 turn restore back in in eclair 2009-07-10 11:05:23 -07:00
Android (Google) Code Review
27835c2740 Merge change 6764 
* changes:
  Undo the changes accidentally merged from Donut
 2009-07-10 09:57:57 -07:00
Android (Google) Code Review
bdafc9b65f am d2cad295: Merge change 6734 into donut 
Merge commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71'

* commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71':
  Adding tagging to utterances to track which app said what.
 2009-07-10 09:57:38 -07:00
Android (Google) Code Review
38645ee6d6 Merge change 6759 into donut 
* changes:
  Do not merge
 2009-07-10 09:57:24 -07:00
Andrei Popescu
15d21453b0 Do not merge 
Install an observer for the Location system setting and
move the Gears permission check to a slightly earlier time.
Move the logic into a separate manager class.

Also delete some whitespace and fix some style issues.
 2009-07-10 17:54:32 +01:00
Android (Google) Code Review
d2cad2951f Merge change 6734 into donut 
* changes:
  Adding tagging to utterances to track which app said what.
 2009-07-10 09:47:37 -07:00
Charles Chen
a9c5e4bf26 Adding tagging to utterances to track which app said what. 2009-07-10 09:43:03 -07:00
Andrei Popescu
972acd0c33 Undo the changes accidentally merged from Donut 2009-07-10 16:58:13 +01:00
Bjorn Bringert
88588d137b am 0e01ea41: Deprecate DialogInterface methods in SearchManager 
Merge commit '0e01ea41b215941128a4ea8dee454e6b35a4e798'

* commit '0e01ea41b215941128a4ea8dee454e6b35a4e798':
  Deprecate DialogInterface methods in SearchManager
 2009-07-10 00:50:45 -07:00
Bjorn Bringert
0e01ea41b2 Deprecate DialogInterface methods in SearchManager 
android.app.SearchManager implements
DialogInterface.OnDismissListener and DialogInterface.OnCancelListener
and thus exposes the methods onCancel(DialogInterface dialog) and
onDismiss(DialogInterface dialog). This was used by the SearchManager
to register itself as a listener on the search dialog, but is no
longer used.

This was an implementation detail that leaked into the public
API. Removing them would change the API, so they are deprecated instead.

Fixes http://b/issue?id=1962203
 2009-07-10 07:16:47 +01:00
Android (Google) Code Review
320a34aa4f Merge change 6725 
* changes:
  do not merge - add a big flag to turn off backup
 2009-07-09 19:19:11 -07:00
Joe Onorato
76ad319b5e do not merge - add a big flag to turn off backup 2009-07-09 18:48:03 -07:00