OSDN Git Service
Bjorn Bringert [Thu, 30 Apr 2009 16:20:54 +0000 (09:20 -0700)]
am
bcd20b3: Import clean-up in BrowserProvider.
Merge commit '
bcd20b33a57c6505eb610c9d0bad2aa643bc2dfc'
* commit '
bcd20b33a57c6505eb610c9d0bad2aa643bc2dfc':
Import clean-up in BrowserProvider.
Bjorn Bringert [Thu, 30 Apr 2009 16:20:54 +0000 (09:20 -0700)]
am
346dafb: Add search suggestions for just bookmarks+history.
Merge commit '
346dafbfbd4c43fb6e71227b5c812978a1d9ac3f'
* commit '
346dafbfbd4c43fb6e71227b5c812978a1d9ac3f':
Add search suggestions for just bookmarks+history.
Bjorn Bringert [Wed, 29 Apr 2009 20:52:09 +0000 (21:52 +0100)]
Import clean-up in BrowserProvider.
While I was working on BrowserProvider, I noticed some unused and
incorrecly ordered imports.
Bjorn Bringert [Wed, 29 Apr 2009 20:43:13 +0000 (13:43 -0700)]
am
24e1ec6: Fix Google search suggestions in Browser address bar.
Merge commit '
24e1ec69f429c0dc5205e021a46c2b432b2ce652'
* commit '
24e1ec69f429c0dc5205e021a46c2b432b2ce652':
Fix Google search suggestions in Browser address bar.
Eric Fischer [Wed, 29 Apr 2009 20:43:13 +0000 (13:43 -0700)]
am
3ea6f86: am
94d2163: AI 147962: Import updated zh_TW translations.
Merge commit '
3ea6f8638c13ae1672494736960ec138ae0889bc'
* commit '
3ea6f8638c13ae1672494736960ec138ae0889bc':
AI 147962: Import updated zh_TW translations.
Eric Fischer [Wed, 29 Apr 2009 20:43:13 +0000 (13:43 -0700)]
am
c26a433: am
09c5179: AI 147492: Update zh_TW translations.
Merge commit '
c26a433bc059ed35b71d26d7a38ae221bc4faa7f'
* commit '
c26a433bc059ed35b71d26d7a38ae221bc4faa7f':
AI 147492: Update zh_TW translations.
Patrick Scott [Wed, 29 Apr 2009 20:43:13 +0000 (13:43 -0700)]
am
8df1967: Remove the tab from the list of tabs so the ImageGrid will u
Merge commit '
8df1967e2a198b69af9da63e9571afef425c95db'
* commit '
8df1967e2a198b69af9da63e9571afef425c95db':
Remove the tab from the list of tabs so the ImageGrid will update.
Patrick Scott [Wed, 29 Apr 2009 20:43:13 +0000 (13:43 -0700)]
am
20abe04: Check for null before accessing mPickerData.
Merge commit '
20abe047a9f424a916e1b2a5d8b614b9b466e924'
* commit '
20abe047a9f424a916e1b2a5d8b614b9b466e924':
Check for null before accessing mPickerData.
Android (Google) Code Review [Wed, 29 Apr 2009 20:43:13 +0000 (13:43 -0700)]
am
761b3b5: Merge change 423 into donut
Merge commit '
761b3b5a23c06b64b9ecb99953665d2059e3b145'
* commit '
761b3b5a23c06b64b9ecb99953665d2059e3b145':
Show the saved picture for freed tabs.
Bjorn Bringert [Wed, 29 Apr 2009 20:41:47 +0000 (21:41 +0100)]
Add search suggestions for just bookmarks+history.
The browser returns bookmarks+history, and pads with
google search suggest, when search suggestions are
requested using content://browser/search_suggest_query
This patch adds a new URI
content://browser/bookmarks/search_suggest_query
that only returns bookmarks+history.
Bjorn Bringert [Wed, 29 Apr 2009 15:10:43 +0000 (16:10 +0100)]
Fix Google search suggestions in Browser address bar.
Before, the BrowserProvider talked directly to the
SearchManagerService and implemented its own version of
the SearchManager code for getting search suggestions.
This breaks if the global search provider is not
GoogleSearch.
This patch changes BrowserProvider to instead use
the SearchManager API to get suggestions from
the GoogleSearch application. When we have support
for third-party web search providers, this should be
changed to use the selected web search provider.
Eric Fischer [Wed, 29 Apr 2009 04:57:20 +0000 (21:57 -0700)]
am
94d2163: AI 147962: Import updated zh_TW translations.
Merge commit '
94d2163ddf27a162bbe66aad7336c5858a3b3f11' into donut
* commit '
94d2163ddf27a162bbe66aad7336c5858a3b3f11':
AI 147962: Import updated zh_TW translations.
Eric Fischer [Wed, 29 Apr 2009 04:57:20 +0000 (21:57 -0700)]
am
09c5179: AI 147492: Update zh_TW translations.
Merge commit '
09c51792e15cd7bbd1c239ec3346d571478923ba' into donut
* commit '
09c51792e15cd7bbd1c239ec3346d571478923ba':
AI 147492: Update zh_TW translations.
Eric Fischer [Tue, 28 Apr 2009 22:48:38 +0000 (15:48 -0700)]
AI 147962: Import updated zh_TW translations.
Automated import of CL 147962
Patrick Scott [Tue, 28 Apr 2009 12:57:56 +0000 (08:57 -0400)]
Remove the tab from the list of tabs so the ImageGrid will update.
I removed this by accident when removing the clearPictureListeners method. This
fixes a NPE when touching a removed tab in the tab picker.
BUG=
1816205
Patrick Scott [Tue, 28 Apr 2009 12:03:29 +0000 (08:03 -0400)]
Check for null before accessing mPickerData.
It could be null when switching to a parent tab since the parent tab will be
restored before showing the tab picker. This clears mPickerData before building
the tab picker.
Eric Fischer [Thu, 23 Apr 2009 18:59:14 +0000 (11:59 -0700)]
AI 147492: Update zh_TW translations.
Automated import of CL 147492
Android (Google) Code Review [Thu, 23 Apr 2009 12:47:43 +0000 (05:47 -0700)]
Merge change 423 into donut
* changes:
Show the saved picture for freed tabs.
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:17 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:59 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:36 +0000 (17:12 -0700)]
Merge donut into master
Eric Fischer [Wed, 22 Apr 2009 19:33:55 +0000 (12:33 -0700)]
AI 147406: Import revised translations.
Automated import of CL 147406
Patrick Scott [Wed, 22 Apr 2009 14:07:45 +0000 (10:07 -0400)]
Show the saved picture for freed tabs.
Create a small class containing the data needed to display the saved or current
picture. For freed tabs, inflate the picture and use the saved state from
mSavedState. Reorganize populatePickerData to use the current top window or the
saved state depending on if the tab has been freed.
There was another bug where onNewPicture would update the wrong FakeWebView due
to ListViews reusing the same view. Have the tab manage the new picture and
invalidate the FakeWebView. When reusing the view, clear out the tab's
FakeWebView field.
Wipe all the picker data at the same time the ImageGrid and ImageAdapter are
cleared.
Leon Scroggins [Mon, 20 Apr 2009 16:53:46 +0000 (12:53 -0400)]
Set a persistent default home page for the browser.
Fix for buganizer issue
1793708: 'Set home page' is empty after resetting to default. Keep track of the base for the default home page in a final variable. In loadFromDb, add the client to that (instead of to homeUrl, which could result in the client showing up twice in homeUrl) to get the homeUrl. Then, in resetDefaultPreferences, call setHomePage, with that same construction, so if the user clears their settings, they will return to having the default home page.
Android (Google) Code Review [Mon, 20 Apr 2009 19:42:31 +0000 (12:42 -0700)]
Merge change 325
* changes:
Check for null before animating the tab/webview.
Patrick Scott [Mon, 20 Apr 2009 17:51:49 +0000 (13:51 -0400)]
Check for null before animating the tab/webview.
The tab will most likely not be null but the top window could easily be null if
the tab has been freed due to low memory. Update getTabIndex to return -1 if the
tab is null.
Android (Google) Code Review [Mon, 20 Apr 2009 17:04:37 +0000 (10:04 -0700)]
Merge change 262
* changes:
Enable Application Caches.
Andrei Popescu [Fri, 17 Apr 2009 09:43:07 +0000 (10:43 +0100)]
Enable Application Caches.
Leon Scroggins [Thu, 16 Apr 2009 19:24:07 +0000 (15:24 -0400)]
Correct behavior of FindDialog when clicking trackball.
Fix for buganizer issue
1793584. Previously, a CENTER_KEY (or trackball) event passed to the EditText in the FindDialog would go to the next match, removing the soft keyboard in the process. Now the FindDialog does not override it, so it behaves exactly like touching on the EditText.
Eric Fischer [Wed, 15 Apr 2009 20:30:19 +0000 (13:30 -0700)]
AI 146365: Import revised translations.
DO NOT MERGE
Automated import of CL 146365
Eric Fischer [Tue, 14 Apr 2009 19:10:43 +0000 (12:10 -0700)]
AI 146175: Import updated translations.
Automated import of CL 146175
Grace Kloba [Tue, 14 Apr 2009 15:54:41 +0000 (08:54 -0700)]
Merge branch 'readonly-p4-master'
Grace Kloba [Tue, 14 Apr 2009 15:53:22 +0000 (08:53 -0700)]
AI 146114: Fix #
1770479. When a window is opened by "Open in new window", back should take it back to the window where it is opened from.
BUG=
1770479
Automated import of CL 146114
Eric Fischer [Tue, 14 Apr 2009 00:16:19 +0000 (17:16 -0700)]
AI 146037: Import updated translations.
Automated import of CL 146037
Dave Bort [Mon, 13 Apr 2009 22:56:49 +0000 (15:56 -0700)]
Browser: Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.
BUG=
1780938
Eric Fischer [Fri, 10 Apr 2009 17:45:19 +0000 (10:45 -0700)]
AI 145711: Import a few changed translations.
DO NOT MERGE
Automated import of CL 145711
Patrick Scott [Thu, 9 Apr 2009 02:18:46 +0000 (19:18 -0700)]
Merge branch 'readonly-p4-master'
Patrick Scott [Thu, 9 Apr 2009 02:17:37 +0000 (19:17 -0700)]
AI 145181: There might not be a current tab during onDestroy so check before
detaching it from the view system.
BUG=
1746760
Automated import of CL 145181
Eric Fischer [Wed, 8 Apr 2009 07:31:51 +0000 (00:31 -0700)]
Merge branch 'readonly-p4-master'
Eric Fischer [Wed, 8 Apr 2009 07:30:38 +0000 (00:30 -0700)]
AI 144913: am: CL 144912 Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
Import a bunch of revised translations.
Original author: enf
Automated import of CL 144913
Eric Fischer [Wed, 8 Apr 2009 01:15:15 +0000 (18:15 -0700)]
AI 144977: Import revised translations.
DO NOT MERGE
Automated import of CL 144977
Eric Fischer [Tue, 7 Apr 2009 20:55:06 +0000 (13:55 -0700)]
AI 144912: Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
Import a bunch of revised translations.
Automated import of CL 144912
Eric Fischer [Tue, 7 Apr 2009 18:48:29 +0000 (11:48 -0700)]
AI 144891: Import a bunch of revised translations.
Automated import of CL 144891
Leon Scroggins [Fri, 3 Apr 2009 17:17:16 +0000 (10:17 -0700)]
Merge branch 'readonly-p4-master'
Leon Scroggins [Fri, 3 Apr 2009 17:16:06 +0000 (10:16 -0700)]
AI 144462: Fix for
1570350: file:///foo not recorded in goto history. When creating suggestions for the search bar, provide suggestions from the history/bookmarks database that begin with "file" if the user types "file".
BUG=
1570350
Automated import of CL 144462
Eric Fischer [Fri, 3 Apr 2009 06:32:28 +0000 (23:32 -0700)]
Merge branch 'readonly-p4-master'
Eric Fischer [Fri, 3 Apr 2009 06:31:17 +0000 (23:31 -0700)]
AI 144411: am: CL 144336 am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 144411
Eric Fischer [Fri, 3 Apr 2009 04:42:06 +0000 (21:42 -0700)]
AI 144355: Automated g4 rollback of changelist 144335.
*** Reason for rollback ***
Roll back US Spanish import because it made the build too big.
*** Original change description ***
Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144355
Eric Fischer [Thu, 2 Apr 2009 23:42:13 +0000 (16:42 -0700)]
AI 144336: am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 144336
Eric Fischer [Thu, 2 Apr 2009 23:39:21 +0000 (16:39 -0700)]
AI 144335: Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144335
Jean-Baptiste Queru [Tue, 31 Mar 2009 23:49:44 +0000 (16:49 -0700)]
Use the new download manager APIs introduced in change 7400
Conflicts:
src/com/android/browser/BrowserActivity.java
Jean-Baptiste Queru [Tue, 31 Mar 2009 23:47:42 +0000 (16:47 -0700)]
Merge branch 'open_source_contributions_cherry_picked' into google_internal
Leon Scroggins [Tue, 31 Mar 2009 21:31:22 +0000 (14:31 -0700)]
AI 143762: Fix for issue
1636784: Landscape only option for the browser. (This change is in ) Add an option in the settings menu of the browser to give the user the option of always displaying in landscape, ignoring sensor/opening and closing of the keyboard.
BUG=
1636784
Automated import of CL 143762
Andrei Popescu [Sat, 28 Mar 2009 03:11:20 +0000 (20:11 -0700)]
AI 143239: am: CL 143100 Update Gears to 0.5.17.0 and fix
1741787.
Original author: andreip
Merged from: //branches/cupcake/...
Automated import of CL 143239
Andrei Popescu [Sat, 28 Mar 2009 02:48:05 +0000 (19:48 -0700)]
AI 143389: am: CL 143239 am: CL 143100 Update Gears to 0.5.17.0 and fix
1741787.
Original author: andreip
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143389
The Android Open Source Project [Sat, 28 Mar 2009 01:48:32 +0000 (18:48 -0700)]
Merge commit 'goog/cupcake'
Andrei Popescu [Sat, 28 Mar 2009 01:46:50 +0000 (18:46 -0700)]
AI 143337: am: CL 143186 am: CL 142931 Upgrade Gears to 0.5.16.0 and fix
1709247.
Original author: andreip
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143337
Andrei Popescu [Fri, 27 Mar 2009 23:54:18 +0000 (16:54 -0700)]
AI 143186: am: CL 142931 Upgrade Gears to 0.5.16.0 and fix
1709247.
Original author: andreip
Merged from: //branches/cupcake/...
Automated import of CL 143186
The Android Open Source Project [Fri, 27 Mar 2009 22:31:11 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'
Andrei Popescu [Fri, 27 Mar 2009 16:40:58 +0000 (09:40 -0700)]
AI 143100: Update Gears to 0.5.17.0 and fix
1741787.
BUG=
1741787
Automated import of CL 143100
Andrei Popescu [Thu, 26 Mar 2009 17:02:12 +0000 (10:02 -0700)]
Automated import from //branches/cupcake/...@142931,142931
Grace Kloba [Thu, 26 Mar 2009 00:30:20 +0000 (17:30 -0700)]
Automated import from //branches/donutburger/...@142729,142729
Eric Fischer [Thu, 26 Mar 2009 00:04:27 +0000 (17:04 -0700)]
Automated import from //branches/donutburger/...@142720,142720
Grace Kloba [Wed, 25 Mar 2009 23:24:31 +0000 (16:24 -0700)]
Automated import from //branches/master/...@142773,142773
Eric Fischer [Wed, 25 Mar 2009 23:13:51 +0000 (16:13 -0700)]
Automated import from //branches/master/...@142759,142759
Grace Kloba [Wed, 25 Mar 2009 22:36:05 +0000 (15:36 -0700)]
Automated import from //branches/cupcake/...@142689,142689
Eric Fischer [Wed, 25 Mar 2009 22:22:43 +0000 (15:22 -0700)]
Automated import from //branches/cupcake/...@142643,142643
Grace Kloba [Wed, 25 Mar 2009 05:26:59 +0000 (22:26 -0700)]
Automated import from //branches/master/...@142273,142273
Grace Kloba [Wed, 25 Mar 2009 04:36:18 +0000 (21:36 -0700)]
Automated import from //branches/donutburger/...@142261,142261
Feng Qian [Wed, 25 Mar 2009 04:27:26 +0000 (21:27 -0700)]
Automated import from //branches/master/...@142050,142050
Eric Fischer [Wed, 25 Mar 2009 04:06:32 +0000 (21:06 -0700)]
Automated import from //branches/master/...@141869,141869
Eric Fischer [Wed, 25 Mar 2009 04:02:49 +0000 (21:02 -0700)]
Automated import from //branches/donutburger/...@141868,141868
Joe Onorato [Wed, 25 Mar 2009 03:45:47 +0000 (20:45 -0700)]
Automated import from //branches/master/...@141686,141686
Joe Onorato [Wed, 25 Mar 2009 03:44:17 +0000 (20:44 -0700)]
Automated import from //branches/donutburger/...@141685,141685
Patrick Scott [Wed, 25 Mar 2009 03:43:37 +0000 (20:43 -0700)]
Automated import from //branches/master/...@141656,141656
Patrick Scott [Wed, 25 Mar 2009 03:42:08 +0000 (20:42 -0700)]
Automated import from //branches/donutburger/...@141655,141655
Ramanan Rajeswaran [Wed, 25 Mar 2009 03:41:19 +0000 (20:41 -0700)]
Automated import from //branches/master/...@141638,141638
Ramanan Rajeswaran [Wed, 25 Mar 2009 03:40:12 +0000 (20:40 -0700)]
Automated import from //branches/donutburger/...@141637,141637
Grace Kloba [Wed, 25 Mar 2009 02:11:23 +0000 (19:11 -0700)]
Automated import from //branches/cupcake/...@142167,142167
Eric Fischer [Wed, 25 Mar 2009 01:47:15 +0000 (18:47 -0700)]
Automated import from //branches/master/...@140875,140875
Eric Fischer [Wed, 25 Mar 2009 01:47:00 +0000 (18:47 -0700)]
Automated import from //branches/donutburger/...@140873,140873
Eric Fischer [Wed, 25 Mar 2009 01:33:42 +0000 (18:33 -0700)]
Automated import from //branches/cupcake/...@141866,141866
Romain Guy [Wed, 25 Mar 2009 01:10:16 +0000 (18:10 -0700)]
Automated import from //branches/master/...@140651,140651
Joe Onorato [Wed, 25 Mar 2009 01:10:07 +0000 (18:10 -0700)]
Automated import from //branches/cupcake/...@141684,141684
Romain Guy [Wed, 25 Mar 2009 01:08:40 +0000 (18:08 -0700)]
Automated import from //branches/donutburger/...@140648,140648
Patrick Scott [Wed, 25 Mar 2009 01:05:24 +0000 (18:05 -0700)]
Automated import from //branches/cupcake/...@141654,141654
Leon Scroggins [Wed, 25 Mar 2009 01:03:43 +0000 (18:03 -0700)]
Automated import from //branches/master/...@140610,140610
Ramanan Rajeswaran [Wed, 25 Mar 2009 01:03:12 +0000 (18:03 -0700)]
Automated import from //branches/cupcake/...@141636,141636
Patrick Scott [Wed, 25 Mar 2009 01:02:58 +0000 (18:02 -0700)]
Automated import from //branches/master/...@140606,140606
Leon Scroggins [Wed, 25 Mar 2009 01:02:07 +0000 (18:02 -0700)]
Automated import from //branches/donutburger/...@140608,140608
Patrick Scott [Wed, 25 Mar 2009 01:01:26 +0000 (18:01 -0700)]
Automated import from //branches/donutburger/...@140604,140604
Eric Fischer [Wed, 25 Mar 2009 00:53:52 +0000 (17:53 -0700)]
Automated import from //branches/master/...@140538,140538
Eric Fischer [Wed, 25 Mar 2009 00:51:55 +0000 (17:51 -0700)]
Automated import from //branches/donutburger/...@140535,140535
Grace Kloba [Wed, 25 Mar 2009 00:40:12 +0000 (17:40 -0700)]
Automated import from //branches/master/...@140428,140428
Patrick Scott [Wed, 25 Mar 2009 00:38:39 +0000 (17:38 -0700)]
Automated import from //branches/master/...@140415,140415
Grace Kloba [Wed, 25 Mar 2009 00:38:24 +0000 (17:38 -0700)]
Automated import from //branches/donutburger/...@140427,140427
Patrick Scott [Wed, 25 Mar 2009 00:36:38 +0000 (17:36 -0700)]
Automated import from //branches/donutburger/...@140394,140394
The Android Open Source Project [Fri, 20 Mar 2009 06:08:56 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 00:39:48 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
Jean-Baptiste Queru [Tue, 17 Mar 2009 23:31:53 +0000 (16:31 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
src/com/android/browser/BrowserActivity.java