diff options
15 files changed, 0 insertions, 315 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestResourceProvider.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestResourceProvider.java index 1d5dd9d..5aaab7b 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestResourceProvider.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestResourceProvider.java @@ -7,7 +7,6 @@ package org.chromium.android_webview.test; import android.content.Context; import org.chromium.android_webview.AwResource; -import org.chromium.content.app.AppResource; public class AwTestResourceProvider { private static boolean sInitialized; @@ -17,12 +16,6 @@ public class AwTestResourceProvider { return; } - AppResource.DRAWABLE_ICON_ACTION_BAR_SHARE = R.drawable.resource_icon; - AppResource.DRAWABLE_ICON_ACTION_BAR_WEB_SEARCH = R.drawable.resource_icon; - - AppResource.STRING_ACTION_BAR_SHARE = R.string.test_string; - AppResource.STRING_ACTION_BAR_WEB_SEARCH = R.string.test_string; - AwResource.setResources(context.getResources()); AwResource.RAW_LOAD_ERROR = R.raw.blank_html; diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java index 4ae0493..68f9f04 100644 --- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java +++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java @@ -13,7 +13,6 @@ import android.view.KeyEvent; import org.chromium.chrome.browser.DevToolsServer; import org.chromium.chrome.browser.TabBase; -import org.chromium.content.app.AppResource; import org.chromium.content.app.LibraryLoader; import org.chromium.content.browser.ContentView; import org.chromium.content.browser.DeviceUtils; @@ -41,7 +40,6 @@ public class ChromiumTestShellActivity extends Activity { DeviceUtils.addDeviceSpecificUserAgentSwitch(this); - initializeContentViewResources(); ContentView.initChromiumBrowserProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC); setContentView(R.layout.testshell_activity); @@ -139,26 +137,6 @@ public class ChromiumTestShellActivity extends Activity { } } - private void initializeContentViewResources() { - AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS = R.dimen.link_preview_overlay_radius; - AppResource.DRAWABLE_ICON_ACTION_BAR_SHARE = R.drawable.ic_menu_share_holo_light; - AppResource.DRAWABLE_ICON_ACTION_BAR_WEB_SEARCH = R.drawable.ic_menu_search_holo_light; - AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY = R.drawable.popup_zoomer_overlay; - AppResource.ID_AUTOFILL_LABEL = R.id.autofill_label; - AppResource.ID_AUTOFILL_NAME = R.id.autofill_name; - AppResource.LAYOUT_AUTOFILL_TEXT = R.layout.autofill_text; - AppResource.STRING_ACTION_BAR_SHARE = R.string.action_bar_share; - AppResource.STRING_ACTION_BAR_WEB_SEARCH = R.string.action_bar_search; - AppResource.STRING_CONTENT_VIEW_CONTENT_DESCRIPTION = R.string.accessibility_content_view; - AppResource.STRING_MEDIA_PLAYER_MESSAGE_PLAYBACK_ERROR = - R.string.media_player_error_text_invalid_progressive_playback; - AppResource.STRING_MEDIA_PLAYER_MESSAGE_UNKNOWN_ERROR = - R.string.media_player_error_text_unknown; - AppResource.STRING_MEDIA_PLAYER_ERROR_BUTTON = R.string.media_player_error_button; - AppResource.STRING_MEDIA_PLAYER_ERROR_TITLE = R.string.media_player_error_title; - AppResource.STRING_MEDIA_PLAYER_LOADING_VIDEO = R.string.media_player_loading_video; - } - private static String getUrlFromIntent(Intent intent) { return intent != null ? intent.getDataString() : null; } diff --git a/chrome/android/testshell/res/drawable-nodpi/popup_zoomer_overlay.9.png b/chrome/android/testshell/res/drawable-nodpi/popup_zoomer_overlay.9.png Binary files differdeleted file mode 100644 index bae5478..0000000 --- a/chrome/android/testshell/res/drawable-nodpi/popup_zoomer_overlay.9.png +++ /dev/null diff --git a/chrome/android/testshell/res/drawable/ic_menu_search_holo_light.png b/chrome/android/testshell/res/drawable/ic_menu_search_holo_light.png Binary files differdeleted file mode 100644 index 34195a0..0000000 --- a/chrome/android/testshell/res/drawable/ic_menu_search_holo_light.png +++ /dev/null diff --git a/chrome/android/testshell/res/drawable/ic_menu_share_holo_light.png b/chrome/android/testshell/res/drawable/ic_menu_share_holo_light.png Binary files differdeleted file mode 100644 index 70fe31a..0000000 --- a/chrome/android/testshell/res/drawable/ic_menu_share_holo_light.png +++ /dev/null diff --git a/chrome/android/testshell/res/layout/autofill_text.xml b/chrome/android/testshell/res/layout/autofill_text.xml deleted file mode 100644 index 0a9e113..0000000 --- a/chrome/android/testshell/res/layout/autofill_text.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. - - Use of this source code is governed by a BSD-style license that can be - found in the LICENSE file. - --> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="fill_parent" - android:layout_width="fill_parent" - android:orientation="horizontal"> - <TextView android:id="@+id/autofill_name" - android:layout_alignParentLeft="true" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="#FFF" - android:padding="5dp" - android:textSize="18sp" - android:textColor="#000"/> - <TextView android:id="@+id/autofill_label" - android:layout_alignParentRight="true" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:padding="5dp" - android:textSize="18sp" - android:background="#FFF" - android:textColor="#CCC"/> -</RelativeLayout>
\ No newline at end of file diff --git a/chrome/android/testshell/res/values/dimens.xml b/chrome/android/testshell/res/values/dimens.xml deleted file mode 100644 index b3eb8f8..0000000 --- a/chrome/android/testshell/res/values/dimens.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. - - Use of this source code is governed by a BSD-style license that can be - found in the LICENSE file. - --> - -<resources> - <!-- Link Preview dimensions --> - <dimen name="link_preview_overlay_radius">0dp</dimen> -</resources> diff --git a/chrome/android/testshell/res/values/strings.xml b/chrome/android/testshell/res/values/strings.xml index a25a193..6eaaaec 100644 --- a/chrome/android/testshell/res/values/strings.xml +++ b/chrome/android/testshell/res/values/strings.xml @@ -8,18 +8,4 @@ <resources> <string name="url_hint">Type URL Here</string> - <string name="accessibility_content_view">Web View</string> - - <!-- Action Bar --> - <string name="action_bar_share">Share</string> - <string name="action_bar_search">Search</string> - - <!-- Media Player --> - <string name="media_player_error_title">Cannot play video</string> - <string name="media_player_error_text_invalid_progressive_playback"> - Sorry, this video is not valid for streaming to this device.</string> - <string name="media_player_error_text_unknown"> - Sorry, this video cannot be played.</string> - <string name="media_player_error_button">OK</string> - <string name="media_player_loading_video">Loading video</string> </resources> diff --git a/content/public/android/java/src/org/chromium/content/app/AppResource.java b/content/public/android/java/src/org/chromium/content/app/AppResource.java deleted file mode 100644 index 9a260f8f..0000000 --- a/content/public/android/java/src/org/chromium/content/app/AppResource.java +++ /dev/null @@ -1,184 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package org.chromium.content.app; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; - -/** - * Interface to list and expose any required Android app resources. - * All resources must be registered before instantiating ContentView objects. - */ -public class AppResource { - /** Array resource containing the official command line arguments. */ - public static int ARRAY_OFFICIAL_COMMAND_LINE; - - /** Dimension defining the corner radii of the favicon color strip when creating shortcuts. */ - public static int DIMENSION_FAVICON_COLORSTRIP_CORNER_RADII; - - /** Dimension defining the height of the favicon color strip when creating shortcuts. */ - public static int DIMENSION_FAVICON_COLORSTRIP_HEIGHT; - - /** Dimension defining the padding of the favicon color strip when creating shortcuts. */ - public static int DIMENSION_FAVICON_COLORSTRIP_PADDING; - - /** Dimension defining the width of the favicon color strip when creating shortcuts. */ - public static int DIMENSION_FAVICON_COLORSTRIP_WIDTH; - - /** Dimension defining the border of the favicon fold when creating shortcuts. */ - public static int DIMENSION_FAVICON_FOLD_BORDER; - - /** Dimension defining the corner radii of the favicon fold when creating shortcuts. */ - public static int DIMENSION_FAVICON_FOLD_CORNER_RADII; - - /** Dimension defining the shadow of the favicon fold when creating shortcuts. */ - public static int DIMENSION_FAVICON_FOLD_SHADOW; - - /** Dimension defining the size of the favicon fold when creating shortcuts. */ - public static int DIMENSION_FAVICON_FOLD_SIZE; - - /** Dimension defining the size of the favicon image when creating shortcuts. */ - public static int DIMENSION_FAVICON_SIZE; - - /** Dimension of the radius used in the link preview overlay. */ - public static int DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS; - - /** Drawable icon resource for the Share button in the action bar. */ - public static int DRAWABLE_ICON_ACTION_BAR_SHARE; - - /** Drawable icon resource for the Web Search button in the action bar. */ - public static int DRAWABLE_ICON_ACTION_BAR_WEB_SEARCH; - - /** Drawable icon resource of the Application icon. */ - public static int DRAWABLE_ICON_APP_ICON; - - /** Drawable icon resource used for favicons by default. */ - public static int DRAWABLE_ICON_DEFAULT_FAVICON; - - /** Drawable resource for the link preview popup overlay. */ - public static int DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY; - - /** Id of the autofill label. */ - public static int ID_AUTOFILL_LABEL; - - /** Id of the autofill name. */ - public static int ID_AUTOFILL_NAME; - - /** Id of the date picker view. */ - public static int ID_DATE_PICKER; - - /** Id of the cancel button in Javascript modal dialogs. */ - public static int ID_JS_MODAL_DIALOG_BUTTON_CANCEL; - - /** Id of the confirm button in Javascript modal dialogs. */ - public static int ID_JS_MODAL_DIALOG_BUTTON_CONFIRM; - - /** Id of the CheckBox to suppress further modal dialogs in Javascript modal dialogs. */ - public static int ID_JS_MODAL_DIALOG_CHECKBOX_SUPPRESS_DIALOGS; - - /** Id of the message TextView in Javascript modal dialogs. */ - public static int ID_JS_MODAL_DIALOG_TEXT_MESSAGE; - - /** Id of the prompt EditText in Javascript modal dialogs. */ - public static int ID_JS_MODAL_DIALOG_TEXT_PROMPT; - - /** Id of the title TextView in Javascript modal dialogs. */ - public static int ID_JS_MODAL_DIALOG_TEXT_TITLE; - - /** Id of the month picker view. */ - public static int ID_MONTH_PICKER; - - /** Id of the time picker view. */ - public static int ID_TIME_PICKER; - - /** Id of the year picker view. */ - public static int ID_YEAR_PICKER; - - /** Id of the view containing the month and year pickers. */ - public static int ID_MONTH_YEAR_PICKERS_CONTAINER; - - /** Layout of the autofill popup. */ - public static int LAYOUT_AUTOFILL_TEXT; - - /** Layout of the date/time picker dialog. */ - public static int LAYOUT_DATE_TIME_PICKER_DIALOG; - - /** Layout of the Javascript modal dialog. */ - public static int LAYOUT_JS_MODAL_DIALOG; - - /** Layout of the month picker. */ - public static int LAYOUT_MONTH_PICKER; - - /** Layout of the month picker dialog. */ - public static int LAYOUT_MONTH_PICKER_DIALOG; - - /** Mipmap image used as background for bookmark shortcut icons. */ - public static int MIPMAP_BOOKMARK_SHORTCUT_BACKGROUND; - - /** String for the Share button in the action bar. */ - public static int STRING_ACTION_BAR_SHARE; - - /** String for the Web Search button in the action bar. */ - public static int STRING_ACTION_BAR_WEB_SEARCH; - - /** String for the Content View accessibility contentDescription. */ - public static int STRING_CONTENT_VIEW_CONTENT_DESCRIPTION; - - /** String for the Clear button in the date picker dialog. */ - public static int STRING_DATE_PICKER_DIALOG_CLEAR; - - /** String for the Set button in the date picker dialog. */ - public static int STRING_DATE_PICKER_DIALOG_SET; - - /** String for the title of the date/time picker dialog. */ - public static int STRING_DATE_TIME_PICKER_DIALOG_TITLE; - - /** String for 'Don't reload this page' in Javascript modal dialogs. */ - public static int STRING_JS_MODAL_DIALOG_DONT_RELOAD_THIS_PAGE; - - /** String for 'Leave this page' in Javascript modal dialogs. */ - public static int STRING_JS_MODAL_DIALOG_LEAVE_THIS_PAGE; - - /** String for 'Reload this page' in Javascript modal dialogs. */ - public static int STRING_JS_MODAL_DIALOG_RELOAD_THIS_PAGE; - - /** String for 'Stay on this page' in Javascript modal dialogs. */ - public static int STRING_JS_MODAL_DIALOG_STAY_ON_THIS_PAGE; - - /** String for the title of the month picker dialog. */ - public static int STRING_MONTH_PICKER_DIALOG_TITLE; - - /** String for playback errors in the media player. */ - public static int STRING_MEDIA_PLAYER_MESSAGE_PLAYBACK_ERROR; - - /** String for unknown errors in the media player. */ - public static int STRING_MEDIA_PLAYER_MESSAGE_UNKNOWN_ERROR; - - /** String for the button contents in the media player error dialog. */ - public static int STRING_MEDIA_PLAYER_ERROR_BUTTON; - - /** String for the title of the media player error dialog. */ - public static int STRING_MEDIA_PLAYER_ERROR_TITLE; - - /** String for the progress bar while loading the fullscreen video. */ - public static int STRING_MEDIA_PLAYER_LOADING_VIDEO; - - /** - * Iterates through all the resources ids and verifies they have values other than zero. - * @return true if all the resources have been registered. - */ - public static boolean verifyResourceRegistration() { - Field[] fields = AppResource.class.getDeclaredFields(); - for (Field field : fields) { - try { - if (field.getType().equals(int.class) && Modifier.isStatic(field.getModifiers())) { - if (field.getInt(null) == 0) return false; - } - } catch (IllegalAccessException e) { - } - } - return true; - } -} diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java index 00cd670..2a6a0c5 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java @@ -11,7 +11,6 @@ import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; -import org.chromium.content.app.AppResource; import org.chromium.content.app.LibraryLoader; import org.chromium.content.browser.ContentVideoView; import org.chromium.content.browser.ContentView; @@ -51,7 +50,6 @@ public class ContentShellActivity extends Activity { DeviceUtils.addDeviceSpecificUserAgentSwitch(this); LibraryLoader.ensureInitialized(); - initializeContentViewResources(); setContentView(R.layout.content_shell_activity); mShellManager = (ShellManager) findViewById(R.id.shell_container); @@ -175,21 +173,4 @@ public class ContentShellActivity extends Activity { Shell shell = getActiveShell(); return shell != null ? shell.getContentView() : null; } - - private void initializeContentViewResources() { - AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS = R.dimen.link_preview_overlay_radius; - AppResource.DRAWABLE_ICON_ACTION_BAR_SHARE = R.drawable.ic_menu_share_holo_light; - AppResource.DRAWABLE_ICON_ACTION_BAR_WEB_SEARCH = R.drawable.ic_menu_search_holo_light; - AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY = R.drawable.popup_zoomer_overlay; - AppResource.STRING_ACTION_BAR_SHARE = R.string.action_bar_share; - AppResource.STRING_ACTION_BAR_WEB_SEARCH = R.string.action_bar_search; - AppResource.STRING_CONTENT_VIEW_CONTENT_DESCRIPTION = R.string.accessibility_content_view; - AppResource.STRING_MEDIA_PLAYER_MESSAGE_PLAYBACK_ERROR = - R.string.media_player_error_text_invalid_progressive_playback; - AppResource.STRING_MEDIA_PLAYER_MESSAGE_UNKNOWN_ERROR = - R.string.media_player_error_text_unknown; - AppResource.STRING_MEDIA_PLAYER_ERROR_BUTTON = R.string.media_player_error_button; - AppResource.STRING_MEDIA_PLAYER_ERROR_TITLE = R.string.media_player_error_title; - AppResource.STRING_MEDIA_PLAYER_LOADING_VIDEO = R.string.media_player_loading_video; - } } diff --git a/content/shell/android/res/drawable-nodpi/popup_zoomer_overlay.9.png b/content/shell/android/res/drawable-nodpi/popup_zoomer_overlay.9.png Binary files differdeleted file mode 100644 index bae5478..0000000 --- a/content/shell/android/res/drawable-nodpi/popup_zoomer_overlay.9.png +++ /dev/null diff --git a/content/shell/android/res/drawable/ic_menu_search_holo_light.png b/content/shell/android/res/drawable/ic_menu_search_holo_light.png Binary files differdeleted file mode 100644 index 34195a0..0000000 --- a/content/shell/android/res/drawable/ic_menu_search_holo_light.png +++ /dev/null diff --git a/content/shell/android/res/drawable/ic_menu_share_holo_light.png b/content/shell/android/res/drawable/ic_menu_share_holo_light.png Binary files differdeleted file mode 100644 index 70fe31a..0000000 --- a/content/shell/android/res/drawable/ic_menu_share_holo_light.png +++ /dev/null diff --git a/content/shell/android/res/values/dimens.xml b/content/shell/android/res/values/dimens.xml deleted file mode 100644 index 0a0ff61..0000000 --- a/content/shell/android/res/values/dimens.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. - - Use of this source code is governed by a BSD-style license that can be - found in the LICENSE file. - --> - -<resources> - - <!-- Link Preview dimensions --> - <dimen name="link_preview_overlay_radius">0dp</dimen> - -</resources> diff --git a/content/shell/android/res/values/strings.xml b/content/shell/android/res/values/strings.xml index a25a193..6eaaaec 100644 --- a/content/shell/android/res/values/strings.xml +++ b/content/shell/android/res/values/strings.xml @@ -8,18 +8,4 @@ <resources> <string name="url_hint">Type URL Here</string> - <string name="accessibility_content_view">Web View</string> - - <!-- Action Bar --> - <string name="action_bar_share">Share</string> - <string name="action_bar_search">Search</string> - - <!-- Media Player --> - <string name="media_player_error_title">Cannot play video</string> - <string name="media_player_error_text_invalid_progressive_playback"> - Sorry, this video is not valid for streaming to this device.</string> - <string name="media_player_error_text_unknown"> - Sorry, this video cannot be played.</string> - <string name="media_player_error_button">OK</string> - <string name="media_player_loading_video">Loading video</string> </resources> |
