diff options
Diffstat (limited to 'src/com/android/browser')
4 files changed, 23 insertions, 7 deletions
diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java index b3f8d98..2fd880c 100644 --- a/src/com/android/browser/BrowserBookmarksAdapter.java +++ b/src/com/android/browser/BrowserBookmarksAdapter.java @@ -25,6 +25,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CursorAdapter; import android.widget.ImageView; +import android.widget.ImageView.ScaleType; import android.widget.TextView; public class BrowserBookmarksAdapter extends CursorAdapter { @@ -65,6 +66,7 @@ public class BrowserBookmarksAdapter extends CursorAdapter { if (cursor.getInt(BookmarksLoader.COLUMN_INDEX_IS_FOLDER) != 0) { // folder thumb.setImageResource(R.drawable.thumb_bookmark_widget_folder_holo); + thumb.setScaleType(ScaleType.FIT_END); thumb.setBackgroundDrawable(null); } else { byte[] thumbData = cursor.getBlob(BookmarksLoader.COLUMN_INDEX_THUMBNAIL); @@ -73,6 +75,7 @@ public class BrowserBookmarksAdapter extends CursorAdapter { thumbBitmap = BitmapFactory.decodeByteArray(thumbData, 0, thumbData.length); } + thumb.setScaleType(ScaleType.CENTER_CROP); if (thumbBitmap == null) { thumb.setImageResource(R.drawable.browser_thumbnail); } else { diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 2c0b2ec..b9eec9c 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -677,9 +677,9 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, public boolean enableCpuUploadPath() { if (!isDebugEnabled()) { - return true; + return false; } - return mPrefs.getBoolean(PREF_ENABLE_CPU_UPLOAD_PATH, true); + return mPrefs.getBoolean(PREF_ENABLE_CPU_UPLOAD_PATH, false); } public boolean enableJavascriptConsole() { diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index aa7ecd9..78d0077 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1384,8 +1384,14 @@ public class Controller if (type == WebView.HitTestResult.IMAGE_TYPE) { menu.setHeaderTitle(extra); } - menu.findItem(R.id.view_image_context_menu_id).setIntent( - new Intent(Intent.ACTION_VIEW, Uri.parse(extra))); + menu.findItem(R.id.view_image_context_menu_id) + .setOnMenuItemClickListener(new OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + openTab(extra, mTabControl.getCurrentTab(), true, true); + return false; + } + }); menu.findItem(R.id.download_context_menu_id). setOnMenuItemClickListener( new Download(mActivity, extra, webview.isPrivateBrowsingEnabled())); diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java index 586f46d..209faad 100644 --- a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java +++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java @@ -223,8 +223,15 @@ public class BookmarkThumbnailWidgetService extends RemoteViewsService { String url = mBookmarks.getString(BOOKMARK_INDEX_URL); boolean isFolder = mBookmarks.getInt(BOOKMARK_INDEX_IS_FOLDER) != 0; - RemoteViews views = new RemoteViews( - mContext.getPackageName(), R.layout.bookmarkthumbnailwidget_item); + RemoteViews views; + // Two layouts are needed because of b/5387153 + if (isFolder) { + views = new RemoteViews(mContext.getPackageName(), + R.layout.bookmarkthumbnailwidget_item_folder); + } else { + views = new RemoteViews(mContext.getPackageName(), + R.layout.bookmarkthumbnailwidget_item); + } // Set the title of the bookmark. Use the url as a backup. String displayTitle = title; if (TextUtils.isEmpty(displayTitle)) { @@ -286,7 +293,7 @@ public class BookmarkThumbnailWidgetService extends RemoteViewsService { @Override public int getViewTypeCount() { - return 1; + return 2; } @Override |