From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Mon, 23 May 2011 06:51:55 +0000 (+0800)
Subject: update for gingerbread-x86
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=97e1a08b4a1f51da08622d988fbc4da4b57e3181;p=android-x86%2Fdevice-tegatech-tegav2.git

update for gingerbread-x86
---

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 13af0e2..6f7f97f 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -1,7 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 LOCAL_FIRMWARES := ath3k-1.fw
 TARGET_INITRD_SCRIPTS := $(LOCAL_PATH)/tegav2_info
-TARGET_PREBUILT_APPS := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/app/*))
 TARGET_KERNEL_CONFIG := $(LOCAL_PATH)/tegav2_defconfig
 
 include $(GENERIC_X86_ANDROID_MK)
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2b97efa..6291f3e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,7 +1,6 @@
 TARGET_ARCH_VARIANT := x86-atom
 TARGET_HAS_THIRD_PARTY_APPS := true
-BOARD_WPA_SUPPLICANT_DRIVER := AWEXT
-BOARD_USES_TSLIB := true
+BOARD_USES_TSLIB := false
 BOARD_USES_I915C := true
 BOARD_USES_KBDSENSOR := true
 
diff --git a/overlays/packages/apps/Browser/res/values/strings.xml b/overlays/packages/apps/Browser/res/values/strings.xml
index 31fceeb..db1af91 100644
--- a/overlays/packages/apps/Browser/res/values/strings.xml
+++ b/overlays/packages/apps/Browser/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!-- Copyright (c) 2011, The Android-x86 Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,631 +14,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- The name of the application. -->
-    <string name="application_name">Browser</string>
-    <!-- Displayed with a file picker to choose a file to upload -->
-    <string name="choose_upload">Choose file for upload</string>
-    <!-- Name of menu item of a new tab.  Also used in the title bar when displaying a new tab -->
-    <string name="new_tab">New window</string>
-    <!-- Name of menu item which brings up a list of the currently active tabs -->
-    <string name="active_tabs">Windows</string>
-    <!-- Name of tab containing bookmarks -->
-    <string name="tab_bookmarks">Bookmarks</string>
-    <!-- Name of tab containing the user's most visited websites, organized by number of visits -->
-    <string name="tab_most_visited">Most visited</string>
-    <!-- Name of tab containing the user's complete history, organized by time of last visit -->
-    <string name="tab_history">History</string>
-    <!-- Toast shown when a history item's star is clicked, converting it to a bookmark -->
-    <string name="added_to_bookmarks">Added to bookmarks</string>
-    <!-- Toast shown when a history item's star is clicked off, removing its bookmark -->
-    <string name="removed_from_bookmarks">Removed from bookmarks</string>
-    <!-- Sign-in dialog -->
-    <!-- This is used as the title of a dialog which is used to sign in to a secure site.
-            "%s1"is replaced with the host and "%s2" with realm -->
-    <string name="sign_in_to">Sign in to <xliff:g id="hostname">%s1</xliff:g> \"<xliff:g id="realm">%s2</xliff:g>\"</string>
-    <!-- Prompt for an input box that allows the user to enter their login name -->
-    <string name="username">Name</string>
-    <!-- Prompt for an input box that allows the user to enter their password -->
-    <string name="password">Password</string>
-    <!-- The label on the "sign in" button -->
-    <string name="action">Sign in</string>
-    <!-- The name of the bookmarks and history search suggestion source.  -->
-    <string name="bookmarks_search">Browser</string>
-
-    <!-- Label for a cancel button.  It is used for multiple cancel buttons in different contexts -->
-    <string name="cancel">Cancel</string>
-    <!-- Label for a confirm button.  Used in multiple contexts. -->
-    <string name="ok">OK</string>
-
-    <!-- Displayed on the Find dialog to display the number of matches
-         found in the current page. -->
-    <plurals name="matches_found">
-        <!-- Case of no matches -->
-        <item quantity="zero">No matches</item>
-        <!-- Case of one match -->
-        <item quantity="one">1 match</item>
-        <!-- Case of "few" (two) matches -->
-        <item quantity="few"><xliff:g id="number" example="2">%d</xliff:g> matches</item>
-        <!-- Case of several matches -->
-        <item quantity="other"><xliff:g id="number" example="137">%d</xliff:g> matches</item>
-    </plurals>
-
-    <!-- Displayed on the title bar while the page is loading -->
-    <string name="title_bar_loading">Loading\u2026</string>
-
-    <!-- Menu item -->
-    <string name="page_info">Page info</string>
-    <!-- Label for a button on an SSL error dialog that allows the user to see
-        Page info screen for the current page -->
-    <string name="page_info_view">View page info</string>
-    <!-- Page Info dialog strings -->
-    <!-- Noun.  The url for the current page. Displayed on the Page Info
-            screen. -->
-    <string name="page_info_address">Address:</string>
-
-    <!-- SSL Error dialogs -->
-    <string name="ssl_warnings_header">There are problems with the security certificate for this site.</string>
-    <!-- Label for a button on an SSL error dialog that lets the user continue
-            and view the page despite the error -->
-    <string name="ssl_continue">Continue</string>
-    <!-- Title for an SSL error dialog  -->
-    <string name="security_warning">Security warning</string>
-    <!-- Label for a button on an SSL error dialog that lets the user view the
-        certificate -->
-    <string name="view_certificate">View certificate</string>
-
-    <!-- Message in an SSL Error dialog -->
-    <string name="ssl_untrusted">This certificate is not from a trusted authority.</string>
-    <!-- Message in an SSL Error dialog -->
-    <string name="ssl_mismatch">The name of the site does not match the name on the certificate.</string>
-    <!-- Message in an SSL Error dialog -->
-    <string name="ssl_expired">This certificate has expired.</string>
-    <!-- Message in an SSL Error dialog -->
-    <string name="ssl_not_yet_valid">This certificate is not valid yet.</string>
-
-    <!-- SSL Certificate dialogs -->
-    <!-- Title for an SSL Certificate dialog -->
-    <string name="ssl_certificate">Security certificate</string>
-    <!-- Message on an SSL Certificate dialog -->
-    <string name="ssl_certificate_is_valid">This certificate is valid.</string>
-    <!-- Label for an information field on an SSL Certificate Dialog -->
-    <string name="issued_to">Issued to:</string>
-    <!-- Label for an information field on an SSL Certificate Dialog -->
-    <string name="common_name">Common name:</string>
-    <!-- Label for an information field on an SSL Certificate Dialog -->
-    <string name="org_name">Organization:</string>
-    <!-- Label for an information field on an SSL Certificate Dialog -->
-    <string name="org_unit">Organizational unit:</string>
-    <!-- Label for an information field on an SSL Certificate Dialog -->
-    <string name="issued_by">Issued by:</string>
-    <!-- Label for an information field on an SSL Certificate Dialog -->
-    <string name="validity_period">Validity:</string>
-    <!-- Label for an information field on an SSL Certificate Dialog -->
-    <string name="issued_on">Issued on:</string>
-    <!-- Label for an information field on an SSL Certificate Dialog -->
-    <string name="expires_on">Expires on:</string>
-
-    <!-- Toast informing the user that loading has stopped for the current page. -->
-    <string name="stopping">Stopping\u2026</string>
-    <!-- Menu item to stop the current page from loading. -->
-    <string name="stop">Stop</string>
-    <!-- Menu item to reload or refresh the current page. -->
-    <string name="reload">Refresh</string>
-    <!-- Menu item to go back to the previous page -->
-    <string name="back">Back</string>
-    <!-- Menu item to go to the next page (only useful if the user has previously hit back.) -->
-    <string name="forward">Forward</string>
-    <!-- Button label to confirm saving a bookmark. -->
-    <string name="save">OK</string>
-    <!-- Button label to cancel saving a bookmark. -->
-    <string name="do_not_save">Cancel</string>
-    <!-- Field label in Bookmark dialog box: refers to URL of the page to bookmark -->
-    <string name="location">Location</string>
-    <!-- Field label in Bookmark dialog box: title that the user wishes to use for the bookmark -->
-    <string name="name">Name</string>
-    <!-- Initial value in Location field in Bookmark dialog box -->
-    <string name="http">http://</string>
-    <!-- Menu item that opens a dialog to save a bookmark, initialized with the current page -->
-    <string name="save_to_bookmarks">Add bookmark</string>
-    <!-- Menu item on the bookmarks page, to edit an existing bookmark -->
-    <string name="edit_bookmark">Edit bookmark</string>
-    <!-- Context menu item to create a shortcut to the bookmark on the desktop -->
-    <string name="create_shortcut_bookmark">Add shortcut to Home</string>
-    <!-- Context menu item to open the currently highlighted bookmark -->
-    <string name="open_bookmark">Open</string>
-    <!-- Menu item to remove the currently highlighted bookmark-->
-    <string name="remove_bookmark">Delete bookmark</string>
-    <!-- Context menu item to remove a history item from bookmarks -->
-    <string name="remove_from_bookmarks">Remove from bookmarks</string>
-    <!-- Menu item to remove the currently highlighted history entry from the list of previously visited sites -->
-    <string name="remove_history_item">Remove from history</string>
-    <!-- Context menu item for setting the bookmark/history item as the homepage -->
-    <string name="set_as_homepage">Set as homepage</string>
-    <!-- Toast informing the user that their action to save a bookmark has succeeded -->
-    <string name="bookmark_saved">Saved to bookmarks.</string>
-    <!-- Toast informing the user that their action to save a bookmark did not succeed -->
-    <string name="bookmark_not_saved">Unable to save bookmark.</string>
-    <!-- Toast confirming that the homepage has been set -->
-    <string name="homepage_set">Homepage set.</string>
-    <!-- Error that appears in the title of Bookmark dialog when user selects OK with empty Name field -->
-    <string name="bookmark_needs_title">"Bookmark must have a name."</string>
-        <!-- Error that appears in the title of Bookmark dialog when user selects OK with empty Location field -->
-    <string name="bookmark_needs_url">"Bookmark must have a location."</string>
-        <!-- Error that appears in the title of Bookmark dialog when user selects OK with invalid URL -->
-    <string name="bookmark_url_not_valid">URL is not valid.</string>
-        <!-- Error that appears in the Bookmark dialog when user selects OK with a URL of a type we cannot bookmark -->
-    <string name="bookmark_cannot_save_url">This URL cannot be bookmarked.</string>
-        <!-- Title of a confirmation dialog when the user deletes a bookmark-->
-    <string name="delete_bookmark">Delete</string>
-    <!-- Menu item in the page that displays all bookmarks. It brings up a
-            dialog that allows the user to bookmark the page that the browser is
-            currently on, but is not visible because the bookmarks page is
-            showing. -->
-    <string name="bookmark_page">Bookmark last-viewed page</string>
-    <!-- Menu item in the page that displays all bookmarks.  Switches to
-            a grid view which shows thumbnails -->
-    <string name="switch_to_thumbnails">Thumbnail view</string>
-    <!-- Menu item in the page that displays all bookmarks.  Switches to a
-            list view which shows titles -->
-    <string name="switch_to_list">List view</string>
-    <!-- Summary text under the New Bookmark item on the Bookmarks screen.
-            Tells the user that if they select this item, it will bring up a
-            dialog to bookmark the page that the browser is currently viewing,
-            though it is not currently being displayed, since they are viewing
-            the bookmarks screen. -->
-    <string name="current_page">from\u0020</string>
-    <!-- Confirmation dialog message confirming that the user wishes to delete
-            the bookmark they selected for deletion -->
-    <string name="delete_bookmark_warning">Bookmark \"<xliff:g id="bookmark">%s</xliff:g>\" will be deleted.</string>
-    <!-- Context Menu item to open the selected link in a new window -->
-    <string name="open_in_new_window">Open in new window</string>
-    <!-- Menu item to open a dialog which allows the user to enter a url or do search-->
-    <string name="goto_dot">Go</string>
-    <!-- Menu item that opens up a dialog which allows the user to provide a
-            string and search for it on the page. -->
-    <string name="find_dot">Find on page</string>
-    <!-- Menu item to switch to text selection mode for copy and paste. -->
-    <string name="select_dot">Select text</string>
-    <!-- Title of current windows screen; appears in title bar -->
-    <string name="tab_picker_title">Current windows</string>
-    <!-- Context Menu item to close the currently selected window -->
-    <string name="tab_picker_remove_tab">Close</string>
-    <!-- Menu item to open the bookmarks page. This is a shorter version that
-            is displayed with an icon -->
-    <string name="bookmarks">Bookmarks</string>
-    <!-- Secondary name for the Activity "BrowserBookmarksPage" -->
-    <string name="shortcut_bookmark">Bookmark</string>
-    <!-- Menu item to display the History of previously visited pages -->
-    <string name="history">History</string>
-    <!-- Menu item for viewing downloads from the browser -->
-    <string name="menu_view_download">Downloads</string>
-    <!-- Context menu item for copying the url of the current page from the
-            title bar -->
-    <string name="copy_page_url">Copy page url</string>
-    <!-- Menu item -->
-    <string name="share_page">Share page</string>
-    <!-- Context Menu item open the currently selected link in the current
-            window.-->
-    <string name="contextmenu_openlink">Open</string>
-    <!-- Context Menu item to open the currently selected link in a new
-            window. -->
-    <string name="contextmenu_openlink_newwindow">Open in new window</string>
-    <!-- Context Menu item to create a bookmark for the url of the currently
-            selected link. -->
-    <string name="contextmenu_bookmark_thislink">Bookmark link</string>
-    <!-- Context Menu item to save the webpage referred to by this link to the
-            SD card (external storage) -->
-    <string name="contextmenu_savelink">Save link</string>
-    <!-- Context Menu item to send the url of the selected link to someone else,
-            via Gmail or another app -->
-    <string name="contextmenu_sharelink">Share link</string>
-    <!-- Context Menu item -->
-    <string name="contextmenu_copy">Copy</string>
-    <!-- Context Menu item to copy the url of the selected link to the
-            clipboard -->
-    <string name="contextmenu_copylink">Copy link URL</string>
-    <!-- Context Menu item to save the image to external storage -->
-    <string name="contextmenu_download_image">Save image</string>
-    <!-- Context Menu item to view the image by itself in the browser -->
-    <string name="contextmenu_view_image">View image</string>
-    <!-- Context Menu item to set the image as the home screen wallpaper -->
-    <string name="contextmenu_set_wallpaper">Set as wallpaper</string>
-
-    <!-- Context Menu item to open the dialer app with the selected phone number
-            -->
-    <string name="contextmenu_dial_dot">Dial\u2026</string>
-    <!-- Context Menu item to add the selected phone number to the address book.
-            -->
-    <string name="contextmenu_add_contact">Add contact</string>
-    <!-- Context Menu item to send an email using the selected email address.-->
-    <string name="contextmenu_send_mail">Send email</string>
-    <!-- Context Menu item to show the currently selected address in the Maps
-            application -->
-    <string name="contextmenu_map">Map</string>
-
-     <!-- Title of the dialog used for selecting the application that should be
-            used for sharing a link (e.g. Gmail or another app). See also
-            contextmenu_sharelink above -->
-    <string name="choosertitle_sharevia">Share via</string>
-
-    <!-- Used as the title of dialogs in the Browser Settings confirming that
-            the user wants to clear (cache, history, or cookie data) -->
-    <string name="clear">Clear</string>
-
-    <!-- Part of a sentence that says "Replace <url of existing bookmark> with
-            <url of new bookmark>?" -->
-    <string name="replace">Replace</string>
-
-    <!-- Title displayed when the bookmarks page is shown -->
-    <string name="browser_bookmarks_page_bookmarks_text">Bookmarks</string>
-
-
-    <!-- Settings screen strings -->
-    <!-- Menu item to open the Settings screen -->
-    <string name="menu_preferences">Settings</string>
-    <!-- Settings screen, section title -->
-    <string name="pref_content_title">Page content settings</string>
-    <!-- Settings label -->
-    <string name="pref_content_load_images">Load images</string>
-    <!-- Settings label -->
-    <string name="pref_content_load_images_summary">Display images on web pages</string>
-    <!-- Settings label -->
-    <string name="pref_content_block_popups">Block pop-up windows</string>
-    <!-- Settings label -->
-    <string name="pref_content_javascript">Enable JavaScript</string>
-    <!-- Settings label -->
-    <string name="pref_content_open_in_background">Open in background</string>
-    <!-- Settings label -->
-    <string name="pref_content_plugins">Enable plug-ins</string>
-    <!-- Plugin options -->
-    <string-array name="pref_content_plugins_choices">
-        <item>Always on</item>
-        <item>On demand</item>
-        <item>Off</item>
-    </string-array>
-    <string-array name="pref_content_plugins_values" translatable="false">
-        <item>ON</item>
-        <item>ON_DEMAND</item>
-        <item>OFF</item>
-    </string-array>
-    <!-- Settings summary -->
-    <string name="pref_content_open_in_background_summary">Open new windows behind the current one</string>
-    <!-- Settings label -->
-    <string name="pref_content_homepage">Set home page</string>
-    <!-- Settings button label -->
-    <string name="pref_use_current">Use current page</string>
-    <!-- Settings label -->
-    <string name="pref_content_autofit">Auto-fit pages</string>
-    <!-- Settings summary -->
-    <string name="pref_content_autofit_summary">Format web pages to fit the screen</string>
-    <!-- Settings label for enabling a mode where the browser is always set to landscape mode -->
-    <string name="pref_content_landscape_only">Landscape-only display</string>
-    <!-- Settings summary -->
-    <string name="pref_content_landscape_only_summary">Display pages only in the wider, landscape screen orientation</string>
-    <!-- Settings screen, section title -->
-    <string name="pref_privacy_title">Privacy settings</string>
-    <!-- Settings label -->
-    <string name="pref_privacy_clear_cache">Clear cache</string>
-    <!-- Settings summary -->
-    <string name="pref_privacy_clear_cache_summary">Clear locally cached content and databases</string>
-    <!-- Confirmation dialog message -->
-    <string name="pref_privacy_clear_cache_dlg">Locally cached content and databases will be deleted.</string>
-    <!-- Settings label -->
-    <string name="pref_privacy_clear_cookies">Clear all cookie data</string>
-    <!-- Settings summary -->
-    <string name="pref_privacy_clear_cookies_summary">Clear all browser cookies</string>
-    <!-- Confirmation dialog message -->
-    <string name="pref_privacy_clear_cookies_dlg">All cookies will be deleted.</string>
-    <!-- Settings label -->
-    <string name="pref_privacy_clear_history">Clear history</string>
-    <!-- Settings summary -->
-    <string name="pref_privacy_clear_history_summary">Clear the browser navigation history</string>
-    <!-- Confirmation dialog message -->
-    <string name="pref_privacy_clear_history_dlg">The browser navigation history will be deleted.</string>
-    <!-- Settings label -->
-    <string name="pref_privacy_clear_form_data">Clear form data</string>
-    <!-- Settings summary -->
-    <string name="pref_privacy_clear_form_data_summary">Clear all the saved form data</string>
-    <!-- Confirmation dialog message -->
-    <string name="pref_privacy_clear_form_data_dlg">All saved form data will be deleted.</string>
-    <!-- Settings label -->
-    <string name="pref_privacy_clear_passwords">Clear passwords</string>
-    <!-- Settings summary -->
-    <string name="pref_privacy_clear_passwords_summary">Clear all saved passwords</string>
-    <!-- Confirmation dialog message -->
-    <string name="pref_privacy_clear_passwords_dlg">All saved passwords will be deleted.</string>
-    <!-- Settings label -->
-    <string name="pref_privacy_enable_geolocation">Enable location</string>
-    <!-- Settings summary -->
-    <string name="pref_privacy_enable_geolocation_summary">Allow sites to request access to your location</string>
-    <!-- Settings label -->
-    <string name="pref_privacy_clear_geolocation_access">Clear location access</string>
-    <!-- Settings summary -->
-    <string name="pref_privacy_clear_geolocation_access_summary">Clear location access for all websites</string>
-    <!-- Confirmation dialog message -->
-    <string name="pref_privacy_clear_geolocation_access_dlg">Clear location access for all websites</string>
-    <!-- Settings screen, section title -->
-    <string name="pref_security_title">Security settings</string>
-    <!-- Settings label -->
-    <string name="pref_security_remember_passwords">Remember passwords</string>
-    <!-- Settings summary -->
-    <string name="pref_security_remember_passwords_summary">Save usernames and passwords for websites</string>
-    <!-- Settings label -->
-    <string name="pref_security_save_form_data">Remember form data</string>
-    <!-- Settings summary -->
-    <string name="pref_security_save_form_data_summary">Remember data I type in forms for later use</string>
-    <!-- Settings label -->
-    <string name="pref_security_show_security_warning">Show security warnings</string>
-    <!-- Settings summmary -->
-    <string name="pref_security_show_security_warning_summary">Show warning if there is a problem with a site\'s security</string>
-    <!-- Settings label -->
-    <string name="pref_security_accept_cookies">Accept cookies</string>
-    <!-- Settings summary -->
-    <string name="pref_security_accept_cookies_summary">Allow sites to save and read \"cookie\" data</string>
-    <!-- Settings label -->
-    <string name="pref_text_size">Text size</string>
-    <!-- Settings text size options; appear in Text size dialog box -->
-    <string-array name="pref_text_size_choices">
-        <item>Tiny</item>
-        <item>Small</item>
-        <item>Normal</item>
-        <item>Large</item>
-        <item>Huge</item>
-    </string-array>
-    <!-- Title of dialog for setting the text size -->
-    <string name="pref_text_size_dialogtitle">Text size</string>
-    <!-- Do not translate -->
-    <string-array name="pref_text_size_values" translatable="false">
-        <item><xliff:g>SMALLEST</xliff:g></item>
-        <item><xliff:g>SMALLER</xliff:g></item>
-        <item><xliff:g>NORMAL</xliff:g></item>
-        <item><xliff:g>LARGER</xliff:g></item>
-        <item><xliff:g>LARGEST</xliff:g></item>
-    </string-array>
-    <!-- Settings label -->
-    <string name="pref_default_zoom">Default zoom</string>
-    <!-- Settings default zoom options; appear in default zoom dialog box -->
-    <string-array name="pref_default_zoom_choices">
-        <item>Far</item>
-        <item>Medium</item>
-        <item>Close</item>
-    </string-array>
-    <!-- Title of dialog for setting the default zoom -->
-    <string name="pref_default_zoom_dialogtitle">Default zoom</string>
-    <!-- Do not translate -->
-    <string-array name="pref_default_zoom_values" translatable="false">
-        <item><xliff:g>FAR</xliff:g></item>
-        <item><xliff:g>MEDIUM</xliff:g></item>
-        <item><xliff:g>CLOSE</xliff:g></item>
-    </string-array>
-    <!-- Settings label -->
-    <string name="pref_content_load_page">Open pages in overview</string>
-    <!-- Settings summary -->
-    <string name="pref_content_load_page_summary">Show overview of newly opened pages</string>
-    <!-- Settings screen, section title -->
-    <string name="pref_extras_title">Advanced settings</string>
-    <!-- Settings label -->
-    <string name="pref_extras_website_settings">Website settings</string>
-    <!-- Settings summary -->
-    <string name="pref_extras_website_settings_summary">Advanced settings for individual websites</string>
-    <!-- Settings label -->
-    <string name="pref_extras_reset_default">Reset to default</string>
-    <!-- Settings summary -->
-    <string name="pref_extras_reset_default_summary">Restore default settings</string>
-    <!-- Confirmation dialog message -->
-    <string name="pref_extras_reset_default_dlg">Settings will revert to default values.</string>
-    <!-- Confirmation dialog title -->
-    <string name="pref_extras_reset_default_dlg_title">Reset to default</string>
-    <!-- Title for a group of settings -->
-    <string name="pref_development_title">Debug</string>
-    <!-- Do not tranlsate.  Development option -->
-    <string name="pref_development_viewport" translatable="false">Use wide viewport</string>
-    <!-- Do not tranlsate.  Development option -->
-    <string name="pref_development_single_column_rendering" translatable="false">Single column rendering</string>
-    <!-- Do not tranlsate.  Development option -->
-    <string name="pref_development_normal_rendering" translatable="false">Normal rendering</string>
-    <!-- Do not tranlsate.  Development option -->
-    <string name="pref_development_trace" translatable="false">Enable tracing</string>
-    <!-- Do not tranlsate.  Development option -->
-    <string name="pref_development_nav_dump" translatable="false">Enable nav cache dump</string>
-    <!-- Do not tranlsate.  Development option -->
-    <string name="js_engine_flags" translatable="false">Set JS flags</string>
-    <!-- Do not tranlsate.  Development option -->
-    <string name="pref_development_uastring" translatable="false">UAString</string>
-    <!-- Do not tranlsate.  Development option -->
-    <string-array name="pref_development_ua_choices" translatable="false">
-        <item>Android</item>
-        <item>Desktop</item>
-        <item>iPhone</item>
-    </string-array>
-    <!-- Do not tranlsate.  Development option -->
-    <string-array name="pref_development_ua_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    <string name="pref_development_error_console" translatable="false">Show JavaScript Console</string>
-    <!-- Settings screen, setting option name -->
-    <string name="pref_default_text_encoding">Text encoding</string>
-    <!-- Options in the Default encoding dialog box -->
-    <string-array name="pref_default_text_encoding_choices">
-        <item>Latin-1 (ISO-8859-1)</item>
-        <item>Unicode (UTF-8)</item>
-        <item>Chinese (GBK)</item>
-        <item>Chinese (Big5)</item>
-        <item>Japanese (ISO-2022-JP)</item>
-        <item>Japanese (SHIFT_JIS)</item>
-        <item>Japanese (EUC-JP)</item>
-        <!-- TODO: We should add a lot more encodings.  -->
-    </string-array>
-    <!-- Dialog box title -->
-    <string name="pref_default_text_encoding_dialogtitle">Text encoding</string>
-    <!-- Do not translate. Actual encoding values. Must be valid text encodings understandable from WebKit. -->
-    <string-array name="pref_default_text_encoding_values" translatable="false">
-        <item>Latin-1</item>
-        <item>UTF-8</item>
-        <item>GBK</item>
-        <item>Big5</item>
-        <item>ISO-2022-JP</item>
-        <item>SHIFT_JIS</item>
-        <item>EUC-JP</item>
-    </string-array>
-    <string name="pref_default_text_encoding_default" translatable="false">Latin-1</string>
-    <!-- Title for a dialog displayed when the browser has a data connectivity
-            problem -->
-    <string name="browserFrameNetworkErrorLabel">Data connectivity problem</string>
-    <!-- Title for a dialog displayed when the browser runs into a file label
-            error -->
-    <string name="browserFrameFileErrorLabel">Problem with file</string>
-    <!-- Dialog box title -->
-    <string name="browserFrameFormResubmitLabel">Confirm</string>
-    <!-- Dialog box message -->
-    <string name="browserFrameFormResubmitMessage">The page you are trying to view contains data that has already been submitted (\"POSTDATA\"). If you resend the data, any action the form on the page carried out (such as a search or online purchase) will be repeated.</string>
-    <!-- Dialog box title -->
-    <string name="loadSuspendedTitle">No network connection</string>
-    <!-- Dialog box message -->
-    <string name="loadSuspended">Browser cannot load this page because there
-      is no internet connection.</string>
-    <!-- Menu item -->
-    <string name="clear_history">Clear history</string>
-    <!-- History screen title; appears in title bar -->
-    <string name="browser_history">Recently visited pages</string>
-    <!-- Appears on History screen if no history is found -->
-    <string name="empty_history">Browser history is empty.</string>
-    <!-- Displayed at the top of the bookmarks page.  When clicked, it bookmarks the page the browser is currently showing -->
-    <string name="add_new_bookmark">Add bookmark\u2026</string>
-    <!-- Verb placed in front of a screenshot of a web page that, when clicked,
-            will add that page to bookmarks -->
-    <string name="add_bookmark_short">Add</string>
-
-    <!-- This string is for the browser "Go To" UI. -->
-    <!-- Do not translate.  This string is not displayed in UI (no badge is selected for go to). -->
-    <string name="search_label" translatable="false">Browser</string>
-    <!-- This string is for the browser "Go To" UI. -->
-    <!-- This is the hint text shown in the Go To widget, before text is entered. -->
-    <string name="search_hint">Search or type URL</string>
-    <!-- This string is for the browser "Go To" UI. -->
-    <!-- This is the button label in the "Go To" UI. -->
-    <string name="search_button_text">Go</string>
-    <!-- The string used to describe the browser as a searchable item within system search settings. -->
-    <string name="search_settings_description">Bookmarks and web history</string>
-
-    <!-- Pop-up window dialog -->
-    <!-- Title for a dialog informing the user that the site is attempting to
-            display a popup window -->
-    <string name="attention">Attention</string>
-    <!-- Message for a dialog informing the user that the site is attempting to
-            display a popup window -->
-    <string name="popup_window_attempt">This site is attempting to open a
-      pop-up window.</string>
-    <!-- Label for a button to allow a particular popup window to open -->
-    <string name="allow">Allow</string>
-    <!-- Label for a button to disallow a particular popup from opening -->
-    <string name="block">Block</string>
-
-    <!-- Title for a dialog informing the user that they cannot open any more
-            windows because the limit has been reached. -->
-    <string name="too_many_windows_dialog_title">Window limit reached</string>
-    <!-- Message in a dialog telling the user that they cannot open any more
-            windows because the limit has been reached. -->
-    <string name="too_many_windows_dialog_message">Could not open a new window because you have already opened the maximum number.</string>
-    <!-- Title for a dialog informing the user that they cannot open a subwindow
-            because only one can be open at a time. -->
-    <string name="too_many_subwindows_dialog_title">Pop-up already open</string>
-    <!-- Message for a dialog informing the user that they cannot open a
-            subwindow because only one can be open at a time. -->
-    <string name="too_many_subwindows_dialog_message">Could not open a new
-      pop-up window because only one can be open at any time.</string>
-
-    <!-- Download History UI strings -->
-    <string name="download_title">Download history</string>
-    <!-- Download history screen string-->
-    <string name="download_unknown_filename">&lt;Unknown&gt;</string>
-    <!-- Context menu item on Download history screen -->
-    <string name="download_menu_open">Open</string>
-    <!-- Context menu item on Download history screen -->
-    <string name="download_menu_clear">Clear from list</string>
-    <!-- Context menu item in Download history screen -->
-    <string name="download_menu_delete">Delete</string>
-    <!-- Context menu item in Download history screen -->
-    <string name="download_menu_cancel">Cancel download</string>
-    <!-- Menu item -->
-    <string name="download_menu_cancel_all">Cancel all downloads</string>
-    <!-- Confirmation dialog title -->
-    <string name="download_cancel_dlg_title">Cancel downloads</string>
-    <!-- Confirmation dialog message -->
-    <string name="download_cancel_dlg_msg">All <xliff:g id="download_count">%d</xliff:g> downloads will be canceled and cleared from the download history.</string>
-    <!-- Confirmation dialog title -->
-    <string name="download_delete_file">File will be deleted</string>
-    <!-- Dialog title -->
-    <string name="download_file_error_dlg_title">Out of space</string>
-    <!-- Dialog message -->
-    <string name="download_file_error_dlg_msg"><xliff:g id="filename">%s</xliff:g> could not be downloaded.\nFree up some space on your phone and try again.</string>
-    <!-- Title for a dialog informing the user that the download has failed -->
-    <string name="download_failed_generic_dlg_title">Download unsuccessful</string>
-    <!-- Dialog title -->
-    <string name="download_no_sdcard_dlg_title">No SD card</string>
-    <!-- Dialog message -->
-    <string name="download_no_sdcard_dlg_msg">An SD card is required to download <xliff:g id="filename">%s</xliff:g>.</string>
-    <!-- Title for a dialog informing the user that the SD card used for
-            external storage is busy so they cannot download anything -->
-    <string name="download_sdcard_busy_dlg_title">SD card unavailable</string>
-    <!-- Message for a dialog informing the user that the SD card used for
-            external storage is busy so they cannot download anything.  Informs
-            the user how to enable SD card storage -->
-    <string name="download_sdcard_busy_dlg_msg">The SD card is busy. To allow downloads, select \"Turn off USB storage\" in the notification.</string>
-
-    <!-- Title for a dialog informing the user that there is no application on
-            the phone that can open the file that was downloaded -->
-    <string name="download_no_application_title">Cannot open file</string>
-    <!-- Label for a button to re-attempt downloading a file -->
-    <string name="retry">Retry</string>
-    <!-- Appears in Download history screen if there is no history -->
-    <string name="no_downloads">Download history is empty.</string>
-    <!-- the following download_xxxx matches the download manager state, ie Downloads.Status -->
-    <string name="download_error">Download unsuccessful.</string>
-    <!-- Appears in Download history screen after an item has downloaded, included item size -->
-    <string name="download_success"><xliff:g id="file">%s</xliff:g> Download complete.</string>
-    <!-- Appears in Download history screen while an item is being downloaded -->
-    <string name="download_running">Downloading\u2026</string>
-    <!-- Message in the list of items which have received download requests
-            telling their status.  This message states that the download has not
-            yet begun -->
-    <string name="download_pending">Starting download\u2026</string>
-    <!-- Message in the list of items which have received download requests
-            telling their status.  This message states that the download is
-            waiting for a network connection to continue -->
-    <string name="download_pending_network">Waiting for data connection\u2026</string>
-    <!-- Message in the list of items which have received download requests
-            telling their status.  This message states that the download has
-            paused to wait for a network connection -->
-    <string name="download_running_paused">Waiting for data connection\u2026</string>
-    <!-- Message in the list of items which have received download requests
-            telling their status.  This message states that the download has
-            been canceled -->
-    <string name="download_canceled">Download canceled.</string>
-    <!-- Message in the list of items which have received download requests
-            telling their status.  This message states that the download will
-            not happen because the content is not supported by the phone -->
-    <string name="download_not_acceptable">Cannot download. The content is not supported on this phone.</string>
-    <!-- Message in the list of items which have received download requests
-            telling their status.  This message states that the download did not
-            finish because there is not enough storage for the file -->
-    <string name="download_file_error">Cannot finish download. There is not enough space.</string>
-    <!-- Message in the list of items which have received download requests
-            telling their status.  This message states that the item cannot be
-            downloaded because it cannot determine the length of the item -->
-    <string name="download_length_required">Cannot download. The size of the item cannot be determined.</string>
-    <!-- Message in the list of items which have received download requests
-            telling their status.  This message states that the download was
-            interrupted and cannot be resumed -->
-    <string name="download_precondition_failed">Download interrupted. It cannot be resumed.</string>
-
-    <!-- Do not translate.  Testing only -->
-    <string name="dump_nav" translatable="false">Dump navigation cache</string>
-    <!-- Do not translate.  Testing only -->
-    <string name="dump_counters" translatable="false">Dump V8 counters</string>
-
     <!-- The default homepage. If it starts with "http://www.google" and the
             user signs up the device with a Google sites account, the site's
             domain will be appended. -->
@@ -651,6 +26,10 @@
         <item>http://www.android-x86.org/?android</item>
         <item>Google</item>
         <item>http://www.google.com/</item>
+        <item>Chinatimes</item>
+        <item>http://www.chinatimes.com/</item>
+        <item>UDN</item>
+        <item>http://udn.com/</item>
         <item>Picasa</item>
         <item>http://picasaweb.google.com/m/viewer?source=androidclient</item>
         <item>Yahoo!</item>
@@ -679,61 +58,4 @@
         <item>http://www.bbc.co.uk/</item>
     </string-array>
 
-    <!-- Bookmark name for Picasa website -->
-    <string name="picasa" translatable="false">Picasa</string>
-
-    <!-- The description of the suggestion that lets the user search the web for the query currently
-         in the text field. -->
-    <string name="search_the_web">Search the web</string>
-
-    <!-- HTML5 dialogs -->
-    <!-- Used as a status bar notification when the browser is running out of space trying to allocate or increase the database quota for an HTML5 databae or application cache. -->
-    <string name="webstorage_outofspace_notification_title">Browser storage full</string>
-    <string name="webstorage_outofspace_notification_text">Click to free up space.</string>
-    <!-- Used in the Browser Settings -->
-    <string name="webstorage_clear_data_title">Clear stored data</string>
-
-    <!-- Confirmation dialog when the user ask to clear all data for an origin -->
-    <string name="webstorage_clear_data_dialog_title">Clear stored data</string>
-    <string name="webstorage_clear_data_dialog_message">All data stored by this website will be deleted</string>
-    <string name="webstorage_clear_data_dialog_ok_button">Clear all</string>
-    <string name="webstorage_clear_data_dialog_cancel_button">Cancel</string>
-    <!-- Strings used in the summary of origins -->
-    <string name="webstorage_origin_summary_mb_stored">MB stored on your phone</string>
-        <!-- String shown in a progress view while a video is loading, before it starts playing -->
-    <string name="loading_video">Loading video</string>
-
-    <!-- Geolocation -->
-    <!-- Permissions prompt -->
-    <string name="geolocation_permissions_prompt_message"><xliff:g id="website origin" example="maps.google.com">%s</xliff:g> wants to know your location</string>
-    <string name="geolocation_permissions_prompt_share">Share location</string>
-    <string name="geolocation_permissions_prompt_dont_share">Decline</string>
-    <string name="geolocation_permissions_prompt_remember">Remember preference</string>
-    <!-- Permissions prompt toast -->
-    <string name="geolocation_permissions_prompt_toast_allowed">This site can access your location. Change this in Settings -&gt; Website settings</string>
-    <string name="geolocation_permissions_prompt_toast_disallowed">This site cannot access your location. Change this in Settings -&gt; Website settings</string>
-    <!-- Settings page, Advanced Settings -> Website settings -> <origin> -->
-    <string name="geolocation_settings_page_title">Clear location access</string>
-    <string name="geolocation_settings_page_summary_allowed">This site can currently access your location</string>
-    <string name="geolocation_settings_page_summary_not_allowed">This site cannot currently access your location</string>
-    <!-- Settings page dialog -->
-    <string name="geolocation_settings_page_dialog_title">Clear location access</string>
-    <string name="geolocation_settings_page_dialog_message">Location access for this website will be cleared</string>
-    <string name="geolocation_settings_page_dialog_ok_button">Clear access</string>
-    <string name="geolocation_settings_page_dialog_cancel_button">Cancel</string>
-    <!-- Label for the menu item in the website settings activity used to clear data stored by all websites -->
-    <string name="website_settings_clear_all">Clear all</string>
-    <string name="website_settings_clear_all_dialog_title">Clear all website settings?</string>
-    <string name="website_settings_clear_all_dialog_message">All website data and location permissions will be deleted.</string>
-    <string name="website_settings_clear_all_dialog_ok_button">Delete all data</string>
-    <string name="website_settings_clear_all_dialog_cancel_button">Cancel</string>
-
-    <!-- Text in the progress dialog when we are setting an image as the home screen wallpaper. -->
-    <string name="progress_dialog_setting_wallpaper">Setting wallpaper...</string>
-
-    <string name="error_console_header_text_minimized" translatable="false">Show JavaScript console</string>
-    <string name="error_console_header_text_maximized" translatable="false">JavaScript console</string>
-    <string name="error_console_eval_text_hint" translatable="false">Evaluate JavaScript</string>
-    <string name="error_console_eval_button_text" translatable="false">Evaluate</string>
-
 </resources>
diff --git a/tegav2.mk b/tegav2.mk
index 58d206a..cdb7a8c 100644
--- a/tegav2.mk
+++ b/tegav2.mk
@@ -2,7 +2,7 @@ PRODUCT_PACKAGES := $(THIRD_PARTY_APPS)
 PRODUCT_PACKAGES += sensors.$(TARGET_PRODUCT)
 
 PRODUCT_COPY_FILES := \
-    frameworks/base/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \
+    frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
     $(LOCAL_PATH)/excluded-input-devices.xml:system/etc/excluded-input-devices.xml \
     $(LOCAL_PATH)/vold.fstab:system/etc/vold.fstab \
     $(LOCAL_PATH)/btn_switch:system/xbin/btn_switch