commit 9e6842caa8334f78744dee77d476ac6eec5b7540
author Android (Google) Code Review <android-gerrit@google.com> Fri Aug 28 13:31:28 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 28 13:31:28 2009 -0700
tree 39e41d6c4aed8aa20ea17bf2635fce3c34a95bc5
parent 4b027f128fea32bfcabee55bf4d994400453c00c
parent 36dad722511366e7d90b6e33669a033d0c8ec74e

Merge change 23168 into eclair

* changes:
  EventHub: Fix file descriptor leak.

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index dcf0d84..403a961 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -4200,6 +4200,17 @@
  visibility="public"
 >
 </field>
+<field name="includeInGlobalSearch"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843374"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="indeterminate"
  type="int"
  transient="false"
@@ -6268,6 +6279,17 @@
  visibility="public"
 >
 </field>
+<field name="queryAfterZeroResults"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843394"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="radioButtonStyle"
  type="int"
  transient="false"
@@ -6774,6 +6796,17 @@
  visibility="public"
 >
 </field>
+<field name="searchSettingsDescription"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843402"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="searchSuggestAuthority"
  type="int"
  transient="false"
@@ -6829,6 +6862,17 @@
  visibility="public"
 >
 </field>
+<field name="searchSuggestThreshold"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843373"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="secondaryProgress"
  type="int"
  transient="false"
@@ -23451,6 +23495,17 @@
  visibility="public"
 >
 </field>
+<field name="INTENT_ACTION_WEB_SEARCH_SETTINGS"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;android.search.action.WEB_SEARCH_SETTINGS&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="MENU_KEY"
  type="char"
  transient="false"
@@ -23484,6 +23539,17 @@
  visibility="public"
 >
 </field>
+<field name="SHORTCUT_MIME_TYPE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;vnd.android.cursor.item/vnd.android.search.suggest&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_COLUMN_FORMAT"
  type="java.lang.String"
  transient="false"
@@ -23572,6 +23638,28 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_COLUMN_SHORTCUT_ID"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;suggest_shortcut_id&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;suggest_spinner_while_refreshing&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_COLUMN_TEXT_1"
  type="java.lang.String"
  transient="false"
@@ -23605,6 +23693,17 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_NEVER_MAKE_SHORTCUT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;_-1&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_URI_PATH_QUERY"
  type="java.lang.String"
  transient="false"
@@ -23616,6 +23715,17 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_URI_PATH_SHORTCUT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;search_suggest_shortcut&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="USER_QUERY"
  type="java.lang.String"
  transient="false"

cmds/stagefright/stagefright.cpp

diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index baa00da..54c6a0c 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -96,7 +96,7 @@
 
             if (gReproduceBug == 1 && numFrames == 40) {
                 printf("seeking past the end now.");
-                options.setSeekTo(LONG_MAX);
+                options.setSeekTo(0x7fffffffL);
             }
         }
 

core/java/android/app/SearchManager.java

diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java
index e43834a..b365d00 100644
--- a/core/java/android/app/SearchManager.java
+++ b/core/java/android/app/SearchManager.java
@@ -52,6 +52,8 @@
  * <li><a href="#HowSearchIsInvoked">How Search Is Invoked</a>
  * <li><a href="#ImplementingSearchForYourApp">Implementing Search for Your App</a>
  * <li><a href="#Suggestions">Search Suggestions</a>
+ * <li><a href="#ExposingSearchSuggestionsToQuickSearchBox">Exposing Search Suggestions to
+ * Quick Search Box</a></li>
  * <li><a href="#ActionKeys">Action Keys</a>
  * <li><a href="#SearchabilityMetadata">Searchability Metadata</a>
  * <li><a href="#PassingSearchContext">Passing Search Context</a>
@@ -247,6 +249,12 @@
  * <li>Summaries of possible results</li>
  * </ul>
  * 
+ * <p>Once an application is configured to provide search suggestions, those same suggestions can
+ * easily be made available to the system-wide Quick Search Box, providing faster access to its
+ * content from on central prominent place. See
+ * <a href="#ExposingSearchSuggestionsToQuickSearchBox">Exposing Search Suggestions to Quick Search
+ * Box</a> for more details.
+ * 
  * <p>The primary form of suggestions is known as <i>queried suggestions</i> and is based on query
  * text that the user has already typed.  This would generally be based on partial matches in
  * the available data.  In certain situations - for example, when no query text has been typed yet -
@@ -481,6 +489,26 @@
  *             {@link android.content.Intent#ACTION_SEARCH ACTION_SEARCH}, optional otherwise.</td>
  *     </tr>
  *
+ *     <tr><th>{@link #SUGGEST_COLUMN_SHORTCUT_ID}</th>
+ *         <td>This column is used to indicate whether a search suggestion should be stored as a
+ *             shortcut, and whether it should be validated.  Shortcuts are usually formed when the
+ *             user clicks a suggestion from Quick Search Box.  If missing, the result will be
+ *             stored as a shortcut and never refreshed.  If set to
+ *             {@link #SUGGEST_NEVER_MAKE_SHORTCUT}, the result will not be stored as a shortcut.
+ *             Otherwise, the shortcut id will be used to check back for for an up to date
+ *             suggestion using {@link #SUGGEST_URI_PATH_SHORTCUT}. Read more about shortcut
+ *             refreshing in the section about
+ *             <a href="#ExposingSearchSuggestionsToQuickSearchBox">exposing search suggestions to
+ *             Quick Search Box</a>.</td>
+ *         <td align="center">No.  Only applicable to sources included in Quick Search Box.</td>
+ *     </tr>
+ *
+ *     <tr><th>{@link #SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING}</th>
+ *         <td>This column is used to specify that a spinner should be shown in lieu of an icon2
+ *             while the shortcut of this suggestion is being refreshed.</td>
+ *         <td align="center">No.  Only applicable to sources included in Quick Search Box.</td>
+ *     </tr>
+ * 
  *     <tr><th><i>Other Columns</i></th>
  *         <td>Finally, if you have defined any <a href="#ActionKeys">Action Keys</a> and you wish 
  *             for them to have suggestion-specific definitions, you'll need to define one 
@@ -554,6 +582,59 @@
  * query text is provided and the SUGGEST_COLUMN_INTENT_DATA values are not suitable for user 
  * inspection and editing.</li></ul>
  *
+ * <a name="ExposingSearchSuggestionsToQuickSearchBox"></a>
+ * <h3>Exposing Search Suggestions to Quick Search Box</h3>
+ * 
+ * <p>Once your application is setup to provide search suggestions, making them available to the
+ * globally accessable Quick Search Box is as easy as setting android:includeInGlobalSearch to
+ * "true" in your searchable metadata file.  Beyond that, here are some more details of how
+ * suggestions interact with Quick Search Box, and optional ways that you may customize suggestions
+ * for your application.
+ *
+ * <p><b>Source Ranking:</b>  Once your application's search results are made available to Quick
+ * Search Box, how they surface to the user for a particular query will depend on how many
+ * other apps have results for that query, and how often the user has clicked on your results
+ * compared to the other apps'.  The apps with the best track record within Quick Search
+ * Box will get queried earlier and have a better chance of showing their results in the top few
+ * slots.  If there are more results than can be displayed to the user within a screen or two, the
+ * results may spill into a "more results" section that groups the remaining results by
+ * source.  The newest apps with little usage information are given middle of the road positioning
+ * until enough usage information is available to rank it as usual.  The exact formula for ranking
+ * the results is not set in stone, but suffice it is to say that providing quality results will
+ * increase the likelihood that your app's suggestions are provided in a prominent position, and
+ * apps that provide lower quality suggestions will be more likely to be pushed into the spillover
+ * area.
+ *
+ * <p><b>Search Settings:</b>  Each app that is available to Quick Search Box has an entry in the
+ * system settings where the user can enable or disable the inclusion of its results.  Below the
+ * name of the application, each application may provide a brief description of what kind of
+ * information will be made available via a search settings description string pointed to by the
+ * android:searchSettingsDescription attribute in the searchable metadata.
+ *
+ * <p><b>Shortcuts:</b>  Suggestions that are clicked on by the user are automatically made into
+ * shortcuts, or, copied so they can quickly be displayed to the user before querying any of
+ * the sources. Thereafter, the shortcutted suggestion will be displayed for the query that yielded
+ * the suggestion and for any prefixes of that query.  When multiple shortcuts are made available
+ * for a given query, they are ranked based on recency and the number of clicks they have received.
+ * You can control how your suggestions are made into shortcuts, and whether they are refreshed,
+ * using the {@link #SUGGEST_COLUMN_SHORTCUT_ID} column:
+ * <ul><li>Suggestions that do not include a shortcut id column will be made into shortcuts and
+ * never refreshed.  This makes sense for suggestions that refer to data that will never be changed
+ * or removed.</li>
+ * <li>Suggestions that include a shortcut id will be re-queried for a fresh version of the
+ * suggestion each time the shortcut is displayed.  The shortcut will be quickly displayed with
+ * whatever data was most recently available until the refresh query returns, after which the
+ * suggestion will be dynamically refreshed with the up to date information.  The shortcut refresh
+ * query will be sent to your suggestion provider with a uri of {@link #SUGGEST_URI_PATH_SHORTCUT}.
+ * The result should contain one suggestion using the same columns as the suggestion query, or be
+ * empty, indicating that the shortcut is no longer valid.  Shortcut ids make sense when referring
+ * to data that may change over time, such as a contact's presence status.  If a suggestion refers
+ * to data that could take longer to refresh, such as a network based refresh of a stock quote, you
+ * may include {@link #SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING} to show a progress spinner for the
+ * right hand icon until the refresh is complete.</li>
+ * <li>Finally, to prevent a suggestion from being copied into a shortcut, you may provide a
+ * shortcut id with a value of {@link #SUGGEST_NEVER_MAKE_SHORTCUT}.</li></ul>
+ * 
  * <a name="ActionKeys"></a>
  * <h3>Action Keys</h3>
  * 
@@ -870,6 +951,47 @@
  *     </tbody>
  * </table>
  *
+ * <p>Elements of search metadata that configure search suggestions being available to Quick Search
+ * Box:
+ * <table border="2" width="85%" align="center" frame="hsides" rules="rows">
+ *
+ *     <thead>
+ *     <tr><th>Attribute</th> <th>Description</th> <th>Required?</th></tr>
+ *     </thead>
+ *
+ *     <tr><th>android:includeInGlobalSearch</th>
+ *         <td>If true, indicates the search suggestions provided by your application should be
+ *             included in the globally accessible Quick Search Box.  The attributes below are only
+ *             applicable if this is set to true.</td>
+ *         <td align="center">Yes</td>
+ *     </tr>
+ *
+ *     <tr><th>android:searchSettingsDescription</th>
+ *         <td>If provided, provides a brief description of the search suggestions that are provided
+ *             by your application to Quick Search Box, and will be displayed in the search settings
+ *             entry for your application.</td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *
+ *     <tr><th>android:queryAfterZeroResults</th>
+ *         <td>Indicates whether a source should be invoked for supersets of queries it has
+ *             returned zero results for in the past.  For example, if a source returned zero
+ *             results for "bo", it would be ignored for "bob".  If set to false, this source
+ *             will only be ignored for a single session; the next time the search dialog is
+ *             invoked, all sources will be queried.  The default value is false.</td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *
+ *     <tr><th>android:searchSuggestThreshold</th>
+ *         <td>Indicates the minimum number of characters needed to trigger a source from Quick
+ *             Search Box.  Only guarantees that a source will not be queried for anything shorter
+ *             than the threshold.  The default value is 0.</td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *
+ *     </tbody>
+ * </table>
+ *
  * <p><b>Additional metadata for search action keys.</b>  For each action key that you would like to
  * define, you'll need to add an additional element defining that key, and using the attributes
  * discussed in <a href="#ActionKeys">Action Keys</a>.  A simple example is shown here:
@@ -1247,16 +1369,12 @@
      * result indicates the shortcut refers to a no longer valid sugggestion.
      *
      * @see #SUGGEST_COLUMN_SHORTCUT_ID
-     *
-     * @hide pending enabling of global search for third parties
      */
     public final static String SUGGEST_URI_PATH_SHORTCUT = "search_suggest_shortcut";
     
     /**
      * MIME type for shortcut validation.  You'll use this in your suggestions content provider
      * in the getType() function.
-     *
-     * @hide pending enabling of global search for third parties
      */
     public final static String SHORTCUT_MIME_TYPE = 
             "vnd.android.cursor.item/vnd.android.search.suggest";
@@ -1269,7 +1387,7 @@
      * In addition to the columns below, the suggestion columns are used to pass along the full
      * suggestion so it can be shortcutted.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SEARCH_CLICK_REPORT_AUTHORITY =
             "com.android.globalsearch.stats";
@@ -1277,21 +1395,21 @@
     /**
      * The path the write goes to.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SEARCH_CLICK_REPORT_URI_PATH = "click";
 
     /**
      * The column storing the query for the click.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SEARCH_CLICK_REPORT_COLUMN_QUERY = "query";
 
     /**
      * The column storing the component name of the application that was pivoted into.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SEARCH_CLICK_REPORT_COLUMN_COMPONENT = "component";
 
@@ -1376,7 +1494,7 @@
      *  {@link #COMPONENT_NAME_KEY}. For use by the global search system only - if other providers
      *  attempt to use this column, the value will be overwritten by global search.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SUGGEST_COLUMN_INTENT_COMPONENT_NAME = "suggest_intent_component";
     /**
@@ -1401,8 +1519,6 @@
      * {@link #SUGGEST_NEVER_MAKE_SHORTCUT}, the result will not be stored as a shortcut.
      * Otherwise, the shortcut id will be used to check back for an up to date suggestion using
      * {@link #SUGGEST_URI_PATH_SHORTCUT}.
-     *
-     * @hide pending reenabling of global search for third parties
      */
     public final static String SUGGEST_COLUMN_SHORTCUT_ID = "suggest_shortcut_id";
 
@@ -1411,7 +1527,7 @@
      * cursor item's background color if it needs a non-default background color. A non-zero value
      * indicates a valid background color to override the default.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide For internal use, not part of the public API.
      */
     public final static String SUGGEST_COLUMN_BACKGROUND_COLOR = "suggest_background_color";
     
@@ -1419,8 +1535,6 @@
      * Column name for suggestions cursor. <i>Optional.</i> This column is used to specify
      * that a spinner should be shown in lieu of an icon2 while the shortcut of this suggestion
      * is being refreshed.
-     *
-     * @hide pending reenabling of global search for third parties
      */
     public final static String SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING =
             "suggest_spinner_while_refreshing";
@@ -1428,8 +1542,6 @@
     /**
      * Column value for suggestion column {@link #SUGGEST_COLUMN_SHORTCUT_ID} when a suggestion
      * should not be stored as a shortcut in global search.
-     *
-     * @hide pending reenabling of global search for third parties
      */
     public final static String SUGGEST_NEVER_MAKE_SHORTCUT = "_-1";
 
@@ -1476,8 +1588,6 @@
      * Intent action for starting a web search provider's settings activity.
      * Web search providers should handle this intent if they have provider-specific
      * settings to implement.
-     *
-     * @hide implementation detail only relevent to web search providers
      */
     public final static String INTENT_ACTION_WEB_SEARCH_SETTINGS
             = "android.search.action.WEB_SEARCH_SETTINGS";
@@ -1492,7 +1602,8 @@
     
     /**
      * Intent action broadcasted to inform that the search settings have changed in some way.
-     * Either searchables have been enabled or disabled.
+     * Either searchables have been enabled or disabled, or a different web search provider
+     * has been chosen.
      */
     public final static String INTENT_ACTION_SEARCH_SETTINGS_CHANGED
             = "android.search.action.SETTINGS_CHANGED";
@@ -1501,7 +1612,7 @@
      * If a suggestion has this value in {@link #SUGGEST_COLUMN_INTENT_ACTION},
      * the search dialog will take no action.
      *
-     * @hide an implentation detail not part of the public api
+     * @hide
      */
     public final static String INTENT_ACTION_NONE = "android.search.action.ZILCH";
     

core/java/android/server/search/Searchables.java

diff --git a/core/java/android/server/search/Searchables.java b/core/java/android/server/search/Searchables.java
index a2add73..c615957 100644
--- a/core/java/android/server/search/Searchables.java
+++ b/core/java/android/server/search/Searchables.java
@@ -26,7 +26,6 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.pm.ApplicationInfo;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -231,16 +230,14 @@
                         : webSearchInfoList.get(ii - search_count);
                 ActivityInfo ai = info.activityInfo;
                 // Check first to avoid duplicate entries.
-                if (newSearchablesMap.containsKey(new ComponentName(ai.packageName, ai.name))) {
-                    continue;
-                }
-                SearchableInfo searchable = SearchableInfo.getActivityMetaData(mContext, ai);
-                if (searchable != null) {
-                    newSearchablesList.add(searchable);
-                    newSearchablesMap.put(searchable.getSearchActivity(), searchable);
-                    if (searchable.shouldIncludeInGlobalSearch()
-                            && isWhitelistedForGlobalSearch(pm, searchable.getSearchActivity())) {
-                        newSearchablesInGlobalSearchList.add(searchable);
+                if (newSearchablesMap.get(new ComponentName(ai.packageName, ai.name)) == null) {
+                    SearchableInfo searchable = SearchableInfo.getActivityMetaData(mContext, ai);
+                    if (searchable != null) {
+                        newSearchablesList.add(searchable);
+                        newSearchablesMap.put(searchable.getSearchActivity(), searchable);
+                        if (searchable.shouldIncludeInGlobalSearch()) {
+                            newSearchablesInGlobalSearchList.add(searchable);
+                        }
                     }
                 }
             }
@@ -292,25 +289,6 @@
     }
 
     /**
-     * Determines whether an activity may be included in quick search box.  For now this is
-     * restricted to system installed apps.
-     *
-     * TODO: remove when we are ready to enable global search for third party applications.
-     *
-     * @param pm The package manager.
-     * @param searchActivity The component of the search activity.
-     * @return True if the search activity may include its search suggestions in quick search box.
-     */
-    private boolean isWhitelistedForGlobalSearch(PackageManager pm, ComponentName searchActivity) {
-        try {
-            ActivityInfo ai = pm.getActivityInfo(searchActivity, 0);
-            return ((ai.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
-
-    /**
      * Checks if the given activity component is present in the system and if so makes it the
      * preferred activity for handling ACTION_WEB_SEARCH.
      * @param component Name of the component to check and set as preferred.

core/java/android/webkit/WebSettings.java

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 050a886..3c306bb 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -360,11 +360,13 @@
             // default to "en"
             buffer.append("en");
         }
-        
-        final String model = Build.MODEL;
-        if (model.length() > 0) {
-            buffer.append("; ");
-            buffer.append(model);
+        // add the model for the release build
+        if ("REL".equals(Build.VERSION.CODENAME)) {
+            final String model = Build.MODEL;
+            if (model.length() > 0) {
+                buffer.append("; ");
+                buffer.append(model);
+            }
         }
         final String id = Build.ID;
         if (id.length() > 0) {

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 196c66b..e39e3f1 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1935,6 +1935,7 @@
         int mHeight;
         int mTextWrapWidth;
         float mScale;
+        boolean mIgnoreHeight;
     }
 
     /**
@@ -1969,6 +1970,7 @@
             data.mTextWrapWidth = mInZoomOverview ? Math.round(viewWidth
                     / mLastScale) : newWidth;
             data.mScale = mActualScale;
+            data.mIgnoreHeight = mZoomScale != 0 && !mHeightCanMeasure;
             mWebViewCore.sendMessage(EventHub.VIEW_SIZE_CHANGED, data);
             mLastWidthSent = newWidth;
             mLastHeightSent = newHeight;

core/java/android/webkit/WebViewCore.java

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 25cb249..f474f15 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -418,7 +418,8 @@
         should this be called nativeSetViewPortSize?
     */
     private native void nativeSetSize(int width, int height, int screenWidth,
-            float scale, int realScreenWidth, int screenHeight);
+            float scale, int realScreenWidth, int screenHeight,
+            boolean ignoreHeight);
 
     private native int nativeGetContentMinPrefWidth();
 
@@ -918,7 +919,8 @@
                             WebView.ViewSizeData data =
                                     (WebView.ViewSizeData) msg.obj;
                             viewSizeChanged(data.mWidth, data.mHeight,
-                                    data.mTextWrapWidth, data.mScale);
+                                    data.mTextWrapWidth, data.mScale,
+                                    data.mIgnoreHeight);
                             break;
                         }
                         case SET_SCROLL_OFFSET:
@@ -1411,7 +1413,8 @@
     private float mCurrentViewScale = 1.0f;
 
     // notify webkit that our virtual view size changed size (after inv-zoom)
-    private void viewSizeChanged(int w, int h, int textwrapWidth, float scale) {
+    private void viewSizeChanged(int w, int h, int textwrapWidth, float scale,
+            boolean ignoreHeight) {
         if (DebugFlags.WEB_VIEW_CORE) {
             Log.v(LOGTAG, "viewSizeChanged w=" + w + "; h=" + h
                     + "; textwrapWidth=" + textwrapWidth + "; scale=" + scale);
@@ -1447,7 +1450,7 @@
             }
         }
         nativeSetSize(width, width == w ? h : Math.round((float) width * h / w),
-                textwrapWidth, scale, w, h);
+                textwrapWidth, scale, w, h, ignoreHeight);
         // Remember the current width and height
         boolean needInvalidate = (mCurrentViewWidth == 0);
         mCurrentViewWidth = w;
@@ -1905,6 +1908,7 @@
             // true. It is safe to use mWidth for mTextWrapWidth.
             data.mTextWrapWidth = data.mWidth;
             data.mScale = -1.0f;
+            data.mIgnoreHeight = false;
             mEventHub.sendMessageAtFrontOfQueue(Message.obtain(null,
                     EventHub.VIEW_SIZE_CHANGED, data));
         } else if (mSettings.getUseWideViewPort()) {
@@ -1926,6 +1930,7 @@
                         / mCurrentViewWidth;
                 data.mTextWrapWidth = Math.round(webViewWidth
                         / mRestoreState.mTextWrapScale);
+                data.mIgnoreHeight = false;
                 mEventHub.sendMessageAtFrontOfQueue(Message.obtain(null,
                         EventHub.VIEW_SIZE_CHANGED, data));
             }

core/res/res/drawable-hdpi/activity_title_bar.9.png

diff --git a/core/res/res/drawable-hdpi/activity_title_bar.9.png b/core/res/res/drawable-hdpi/activity_title_bar.9.png
new file mode 100644
index 0000000..48d60c4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/activity_title_bar.9.png
Binary files differ

core/res/res/drawable-hdpi/arrow_down_float.png

diff --git a/core/res/res/drawable-hdpi/arrow_down_float.png b/core/res/res/drawable-hdpi/arrow_down_float.png
new file mode 100644
index 0000000..2466c8f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/arrow_down_float.png
Binary files differ

core/res/res/drawable-hdpi/arrow_up_float.png

diff --git a/core/res/res/drawable-hdpi/arrow_up_float.png b/core/res/res/drawable-hdpi/arrow_up_float.png
new file mode 100644
index 0000000..d1301c3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/arrow_up_float.png
Binary files differ

core/res/res/drawable-hdpi/battery_charge_background.png

diff --git a/core/res/res/drawable-hdpi/battery_charge_background.png b/core/res/res/drawable-hdpi/battery_charge_background.png
new file mode 100644
index 0000000..19023a9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/battery_charge_background.png
Binary files differ

core/res/res/drawable-hdpi/battery_charge_fill_empty.9.png

diff --git a/core/res/res/drawable-hdpi/battery_charge_fill_empty.9.png b/core/res/res/drawable-hdpi/battery_charge_fill_empty.9.png
new file mode 100644
index 0000000..c4e70a8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/battery_charge_fill_empty.9.png
Binary files differ

core/res/res/drawable-hdpi/battery_charge_fill_full.9.png

diff --git a/core/res/res/drawable-hdpi/battery_charge_fill_full.9.png b/core/res/res/drawable-hdpi/battery_charge_fill_full.9.png
new file mode 100644
index 0000000..ac66f5a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/battery_charge_fill_full.9.png
Binary files differ

core/res/res/drawable-hdpi/battery_charge_fill_warning.9.png

diff --git a/core/res/res/drawable-hdpi/battery_charge_fill_warning.9.png b/core/res/res/drawable-hdpi/battery_charge_fill_warning.9.png
new file mode 100644
index 0000000..32d99c6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/battery_charge_fill_warning.9.png
Binary files differ

core/res/res/drawable-hdpi/battery_low_battery.png

diff --git a/core/res/res/drawable-hdpi/battery_low_battery.png b/core/res/res/drawable-hdpi/battery_low_battery.png
new file mode 100644
index 0000000..d894f7b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/battery_low_battery.png
Binary files differ

core/res/res/drawable-hdpi/blank_tile.png

diff --git a/core/res/res/drawable-hdpi/blank_tile.png b/core/res/res/drawable-hdpi/blank_tile.png
new file mode 100644
index 0000000..e2a386c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/blank_tile.png
Binary files differ

core/res/res/drawable-hdpi/bottom_bar.png

diff --git a/core/res/res/drawable-hdpi/bottom_bar.png b/core/res/res/drawable-hdpi/bottom_bar.png
new file mode 100644
index 0000000..1f38f3c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/bottom_bar.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_buttonless_off.png

diff --git a/core/res/res/drawable-hdpi/btn_check_buttonless_off.png b/core/res/res/drawable-hdpi/btn_check_buttonless_off.png
new file mode 100644
index 0000000..baf9010
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_buttonless_off.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_buttonless_on.png

diff --git a/core/res/res/drawable-hdpi/btn_check_buttonless_on.png b/core/res/res/drawable-hdpi/btn_check_buttonless_on.png
new file mode 100644
index 0000000..2a77e4c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_buttonless_on.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_label_background.9.png

diff --git a/core/res/res/drawable-hdpi/btn_check_label_background.9.png b/core/res/res/drawable-hdpi/btn_check_label_background.9.png
new file mode 100644
index 0000000..97e6806
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_label_background.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_off.png

diff --git a/core/res/res/drawable-hdpi/btn_check_off.png b/core/res/res/drawable-hdpi/btn_check_off.png
new file mode 100644
index 0000000..aad9ef7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_off.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_off_disable.png

diff --git a/core/res/res/drawable-hdpi/btn_check_off_disable.png b/core/res/res/drawable-hdpi/btn_check_off_disable.png
new file mode 100644
index 0000000..eaee9e0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_off_disable.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_off_disable_focused.png

diff --git a/core/res/res/drawable-hdpi/btn_check_off_disable_focused.png b/core/res/res/drawable-hdpi/btn_check_off_disable_focused.png
new file mode 100644
index 0000000..6d2c293
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_off_disable_focused.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_off_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_check_off_pressed.png b/core/res/res/drawable-hdpi/btn_check_off_pressed.png
new file mode 100644
index 0000000..1c442e9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_off_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_off_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_check_off_selected.png b/core/res/res/drawable-hdpi/btn_check_off_selected.png
new file mode 100644
index 0000000..b852b2c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_off_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_on.png

diff --git a/core/res/res/drawable-hdpi/btn_check_on.png b/core/res/res/drawable-hdpi/btn_check_on.png
new file mode 100644
index 0000000..cd5c181
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_on.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_on_disable.png

diff --git a/core/res/res/drawable-hdpi/btn_check_on_disable.png b/core/res/res/drawable-hdpi/btn_check_on_disable.png
new file mode 100644
index 0000000..b4fc51a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_on_disable.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_on_disable_focused.png

diff --git a/core/res/res/drawable-hdpi/btn_check_on_disable_focused.png b/core/res/res/drawable-hdpi/btn_check_on_disable_focused.png
new file mode 100644
index 0000000..bf34647
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_on_disable_focused.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_on_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_check_on_pressed.png b/core/res/res/drawable-hdpi/btn_check_on_pressed.png
new file mode 100644
index 0000000..fa5c7a2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_on_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_check_on_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_check_on_selected.png b/core/res/res/drawable-hdpi/btn_check_on_selected.png
new file mode 100644
index 0000000..a6a21ad
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_check_on_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_circle_disable.png

diff --git a/core/res/res/drawable-hdpi/btn_circle_disable.png b/core/res/res/drawable-hdpi/btn_circle_disable.png
new file mode 100644
index 0000000..d829716
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_circle_disable.png
Binary files differ

core/res/res/drawable-hdpi/btn_circle_disable_focused.png

diff --git a/core/res/res/drawable-hdpi/btn_circle_disable_focused.png b/core/res/res/drawable-hdpi/btn_circle_disable_focused.png
new file mode 100644
index 0000000..c1b5b6e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_circle_disable_focused.png
Binary files differ

core/res/res/drawable-hdpi/btn_circle_normal.png

diff --git a/core/res/res/drawable-hdpi/btn_circle_normal.png b/core/res/res/drawable-hdpi/btn_circle_normal.png
new file mode 100644
index 0000000..bf3fb5a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_circle_normal.png
Binary files differ

core/res/res/drawable-hdpi/btn_circle_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_circle_pressed.png b/core/res/res/drawable-hdpi/btn_circle_pressed.png
new file mode 100644
index 0000000..50e22e6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_circle_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_circle_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_circle_selected.png b/core/res/res/drawable-hdpi/btn_circle_selected.png
new file mode 100644
index 0000000..cfc68fb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_circle_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_close_normal.png

diff --git a/core/res/res/drawable-hdpi/btn_close_normal.png b/core/res/res/drawable-hdpi/btn_close_normal.png
new file mode 100644
index 0000000..df3d56c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_close_normal.png
Binary files differ

core/res/res/drawable-hdpi/btn_close_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_close_pressed.png b/core/res/res/drawable-hdpi/btn_close_pressed.png
new file mode 100644
index 0000000..ef88fe0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_close_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_code_lock_default.png

diff --git a/core/res/res/drawable-hdpi/btn_code_lock_default.png b/core/res/res/drawable-hdpi/btn_code_lock_default.png
new file mode 100644
index 0000000..9f44d0f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_code_lock_default.png
Binary files differ

core/res/res/drawable-hdpi/btn_code_lock_touched.png

diff --git a/core/res/res/drawable-hdpi/btn_code_lock_touched.png b/core/res/res/drawable-hdpi/btn_code_lock_touched.png
new file mode 100644
index 0000000..a4cc5bf
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_code_lock_touched.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_normal.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_normal.9.png b/core/res/res/drawable-hdpi/btn_default_normal.9.png
new file mode 100644
index 0000000..329ce6e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_normal_disable.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_normal_disable.9.png b/core/res/res/drawable-hdpi/btn_default_normal_disable.9.png
new file mode 100644
index 0000000..a518c6b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_normal_disable.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_normal_disable_focused.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_normal_disable_focused.9.png b/core/res/res/drawable-hdpi/btn_default_normal_disable_focused.9.png
new file mode 100644
index 0000000..71a05b7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_normal_disable_focused.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_pressed.9.png b/core/res/res/drawable-hdpi/btn_default_pressed.9.png
new file mode 100644
index 0000000..d9d02bf
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_selected.9.png b/core/res/res/drawable-hdpi/btn_default_selected.9.png
new file mode 100644
index 0000000..ab7c612
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_small_normal.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_small_normal.9.png b/core/res/res/drawable-hdpi/btn_default_small_normal.9.png
new file mode 100644
index 0000000..baafed6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_small_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_small_normal_disable.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_small_normal_disable.9.png b/core/res/res/drawable-hdpi/btn_default_small_normal_disable.9.png
new file mode 100644
index 0000000..175197b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_small_normal_disable.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png b/core/res/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png
new file mode 100644
index 0000000..ec1feff
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_small_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_small_pressed.9.png b/core/res/res/drawable-hdpi/btn_default_small_pressed.9.png
new file mode 100644
index 0000000..c1f9a0f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_small_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_default_small_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_default_small_selected.9.png b/core/res/res/drawable-hdpi/btn_default_small_selected.9.png
new file mode 100644
index 0000000..0ea3f40
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_default_small_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_dialog_disable.png

diff --git a/core/res/res/drawable-hdpi/btn_dialog_disable.png b/core/res/res/drawable-hdpi/btn_dialog_disable.png
new file mode 100644
index 0000000..2fc5d1a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_dialog_disable.png
Binary files differ

core/res/res/drawable-hdpi/btn_dialog_normal.png

diff --git a/core/res/res/drawable-hdpi/btn_dialog_normal.png b/core/res/res/drawable-hdpi/btn_dialog_normal.png
new file mode 100644
index 0000000..c4a1026
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_dialog_normal.png
Binary files differ

core/res/res/drawable-hdpi/btn_dialog_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_dialog_pressed.png b/core/res/res/drawable-hdpi/btn_dialog_pressed.png
new file mode 100644
index 0000000..846f8bf
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_dialog_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_dialog_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_dialog_selected.png b/core/res/res/drawable-hdpi/btn_dialog_selected.png
new file mode 100644
index 0000000..659c289
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_dialog_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_dropdown_normal.9.png

diff --git a/core/res/res/drawable-hdpi/btn_dropdown_normal.9.png b/core/res/res/drawable-hdpi/btn_dropdown_normal.9.png
new file mode 100644
index 0000000..9392495
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_dropdown_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_dropdown_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_dropdown_pressed.9.png b/core/res/res/drawable-hdpi/btn_dropdown_pressed.9.png
new file mode 100644
index 0000000..beaba45
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_dropdown_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_dropdown_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_dropdown_selected.9.png b/core/res/res/drawable-hdpi/btn_dropdown_selected.9.png
new file mode 100644
index 0000000..ec51fc9e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_dropdown_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_erase_default.9.png

diff --git a/core/res/res/drawable-hdpi/btn_erase_default.9.png b/core/res/res/drawable-hdpi/btn_erase_default.9.png
new file mode 100644
index 0000000..30984f4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_erase_default.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_erase_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_erase_pressed.9.png b/core/res/res/drawable-hdpi/btn_erase_pressed.9.png
new file mode 100644
index 0000000..a8225e8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_erase_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_erase_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_erase_selected.9.png b/core/res/res/drawable-hdpi/btn_erase_selected.9.png
new file mode 100644
index 0000000..f020f77
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_erase_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_global_search_normal.9.png

diff --git a/core/res/res/drawable-hdpi/btn_global_search_normal.9.png b/core/res/res/drawable-hdpi/btn_global_search_normal.9.png
new file mode 100644
index 0000000..5bec4f8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_global_search_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_keyboard_key_normal.9.png

diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_normal.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_normal.9.png
new file mode 100644
index 0000000..5697369
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_keyboard_key_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png

diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
new file mode 100644
index 0000000..9940245
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png

diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
new file mode 100644
index 0000000..5a26d83
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_keyboard_key_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_pressed.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
new file mode 100644
index 0000000..089dbf3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png

diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
new file mode 100644
index 0000000..c10a3db
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png

diff --git a/core/res/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png b/core/res/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
new file mode 100644
index 0000000..9e83ace
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_media_player.9.png

diff --git a/core/res/res/drawable-hdpi/btn_media_player.9.png b/core/res/res/drawable-hdpi/btn_media_player.9.png
new file mode 100644
index 0000000..bf16315
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_media_player.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_media_player_disabled.9.png

diff --git a/core/res/res/drawable-hdpi/btn_media_player_disabled.9.png b/core/res/res/drawable-hdpi/btn_media_player_disabled.9.png
new file mode 100644
index 0000000..d7b8ed5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_media_player_disabled.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_media_player_disabled_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_media_player_disabled_selected.9.png b/core/res/res/drawable-hdpi/btn_media_player_disabled_selected.9.png
new file mode 100644
index 0000000..1a35c31
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_media_player_disabled_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_media_player_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_media_player_pressed.9.png b/core/res/res/drawable-hdpi/btn_media_player_pressed.9.png
new file mode 100644
index 0000000..17dd3fc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_media_player_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_media_player_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_media_player_selected.9.png b/core/res/res/drawable-hdpi/btn_media_player_selected.9.png
new file mode 100644
index 0000000..a146d8f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_media_player_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_minus_default.png

diff --git a/core/res/res/drawable-hdpi/btn_minus_default.png b/core/res/res/drawable-hdpi/btn_minus_default.png
new file mode 100644
index 0000000..f2831af
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_minus_default.png
Binary files differ

core/res/res/drawable-hdpi/btn_minus_disable.png

diff --git a/core/res/res/drawable-hdpi/btn_minus_disable.png b/core/res/res/drawable-hdpi/btn_minus_disable.png
new file mode 100644
index 0000000..24ce695
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_minus_disable.png
Binary files differ

core/res/res/drawable-hdpi/btn_minus_disable_focused.png

diff --git a/core/res/res/drawable-hdpi/btn_minus_disable_focused.png b/core/res/res/drawable-hdpi/btn_minus_disable_focused.png
new file mode 100644
index 0000000..e92c2b1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_minus_disable_focused.png
Binary files differ

core/res/res/drawable-hdpi/btn_minus_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_minus_pressed.png b/core/res/res/drawable-hdpi/btn_minus_pressed.png
new file mode 100644
index 0000000..ba2ed26
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_minus_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_minus_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_minus_selected.png b/core/res/res/drawable-hdpi/btn_minus_selected.png
new file mode 100644
index 0000000..6b938b3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_minus_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_plus_default.png

diff --git a/core/res/res/drawable-hdpi/btn_plus_default.png b/core/res/res/drawable-hdpi/btn_plus_default.png
new file mode 100644
index 0000000..441d1fb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_plus_default.png
Binary files differ

core/res/res/drawable-hdpi/btn_plus_disable.png

diff --git a/core/res/res/drawable-hdpi/btn_plus_disable.png b/core/res/res/drawable-hdpi/btn_plus_disable.png
new file mode 100644
index 0000000..4e965c1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_plus_disable.png
Binary files differ

core/res/res/drawable-hdpi/btn_plus_disable_focused.png

diff --git a/core/res/res/drawable-hdpi/btn_plus_disable_focused.png b/core/res/res/drawable-hdpi/btn_plus_disable_focused.png
new file mode 100644
index 0000000..0c938eb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_plus_disable_focused.png
Binary files differ

core/res/res/drawable-hdpi/btn_plus_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_plus_pressed.png b/core/res/res/drawable-hdpi/btn_plus_pressed.png
new file mode 100644
index 0000000..8dd5a68
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_plus_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_plus_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_plus_selected.png b/core/res/res/drawable-hdpi/btn_plus_selected.png
new file mode 100644
index 0000000..8fe30ed
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_plus_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_radio_label_background.9.png

diff --git a/core/res/res/drawable-hdpi/btn_radio_label_background.9.png b/core/res/res/drawable-hdpi/btn_radio_label_background.9.png
new file mode 100644
index 0000000..45c5c6a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_radio_label_background.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_radio_off.png

diff --git a/core/res/res/drawable-hdpi/btn_radio_off.png b/core/res/res/drawable-hdpi/btn_radio_off.png
new file mode 100644
index 0000000..c0b14aa
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_radio_off.png
Binary files differ

core/res/res/drawable-hdpi/btn_radio_off_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_radio_off_pressed.png b/core/res/res/drawable-hdpi/btn_radio_off_pressed.png
new file mode 100644
index 0000000..3189581
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_radio_off_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_radio_off_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_radio_off_selected.png b/core/res/res/drawable-hdpi/btn_radio_off_selected.png
new file mode 100644
index 0000000..f337703
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_radio_off_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_radio_on.png

diff --git a/core/res/res/drawable-hdpi/btn_radio_on.png b/core/res/res/drawable-hdpi/btn_radio_on.png
new file mode 100644
index 0000000..c90d2eb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_radio_on.png
Binary files differ

core/res/res/drawable-hdpi/btn_radio_on_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_radio_on_pressed.png b/core/res/res/drawable-hdpi/btn_radio_on_pressed.png
new file mode 100644
index 0000000..d79450b8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_radio_on_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_radio_on_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_radio_on_selected.png b/core/res/res/drawable-hdpi/btn_radio_on_selected.png
new file mode 100644
index 0000000..db50c43
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_radio_on_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_rating_star_off_normal.png

diff --git a/core/res/res/drawable-hdpi/btn_rating_star_off_normal.png b/core/res/res/drawable-hdpi/btn_rating_star_off_normal.png
new file mode 100644
index 0000000..d119807
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_rating_star_off_normal.png
Binary files differ

core/res/res/drawable-hdpi/btn_rating_star_off_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_rating_star_off_pressed.png b/core/res/res/drawable-hdpi/btn_rating_star_off_pressed.png
new file mode 100644
index 0000000..6f76da3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_rating_star_off_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_rating_star_off_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_rating_star_off_selected.png b/core/res/res/drawable-hdpi/btn_rating_star_off_selected.png
new file mode 100644
index 0000000..566090d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_rating_star_off_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_rating_star_on_normal.png

diff --git a/core/res/res/drawable-hdpi/btn_rating_star_on_normal.png b/core/res/res/drawable-hdpi/btn_rating_star_on_normal.png
new file mode 100644
index 0000000..c55c1f6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_rating_star_on_normal.png
Binary files differ

core/res/res/drawable-hdpi/btn_rating_star_on_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_rating_star_on_pressed.png b/core/res/res/drawable-hdpi/btn_rating_star_on_pressed.png
new file mode 100644
index 0000000..89b8161
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_rating_star_on_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_rating_star_on_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_rating_star_on_selected.png b/core/res/res/drawable-hdpi/btn_rating_star_on_selected.png
new file mode 100644
index 0000000..1a76a26
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_rating_star_on_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_search_dialog_default.9.png

diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_default.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_default.9.png
new file mode 100644
index 0000000..fe38843
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_search_dialog_default.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_search_dialog_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_pressed.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_pressed.9.png
new file mode 100644
index 0000000..e673b27
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_search_dialog_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_search_dialog_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_selected.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_selected.9.png
new file mode 100644
index 0000000..64b689d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_search_dialog_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_search_dialog_voice_default.9.png

diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_voice_default.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_voice_default.9.png
new file mode 100644
index 0000000..f65fa14
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_search_dialog_voice_default.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png
new file mode 100644
index 0000000..17cc0dd
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png
new file mode 100644
index 0000000..0509e14
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_square_overlay_disabled.png

diff --git a/core/res/res/drawable-hdpi/btn_square_overlay_disabled.png b/core/res/res/drawable-hdpi/btn_square_overlay_disabled.png
new file mode 100644
index 0000000..71a037e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_square_overlay_disabled.png
Binary files differ

core/res/res/drawable-hdpi/btn_square_overlay_disabled_focused.png

diff --git a/core/res/res/drawable-hdpi/btn_square_overlay_disabled_focused.png b/core/res/res/drawable-hdpi/btn_square_overlay_disabled_focused.png
new file mode 100644
index 0000000..a474605
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_square_overlay_disabled_focused.png
Binary files differ

core/res/res/drawable-hdpi/btn_square_overlay_normal.png

diff --git a/core/res/res/drawable-hdpi/btn_square_overlay_normal.png b/core/res/res/drawable-hdpi/btn_square_overlay_normal.png
new file mode 100644
index 0000000..bf5da22
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_square_overlay_normal.png
Binary files differ

core/res/res/drawable-hdpi/btn_square_overlay_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_square_overlay_pressed.png b/core/res/res/drawable-hdpi/btn_square_overlay_pressed.png
new file mode 100644
index 0000000..52a302d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_square_overlay_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_square_overlay_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_square_overlay_selected.png b/core/res/res/drawable-hdpi/btn_square_overlay_selected.png
new file mode 100644
index 0000000..e065682
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_square_overlay_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_off.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_off.png b/core/res/res/drawable-hdpi/btn_star_big_off.png
new file mode 100644
index 0000000..4be0f5d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_off.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_off_disable.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_off_disable.png b/core/res/res/drawable-hdpi/btn_star_big_off_disable.png
new file mode 100644
index 0000000..faba665
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_off_disable.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_off_disable_focused.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_off_disable_focused.png b/core/res/res/drawable-hdpi/btn_star_big_off_disable_focused.png
new file mode 100644
index 0000000..fc8aca4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_off_disable_focused.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_off_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_off_pressed.png b/core/res/res/drawable-hdpi/btn_star_big_off_pressed.png
new file mode 100644
index 0000000..b8c8e70
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_off_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_off_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_off_selected.png b/core/res/res/drawable-hdpi/btn_star_big_off_selected.png
new file mode 100644
index 0000000..86250bb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_off_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_on.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_on.png b/core/res/res/drawable-hdpi/btn_star_big_on.png
new file mode 100644
index 0000000..4213050
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_on.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_on_disable.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_on_disable.png b/core/res/res/drawable-hdpi/btn_star_big_on_disable.png
new file mode 100644
index 0000000..5629849
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_on_disable.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_on_disable_focused.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_on_disable_focused.png b/core/res/res/drawable-hdpi/btn_star_big_on_disable_focused.png
new file mode 100644
index 0000000..cb9f79c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_on_disable_focused.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_on_pressed.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_on_pressed.png b/core/res/res/drawable-hdpi/btn_star_big_on_pressed.png
new file mode 100644
index 0000000..648cd1b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_on_pressed.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_big_on_selected.png

diff --git a/core/res/res/drawable-hdpi/btn_star_big_on_selected.png b/core/res/res/drawable-hdpi/btn_star_big_on_selected.png
new file mode 100644
index 0000000..cb15673
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_big_on_selected.png
Binary files differ

core/res/res/drawable-hdpi/btn_star_label_background.9.png

diff --git a/core/res/res/drawable-hdpi/btn_star_label_background.9.png b/core/res/res/drawable-hdpi/btn_star_label_background.9.png
new file mode 100644
index 0000000..6008067
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_star_label_background.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_toggle_off.9.png

diff --git a/core/res/res/drawable-hdpi/btn_toggle_off.9.png b/core/res/res/drawable-hdpi/btn_toggle_off.9.png
new file mode 100644
index 0000000..9e141d8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_toggle_off.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_toggle_on.9.png

diff --git a/core/res/res/drawable-hdpi/btn_toggle_on.9.png b/core/res/res/drawable-hdpi/btn_toggle_on.9.png
new file mode 100644
index 0000000..dba2fa5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_toggle_on.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_down_disabled.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_down_disabled.9.png b/core/res/res/drawable-hdpi/btn_zoom_down_disabled.9.png
new file mode 100644
index 0000000..6441f4d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_down_disabled.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_down_disabled_focused.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_down_disabled_focused.9.png b/core/res/res/drawable-hdpi/btn_zoom_down_disabled_focused.9.png
new file mode 100644
index 0000000..cfb0613
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_down_disabled_focused.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_down_normal.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_down_normal.9.png b/core/res/res/drawable-hdpi/btn_zoom_down_normal.9.png
new file mode 100644
index 0000000..b30f834
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_down_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_down_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_down_pressed.9.png b/core/res/res/drawable-hdpi/btn_zoom_down_pressed.9.png
new file mode 100644
index 0000000..4ff9910
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_down_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_down_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_down_selected.9.png b/core/res/res/drawable-hdpi/btn_zoom_down_selected.9.png
new file mode 100644
index 0000000..5542695
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_down_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_page_normal.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_page_normal.png b/core/res/res/drawable-hdpi/btn_zoom_page_normal.png
new file mode 100644
index 0000000..15d60a0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_page_normal.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_page_press.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_page_press.png b/core/res/res/drawable-hdpi/btn_zoom_page_press.png
new file mode 100644
index 0000000..28f437e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_page_press.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_up_disabled.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_up_disabled.9.png b/core/res/res/drawable-hdpi/btn_zoom_up_disabled.9.png
new file mode 100644
index 0000000..9813201
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_up_disabled.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_up_disabled_focused.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_up_disabled_focused.9.png b/core/res/res/drawable-hdpi/btn_zoom_up_disabled_focused.9.png
new file mode 100644
index 0000000..8710c72
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_up_disabled_focused.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_up_normal.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_up_normal.9.png b/core/res/res/drawable-hdpi/btn_zoom_up_normal.9.png
new file mode 100644
index 0000000..763d271
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_up_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_up_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_up_pressed.9.png b/core/res/res/drawable-hdpi/btn_zoom_up_pressed.9.png
new file mode 100644
index 0000000..b77936a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_up_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/btn_zoom_up_selected.9.png

diff --git a/core/res/res/drawable-hdpi/btn_zoom_up_selected.9.png b/core/res/res/drawable-hdpi/btn_zoom_up_selected.9.png
new file mode 100644
index 0000000..a8e4af1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/btn_zoom_up_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/button_onoff_indicator_off.png

diff --git a/core/res/res/drawable-hdpi/button_onoff_indicator_off.png b/core/res/res/drawable-hdpi/button_onoff_indicator_off.png
new file mode 100644
index 0000000..9af36e9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/button_onoff_indicator_off.png
Binary files differ

core/res/res/drawable-hdpi/button_onoff_indicator_on.png

diff --git a/core/res/res/drawable-hdpi/button_onoff_indicator_on.png b/core/res/res/drawable-hdpi/button_onoff_indicator_on.png
new file mode 100644
index 0000000..bde297e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/button_onoff_indicator_on.png
Binary files differ

core/res/res/drawable-hdpi/call_contact.png

diff --git a/core/res/res/drawable-hdpi/call_contact.png b/core/res/res/drawable-hdpi/call_contact.png
new file mode 100644
index 0000000..57fea24
--- /dev/null
+++ b/core/res/res/drawable-hdpi/call_contact.png
Binary files differ

core/res/res/drawable-hdpi/checkbox_off_background.png

diff --git a/core/res/res/drawable-hdpi/checkbox_off_background.png b/core/res/res/drawable-hdpi/checkbox_off_background.png
new file mode 100644
index 0000000..a8e4785
--- /dev/null
+++ b/core/res/res/drawable-hdpi/checkbox_off_background.png
Binary files differ

core/res/res/drawable-hdpi/checkbox_on_background.png

diff --git a/core/res/res/drawable-hdpi/checkbox_on_background.png b/core/res/res/drawable-hdpi/checkbox_on_background.png
new file mode 100644
index 0000000..800d3d5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/checkbox_on_background.png
Binary files differ

core/res/res/drawable-hdpi/clock_dial.png

diff --git a/core/res/res/drawable-hdpi/clock_dial.png b/core/res/res/drawable-hdpi/clock_dial.png
new file mode 100644
index 0000000..9de29bc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/clock_dial.png
Binary files differ

core/res/res/drawable-hdpi/clock_hand_hour.png

diff --git a/core/res/res/drawable-hdpi/clock_hand_hour.png b/core/res/res/drawable-hdpi/clock_hand_hour.png
new file mode 100644
index 0000000..9f7e5c0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/clock_hand_hour.png
Binary files differ

core/res/res/drawable-hdpi/clock_hand_minute.png

diff --git a/core/res/res/drawable-hdpi/clock_hand_minute.png b/core/res/res/drawable-hdpi/clock_hand_minute.png
new file mode 100644
index 0000000..2eec380
--- /dev/null
+++ b/core/res/res/drawable-hdpi/clock_hand_minute.png
Binary files differ

core/res/res/drawable-hdpi/code_lock_bottom.9.png

diff --git a/core/res/res/drawable-hdpi/code_lock_bottom.9.png b/core/res/res/drawable-hdpi/code_lock_bottom.9.png
new file mode 100644
index 0000000..e72d0f7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/code_lock_bottom.9.png
Binary files differ

core/res/res/drawable-hdpi/code_lock_left.9.png

diff --git a/core/res/res/drawable-hdpi/code_lock_left.9.png b/core/res/res/drawable-hdpi/code_lock_left.9.png
new file mode 100644
index 0000000..76ff1f5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/code_lock_left.9.png
Binary files differ

core/res/res/drawable-hdpi/code_lock_top.9.png

diff --git a/core/res/res/drawable-hdpi/code_lock_top.9.png b/core/res/res/drawable-hdpi/code_lock_top.9.png
new file mode 100644
index 0000000..20af255
--- /dev/null
+++ b/core/res/res/drawable-hdpi/code_lock_top.9.png
Binary files differ

core/res/res/drawable-hdpi/compass_arrow.png

diff --git a/core/res/res/drawable-hdpi/compass_arrow.png b/core/res/res/drawable-hdpi/compass_arrow.png
new file mode 100644
index 0000000..6dbd900
--- /dev/null
+++ b/core/res/res/drawable-hdpi/compass_arrow.png
Binary files differ

core/res/res/drawable-hdpi/compass_base.png

diff --git a/core/res/res/drawable-hdpi/compass_base.png b/core/res/res/drawable-hdpi/compass_base.png
new file mode 100644
index 0000000..298fc09
--- /dev/null
+++ b/core/res/res/drawable-hdpi/compass_base.png
Binary files differ

core/res/res/drawable-hdpi/create_contact.png

diff --git a/core/res/res/drawable-hdpi/create_contact.png b/core/res/res/drawable-hdpi/create_contact.png
new file mode 100644
index 0000000..19d59b4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/create_contact.png
Binary files differ

core/res/res/drawable-hdpi/dark_header.9.png

diff --git a/core/res/res/drawable-hdpi/dark_header.9.png b/core/res/res/drawable-hdpi/dark_header.9.png
new file mode 100644
index 0000000..a2fa569
--- /dev/null
+++ b/core/res/res/drawable-hdpi/dark_header.9.png
Binary files differ

core/res/res/drawable-hdpi/dialog_divider_horizontal_light.9.png

diff --git a/core/res/res/drawable-hdpi/dialog_divider_horizontal_light.9.png b/core/res/res/drawable-hdpi/dialog_divider_horizontal_light.9.png
new file mode 100644
index 0000000..441ef32
--- /dev/null
+++ b/core/res/res/drawable-hdpi/dialog_divider_horizontal_light.9.png
Binary files differ

core/res/res/drawable-hdpi/divider_horizontal_bright.9.png

diff --git a/core/res/res/drawable-hdpi/divider_horizontal_bright.9.png b/core/res/res/drawable-hdpi/divider_horizontal_bright.9.png
new file mode 100644
index 0000000..c7803a2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/divider_horizontal_bright.9.png
Binary files differ

core/res/res/drawable-hdpi/divider_horizontal_bright_opaque.9.png

diff --git a/core/res/res/drawable-hdpi/divider_horizontal_bright_opaque.9.png b/core/res/res/drawable-hdpi/divider_horizontal_bright_opaque.9.png
new file mode 100644
index 0000000..d8d8aa9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/divider_horizontal_bright_opaque.9.png
Binary files differ

core/res/res/drawable-hdpi/divider_horizontal_dark.9.png

diff --git a/core/res/res/drawable-hdpi/divider_horizontal_dark.9.png b/core/res/res/drawable-hdpi/divider_horizontal_dark.9.png
new file mode 100644
index 0000000..63859f7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/divider_horizontal_dark.9.png
Binary files differ

core/res/res/drawable-hdpi/divider_horizontal_dark_opaque.9.png

diff --git a/core/res/res/drawable-hdpi/divider_horizontal_dark_opaque.9.png b/core/res/res/drawable-hdpi/divider_horizontal_dark_opaque.9.png
new file mode 100644
index 0000000..ced2832
--- /dev/null
+++ b/core/res/res/drawable-hdpi/divider_horizontal_dark_opaque.9.png
Binary files differ

core/res/res/drawable-hdpi/divider_horizontal_dim_dark.9.png

diff --git a/core/res/res/drawable-hdpi/divider_horizontal_dim_dark.9.png b/core/res/res/drawable-hdpi/divider_horizontal_dim_dark.9.png
new file mode 100644
index 0000000..63859f7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/divider_horizontal_dim_dark.9.png
Binary files differ

core/res/res/drawable-hdpi/divider_horizontal_textfield.9.png

diff --git a/core/res/res/drawable-hdpi/divider_horizontal_textfield.9.png b/core/res/res/drawable-hdpi/divider_horizontal_textfield.9.png
new file mode 100644
index 0000000..23b0b51
--- /dev/null
+++ b/core/res/res/drawable-hdpi/divider_horizontal_textfield.9.png
Binary files differ

core/res/res/drawable-hdpi/divider_vertical_bright.9.png

diff --git a/core/res/res/drawable-hdpi/divider_vertical_bright.9.png b/core/res/res/drawable-hdpi/divider_vertical_bright.9.png
new file mode 100644
index 0000000..128a4de
--- /dev/null
+++ b/core/res/res/drawable-hdpi/divider_vertical_bright.9.png
Binary files differ

core/res/res/drawable-hdpi/editbox_background_focus_yellow.9.png

diff --git a/core/res/res/drawable-hdpi/editbox_background_focus_yellow.9.png b/core/res/res/drawable-hdpi/editbox_background_focus_yellow.9.png
new file mode 100644
index 0000000..70cd52b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/editbox_background_focus_yellow.9.png
Binary files differ

core/res/res/drawable-hdpi/editbox_background_normal.9.png

diff --git a/core/res/res/drawable-hdpi/editbox_background_normal.9.png b/core/res/res/drawable-hdpi/editbox_background_normal.9.png
new file mode 100644
index 0000000..ce12b3b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/editbox_background_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/editbox_dropdown_background.9.png

diff --git a/core/res/res/drawable-hdpi/editbox_dropdown_background.9.png b/core/res/res/drawable-hdpi/editbox_dropdown_background.9.png
new file mode 100644
index 0000000..e7967d5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/editbox_dropdown_background.9.png
Binary files differ

core/res/res/drawable-hdpi/editbox_dropdown_background_dark.9.png

diff --git a/core/res/res/drawable-hdpi/editbox_dropdown_background_dark.9.png b/core/res/res/drawable-hdpi/editbox_dropdown_background_dark.9.png
new file mode 100644
index 0000000..4cce373
--- /dev/null
+++ b/core/res/res/drawable-hdpi/editbox_dropdown_background_dark.9.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_angel.png

diff --git a/core/res/res/drawable-hdpi/emo_im_angel.png b/core/res/res/drawable-hdpi/emo_im_angel.png
new file mode 100644
index 0000000..10742a6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_angel.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_cool.png

diff --git a/core/res/res/drawable-hdpi/emo_im_cool.png b/core/res/res/drawable-hdpi/emo_im_cool.png
new file mode 100644
index 0000000..e3c8654
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_cool.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_crying.png

diff --git a/core/res/res/drawable-hdpi/emo_im_crying.png b/core/res/res/drawable-hdpi/emo_im_crying.png
new file mode 100644
index 0000000..b23791c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_crying.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_foot_in_mouth.png

diff --git a/core/res/res/drawable-hdpi/emo_im_foot_in_mouth.png b/core/res/res/drawable-hdpi/emo_im_foot_in_mouth.png
new file mode 100644
index 0000000..050b7be
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_foot_in_mouth.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_happy.png

diff --git a/core/res/res/drawable-hdpi/emo_im_happy.png b/core/res/res/drawable-hdpi/emo_im_happy.png
new file mode 100644
index 0000000..69e3bed
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_happy.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_kissing.png

diff --git a/core/res/res/drawable-hdpi/emo_im_kissing.png b/core/res/res/drawable-hdpi/emo_im_kissing.png
new file mode 100644
index 0000000..0cca68e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_kissing.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_laughing.png

diff --git a/core/res/res/drawable-hdpi/emo_im_laughing.png b/core/res/res/drawable-hdpi/emo_im_laughing.png
new file mode 100644
index 0000000..8406ad0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_laughing.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_lips_are_sealed.png

diff --git a/core/res/res/drawable-hdpi/emo_im_lips_are_sealed.png b/core/res/res/drawable-hdpi/emo_im_lips_are_sealed.png
new file mode 100644
index 0000000..222f175
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_lips_are_sealed.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_money_mouth.png

diff --git a/core/res/res/drawable-hdpi/emo_im_money_mouth.png b/core/res/res/drawable-hdpi/emo_im_money_mouth.png
new file mode 100644
index 0000000..d711bfb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_money_mouth.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_sad.png

diff --git a/core/res/res/drawable-hdpi/emo_im_sad.png b/core/res/res/drawable-hdpi/emo_im_sad.png
new file mode 100644
index 0000000..40017f1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_sad.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_surprised.png

diff --git a/core/res/res/drawable-hdpi/emo_im_surprised.png b/core/res/res/drawable-hdpi/emo_im_surprised.png
new file mode 100644
index 0000000..4b2af7a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_surprised.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_tongue_sticking_out.png

diff --git a/core/res/res/drawable-hdpi/emo_im_tongue_sticking_out.png b/core/res/res/drawable-hdpi/emo_im_tongue_sticking_out.png
new file mode 100644
index 0000000..42ac80d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_tongue_sticking_out.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_undecided.png

diff --git a/core/res/res/drawable-hdpi/emo_im_undecided.png b/core/res/res/drawable-hdpi/emo_im_undecided.png
new file mode 100644
index 0000000..2cf5bd2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_undecided.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_winking.png

diff --git a/core/res/res/drawable-hdpi/emo_im_winking.png b/core/res/res/drawable-hdpi/emo_im_winking.png
new file mode 100644
index 0000000..a3a0876
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_winking.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_wtf.png

diff --git a/core/res/res/drawable-hdpi/emo_im_wtf.png b/core/res/res/drawable-hdpi/emo_im_wtf.png
new file mode 100644
index 0000000..86c4bda
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_wtf.png
Binary files differ

core/res/res/drawable-hdpi/emo_im_yelling.png

diff --git a/core/res/res/drawable-hdpi/emo_im_yelling.png b/core/res/res/drawable-hdpi/emo_im_yelling.png
new file mode 100644
index 0000000..cfd991a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/emo_im_yelling.png
Binary files differ

core/res/res/drawable-hdpi/expander_ic_maximized.9.png

diff --git a/core/res/res/drawable-hdpi/expander_ic_maximized.9.png b/core/res/res/drawable-hdpi/expander_ic_maximized.9.png
new file mode 100644
index 0000000..4dcb984
--- /dev/null
+++ b/core/res/res/drawable-hdpi/expander_ic_maximized.9.png
Binary files differ

core/res/res/drawable-hdpi/expander_ic_minimized.9.png

diff --git a/core/res/res/drawable-hdpi/expander_ic_minimized.9.png b/core/res/res/drawable-hdpi/expander_ic_minimized.9.png
new file mode 100644
index 0000000..45b7322
--- /dev/null
+++ b/core/res/res/drawable-hdpi/expander_ic_minimized.9.png
Binary files differ

core/res/res/drawable-hdpi/focused_application_background_static.png

diff --git a/core/res/res/drawable-hdpi/focused_application_background_static.png b/core/res/res/drawable-hdpi/focused_application_background_static.png
new file mode 100644
index 0000000..6872f26
--- /dev/null
+++ b/core/res/res/drawable-hdpi/focused_application_background_static.png
Binary files differ

core/res/res/drawable-hdpi/frame_gallery_thumb.9.png

diff --git a/core/res/res/drawable-hdpi/frame_gallery_thumb.9.png b/core/res/res/drawable-hdpi/frame_gallery_thumb.9.png
new file mode 100644
index 0000000..8edbd3f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/frame_gallery_thumb.9.png
Binary files differ

core/res/res/drawable-hdpi/frame_gallery_thumb_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/frame_gallery_thumb_pressed.9.png b/core/res/res/drawable-hdpi/frame_gallery_thumb_pressed.9.png
new file mode 100644
index 0000000..986e6d5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/frame_gallery_thumb_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/frame_gallery_thumb_selected.9.png

diff --git a/core/res/res/drawable-hdpi/frame_gallery_thumb_selected.9.png b/core/res/res/drawable-hdpi/frame_gallery_thumb_selected.9.png
new file mode 100644
index 0000000..95f3ab5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/frame_gallery_thumb_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/gallery_selected_default.9.png

diff --git a/core/res/res/drawable-hdpi/gallery_selected_default.9.png b/core/res/res/drawable-hdpi/gallery_selected_default.9.png
new file mode 100644
index 0000000..99403aa
--- /dev/null
+++ b/core/res/res/drawable-hdpi/gallery_selected_default.9.png
Binary files differ

core/res/res/drawable-hdpi/gallery_selected_focused.9.png

diff --git a/core/res/res/drawable-hdpi/gallery_selected_focused.9.png b/core/res/res/drawable-hdpi/gallery_selected_focused.9.png
new file mode 100644
index 0000000..3aa2e17
--- /dev/null
+++ b/core/res/res/drawable-hdpi/gallery_selected_focused.9.png
Binary files differ

core/res/res/drawable-hdpi/gallery_selected_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/gallery_selected_pressed.9.png b/core/res/res/drawable-hdpi/gallery_selected_pressed.9.png
new file mode 100644
index 0000000..8f1e752
--- /dev/null
+++ b/core/res/res/drawable-hdpi/gallery_selected_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/gallery_unselected_default.9.png

diff --git a/core/res/res/drawable-hdpi/gallery_unselected_default.9.png b/core/res/res/drawable-hdpi/gallery_unselected_default.9.png
new file mode 100644
index 0000000..855dca1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/gallery_unselected_default.9.png
Binary files differ

core/res/res/drawable-hdpi/gallery_unselected_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/gallery_unselected_pressed.9.png b/core/res/res/drawable-hdpi/gallery_unselected_pressed.9.png
new file mode 100644
index 0000000..5ec400c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/gallery_unselected_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/grid_selector_background_focus.9.png

diff --git a/core/res/res/drawable-hdpi/grid_selector_background_focus.9.png b/core/res/res/drawable-hdpi/grid_selector_background_focus.9.png
new file mode 100644
index 0000000..be2aeed
--- /dev/null
+++ b/core/res/res/drawable-hdpi/grid_selector_background_focus.9.png
Binary files differ

core/res/res/drawable-hdpi/grid_selector_background_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/grid_selector_background_pressed.9.png b/core/res/res/drawable-hdpi/grid_selector_background_pressed.9.png
new file mode 100644
index 0000000..27e455a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/grid_selector_background_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/highlight_disabled.9.png

diff --git a/core/res/res/drawable-hdpi/highlight_disabled.9.png b/core/res/res/drawable-hdpi/highlight_disabled.9.png
new file mode 100644
index 0000000..46f755d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/highlight_disabled.9.png
Binary files differ

core/res/res/drawable-hdpi/highlight_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/highlight_pressed.9.png b/core/res/res/drawable-hdpi/highlight_pressed.9.png
new file mode 100644
index 0000000..91d7db1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/highlight_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/highlight_selected.9.png

diff --git a/core/res/res/drawable-hdpi/highlight_selected.9.png b/core/res/res/drawable-hdpi/highlight_selected.9.png
new file mode 100644
index 0000000..6e92dd5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/highlight_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/ic_btn_round_more_disabled.png

diff --git a/core/res/res/drawable-hdpi/ic_btn_round_more_disabled.png b/core/res/res/drawable-hdpi/ic_btn_round_more_disabled.png
new file mode 100644
index 0000000..0125944
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_btn_round_more_disabled.png
Binary files differ

core/res/res/drawable-hdpi/ic_btn_round_more_normal.png

diff --git a/core/res/res/drawable-hdpi/ic_btn_round_more_normal.png b/core/res/res/drawable-hdpi/ic_btn_round_more_normal.png
new file mode 100644
index 0000000..33d7f89
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_btn_round_more_normal.png
Binary files differ

core/res/res/drawable-hdpi/ic_btn_search.png

diff --git a/core/res/res/drawable-hdpi/ic_btn_search.png b/core/res/res/drawable-hdpi/ic_btn_search.png
new file mode 100644
index 0000000..23eebf5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_btn_search.png
Binary files differ

core/res/res/drawable-hdpi/ic_btn_speak_now.png

diff --git a/core/res/res/drawable-hdpi/ic_btn_speak_now.png b/core/res/res/drawable-hdpi/ic_btn_speak_now.png
new file mode 100644
index 0000000..6dc01fb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_btn_speak_now.png
Binary files differ

core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_disabled.png

diff --git a/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_disabled.png b/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_disabled.png
new file mode 100644
index 0000000..19fe4d4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_disabled.png
Binary files differ

core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_normal.png

diff --git a/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_normal.png b/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_normal.png
new file mode 100644
index 0000000..c5a0594
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_fit_page_normal.png
Binary files differ

core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_disabled.png

diff --git a/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_disabled.png b/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_disabled.png
new file mode 100644
index 0000000..e5b22e8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_disabled.png
Binary files differ

core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_normal.png

diff --git a/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_normal.png b/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_normal.png
new file mode 100644
index 0000000..0612d01
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_btn_square_browser_zoom_page_overview_normal.png
Binary files differ

core/res/res/drawable-hdpi/ic_bullet_key_permission.png

diff --git a/core/res/res/drawable-hdpi/ic_bullet_key_permission.png b/core/res/res/drawable-hdpi/ic_bullet_key_permission.png
new file mode 100644
index 0000000..98d95dc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_bullet_key_permission.png
Binary files differ

core/res/res/drawable-hdpi/ic_contact_picture.png

diff --git a/core/res/res/drawable-hdpi/ic_contact_picture.png b/core/res/res/drawable-hdpi/ic_contact_picture.png
new file mode 100644
index 0000000..a60565a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_contact_picture.png
Binary files differ

core/res/res/drawable-hdpi/ic_delete.png

diff --git a/core/res/res/drawable-hdpi/ic_delete.png b/core/res/res/drawable-hdpi/ic_delete.png
new file mode 100644
index 0000000..f3e53d7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_delete.png
Binary files differ

core/res/res/drawable-hdpi/ic_dialog_alert.png

diff --git a/core/res/res/drawable-hdpi/ic_dialog_alert.png b/core/res/res/drawable-hdpi/ic_dialog_alert.png
new file mode 100644
index 0000000..7f905ba
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_dialog_alert.png
Binary files differ

core/res/res/drawable-hdpi/ic_dialog_dialer.png

diff --git a/core/res/res/drawable-hdpi/ic_dialog_dialer.png b/core/res/res/drawable-hdpi/ic_dialog_dialer.png
new file mode 100644
index 0000000..2ded243
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_dialog_dialer.png
Binary files differ

core/res/res/drawable-hdpi/ic_dialog_email.png

diff --git a/core/res/res/drawable-hdpi/ic_dialog_email.png b/core/res/res/drawable-hdpi/ic_dialog_email.png
new file mode 100644
index 0000000..faea271
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_dialog_email.png
Binary files differ

core/res/res/drawable-hdpi/ic_dialog_info.png

diff --git a/core/res/res/drawable-hdpi/ic_dialog_info.png b/core/res/res/drawable-hdpi/ic_dialog_info.png
new file mode 100644
index 0000000..efee1ef
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_dialog_info.png
Binary files differ

core/res/res/drawable-hdpi/ic_dialog_map.png

diff --git a/core/res/res/drawable-hdpi/ic_dialog_map.png b/core/res/res/drawable-hdpi/ic_dialog_map.png
new file mode 100644
index 0000000..f102b08
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_dialog_map.png
Binary files differ

core/res/res/drawable-hdpi/ic_dialog_menu_generic.png

diff --git a/core/res/res/drawable-hdpi/ic_dialog_menu_generic.png b/core/res/res/drawable-hdpi/ic_dialog_menu_generic.png
new file mode 100644
index 0000000..ef8a877
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_dialog_menu_generic.png
Binary files differ

core/res/res/drawable-hdpi/ic_dialog_time.png

diff --git a/core/res/res/drawable-hdpi/ic_dialog_time.png b/core/res/res/drawable-hdpi/ic_dialog_time.png
new file mode 100644
index 0000000..337a43a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_dialog_time.png
Binary files differ

core/res/res/drawable-hdpi/ic_dialog_usb.png

diff --git a/core/res/res/drawable-hdpi/ic_dialog_usb.png b/core/res/res/drawable-hdpi/ic_dialog_usb.png
new file mode 100644
index 0000000..e69e14a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_dialog_usb.png
Binary files differ

core/res/res/drawable-hdpi/ic_emergency.png

diff --git a/core/res/res/drawable-hdpi/ic_emergency.png b/core/res/res/drawable-hdpi/ic_emergency.png
new file mode 100644
index 0000000..a2dd372
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_emergency.png
Binary files differ

core/res/res/drawable-hdpi/ic_input_add.png

diff --git a/core/res/res/drawable-hdpi/ic_input_add.png b/core/res/res/drawable-hdpi/ic_input_add.png
new file mode 100644
index 0000000..d26ebac
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_input_add.png
Binary files differ

core/res/res/drawable-hdpi/ic_input_delete.png

diff --git a/core/res/res/drawable-hdpi/ic_input_delete.png b/core/res/res/drawable-hdpi/ic_input_delete.png
new file mode 100644
index 0000000..f35f89f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_input_delete.png
Binary files differ

core/res/res/drawable-hdpi/ic_input_get.png

diff --git a/core/res/res/drawable-hdpi/ic_input_get.png b/core/res/res/drawable-hdpi/ic_input_get.png
new file mode 100644
index 0000000..e2b665a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_input_get.png
Binary files differ

core/res/res/drawable-hdpi/ic_launcher_android.png

diff --git a/core/res/res/drawable-hdpi/ic_launcher_android.png b/core/res/res/drawable-hdpi/ic_launcher_android.png
new file mode 100644
index 0000000..d70b8ca
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_launcher_android.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_airplane_mode.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_airplane_mode.png b/core/res/res/drawable-hdpi/ic_lock_airplane_mode.png
new file mode 100644
index 0000000..610f9d0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_airplane_mode.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_airplane_mode_off.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_airplane_mode_off.png b/core/res/res/drawable-hdpi/ic_lock_airplane_mode_off.png
new file mode 100644
index 0000000..cd50647
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_airplane_mode_off.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_idle_alarm.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_idle_alarm.png b/core/res/res/drawable-hdpi/ic_lock_idle_alarm.png
new file mode 100644
index 0000000..3f3af06
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_idle_alarm.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_idle_charging.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_idle_charging.png b/core/res/res/drawable-hdpi/ic_lock_idle_charging.png
new file mode 100644
index 0000000..42572ee
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_idle_charging.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_idle_lock.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_idle_lock.png b/core/res/res/drawable-hdpi/ic_lock_idle_lock.png
new file mode 100644
index 0000000..11163d8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_idle_lock.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_idle_low_battery.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_idle_low_battery.png b/core/res/res/drawable-hdpi/ic_lock_idle_low_battery.png
new file mode 100644
index 0000000..30ff905
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_idle_low_battery.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_lock.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_lock.png b/core/res/res/drawable-hdpi/ic_lock_lock.png
new file mode 100644
index 0000000..0fc79e1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_lock.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_power_off.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_power_off.png b/core/res/res/drawable-hdpi/ic_lock_power_off.png
new file mode 100644
index 0000000..2f120c6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_power_off.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_silent_mode.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_silent_mode.png b/core/res/res/drawable-hdpi/ic_lock_silent_mode.png
new file mode 100644
index 0000000..00e1960
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_silent_mode.png
Binary files differ

core/res/res/drawable-hdpi/ic_lock_silent_mode_off.png

diff --git a/core/res/res/drawable-hdpi/ic_lock_silent_mode_off.png b/core/res/res/drawable-hdpi/ic_lock_silent_mode_off.png
new file mode 100644
index 0000000..6b4ce89
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_lock_silent_mode_off.png
Binary files differ

core/res/res/drawable-hdpi/ic_maps_indicator_current_position.png

diff --git a/core/res/res/drawable-hdpi/ic_maps_indicator_current_position.png b/core/res/res/drawable-hdpi/ic_maps_indicator_current_position.png
new file mode 100644
index 0000000..bc9160d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_maps_indicator_current_position.png
Binary files differ

core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim1.png

diff --git a/core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim1.png b/core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim1.png
new file mode 100644
index 0000000..d3d9339
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim1.png
Binary files differ

core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim2.png

diff --git a/core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim2.png b/core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim2.png
new file mode 100644
index 0000000..e32c223
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim2.png
Binary files differ

core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim3.png

diff --git a/core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim3.png b/core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim3.png
new file mode 100644
index 0000000..cf2db7c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_maps_indicator_current_position_anim3.png
Binary files differ

core/res/res/drawable-hdpi/ic_media_ff.png

diff --git a/core/res/res/drawable-hdpi/ic_media_ff.png b/core/res/res/drawable-hdpi/ic_media_ff.png
new file mode 100644
index 0000000..b0dc05b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_media_ff.png
Binary files differ

core/res/res/drawable-hdpi/ic_media_next.png

diff --git a/core/res/res/drawable-hdpi/ic_media_next.png b/core/res/res/drawable-hdpi/ic_media_next.png
new file mode 100644
index 0000000..2552f4e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_media_next.png
Binary files differ

core/res/res/drawable-hdpi/ic_media_pause.png

diff --git a/core/res/res/drawable-hdpi/ic_media_pause.png b/core/res/res/drawable-hdpi/ic_media_pause.png
new file mode 100644
index 0000000..d4670c2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_media_pause.png
Binary files differ

core/res/res/drawable-hdpi/ic_media_play.png

diff --git a/core/res/res/drawable-hdpi/ic_media_play.png b/core/res/res/drawable-hdpi/ic_media_play.png
new file mode 100644
index 0000000..e67ec80
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_media_play.png
Binary files differ

core/res/res/drawable-hdpi/ic_media_previous.png

diff --git a/core/res/res/drawable-hdpi/ic_media_previous.png b/core/res/res/drawable-hdpi/ic_media_previous.png
new file mode 100644
index 0000000..05eba71
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_media_previous.png
Binary files differ

core/res/res/drawable-hdpi/ic_media_rew.png

diff --git a/core/res/res/drawable-hdpi/ic_media_rew.png b/core/res/res/drawable-hdpi/ic_media_rew.png
new file mode 100644
index 0000000..88eed2e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_media_rew.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_account_list.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_account_list.png b/core/res/res/drawable-hdpi/ic_menu_account_list.png
new file mode 100644
index 0000000..f858d2c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_account_list.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_add.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_add.png b/core/res/res/drawable-hdpi/ic_menu_add.png
new file mode 100644
index 0000000..65cc01e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_add.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_agenda.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_agenda.png b/core/res/res/drawable-hdpi/ic_menu_agenda.png
new file mode 100644
index 0000000..6bb5cc8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_agenda.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_allfriends.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_allfriends.png b/core/res/res/drawable-hdpi/ic_menu_allfriends.png
new file mode 100644
index 0000000..8d11ca1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_allfriends.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_always_landscape_portrait.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_always_landscape_portrait.png b/core/res/res/drawable-hdpi/ic_menu_always_landscape_portrait.png
new file mode 100644
index 0000000..7ae1760a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_always_landscape_portrait.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_archive.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_archive.png b/core/res/res/drawable-hdpi/ic_menu_archive.png
new file mode 100644
index 0000000..9ca5c62
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_archive.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_attachment.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_attachment.png b/core/res/res/drawable-hdpi/ic_menu_attachment.png
new file mode 100644
index 0000000..8f11153
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_attachment.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_back.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_back.png b/core/res/res/drawable-hdpi/ic_menu_back.png
new file mode 100644
index 0000000..a6cd712
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_back.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_block.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_block.png b/core/res/res/drawable-hdpi/ic_menu_block.png
new file mode 100644
index 0000000..e1f9c2c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_block.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_blocked_user.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_blocked_user.png b/core/res/res/drawable-hdpi/ic_menu_blocked_user.png
new file mode 100644
index 0000000..3dd9a4a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_blocked_user.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_call.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_call.png b/core/res/res/drawable-hdpi/ic_menu_call.png
new file mode 100644
index 0000000..2ccc087
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_call.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_camera.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_camera.png b/core/res/res/drawable-hdpi/ic_menu_camera.png
new file mode 100644
index 0000000..5a3850f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_camera.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_cc.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_cc.png b/core/res/res/drawable-hdpi/ic_menu_cc.png
new file mode 100644
index 0000000..47905a5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_cc.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_chat_dashboard.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_chat_dashboard.png b/core/res/res/drawable-hdpi/ic_menu_chat_dashboard.png
new file mode 100644
index 0000000..dde6741
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_chat_dashboard.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_clear_playlist.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_clear_playlist.png b/core/res/res/drawable-hdpi/ic_menu_clear_playlist.png
new file mode 100644
index 0000000..e6be48b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_clear_playlist.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_close_clear_cancel.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_close_clear_cancel.png b/core/res/res/drawable-hdpi/ic_menu_close_clear_cancel.png
new file mode 100644
index 0000000..a54ea9d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_close_clear_cancel.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_compass.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_compass.png b/core/res/res/drawable-hdpi/ic_menu_compass.png
new file mode 100644
index 0000000..104270f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_compass.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_compose.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_compose.png b/core/res/res/drawable-hdpi/ic_menu_compose.png
new file mode 100644
index 0000000..6ad379e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_compose.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_crop.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_crop.png b/core/res/res/drawable-hdpi/ic_menu_crop.png
new file mode 100644
index 0000000..0d4c9fe
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_crop.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_day.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_day.png b/core/res/res/drawable-hdpi/ic_menu_day.png
new file mode 100644
index 0000000..84429aa
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_day.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_delete.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_delete.png b/core/res/res/drawable-hdpi/ic_menu_delete.png
new file mode 100644
index 0000000..2aed26a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_delete.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_directions.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_directions.png b/core/res/res/drawable-hdpi/ic_menu_directions.png
new file mode 100644
index 0000000..23f6eb3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_directions.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_edit.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_edit.png b/core/res/res/drawable-hdpi/ic_menu_edit.png
new file mode 100644
index 0000000..602dd10
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_edit.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_emoticons.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_emoticons.png b/core/res/res/drawable-hdpi/ic_menu_emoticons.png
new file mode 100644
index 0000000..2fab515
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_emoticons.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_end_conversation.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_end_conversation.png b/core/res/res/drawable-hdpi/ic_menu_end_conversation.png
new file mode 100644
index 0000000..c05a207
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_end_conversation.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_forward.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_forward.png b/core/res/res/drawable-hdpi/ic_menu_forward.png
new file mode 100644
index 0000000..606e6aa
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_forward.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_friendslist.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_friendslist.png b/core/res/res/drawable-hdpi/ic_menu_friendslist.png
new file mode 100644
index 0000000..a90e573
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_friendslist.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_gallery.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_gallery.png b/core/res/res/drawable-hdpi/ic_menu_gallery.png
new file mode 100644
index 0000000..76dfbc3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_gallery.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_goto.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_goto.png b/core/res/res/drawable-hdpi/ic_menu_goto.png
new file mode 100644
index 0000000..a1acecb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_goto.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_help.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_help.png b/core/res/res/drawable-hdpi/ic_menu_help.png
new file mode 100644
index 0000000..4300e86
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_help.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_home.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_home.png b/core/res/res/drawable-hdpi/ic_menu_home.png
new file mode 100644
index 0000000..35cb52a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_home.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_info_details.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_info_details.png b/core/res/res/drawable-hdpi/ic_menu_info_details.png
new file mode 100644
index 0000000..7696ceb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_info_details.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_invite.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_invite.png b/core/res/res/drawable-hdpi/ic_menu_invite.png
new file mode 100644
index 0000000..3cb129f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_invite.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_login.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_login.png b/core/res/res/drawable-hdpi/ic_menu_login.png
new file mode 100644
index 0000000..d23ebf0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_login.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_manage.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_manage.png b/core/res/res/drawable-hdpi/ic_menu_manage.png
new file mode 100644
index 0000000..c7c4cbce
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_manage.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_mapmode.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_mapmode.png b/core/res/res/drawable-hdpi/ic_menu_mapmode.png
new file mode 100644
index 0000000..c895ccb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_mapmode.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_mark.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_mark.png b/core/res/res/drawable-hdpi/ic_menu_mark.png
new file mode 100644
index 0000000..724d787
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_mark.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_month.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_month.png b/core/res/res/drawable-hdpi/ic_menu_month.png
new file mode 100644
index 0000000..3e55ae6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_month.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_more.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_more.png b/core/res/res/drawable-hdpi/ic_menu_more.png
new file mode 100644
index 0000000..ed4376f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_more.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_my_calendar.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_my_calendar.png b/core/res/res/drawable-hdpi/ic_menu_my_calendar.png
new file mode 100644
index 0000000..3d6ea1f3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_my_calendar.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_mylocation.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_mylocation.png b/core/res/res/drawable-hdpi/ic_menu_mylocation.png
new file mode 100644
index 0000000..1bcb0cd
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_mylocation.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_myplaces.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_myplaces.png b/core/res/res/drawable-hdpi/ic_menu_myplaces.png
new file mode 100644
index 0000000..5f726d8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_myplaces.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_notifications.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_notifications.png b/core/res/res/drawable-hdpi/ic_menu_notifications.png
new file mode 100644
index 0000000..fb63937
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_notifications.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_play_clip.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_play_clip.png b/core/res/res/drawable-hdpi/ic_menu_play_clip.png
new file mode 100644
index 0000000..ddde03a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_play_clip.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_preferences.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_preferences.png b/core/res/res/drawable-hdpi/ic_menu_preferences.png
new file mode 100644
index 0000000..64c42d2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_preferences.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_recent_history.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_recent_history.png b/core/res/res/drawable-hdpi/ic_menu_recent_history.png
new file mode 100644
index 0000000..0dd1627
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_recent_history.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_refresh.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_refresh.png b/core/res/res/drawable-hdpi/ic_menu_refresh.png
new file mode 100644
index 0000000..53caccac
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_refresh.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_report_image.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_report_image.png b/core/res/res/drawable-hdpi/ic_menu_report_image.png
new file mode 100644
index 0000000..b6aa5d6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_report_image.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_revert.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_revert.png b/core/res/res/drawable-hdpi/ic_menu_revert.png
new file mode 100644
index 0000000..11860a4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_revert.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_rotate.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_rotate.png b/core/res/res/drawable-hdpi/ic_menu_rotate.png
new file mode 100644
index 0000000..85115af
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_rotate.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_save.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_save.png b/core/res/res/drawable-hdpi/ic_menu_save.png
new file mode 100644
index 0000000..fc26c5d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_save.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_search.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_search.png b/core/res/res/drawable-hdpi/ic_menu_search.png
new file mode 100644
index 0000000..f78234e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_search.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_send.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_send.png b/core/res/res/drawable-hdpi/ic_menu_send.png
new file mode 100644
index 0000000..2567b58
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_send.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_set_as.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_set_as.png b/core/res/res/drawable-hdpi/ic_menu_set_as.png
new file mode 100644
index 0000000..7e79c15
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_set_as.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_share.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_share.png b/core/res/res/drawable-hdpi/ic_menu_share.png
new file mode 100644
index 0000000..b41b348
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_share.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_slideshow.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_slideshow.png b/core/res/res/drawable-hdpi/ic_menu_slideshow.png
new file mode 100644
index 0000000..53b1a6f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_slideshow.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_sort_alphabetically.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_sort_alphabetically.png b/core/res/res/drawable-hdpi/ic_menu_sort_alphabetically.png
new file mode 100644
index 0000000..5d68998
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_sort_alphabetically.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_sort_by_size.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_sort_by_size.png b/core/res/res/drawable-hdpi/ic_menu_sort_by_size.png
new file mode 100644
index 0000000..c9388fd
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_sort_by_size.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_star.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_star.png b/core/res/res/drawable-hdpi/ic_menu_star.png
new file mode 100644
index 0000000..21a2c4b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_star.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_start_conversation.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_start_conversation.png b/core/res/res/drawable-hdpi/ic_menu_start_conversation.png
new file mode 100644
index 0000000..d63d3a7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_start_conversation.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_stop.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_stop.png b/core/res/res/drawable-hdpi/ic_menu_stop.png
new file mode 100644
index 0000000..7c99ed4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_stop.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_today.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_today.png b/core/res/res/drawable-hdpi/ic_menu_today.png
new file mode 100644
index 0000000..4a9352d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_today.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_upload.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_upload.png b/core/res/res/drawable-hdpi/ic_menu_upload.png
new file mode 100644
index 0000000..d845112
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_upload.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_upload_you_tube.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_upload_you_tube.png b/core/res/res/drawable-hdpi/ic_menu_upload_you_tube.png
new file mode 100644
index 0000000..df5fa7f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_upload_you_tube.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_view.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_view.png b/core/res/res/drawable-hdpi/ic_menu_view.png
new file mode 100644
index 0000000..75155d4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_view.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_week.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_week.png b/core/res/res/drawable-hdpi/ic_menu_week.png
new file mode 100644
index 0000000..c216eca
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_week.png
Binary files differ

core/res/res/drawable-hdpi/ic_menu_zoom.png

diff --git a/core/res/res/drawable-hdpi/ic_menu_zoom.png b/core/res/res/drawable-hdpi/ic_menu_zoom.png
new file mode 100644
index 0000000..9fa4d7e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_menu_zoom.png
Binary files differ

core/res/res/drawable-hdpi/ic_notification_clear_all.png

diff --git a/core/res/res/drawable-hdpi/ic_notification_clear_all.png b/core/res/res/drawable-hdpi/ic_notification_clear_all.png
new file mode 100644
index 0000000..6bff858
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_notification_clear_all.png
Binary files differ

core/res/res/drawable-hdpi/ic_notification_overlay.9.png

diff --git a/core/res/res/drawable-hdpi/ic_notification_overlay.9.png b/core/res/res/drawable-hdpi/ic_notification_overlay.9.png
new file mode 100644
index 0000000..744178f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_notification_overlay.9.png
Binary files differ

core/res/res/drawable-hdpi/ic_partial_secure.png

diff --git a/core/res/res/drawable-hdpi/ic_partial_secure.png b/core/res/res/drawable-hdpi/ic_partial_secure.png
new file mode 100644
index 0000000..70bd08d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_partial_secure.png
Binary files differ

core/res/res/drawable-hdpi/ic_popup_disk_full.png

diff --git a/core/res/res/drawable-hdpi/ic_popup_disk_full.png b/core/res/res/drawable-hdpi/ic_popup_disk_full.png
new file mode 100644
index 0000000..b3c00a7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_popup_disk_full.png
Binary files differ

core/res/res/drawable-hdpi/ic_popup_reminder.png

diff --git a/core/res/res/drawable-hdpi/ic_popup_reminder.png b/core/res/res/drawable-hdpi/ic_popup_reminder.png
new file mode 100644
index 0000000..9652dde
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_popup_reminder.png
Binary files differ

core/res/res/drawable-hdpi/ic_popup_sync_1.png

diff --git a/core/res/res/drawable-hdpi/ic_popup_sync_1.png b/core/res/res/drawable-hdpi/ic_popup_sync_1.png
new file mode 100644
index 0000000..a248f59
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_popup_sync_1.png
Binary files differ

core/res/res/drawable-hdpi/ic_popup_sync_2.png

diff --git a/core/res/res/drawable-hdpi/ic_popup_sync_2.png b/core/res/res/drawable-hdpi/ic_popup_sync_2.png
new file mode 100644
index 0000000..756bfc6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_popup_sync_2.png
Binary files differ

core/res/res/drawable-hdpi/ic_popup_sync_3.png

diff --git a/core/res/res/drawable-hdpi/ic_popup_sync_3.png b/core/res/res/drawable-hdpi/ic_popup_sync_3.png
new file mode 100644
index 0000000..e06825b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_popup_sync_3.png
Binary files differ

core/res/res/drawable-hdpi/ic_popup_sync_4.png

diff --git a/core/res/res/drawable-hdpi/ic_popup_sync_4.png b/core/res/res/drawable-hdpi/ic_popup_sync_4.png
new file mode 100644
index 0000000..87ce8f6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_popup_sync_4.png
Binary files differ

core/res/res/drawable-hdpi/ic_popup_sync_5.png

diff --git a/core/res/res/drawable-hdpi/ic_popup_sync_5.png b/core/res/res/drawable-hdpi/ic_popup_sync_5.png
new file mode 100644
index 0000000..635480c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_popup_sync_5.png
Binary files differ

core/res/res/drawable-hdpi/ic_popup_sync_6.png

diff --git a/core/res/res/drawable-hdpi/ic_popup_sync_6.png b/core/res/res/drawable-hdpi/ic_popup_sync_6.png
new file mode 100644
index 0000000..b339eb2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_popup_sync_6.png
Binary files differ

core/res/res/drawable-hdpi/ic_search_category_default.png

diff --git a/core/res/res/drawable-hdpi/ic_search_category_default.png b/core/res/res/drawable-hdpi/ic_search_category_default.png
new file mode 100644
index 0000000..4038129
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_search_category_default.png
Binary files differ

core/res/res/drawable-hdpi/ic_secure.png

diff --git a/core/res/res/drawable-hdpi/ic_secure.png b/core/res/res/drawable-hdpi/ic_secure.png
new file mode 100644
index 0000000..5fb62c2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_secure.png
Binary files differ

core/res/res/drawable-hdpi/ic_text_dot.png

diff --git a/core/res/res/drawable-hdpi/ic_text_dot.png b/core/res/res/drawable-hdpi/ic_text_dot.png
new file mode 100644
index 0000000..a7eaec5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_text_dot.png
Binary files differ

core/res/res/drawable-hdpi/ic_vibrate.png

diff --git a/core/res/res/drawable-hdpi/ic_vibrate.png b/core/res/res/drawable-hdpi/ic_vibrate.png
new file mode 100644
index 0000000..3d1e9a5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_vibrate.png
Binary files differ

core/res/res/drawable-hdpi/ic_volume.png

diff --git a/core/res/res/drawable-hdpi/ic_volume.png b/core/res/res/drawable-hdpi/ic_volume.png
new file mode 100644
index 0000000..ec555f1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_volume.png
Binary files differ

core/res/res/drawable-hdpi/ic_volume_bluetooth_ad2p.png

diff --git a/core/res/res/drawable-hdpi/ic_volume_bluetooth_ad2p.png b/core/res/res/drawable-hdpi/ic_volume_bluetooth_ad2p.png
new file mode 100644
index 0000000..31851e1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_volume_bluetooth_ad2p.png
Binary files differ

core/res/res/drawable-hdpi/ic_volume_bluetooth_in_call.png

diff --git a/core/res/res/drawable-hdpi/ic_volume_bluetooth_in_call.png b/core/res/res/drawable-hdpi/ic_volume_bluetooth_in_call.png
new file mode 100644
index 0000000..108a9e1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_volume_bluetooth_in_call.png
Binary files differ

core/res/res/drawable-hdpi/ic_volume_off.png

diff --git a/core/res/res/drawable-hdpi/ic_volume_off.png b/core/res/res/drawable-hdpi/ic_volume_off.png
new file mode 100644
index 0000000..3ace6bf
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_volume_off.png
Binary files differ

core/res/res/drawable-hdpi/ic_volume_off_small.png

diff --git a/core/res/res/drawable-hdpi/ic_volume_off_small.png b/core/res/res/drawable-hdpi/ic_volume_off_small.png
new file mode 100644
index 0000000..4b36677
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_volume_off_small.png
Binary files differ

core/res/res/drawable-hdpi/ic_volume_small.png

diff --git a/core/res/res/drawable-hdpi/ic_volume_small.png b/core/res/res/drawable-hdpi/ic_volume_small.png
new file mode 100644
index 0000000..538e304
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_volume_small.png
Binary files differ

core/res/res/drawable-hdpi/icon_highlight_rectangle.9.png

diff --git a/core/res/res/drawable-hdpi/icon_highlight_rectangle.9.png b/core/res/res/drawable-hdpi/icon_highlight_rectangle.9.png
new file mode 100644
index 0000000..a4da974
--- /dev/null
+++ b/core/res/res/drawable-hdpi/icon_highlight_rectangle.9.png
Binary files differ

core/res/res/drawable-hdpi/icon_highlight_square.9.png

diff --git a/core/res/res/drawable-hdpi/icon_highlight_square.9.png b/core/res/res/drawable-hdpi/icon_highlight_square.9.png
new file mode 100644
index 0000000..6f9a442
--- /dev/null
+++ b/core/res/res/drawable-hdpi/icon_highlight_square.9.png
Binary files differ

core/res/res/drawable-hdpi/ime_qwerty.png

diff --git a/core/res/res/drawable-hdpi/ime_qwerty.png b/core/res/res/drawable-hdpi/ime_qwerty.png
new file mode 100644
index 0000000..f9967cc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ime_qwerty.png
Binary files differ

core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_green_up.png

diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_green_up.png b/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_green_up.png
new file mode 100644
index 0000000..6560696
--- /dev/null
+++ b/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_green_up.png
Binary files differ

core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_red_up.png

diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_red_up.png b/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_red_up.png
new file mode 100644
index 0000000..698c3ec
--- /dev/null
+++ b/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_red_up.png
Binary files differ

core/res/res/drawable-hdpi/indicator_code_lock_point_area_default.png

diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default.png
new file mode 100644
index 0000000..0102a61
--- /dev/null
+++ b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default.png
Binary files differ

core/res/res/drawable-hdpi/indicator_code_lock_point_area_green.png

diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green.png
new file mode 100644
index 0000000..82ad8f7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green.png
Binary files differ

core/res/res/drawable-hdpi/indicator_code_lock_point_area_red.png

diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red.png
new file mode 100644
index 0000000..f9d0d33
--- /dev/null
+++ b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red.png
Binary files differ

core/res/res/drawable-hdpi/indicator_input_error.png

diff --git a/core/res/res/drawable-hdpi/indicator_input_error.png b/core/res/res/drawable-hdpi/indicator_input_error.png
new file mode 100644
index 0000000..213976c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/indicator_input_error.png
Binary files differ

core/res/res/drawable-hdpi/keyboard_accessory_bg_landscape.9.png

diff --git a/core/res/res/drawable-hdpi/keyboard_accessory_bg_landscape.9.png b/core/res/res/drawable-hdpi/keyboard_accessory_bg_landscape.9.png
new file mode 100644
index 0000000..5b0f6c5a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/keyboard_accessory_bg_landscape.9.png
Binary files differ

core/res/res/drawable-hdpi/keyboard_background.9.png

diff --git a/core/res/res/drawable-hdpi/keyboard_background.9.png b/core/res/res/drawable-hdpi/keyboard_background.9.png
new file mode 100644
index 0000000..7a03b8e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/keyboard_background.9.png
Binary files differ

core/res/res/drawable-hdpi/keyboard_key_feedback_background.9.png

diff --git a/core/res/res/drawable-hdpi/keyboard_key_feedback_background.9.png b/core/res/res/drawable-hdpi/keyboard_key_feedback_background.9.png
new file mode 100644
index 0000000..dc3e1f9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/keyboard_key_feedback_background.9.png
Binary files differ

core/res/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png

diff --git a/core/res/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png b/core/res/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png
new file mode 100644
index 0000000..c67ed53
--- /dev/null
+++ b/core/res/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png
Binary files differ

core/res/res/drawable-hdpi/keyboard_popup_panel_background.9.png

diff --git a/core/res/res/drawable-hdpi/keyboard_popup_panel_background.9.png b/core/res/res/drawable-hdpi/keyboard_popup_panel_background.9.png
new file mode 100644
index 0000000..8e2461b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/keyboard_popup_panel_background.9.png
Binary files differ

core/res/res/drawable-hdpi/keyboard_textfield_selected.9.png

diff --git a/core/res/res/drawable-hdpi/keyboard_textfield_selected.9.png b/core/res/res/drawable-hdpi/keyboard_textfield_selected.9.png
new file mode 100644
index 0000000..61db22c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/keyboard_textfield_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/light_header.9.png

diff --git a/core/res/res/drawable-hdpi/light_header.9.png b/core/res/res/drawable-hdpi/light_header.9.png
new file mode 100644
index 0000000..27db59d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/light_header.9.png
Binary files differ

core/res/res/drawable-hdpi/list_selector_background_disabled.9.png

diff --git a/core/res/res/drawable-hdpi/list_selector_background_disabled.9.png b/core/res/res/drawable-hdpi/list_selector_background_disabled.9.png
new file mode 100644
index 0000000..c40233e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/list_selector_background_disabled.9.png
Binary files differ

core/res/res/drawable-hdpi/list_selector_background_focus.9.png

diff --git a/core/res/res/drawable-hdpi/list_selector_background_focus.9.png b/core/res/res/drawable-hdpi/list_selector_background_focus.9.png
new file mode 100644
index 0000000..d8e16b99
--- /dev/null
+++ b/core/res/res/drawable-hdpi/list_selector_background_focus.9.png
Binary files differ

core/res/res/drawable-hdpi/list_selector_background_longpress.9.png

diff --git a/core/res/res/drawable-hdpi/list_selector_background_longpress.9.png b/core/res/res/drawable-hdpi/list_selector_background_longpress.9.png
new file mode 100644
index 0000000..1676ca7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/list_selector_background_longpress.9.png
Binary files differ

core/res/res/drawable-hdpi/list_selector_background_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/list_selector_background_pressed.9.png b/core/res/res/drawable-hdpi/list_selector_background_pressed.9.png
new file mode 100644
index 0000000..ba79cf7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/list_selector_background_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/loading_tile.png

diff --git a/core/res/res/drawable-hdpi/loading_tile.png b/core/res/res/drawable-hdpi/loading_tile.png
new file mode 100644
index 0000000..691ca45
--- /dev/null
+++ b/core/res/res/drawable-hdpi/loading_tile.png
Binary files differ

core/res/res/drawable-hdpi/maps_google_logo.png

diff --git a/core/res/res/drawable-hdpi/maps_google_logo.png b/core/res/res/drawable-hdpi/maps_google_logo.png
new file mode 100644
index 0000000..5956ee2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/maps_google_logo.png
Binary files differ

core/res/res/drawable-hdpi/menu_background.9.png

diff --git a/core/res/res/drawable-hdpi/menu_background.9.png b/core/res/res/drawable-hdpi/menu_background.9.png
new file mode 100644
index 0000000..cbe62af
--- /dev/null
+++ b/core/res/res/drawable-hdpi/menu_background.9.png
Binary files differ

core/res/res/drawable-hdpi/menu_background_fill_parent_width.9.png

diff --git a/core/res/res/drawable-hdpi/menu_background_fill_parent_width.9.png b/core/res/res/drawable-hdpi/menu_background_fill_parent_width.9.png
new file mode 100644
index 0000000..0812487
--- /dev/null
+++ b/core/res/res/drawable-hdpi/menu_background_fill_parent_width.9.png
Binary files differ

core/res/res/drawable-hdpi/menu_separator.9.png

diff --git a/core/res/res/drawable-hdpi/menu_separator.9.png b/core/res/res/drawable-hdpi/menu_separator.9.png
new file mode 100644
index 0000000..3685b4e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/menu_separator.9.png
Binary files differ

core/res/res/drawable-hdpi/menu_submenu_background.9.png

diff --git a/core/res/res/drawable-hdpi/menu_submenu_background.9.png b/core/res/res/drawable-hdpi/menu_submenu_background.9.png
new file mode 100644
index 0000000..cbd4400
--- /dev/null
+++ b/core/res/res/drawable-hdpi/menu_submenu_background.9.png
Binary files differ

core/res/res/drawable-hdpi/menuitem_background_focus.9.png

diff --git a/core/res/res/drawable-hdpi/menuitem_background_focus.9.png b/core/res/res/drawable-hdpi/menuitem_background_focus.9.png
new file mode 100644
index 0000000..d8e16b99
--- /dev/null
+++ b/core/res/res/drawable-hdpi/menuitem_background_focus.9.png
Binary files differ

core/res/res/drawable-hdpi/menuitem_background_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/menuitem_background_pressed.9.png b/core/res/res/drawable-hdpi/menuitem_background_pressed.9.png
new file mode 100644
index 0000000..ba79cf7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/menuitem_background_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/menuitem_background_solid_focused.9.png

diff --git a/core/res/res/drawable/menuitem_background_solid_focused.9.png b/core/res/res/drawable-hdpi/menuitem_background_solid_focused.9.png
similarity index 100%
rename from core/res/res/drawable/menuitem_background_solid_focused.9.png
rename to core/res/res/drawable-hdpi/menuitem_background_solid_focused.9.png
Binary files differ

core/res/res/drawable-hdpi/menuitem_background_solid_pressed.9.png

diff --git a/core/res/res/drawable/menuitem_background_solid_pressed.9.png b/core/res/res/drawable-hdpi/menuitem_background_solid_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/menuitem_background_solid_pressed.9.png
rename to core/res/res/drawable-hdpi/menuitem_background_solid_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/menuitem_checkbox_on.png

diff --git a/core/res/res/drawable-hdpi/menuitem_checkbox_on.png b/core/res/res/drawable-hdpi/menuitem_checkbox_on.png
new file mode 100644
index 0000000..e90f631
--- /dev/null
+++ b/core/res/res/drawable-hdpi/menuitem_checkbox_on.png
Binary files differ

core/res/res/drawable-hdpi/no_tile_128.png

diff --git a/core/res/res/drawable-hdpi/no_tile_128.png b/core/res/res/drawable-hdpi/no_tile_128.png
new file mode 100644
index 0000000..86b998d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/no_tile_128.png
Binary files differ

core/res/res/drawable-hdpi/panel_background.9.png

diff --git a/core/res/res/drawable-hdpi/panel_background.9.png b/core/res/res/drawable-hdpi/panel_background.9.png
new file mode 100644
index 0000000..bfe5713
--- /dev/null
+++ b/core/res/res/drawable-hdpi/panel_background.9.png
Binary files differ

core/res/res/drawable-hdpi/panel_picture_frame_bg_focus_blue.9.png

diff --git a/core/res/res/drawable-hdpi/panel_picture_frame_bg_focus_blue.9.png b/core/res/res/drawable-hdpi/panel_picture_frame_bg_focus_blue.9.png
new file mode 100644
index 0000000..fdafdf5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/panel_picture_frame_bg_focus_blue.9.png
Binary files differ

core/res/res/drawable-hdpi/panel_picture_frame_bg_normal.9.png

diff --git a/core/res/res/drawable-hdpi/panel_picture_frame_bg_normal.9.png b/core/res/res/drawable-hdpi/panel_picture_frame_bg_normal.9.png
new file mode 100644
index 0000000..a654277
--- /dev/null
+++ b/core/res/res/drawable-hdpi/panel_picture_frame_bg_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/panel_picture_frame_bg_pressed_blue.9.png

diff --git a/core/res/res/drawable-hdpi/panel_picture_frame_bg_pressed_blue.9.png b/core/res/res/drawable-hdpi/panel_picture_frame_bg_pressed_blue.9.png
new file mode 100644
index 0000000..73162a5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/panel_picture_frame_bg_pressed_blue.9.png
Binary files differ

core/res/res/drawable-hdpi/pickerbox_background.png

diff --git a/core/res/res/drawable-hdpi/pickerbox_background.png b/core/res/res/drawable-hdpi/pickerbox_background.png
new file mode 100644
index 0000000..9315a31
--- /dev/null
+++ b/core/res/res/drawable-hdpi/pickerbox_background.png
Binary files differ

core/res/res/drawable-hdpi/pickerbox_selected.9.png

diff --git a/core/res/res/drawable-hdpi/pickerbox_selected.9.png b/core/res/res/drawable-hdpi/pickerbox_selected.9.png
new file mode 100644
index 0000000..a88ec63
--- /dev/null
+++ b/core/res/res/drawable-hdpi/pickerbox_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/pickerbox_unselected.9.png

diff --git a/core/res/res/drawable-hdpi/pickerbox_unselected.9.png b/core/res/res/drawable-hdpi/pickerbox_unselected.9.png
new file mode 100644
index 0000000..9f6b7cb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/pickerbox_unselected.9.png
Binary files differ

core/res/res/drawable-hdpi/picture_emergency.png

diff --git a/core/res/res/drawable-hdpi/picture_emergency.png b/core/res/res/drawable-hdpi/picture_emergency.png
new file mode 100644
index 0000000..b0f10f9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/picture_emergency.png
Binary files differ

core/res/res/drawable-hdpi/picture_frame.9.png

diff --git a/core/res/res/drawable-hdpi/picture_frame.9.png b/core/res/res/drawable-hdpi/picture_frame.9.png
new file mode 100644
index 0000000..c038b2a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/picture_frame.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_bottom_bright.9.png

diff --git a/core/res/res/drawable-hdpi/popup_bottom_bright.9.png b/core/res/res/drawable-hdpi/popup_bottom_bright.9.png
new file mode 100644
index 0000000..cca47d3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_bottom_bright.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_bottom_dark.9.png

diff --git a/core/res/res/drawable-hdpi/popup_bottom_dark.9.png b/core/res/res/drawable-hdpi/popup_bottom_dark.9.png
new file mode 100644
index 0000000..62a0bd0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_bottom_dark.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_bottom_medium.9.png

diff --git a/core/res/res/drawable-hdpi/popup_bottom_medium.9.png b/core/res/res/drawable-hdpi/popup_bottom_medium.9.png
new file mode 100644
index 0000000..6ebb4f7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_bottom_medium.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_center_bright.9.png

diff --git a/core/res/res/drawable-hdpi/popup_center_bright.9.png b/core/res/res/drawable-hdpi/popup_center_bright.9.png
new file mode 100644
index 0000000..756e9ed
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_center_bright.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_center_dark.9.png

diff --git a/core/res/res/drawable-hdpi/popup_center_dark.9.png b/core/res/res/drawable-hdpi/popup_center_dark.9.png
new file mode 100644
index 0000000..77b4524
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_center_dark.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_center_medium.9.png

diff --git a/core/res/res/drawable-hdpi/popup_center_medium.9.png b/core/res/res/drawable-hdpi/popup_center_medium.9.png
new file mode 100644
index 0000000..de4be2a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_center_medium.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_full_bright.9.png

diff --git a/core/res/res/drawable-hdpi/popup_full_bright.9.png b/core/res/res/drawable-hdpi/popup_full_bright.9.png
new file mode 100644
index 0000000..6c30bec
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_full_bright.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_full_dark.9.png

diff --git a/core/res/res/drawable-hdpi/popup_full_dark.9.png b/core/res/res/drawable-hdpi/popup_full_dark.9.png
new file mode 100644
index 0000000..fc8c00e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_full_dark.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_inline_error.9.png

diff --git a/core/res/res/drawable-hdpi/popup_inline_error.9.png b/core/res/res/drawable-hdpi/popup_inline_error.9.png
new file mode 100644
index 0000000..b188d81
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_inline_error.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_inline_error_above.9.png

diff --git a/core/res/res/drawable-hdpi/popup_inline_error_above.9.png b/core/res/res/drawable-hdpi/popup_inline_error_above.9.png
new file mode 100644
index 0000000..3d4e8ba
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_inline_error_above.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_top_bright.9.png

diff --git a/core/res/res/drawable-hdpi/popup_top_bright.9.png b/core/res/res/drawable-hdpi/popup_top_bright.9.png
new file mode 100644
index 0000000..ddd30ab
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_top_bright.9.png
Binary files differ

core/res/res/drawable-hdpi/popup_top_dark.9.png

diff --git a/core/res/res/drawable-hdpi/popup_top_dark.9.png b/core/res/res/drawable-hdpi/popup_top_dark.9.png
new file mode 100644
index 0000000..144d0fc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_top_dark.9.png
Binary files differ

core/res/res/drawable-hdpi/presence_away.png

diff --git a/core/res/res/drawable-hdpi/presence_away.png b/core/res/res/drawable-hdpi/presence_away.png
new file mode 100644
index 0000000..d4aa66b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_away.png
Binary files differ

core/res/res/drawable-hdpi/presence_busy.png

diff --git a/core/res/res/drawable-hdpi/presence_busy.png b/core/res/res/drawable-hdpi/presence_busy.png
new file mode 100644
index 0000000..4b27853
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_busy.png
Binary files differ

core/res/res/drawable-hdpi/presence_invisible.png

diff --git a/core/res/res/drawable-hdpi/presence_invisible.png b/core/res/res/drawable-hdpi/presence_invisible.png
new file mode 100644
index 0000000..0e27fba
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_invisible.png
Binary files differ

core/res/res/drawable-hdpi/presence_offline.png

diff --git a/core/res/res/drawable-hdpi/presence_offline.png b/core/res/res/drawable-hdpi/presence_offline.png
new file mode 100644
index 0000000..e511aa4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_offline.png
Binary files differ

core/res/res/drawable-hdpi/presence_online.png

diff --git a/core/res/res/drawable-hdpi/presence_online.png b/core/res/res/drawable-hdpi/presence_online.png
new file mode 100644
index 0000000..d787d2f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/presence_online.png
Binary files differ

core/res/res/drawable-hdpi/pressed_application_background_static.png

diff --git a/core/res/res/drawable-hdpi/pressed_application_background_static.png b/core/res/res/drawable-hdpi/pressed_application_background_static.png
new file mode 100644
index 0000000..dae96e6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/pressed_application_background_static.png
Binary files differ

core/res/res/drawable-hdpi/progressbar_indeterminate1.png

diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate1.png b/core/res/res/drawable-hdpi/progressbar_indeterminate1.png
new file mode 100644
index 0000000..ea88e32
--- /dev/null
+++ b/core/res/res/drawable-hdpi/progressbar_indeterminate1.png
Binary files differ

core/res/res/drawable-hdpi/progressbar_indeterminate2.png

diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate2.png b/core/res/res/drawable-hdpi/progressbar_indeterminate2.png
new file mode 100644
index 0000000..436c48c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/progressbar_indeterminate2.png
Binary files differ

core/res/res/drawable-hdpi/progressbar_indeterminate3.png

diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate3.png b/core/res/res/drawable-hdpi/progressbar_indeterminate3.png
new file mode 100644
index 0000000..ea88e32
--- /dev/null
+++ b/core/res/res/drawable-hdpi/progressbar_indeterminate3.png
Binary files differ

core/res/res/drawable-hdpi/radiobutton_off_background.png

diff --git a/core/res/res/drawable-hdpi/radiobutton_off_background.png b/core/res/res/drawable-hdpi/radiobutton_off_background.png
new file mode 100644
index 0000000..5ce33cd
--- /dev/null
+++ b/core/res/res/drawable-hdpi/radiobutton_off_background.png
Binary files differ

core/res/res/drawable-hdpi/radiobutton_on_background.png

diff --git a/core/res/res/drawable-hdpi/radiobutton_on_background.png b/core/res/res/drawable-hdpi/radiobutton_on_background.png
new file mode 100644
index 0000000..0f46071
--- /dev/null
+++ b/core/res/res/drawable-hdpi/radiobutton_on_background.png
Binary files differ

core/res/res/drawable-hdpi/rate_star_big_half.png

diff --git a/core/res/res/drawable-hdpi/rate_star_big_half.png b/core/res/res/drawable-hdpi/rate_star_big_half.png
new file mode 100644
index 0000000..61906a5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/rate_star_big_half.png
Binary files differ

core/res/res/drawable-hdpi/rate_star_big_off.png

diff --git a/core/res/res/drawable-hdpi/rate_star_big_off.png b/core/res/res/drawable-hdpi/rate_star_big_off.png
new file mode 100644
index 0000000..a688a45
--- /dev/null
+++ b/core/res/res/drawable-hdpi/rate_star_big_off.png
Binary files differ

core/res/res/drawable-hdpi/rate_star_big_on.png

diff --git a/core/res/res/drawable-hdpi/rate_star_big_on.png b/core/res/res/drawable-hdpi/rate_star_big_on.png
new file mode 100644
index 0000000..77cb067
--- /dev/null
+++ b/core/res/res/drawable-hdpi/rate_star_big_on.png
Binary files differ

core/res/res/drawable-hdpi/rate_star_small_half.png

diff --git a/core/res/res/drawable-hdpi/rate_star_small_half.png b/core/res/res/drawable-hdpi/rate_star_small_half.png
new file mode 100644
index 0000000..6b2efd9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/rate_star_small_half.png
Binary files differ

core/res/res/drawable-hdpi/rate_star_small_off.png

diff --git a/core/res/res/drawable-hdpi/rate_star_small_off.png b/core/res/res/drawable-hdpi/rate_star_small_off.png
new file mode 100644
index 0000000..8422919
--- /dev/null
+++ b/core/res/res/drawable-hdpi/rate_star_small_off.png
Binary files differ

core/res/res/drawable-hdpi/rate_star_small_on.png

diff --git a/core/res/res/drawable-hdpi/rate_star_small_on.png b/core/res/res/drawable-hdpi/rate_star_small_on.png
new file mode 100644
index 0000000..45e2324
--- /dev/null
+++ b/core/res/res/drawable-hdpi/rate_star_small_on.png
Binary files differ

core/res/res/drawable-hdpi/reticle.png

diff --git a/core/res/res/drawable-hdpi/reticle.png b/core/res/res/drawable-hdpi/reticle.png
new file mode 100644
index 0000000..a3e8c1b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/reticle.png
Binary files differ

core/res/res/drawable-hdpi/screen_progress_frame.9.png

diff --git a/core/res/res/drawable-hdpi/screen_progress_frame.9.png b/core/res/res/drawable-hdpi/screen_progress_frame.9.png
new file mode 100644
index 0000000..3f9d738
--- /dev/null
+++ b/core/res/res/drawable-hdpi/screen_progress_frame.9.png
Binary files differ

core/res/res/drawable-hdpi/screen_progress_inner.9.png

diff --git a/core/res/res/drawable-hdpi/screen_progress_inner.9.png b/core/res/res/drawable-hdpi/screen_progress_inner.9.png
new file mode 100644
index 0000000..10c7da5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/screen_progress_inner.9.png
Binary files differ

core/res/res/drawable-hdpi/scrollbar_handle_accelerated_anim2.9.png

diff --git a/core/res/res/drawable-hdpi/scrollbar_handle_accelerated_anim2.9.png b/core/res/res/drawable-hdpi/scrollbar_handle_accelerated_anim2.9.png
new file mode 100644
index 0000000..b540cd3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/scrollbar_handle_accelerated_anim2.9.png
Binary files differ

core/res/res/drawable-hdpi/scrollbar_handle_horizontal.9.png

diff --git a/core/res/res/drawable-hdpi/scrollbar_handle_horizontal.9.png b/core/res/res/drawable-hdpi/scrollbar_handle_horizontal.9.png
new file mode 100644
index 0000000..cd206e2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/scrollbar_handle_horizontal.9.png
Binary files differ

core/res/res/drawable-hdpi/scrollbar_handle_vertical.9.png

diff --git a/core/res/res/drawable-hdpi/scrollbar_handle_vertical.9.png b/core/res/res/drawable-hdpi/scrollbar_handle_vertical.9.png
new file mode 100644
index 0000000..3ec0791
--- /dev/null
+++ b/core/res/res/drawable-hdpi/scrollbar_handle_vertical.9.png
Binary files differ

core/res/res/drawable-hdpi/search_dropdown_background.9.png

diff --git a/core/res/res/drawable-hdpi/search_dropdown_background.9.png b/core/res/res/drawable-hdpi/search_dropdown_background.9.png
new file mode 100644
index 0000000..e6945db
--- /dev/null
+++ b/core/res/res/drawable-hdpi/search_dropdown_background.9.png
Binary files differ

core/res/res/drawable-hdpi/search_plate.9.png

diff --git a/core/res/res/drawable-hdpi/search_plate.9.png b/core/res/res/drawable-hdpi/search_plate.9.png
new file mode 100644
index 0000000..561c9fa
--- /dev/null
+++ b/core/res/res/drawable-hdpi/search_plate.9.png
Binary files differ

core/res/res/drawable-hdpi/search_plate_global.9.png

diff --git a/core/res/res/drawable-hdpi/search_plate_global.9.png b/core/res/res/drawable-hdpi/search_plate_global.9.png
new file mode 100644
index 0000000..32c6dc3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/search_plate_global.9.png
Binary files differ

core/res/res/drawable-hdpi/seek_thumb_normal.png

diff --git a/core/res/res/drawable-hdpi/seek_thumb_normal.png b/core/res/res/drawable-hdpi/seek_thumb_normal.png
new file mode 100644
index 0000000..cc83a7d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/seek_thumb_normal.png
Binary files differ

core/res/res/drawable-hdpi/seek_thumb_pressed.png

diff --git a/core/res/res/drawable-hdpi/seek_thumb_pressed.png b/core/res/res/drawable-hdpi/seek_thumb_pressed.png
new file mode 100644
index 0000000..15f79ea
--- /dev/null
+++ b/core/res/res/drawable-hdpi/seek_thumb_pressed.png
Binary files differ

core/res/res/drawable-hdpi/seek_thumb_selected.png

diff --git a/core/res/res/drawable-hdpi/seek_thumb_selected.png b/core/res/res/drawable-hdpi/seek_thumb_selected.png
new file mode 100644
index 0000000..8a7cf68
--- /dev/null
+++ b/core/res/res/drawable-hdpi/seek_thumb_selected.png
Binary files differ

core/res/res/drawable-hdpi/settings_header_raw.9.png

diff --git a/core/res/res/drawable-hdpi/settings_header_raw.9.png b/core/res/res/drawable-hdpi/settings_header_raw.9.png
new file mode 100644
index 0000000..6857c0f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/settings_header_raw.9.png
Binary files differ

core/res/res/drawable-hdpi/spinner_black_16.png

diff --git a/core/res/res/drawable-hdpi/spinner_black_16.png b/core/res/res/drawable-hdpi/spinner_black_16.png
new file mode 100644
index 0000000..eb34867
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_black_16.png
Binary files differ

core/res/res/drawable-hdpi/spinner_black_20.png

diff --git a/core/res/res/drawable-hdpi/spinner_black_20.png b/core/res/res/drawable-hdpi/spinner_black_20.png
new file mode 100644
index 0000000..dac06d7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_black_20.png
Binary files differ

core/res/res/drawable-hdpi/spinner_black_48.png

diff --git a/core/res/res/drawable-hdpi/spinner_black_48.png b/core/res/res/drawable-hdpi/spinner_black_48.png
new file mode 100644
index 0000000..337f72a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_black_48.png
Binary files differ

core/res/res/drawable-hdpi/spinner_black_76.png

diff --git a/core/res/res/drawable-hdpi/spinner_black_76.png b/core/res/res/drawable-hdpi/spinner_black_76.png
new file mode 100644
index 0000000..2edc3e7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_black_76.png
Binary files differ

core/res/res/drawable-hdpi/spinner_dropdown_background_down.9.png

diff --git a/core/res/res/drawable-hdpi/spinner_dropdown_background_down.9.png b/core/res/res/drawable-hdpi/spinner_dropdown_background_down.9.png
new file mode 100644
index 0000000..566543d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_dropdown_background_down.9.png
Binary files differ

core/res/res/drawable-hdpi/spinner_dropdown_background_up.9.png

diff --git a/core/res/res/drawable-hdpi/spinner_dropdown_background_up.9.png b/core/res/res/drawable-hdpi/spinner_dropdown_background_up.9.png
new file mode 100644
index 0000000..7b883cc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_dropdown_background_up.9.png
Binary files differ

core/res/res/drawable-hdpi/spinner_normal.9.png

diff --git a/core/res/res/drawable-hdpi/spinner_normal.9.png b/core/res/res/drawable-hdpi/spinner_normal.9.png
new file mode 100644
index 0000000..b1f25f0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/spinner_press.9.png

diff --git a/core/res/res/drawable-hdpi/spinner_press.9.png b/core/res/res/drawable-hdpi/spinner_press.9.png
new file mode 100644
index 0000000..6aab271
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_press.9.png
Binary files differ

core/res/res/drawable-hdpi/spinner_select.9.png

diff --git a/core/res/res/drawable-hdpi/spinner_select.9.png b/core/res/res/drawable-hdpi/spinner_select.9.png
new file mode 100644
index 0000000..9024d07
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_select.9.png
Binary files differ

core/res/res/drawable-hdpi/spinner_white_16.png

diff --git a/core/res/res/drawable-hdpi/spinner_white_16.png b/core/res/res/drawable-hdpi/spinner_white_16.png
new file mode 100644
index 0000000..7914a68
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_white_16.png
Binary files differ

core/res/res/drawable-hdpi/spinner_white_48.png

diff --git a/core/res/res/drawable-hdpi/spinner_white_48.png b/core/res/res/drawable-hdpi/spinner_white_48.png
new file mode 100644
index 0000000..faee8ca
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_white_48.png
Binary files differ

core/res/res/drawable-hdpi/spinner_white_76.png

diff --git a/core/res/res/drawable-hdpi/spinner_white_76.png b/core/res/res/drawable-hdpi/spinner_white_76.png
new file mode 100644
index 0000000..cd26379
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_white_76.png
Binary files differ

core/res/res/drawable-hdpi/spinnerbox_arrow_first.9.png

diff --git a/core/res/res/drawable-hdpi/spinnerbox_arrow_first.9.png b/core/res/res/drawable-hdpi/spinnerbox_arrow_first.9.png
new file mode 100644
index 0000000..af80855
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinnerbox_arrow_first.9.png
Binary files differ

core/res/res/drawable-hdpi/spinnerbox_arrow_last.9.png

diff --git a/core/res/res/drawable-hdpi/spinnerbox_arrow_last.9.png b/core/res/res/drawable-hdpi/spinnerbox_arrow_last.9.png
new file mode 100644
index 0000000..dc47275
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinnerbox_arrow_last.9.png
Binary files differ

core/res/res/drawable-hdpi/spinnerbox_arrow_middle.9.png

diff --git a/core/res/res/drawable-hdpi/spinnerbox_arrow_middle.9.png b/core/res/res/drawable-hdpi/spinnerbox_arrow_middle.9.png
new file mode 100644
index 0000000..007f279
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinnerbox_arrow_middle.9.png
Binary files differ

core/res/res/drawable-hdpi/spinnerbox_arrow_single.9.png

diff --git a/core/res/res/drawable-hdpi/spinnerbox_arrow_single.9.png b/core/res/res/drawable-hdpi/spinnerbox_arrow_single.9.png
new file mode 100644
index 0000000..24592a3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinnerbox_arrow_single.9.png
Binary files differ

core/res/res/drawable-hdpi/star_big_off.png

diff --git a/core/res/res/drawable-hdpi/star_big_off.png b/core/res/res/drawable-hdpi/star_big_off.png
new file mode 100644
index 0000000..ee6c942
--- /dev/null
+++ b/core/res/res/drawable-hdpi/star_big_off.png
Binary files differ

core/res/res/drawable-hdpi/star_big_on.png

diff --git a/core/res/res/drawable-hdpi/star_big_on.png b/core/res/res/drawable-hdpi/star_big_on.png
new file mode 100644
index 0000000..17b4d73
--- /dev/null
+++ b/core/res/res/drawable-hdpi/star_big_on.png
Binary files differ

core/res/res/drawable-hdpi/star_off.png

diff --git a/core/res/res/drawable-hdpi/star_off.png b/core/res/res/drawable-hdpi/star_off.png
new file mode 100644
index 0000000..e1897c7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/star_off.png
Binary files differ

core/res/res/drawable-hdpi/star_on.png

diff --git a/core/res/res/drawable-hdpi/star_on.png b/core/res/res/drawable-hdpi/star_on.png
new file mode 100644
index 0000000..b7440ea
--- /dev/null
+++ b/core/res/res/drawable-hdpi/star_on.png
Binary files differ

core/res/res/drawable-hdpi/stat_ecb_mode.png

diff --git a/core/res/res/drawable-hdpi/stat_ecb_mode.png b/core/res/res/drawable-hdpi/stat_ecb_mode.png
new file mode 100644
index 0000000..91e6c1e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_ecb_mode.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_alarm.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_alarm.png b/core/res/res/drawable-hdpi/stat_notify_alarm.png
new file mode 100644
index 0000000..adac8a9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_alarm.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_call_mute.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_call_mute.png b/core/res/res/drawable-hdpi/stat_notify_call_mute.png
new file mode 100644
index 0000000..a43139b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_call_mute.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_chat.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_chat.png b/core/res/res/drawable-hdpi/stat_notify_chat.png
new file mode 100644
index 0000000..7b837b3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_chat.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_disk_full.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_disk_full.png b/core/res/res/drawable-hdpi/stat_notify_disk_full.png
new file mode 100644
index 0000000..2163fa7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_disk_full.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_error.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_error.png b/core/res/res/drawable-hdpi/stat_notify_error.png
new file mode 100644
index 0000000..9853cda
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_error.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_missed_call.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_missed_call.png b/core/res/res/drawable-hdpi/stat_notify_missed_call.png
new file mode 100644
index 0000000..a313360
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_missed_call.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_more.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_more.png b/core/res/res/drawable-hdpi/stat_notify_more.png
new file mode 100644
index 0000000..bbbd59b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_more.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_sdcard.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_sdcard.png b/core/res/res/drawable-hdpi/stat_notify_sdcard.png
new file mode 100644
index 0000000..0161419
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_sdcard.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_sdcard_usb.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_sdcard_usb.png b/core/res/res/drawable-hdpi/stat_notify_sdcard_usb.png
new file mode 100644
index 0000000..23b2f0a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_sdcard_usb.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_sim_toolkit.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_sim_toolkit.png b/core/res/res/drawable-hdpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..401fbb0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_sim_toolkit.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_sync.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_sync.png b/core/res/res/drawable-hdpi/stat_notify_sync.png
new file mode 100644
index 0000000..dacfc3a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_sync.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_sync_anim0.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_sync_anim0.png b/core/res/res/drawable-hdpi/stat_notify_sync_anim0.png
new file mode 100644
index 0000000..00e2ebb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_sync_anim0.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_sync_error.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_sync_error.png b/core/res/res/drawable-hdpi/stat_notify_sync_error.png
new file mode 100644
index 0000000..3083b44
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_sync_error.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_voicemail.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_voicemail.png b/core/res/res/drawable-hdpi/stat_notify_voicemail.png
new file mode 100644
index 0000000..7f62e94
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_voicemail.png
Binary files differ

core/res/res/drawable-hdpi/stat_notify_wifi_in_range.png

diff --git a/core/res/res/drawable-hdpi/stat_notify_wifi_in_range.png b/core/res/res/drawable-hdpi/stat_notify_wifi_in_range.png
new file mode 100644
index 0000000..712e071
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_notify_wifi_in_range.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_0.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_0.png b/core/res/res/drawable-hdpi/stat_sys_battery_0.png
new file mode 100644
index 0000000..171b8b5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_0.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_10.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_10.png b/core/res/res/drawable-hdpi/stat_sys_battery_10.png
new file mode 100644
index 0000000..77e8793
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_10.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_100.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_100.png b/core/res/res/drawable-hdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..d13d083
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_100.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_20.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_20.png b/core/res/res/drawable-hdpi/stat_sys_battery_20.png
new file mode 100644
index 0000000..c14dc07
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_20.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_40.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_40.png b/core/res/res/drawable-hdpi/stat_sys_battery_40.png
new file mode 100644
index 0000000..a3077b0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_40.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_60.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_60.png b/core/res/res/drawable-hdpi/stat_sys_battery_60.png
new file mode 100644
index 0000000..621e905
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_60.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_80.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_80.png b/core/res/res/drawable-hdpi/stat_sys_battery_80.png
new file mode 100644
index 0000000..29830e9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_80.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_charge_anim0.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim0.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim0.png
new file mode 100644
index 0000000..61556c6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim0.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_charge_anim1.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim1.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim1.png
new file mode 100644
index 0000000..985dc0f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim1.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_charge_anim2.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim2.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim2.png
new file mode 100644
index 0000000..b319d07
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim2.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_charge_anim3.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim3.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim3.png
new file mode 100644
index 0000000..cbf21c6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim3.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_charge_anim4.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim4.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim4.png
new file mode 100644
index 0000000..51565c3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim4.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_charge_anim5.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim5.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim5.png
new file mode 100644
index 0000000..bf41a89
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim5.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_battery_unknown.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_unknown.png b/core/res/res/drawable-hdpi/stat_sys_battery_unknown.png
new file mode 100644
index 0000000..8c5daba
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_battery_unknown.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_bluetooth.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_bluetooth.png b/core/res/res/drawable-hdpi/stat_sys_data_bluetooth.png
new file mode 100644
index 0000000..7cf5962
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_bluetooth.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png b/core/res/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png
new file mode 100644
index 0000000..3e3f4f0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_connected_3g.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_connected_3g.png b/core/res/res/drawable-hdpi/stat_sys_data_connected_3g.png
new file mode 100644
index 0000000..42af121
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_connected_3g.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_connected_e.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_connected_e.png b/core/res/res/drawable-hdpi/stat_sys_data_connected_e.png
new file mode 100644
index 0000000..6106dd4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_connected_e.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_connected_g.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_connected_g.png b/core/res/res/drawable-hdpi/stat_sys_data_connected_g.png
new file mode 100644
index 0000000..cc6e2849
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_connected_g.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_in_3g.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_in_3g.png b/core/res/res/drawable-hdpi/stat_sys_data_in_3g.png
new file mode 100644
index 0000000..5848981
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_in_3g.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_in_e.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_in_e.png b/core/res/res/drawable-hdpi/stat_sys_data_in_e.png
new file mode 100644
index 0000000..e4c6c2b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_in_e.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_in_g.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_in_g.png b/core/res/res/drawable-hdpi/stat_sys_data_in_g.png
new file mode 100644
index 0000000..05a910b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_in_g.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_inandout_3g.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_inandout_3g.png b/core/res/res/drawable-hdpi/stat_sys_data_inandout_3g.png
new file mode 100644
index 0000000..b4383e2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_inandout_3g.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_inandout_e.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_inandout_e.png b/core/res/res/drawable-hdpi/stat_sys_data_inandout_e.png
new file mode 100644
index 0000000..78b04db
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_inandout_e.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_inandout_g.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_inandout_g.png b/core/res/res/drawable-hdpi/stat_sys_data_inandout_g.png
new file mode 100644
index 0000000..9475159
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_inandout_g.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_out_3g.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_out_3g.png b/core/res/res/drawable-hdpi/stat_sys_data_out_3g.png
new file mode 100644
index 0000000..2f49d60
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_out_3g.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_out_e.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_out_e.png b/core/res/res/drawable-hdpi/stat_sys_data_out_e.png
new file mode 100644
index 0000000..433fa8d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_out_e.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_out_g.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_out_g.png b/core/res/res/drawable-hdpi/stat_sys_data_out_g.png
new file mode 100644
index 0000000..eb43a91
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_out_g.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_data_usb.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_data_usb.png b/core/res/res/drawable-hdpi/stat_sys_data_usb.png
new file mode 100644
index 0000000..7a83544
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_data_usb.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_download_anim0.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_download_anim0.png b/core/res/res/drawable-hdpi/stat_sys_download_anim0.png
new file mode 100644
index 0000000..a907d79
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_download_anim0.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_download_anim1.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_download_anim1.png b/core/res/res/drawable-hdpi/stat_sys_download_anim1.png
new file mode 100644
index 0000000..e9f42ad
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_download_anim1.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_download_anim2.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_download_anim2.png b/core/res/res/drawable-hdpi/stat_sys_download_anim2.png
new file mode 100644
index 0000000..d1682e0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_download_anim2.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_download_anim3.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_download_anim3.png b/core/res/res/drawable-hdpi/stat_sys_download_anim3.png
new file mode 100644
index 0000000..70e757b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_download_anim3.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_download_anim4.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_download_anim4.png b/core/res/res/drawable-hdpi/stat_sys_download_anim4.png
new file mode 100644
index 0000000..3b2d7d1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_download_anim4.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_download_anim5.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_download_anim5.png b/core/res/res/drawable-hdpi/stat_sys_download_anim5.png
new file mode 100644
index 0000000..ced2bb2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_download_anim5.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_gps_acquiring.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_gps_acquiring.png b/core/res/res/drawable-hdpi/stat_sys_gps_acquiring.png
new file mode 100644
index 0000000..fe7b2cc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_gps_acquiring.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_gps_on.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_gps_on.png b/core/res/res/drawable-hdpi/stat_sys_gps_on.png
new file mode 100644
index 0000000..6ab4720
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_gps_on.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_headset.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_headset.png b/core/res/res/drawable-hdpi/stat_sys_headset.png
new file mode 100644
index 0000000..7a70aea
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_headset.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_no_sim.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_no_sim.png b/core/res/res/drawable-hdpi/stat_sys_no_sim.png
new file mode 100644
index 0000000..48d1ca3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_no_sim.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_phone_call.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_phone_call.png b/core/res/res/drawable-hdpi/stat_sys_phone_call.png
new file mode 100644
index 0000000..0aa15d6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_phone_call.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_phone_call_bluetooth.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_phone_call_bluetooth.png b/core/res/res/drawable-hdpi/stat_sys_phone_call_bluetooth.png
new file mode 100644
index 0000000..a143f87
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_phone_call_bluetooth.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_phone_call_forward.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_phone_call_forward.png b/core/res/res/drawable-hdpi/stat_sys_phone_call_forward.png
new file mode 100644
index 0000000..b1ab8ac
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_phone_call_forward.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_phone_call_on_hold.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_phone_call_on_hold.png b/core/res/res/drawable-hdpi/stat_sys_phone_call_on_hold.png
new file mode 100644
index 0000000..b881a67
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_phone_call_on_hold.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_0.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_0.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_0.png
new file mode 100644
index 0000000..938cca7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_0.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_0_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_0_cdma.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_0_cdma.png
new file mode 100644
index 0000000..5ddd177
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_0_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_1.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_1.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_1.png
new file mode 100644
index 0000000..6f82aa9
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_1.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_1_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_1_cdma.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_1_cdma.png
new file mode 100644
index 0000000..fa4265c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_1_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_2.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_2.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_2.png
new file mode 100644
index 0000000..db9752a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_2.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_2_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_2_cdma.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_2_cdma.png
new file mode 100644
index 0000000..c99af17
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_2_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_3.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_3.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_3.png
new file mode 100644
index 0000000..70594e5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_3.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_3_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_3_cdma.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_3_cdma.png
new file mode 100644
index 0000000..5e0235f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_3_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_4.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_4.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_4.png
new file mode 100644
index 0000000..d361263
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_4.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_r_signal_4_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_4_cdma.png b/core/res/res/drawable-hdpi/stat_sys_r_signal_4_cdma.png
new file mode 100644
index 0000000..8b110a3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_r_signal_4_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_ra_signal_0_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_ra_signal_0_cdma.png b/core/res/res/drawable-hdpi/stat_sys_ra_signal_0_cdma.png
new file mode 100644
index 0000000..84b9f94
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_ra_signal_0_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_ra_signal_1_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_ra_signal_1_cdma.png b/core/res/res/drawable-hdpi/stat_sys_ra_signal_1_cdma.png
new file mode 100644
index 0000000..657b572
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_ra_signal_1_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_ra_signal_2_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_ra_signal_2_cdma.png b/core/res/res/drawable-hdpi/stat_sys_ra_signal_2_cdma.png
new file mode 100644
index 0000000..236d44e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_ra_signal_2_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_ra_signal_3_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_ra_signal_3_cdma.png b/core/res/res/drawable-hdpi/stat_sys_ra_signal_3_cdma.png
new file mode 100644
index 0000000..e140735
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_ra_signal_3_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_ra_signal_4_cdma.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_ra_signal_4_cdma.png b/core/res/res/drawable-hdpi/stat_sys_ra_signal_4_cdma.png
new file mode 100644
index 0000000..0e4f854
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_ra_signal_4_cdma.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_ringer_silent.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_ringer_silent.png b/core/res/res/drawable-hdpi/stat_sys_ringer_silent.png
new file mode 100644
index 0000000..d5c301c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_ringer_silent.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_ringer_vibrate.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_ringer_vibrate.png b/core/res/res/drawable-hdpi/stat_sys_ringer_vibrate.png
new file mode 100644
index 0000000..21c1c08
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_ringer_vibrate.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_roaming_cdma_0.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_0.png b/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_0.png
new file mode 100644
index 0000000..f7f5757
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_0.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png b/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png
new file mode 100644
index 0000000..5f01083
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png b/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png
new file mode 100644
index 0000000..f7f5757
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_signal_0.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_0.png b/core/res/res/drawable-hdpi/stat_sys_signal_0.png
new file mode 100644
index 0000000..83ef6a3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_signal_0.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_signal_1.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_1.png b/core/res/res/drawable-hdpi/stat_sys_signal_1.png
new file mode 100644
index 0000000..a1ca717
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_signal_1.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_signal_2.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_2.png b/core/res/res/drawable-hdpi/stat_sys_signal_2.png
new file mode 100644
index 0000000..a478bd0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_signal_2.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_signal_3.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_3.png b/core/res/res/drawable-hdpi/stat_sys_signal_3.png
new file mode 100644
index 0000000..a3978de
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_signal_3.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_signal_4.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_4.png b/core/res/res/drawable-hdpi/stat_sys_signal_4.png
new file mode 100644
index 0000000..1b553e8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_signal_4.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_signal_flightmode.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_flightmode.png b/core/res/res/drawable-hdpi/stat_sys_signal_flightmode.png
new file mode 100644
index 0000000..6ee35fb
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_signal_flightmode.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_signal_null.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_null.png b/core/res/res/drawable-hdpi/stat_sys_signal_null.png
new file mode 100644
index 0000000..6b103f5
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_signal_null.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_speakerphone.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_speakerphone.png b/core/res/res/drawable-hdpi/stat_sys_speakerphone.png
new file mode 100644
index 0000000..62eadb3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_speakerphone.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_tty_mode.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_tty_mode.png b/core/res/res/drawable-hdpi/stat_sys_tty_mode.png
new file mode 100644
index 0000000..4e161c6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_tty_mode.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_upload_anim0.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_upload_anim0.png b/core/res/res/drawable-hdpi/stat_sys_upload_anim0.png
new file mode 100644
index 0000000..4b7e942
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_upload_anim0.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_upload_anim1.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_upload_anim1.png b/core/res/res/drawable-hdpi/stat_sys_upload_anim1.png
new file mode 100644
index 0000000..a416350
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_upload_anim1.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_upload_anim2.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_upload_anim2.png b/core/res/res/drawable-hdpi/stat_sys_upload_anim2.png
new file mode 100644
index 0000000..8d199dd
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_upload_anim2.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_upload_anim3.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_upload_anim3.png b/core/res/res/drawable-hdpi/stat_sys_upload_anim3.png
new file mode 100644
index 0000000..dfef071
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_upload_anim3.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_upload_anim4.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_upload_anim4.png b/core/res/res/drawable-hdpi/stat_sys_upload_anim4.png
new file mode 100644
index 0000000..abe56f1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_upload_anim4.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_upload_anim5.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_upload_anim5.png b/core/res/res/drawable-hdpi/stat_sys_upload_anim5.png
new file mode 100644
index 0000000..1e917c1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_upload_anim5.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_vp_phone_call.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_vp_phone_call.png b/core/res/res/drawable-hdpi/stat_sys_vp_phone_call.png
new file mode 100644
index 0000000..d6b25d2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_vp_phone_call.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_vp_phone_call_bluetooth.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_vp_phone_call_bluetooth.png b/core/res/res/drawable-hdpi/stat_sys_vp_phone_call_bluetooth.png
new file mode 100644
index 0000000..a143f87
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_vp_phone_call_bluetooth.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_vp_phone_call_on_hold.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_vp_phone_call_on_hold.png b/core/res/res/drawable-hdpi/stat_sys_vp_phone_call_on_hold.png
new file mode 100644
index 0000000..53608cf
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_vp_phone_call_on_hold.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_warning.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_warning.png b/core/res/res/drawable-hdpi/stat_sys_warning.png
new file mode 100644
index 0000000..8f7bd5d
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_warning.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_wifi_signal_0.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_0.png b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_0.png
new file mode 100644
index 0000000..9a0aa21
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_0.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_wifi_signal_1.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_1.png b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_1.png
new file mode 100644
index 0000000..39db490
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_1.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_wifi_signal_2.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_2.png b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_2.png
new file mode 100644
index 0000000..5c0ae76
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_2.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_wifi_signal_3.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_3.png b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_3.png
new file mode 100644
index 0000000..f7e0b38
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_3.png
Binary files differ

core/res/res/drawable-hdpi/stat_sys_wifi_signal_4.png

diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_4.png b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_4.png
new file mode 100644
index 0000000..5ad5d12
--- /dev/null
+++ b/core/res/res/drawable-hdpi/stat_sys_wifi_signal_4.png
Binary files differ

core/res/res/drawable-hdpi/status_bar_background.png

diff --git a/core/res/res/drawable-hdpi/status_bar_background.png b/core/res/res/drawable-hdpi/status_bar_background.png
new file mode 100644
index 0000000..e6a865a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/status_bar_background.png
Binary files differ

core/res/res/drawable-hdpi/status_bar_close_on.9.png

diff --git a/core/res/res/drawable-hdpi/status_bar_close_on.9.png b/core/res/res/drawable-hdpi/status_bar_close_on.9.png
new file mode 100644
index 0000000..5acf638
--- /dev/null
+++ b/core/res/res/drawable-hdpi/status_bar_close_on.9.png
Binary files differ

core/res/res/drawable-hdpi/status_bar_header_background.9.png

diff --git a/core/res/res/drawable-hdpi/status_bar_header_background.9.png b/core/res/res/drawable-hdpi/status_bar_header_background.9.png
new file mode 100644
index 0000000..be36ff2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/status_bar_header_background.9.png
Binary files differ

core/res/res/drawable-hdpi/status_bar_item_app_background_normal.9.png

diff --git a/core/res/res/drawable-hdpi/status_bar_item_app_background_normal.9.png b/core/res/res/drawable-hdpi/status_bar_item_app_background_normal.9.png
new file mode 100644
index 0000000..4fbfa4f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/status_bar_item_app_background_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/status_bar_item_background_focus.9.png

diff --git a/core/res/res/drawable-hdpi/status_bar_item_background_focus.9.png b/core/res/res/drawable-hdpi/status_bar_item_background_focus.9.png
new file mode 100644
index 0000000..0876bc6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/status_bar_item_background_focus.9.png
Binary files differ

core/res/res/drawable-hdpi/status_bar_item_background_normal.9.png

diff --git a/core/res/res/drawable-hdpi/status_bar_item_background_normal.9.png b/core/res/res/drawable-hdpi/status_bar_item_background_normal.9.png
new file mode 100644
index 0000000..c01c018
--- /dev/null
+++ b/core/res/res/drawable-hdpi/status_bar_item_background_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/status_bar_item_background_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/status_bar_item_background_pressed.9.png b/core/res/res/drawable-hdpi/status_bar_item_background_pressed.9.png
new file mode 100644
index 0000000..343e4ca
--- /dev/null
+++ b/core/res/res/drawable-hdpi/status_bar_item_background_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/statusbar_background.png

diff --git a/core/res/res/drawable-hdpi/statusbar_background.png b/core/res/res/drawable-hdpi/statusbar_background.png
new file mode 100644
index 0000000..c2b3a5e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/statusbar_background.png
Binary files differ

core/res/res/drawable-hdpi/submenu_arrow_nofocus.png

diff --git a/core/res/res/drawable-hdpi/submenu_arrow_nofocus.png b/core/res/res/drawable-hdpi/submenu_arrow_nofocus.png
new file mode 100644
index 0000000..afc0891
--- /dev/null
+++ b/core/res/res/drawable-hdpi/submenu_arrow_nofocus.png
Binary files differ

core/res/res/drawable-hdpi/sym_action_add.png

diff --git a/core/res/res/drawable-hdpi/sym_action_add.png b/core/res/res/drawable-hdpi/sym_action_add.png
new file mode 100644
index 0000000..6e028b2
--- /dev/null
+++ b/core/res/res/drawable-hdpi/sym_action_add.png
Binary files differ

core/res/res/drawable-hdpi/sym_action_call.png

diff --git a/core/res/res/drawable-hdpi/sym_action_call.png b/core/res/res/drawable-hdpi/sym_action_call.png
new file mode 100644
index 0000000..105f7d0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/sym_action_call.png
Binary files differ

core/res/res/drawable-hdpi/sym_action_chat.png

diff --git a/core/res/res/drawable-hdpi/sym_action_chat.png b/core/res/res/drawable-hdpi/sym_action_chat.png
new file mode 100644
index 0000000..7fd34f0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/sym_action_chat.png
Binary files differ

core/res/res/drawable-hdpi/sym_action_email.png

diff --git a/core/res/res/drawable-hdpi/sym_action_email.png b/core/res/res/drawable-hdpi/sym_action_email.png
new file mode 100644
index 0000000..1d933e4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/sym_action_email.png
Binary files differ

core/res/res/drawable-hdpi/sym_call_incoming.png

diff --git a/core/res/res/drawable-hdpi/sym_call_incoming.png b/core/res/res/drawable-hdpi/sym_call_incoming.png
new file mode 100644
index 0000000..83c75dc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/sym_call_incoming.png
Binary files differ

core/res/res/drawable-hdpi/sym_call_missed.png

diff --git a/core/res/res/drawable-hdpi/sym_call_missed.png b/core/res/res/drawable-hdpi/sym_call_missed.png
new file mode 100644
index 0000000..abcbbbf
--- /dev/null
+++ b/core/res/res/drawable-hdpi/sym_call_missed.png
Binary files differ

core/res/res/drawable-hdpi/sym_call_outgoing.png

diff --git a/core/res/res/drawable-hdpi/sym_call_outgoing.png b/core/res/res/drawable-hdpi/sym_call_outgoing.png
new file mode 100644
index 0000000..6cb8653
--- /dev/null
+++ b/core/res/res/drawable-hdpi/sym_call_outgoing.png
Binary files differ

core/res/res/drawable-hdpi/sym_contact_card.png

diff --git a/core/res/res/drawable-hdpi/sym_contact_card.png b/core/res/res/drawable-hdpi/sym_contact_card.png
new file mode 100644
index 0000000..fe9c751
--- /dev/null
+++ b/core/res/res/drawable-hdpi/sym_contact_card.png
Binary files differ

core/res/res/drawable-hdpi/sym_def_app_icon.png

diff --git a/core/res/res/drawable-hdpi/sym_def_app_icon.png b/core/res/res/drawable-hdpi/sym_def_app_icon.png
new file mode 100644
index 0000000..4b5384f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/sym_def_app_icon.png
Binary files differ

core/res/res/drawable-hdpi/tab_focus.9.png

diff --git a/core/res/res/drawable-hdpi/tab_focus.9.png b/core/res/res/drawable-hdpi/tab_focus.9.png
new file mode 100644
index 0000000..0c3a9ee
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_focus.9.png
Binary files differ

core/res/res/drawable-hdpi/tab_focus_bar_left.9.png

diff --git a/core/res/res/drawable-hdpi/tab_focus_bar_left.9.png b/core/res/res/drawable-hdpi/tab_focus_bar_left.9.png
new file mode 100644
index 0000000..54e3022
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_focus_bar_left.9.png
Binary files differ

core/res/res/drawable-hdpi/tab_focus_bar_right.9.png

diff --git a/core/res/res/drawable-hdpi/tab_focus_bar_right.9.png b/core/res/res/drawable-hdpi/tab_focus_bar_right.9.png
new file mode 100644
index 0000000..34a85f0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_focus_bar_right.9.png
Binary files differ

core/res/res/drawable-hdpi/tab_press.9.png

diff --git a/core/res/res/drawable-hdpi/tab_press.9.png b/core/res/res/drawable-hdpi/tab_press.9.png
new file mode 100644
index 0000000..6b3c1c7
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_press.9.png
Binary files differ

core/res/res/drawable-hdpi/tab_press_bar_left.9.png

diff --git a/core/res/res/drawable-hdpi/tab_press_bar_left.9.png b/core/res/res/drawable-hdpi/tab_press_bar_left.9.png
new file mode 100644
index 0000000..f998532
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_press_bar_left.9.png
Binary files differ

core/res/res/drawable-hdpi/tab_press_bar_right.9.png

diff --git a/core/res/res/drawable-hdpi/tab_press_bar_right.9.png b/core/res/res/drawable-hdpi/tab_press_bar_right.9.png
new file mode 100644
index 0000000..43515bd
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_press_bar_right.9.png
Binary files differ

core/res/res/drawable-hdpi/tab_selected.9.png

diff --git a/core/res/res/drawable-hdpi/tab_selected.9.png b/core/res/res/drawable-hdpi/tab_selected.9.png
new file mode 100644
index 0000000..b128b48
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/tab_selected_bar_left.9.png

diff --git a/core/res/res/drawable-hdpi/tab_selected_bar_left.9.png b/core/res/res/drawable-hdpi/tab_selected_bar_left.9.png
new file mode 100644
index 0000000..a49ef68
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_selected_bar_left.9.png
Binary files differ

core/res/res/drawable-hdpi/tab_selected_bar_right.9.png

diff --git a/core/res/res/drawable-hdpi/tab_selected_bar_right.9.png b/core/res/res/drawable-hdpi/tab_selected_bar_right.9.png
new file mode 100644
index 0000000..472f839
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_selected_bar_right.9.png
Binary files differ

core/res/res/drawable-hdpi/tab_unselected.9.png

diff --git a/core/res/res/drawable-hdpi/tab_unselected.9.png b/core/res/res/drawable-hdpi/tab_unselected.9.png
new file mode 100644
index 0000000..ed9e311
--- /dev/null
+++ b/core/res/res/drawable-hdpi/tab_unselected.9.png
Binary files differ

core/res/res/drawable-hdpi/textfield_default.9.png

diff --git a/core/res/res/drawable-hdpi/textfield_default.9.png b/core/res/res/drawable-hdpi/textfield_default.9.png
new file mode 100644
index 0000000..a2f022a
--- /dev/null
+++ b/core/res/res/drawable-hdpi/textfield_default.9.png
Binary files differ

core/res/res/drawable-hdpi/textfield_disabled.9.png

diff --git a/core/res/res/drawable-hdpi/textfield_disabled.9.png b/core/res/res/drawable-hdpi/textfield_disabled.9.png
new file mode 100644
index 0000000..6a28cb4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/textfield_disabled.9.png
Binary files differ

core/res/res/drawable-hdpi/textfield_disabled_selected.9.png

diff --git a/core/res/res/drawable-hdpi/textfield_disabled_selected.9.png b/core/res/res/drawable-hdpi/textfield_disabled_selected.9.png
new file mode 100644
index 0000000..0de9cda
--- /dev/null
+++ b/core/res/res/drawable-hdpi/textfield_disabled_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/textfield_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/textfield_pressed.9.png b/core/res/res/drawable-hdpi/textfield_pressed.9.png
new file mode 100644
index 0000000..d5892c8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/textfield_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/textfield_search_default.9.png

diff --git a/core/res/res/drawable-hdpi/textfield_search_default.9.png b/core/res/res/drawable-hdpi/textfield_search_default.9.png
new file mode 100644
index 0000000..db64da1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/textfield_search_default.9.png
Binary files differ

core/res/res/drawable-hdpi/textfield_search_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/textfield_search_pressed.9.png b/core/res/res/drawable-hdpi/textfield_search_pressed.9.png
new file mode 100644
index 0000000..cde51e4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/textfield_search_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/textfield_search_selected.9.png

diff --git a/core/res/res/drawable-hdpi/textfield_search_selected.9.png b/core/res/res/drawable-hdpi/textfield_search_selected.9.png
new file mode 100644
index 0000000..f4bf352
--- /dev/null
+++ b/core/res/res/drawable-hdpi/textfield_search_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/textfield_selected.9.png

diff --git a/core/res/res/drawable-hdpi/textfield_selected.9.png b/core/res/res/drawable-hdpi/textfield_selected.9.png
new file mode 100644
index 0000000..7a072dd
--- /dev/null
+++ b/core/res/res/drawable-hdpi/textfield_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_down_disabled.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled.9.png b/core/res/res/drawable-hdpi/timepicker_down_disabled.9.png
new file mode 100644
index 0000000..73b6915
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_down_disabled.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_down_disabled_focused.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_focused.9.png b/core/res/res/drawable-hdpi/timepicker_down_disabled_focused.9.png
new file mode 100644
index 0000000..046e60f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_down_disabled_focused.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_down_normal.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_down_normal.9.png b/core/res/res/drawable-hdpi/timepicker_down_normal.9.png
new file mode 100644
index 0000000..9baf7cc
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_down_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_down_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_down_pressed.9.png b/core/res/res/drawable-hdpi/timepicker_down_pressed.9.png
new file mode 100644
index 0000000..d95fdd3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_down_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_down_selected.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_down_selected.9.png b/core/res/res/drawable-hdpi/timepicker_down_selected.9.png
new file mode 100644
index 0000000..a84448f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_down_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_input_disabled.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_input_disabled.9.png b/core/res/res/drawable-hdpi/timepicker_input_disabled.9.png
new file mode 100644
index 0000000..aa17a98
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_input_disabled.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_input_normal.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_input_normal.9.png b/core/res/res/drawable-hdpi/timepicker_input_normal.9.png
new file mode 100644
index 0000000..be78a58
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_input_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_input_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_input_pressed.9.png b/core/res/res/drawable-hdpi/timepicker_input_pressed.9.png
new file mode 100644
index 0000000..b28f66c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_input_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_input_selected.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_input_selected.9.png b/core/res/res/drawable-hdpi/timepicker_input_selected.9.png
new file mode 100644
index 0000000..2e175e8
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_input_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_up_disabled.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled.9.png b/core/res/res/drawable-hdpi/timepicker_up_disabled.9.png
new file mode 100644
index 0000000..348e48c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_up_disabled.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_up_disabled_focused.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_focused.9.png b/core/res/res/drawable-hdpi/timepicker_up_disabled_focused.9.png
new file mode 100644
index 0000000..93cf3a0
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_up_disabled_focused.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_up_normal.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_up_normal.9.png b/core/res/res/drawable-hdpi/timepicker_up_normal.9.png
new file mode 100644
index 0000000..b4acced
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_up_normal.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_up_pressed.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_up_pressed.9.png b/core/res/res/drawable-hdpi/timepicker_up_pressed.9.png
new file mode 100644
index 0000000..bd29510
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_up_pressed.9.png
Binary files differ

core/res/res/drawable-hdpi/timepicker_up_selected.9.png

diff --git a/core/res/res/drawable-hdpi/timepicker_up_selected.9.png b/core/res/res/drawable-hdpi/timepicker_up_selected.9.png
new file mode 100644
index 0000000..a666998
--- /dev/null
+++ b/core/res/res/drawable-hdpi/timepicker_up_selected.9.png
Binary files differ

core/res/res/drawable-hdpi/title_bar_portrait.9.png

diff --git a/core/res/res/drawable-hdpi/title_bar_portrait.9.png b/core/res/res/drawable-hdpi/title_bar_portrait.9.png
new file mode 100644
index 0000000..161432f
--- /dev/null
+++ b/core/res/res/drawable-hdpi/title_bar_portrait.9.png
Binary files differ

core/res/res/drawable-hdpi/title_bar_shadow.9.png

diff --git a/core/res/res/drawable-hdpi/title_bar_shadow.9.png b/core/res/res/drawable-hdpi/title_bar_shadow.9.png
new file mode 100644
index 0000000..e67f457
--- /dev/null
+++ b/core/res/res/drawable-hdpi/title_bar_shadow.9.png
Binary files differ

core/res/res/drawable-hdpi/title_bar_tall.png

diff --git a/core/res/res/drawable-hdpi/title_bar_tall.png b/core/res/res/drawable-hdpi/title_bar_tall.png
new file mode 100644
index 0000000..f177440
--- /dev/null
+++ b/core/res/res/drawable-hdpi/title_bar_tall.png
Binary files differ

core/res/res/drawable-hdpi/toast_frame.9.png

diff --git a/core/res/res/drawable-hdpi/toast_frame.9.png b/core/res/res/drawable-hdpi/toast_frame.9.png
new file mode 100644
index 0000000..8f5d811
--- /dev/null
+++ b/core/res/res/drawable-hdpi/toast_frame.9.png
Binary files differ

core/res/res/drawable-hdpi/unknown_image.png

diff --git a/core/res/res/drawable-hdpi/unknown_image.png b/core/res/res/drawable-hdpi/unknown_image.png
new file mode 100644
index 0000000..76341db
--- /dev/null
+++ b/core/res/res/drawable-hdpi/unknown_image.png
Binary files differ

core/res/res/drawable-hdpi/zoom_plate.9.png

diff --git a/core/res/res/drawable-hdpi/zoom_plate.9.png b/core/res/res/drawable-hdpi/zoom_plate.9.png
new file mode 100644
index 0000000..e97dac1
--- /dev/null
+++ b/core/res/res/drawable-hdpi/zoom_plate.9.png
Binary files differ

core/res/res/drawable-land-hdpi/statusbar_background.png

diff --git a/core/res/res/drawable-land-hdpi/statusbar_background.png b/core/res/res/drawable-land-hdpi/statusbar_background.png
new file mode 100644
index 0000000..4a955c5
--- /dev/null
+++ b/core/res/res/drawable-land-hdpi/statusbar_background.png
Binary files differ

core/res/res/drawable-land-hdpi/title_bar_tall.png

diff --git a/core/res/res/drawable-land-hdpi/title_bar_tall.png b/core/res/res/drawable-land-hdpi/title_bar_tall.png
new file mode 100644
index 0000000..96b5ffe
--- /dev/null
+++ b/core/res/res/drawable-land-hdpi/title_bar_tall.png
Binary files differ

core/res/res/drawable-land-mdpi/statusbar_background.png

diff --git a/core/res/res/drawable-land/statusbar_background.png b/core/res/res/drawable-land-mdpi/statusbar_background.png
similarity index 100%
rename from core/res/res/drawable-land/statusbar_background.png
rename to core/res/res/drawable-land-mdpi/statusbar_background.png
Binary files differ

core/res/res/drawable-land-mdpi/title_bar_tall.png

diff --git a/core/res/res/drawable-land/title_bar_tall.png b/core/res/res/drawable-land-mdpi/title_bar_tall.png
similarity index 100%
rename from core/res/res/drawable-land/title_bar_tall.png
rename to core/res/res/drawable-land-mdpi/title_bar_tall.png
Binary files differ

core/res/res/drawable-mdpi/activity_title_bar.9.png

diff --git a/core/res/res/drawable/activity_title_bar.9.png b/core/res/res/drawable-mdpi/activity_title_bar.9.png
similarity index 100%
rename from core/res/res/drawable/activity_title_bar.9.png
rename to core/res/res/drawable-mdpi/activity_title_bar.9.png
Binary files differ

core/res/res/drawable-mdpi/arrow_down_float.png

diff --git a/core/res/res/drawable/arrow_down_float.png b/core/res/res/drawable-mdpi/arrow_down_float.png
similarity index 100%
rename from core/res/res/drawable/arrow_down_float.png
rename to core/res/res/drawable-mdpi/arrow_down_float.png
Binary files differ

core/res/res/drawable-mdpi/arrow_up_float.png

diff --git a/core/res/res/drawable/arrow_up_float.png b/core/res/res/drawable-mdpi/arrow_up_float.png
similarity index 100%
rename from core/res/res/drawable/arrow_up_float.png
rename to core/res/res/drawable-mdpi/arrow_up_float.png
Binary files differ

core/res/res/drawable-mdpi/battery_charge_background.png

diff --git a/core/res/res/drawable/battery_charge_background.png b/core/res/res/drawable-mdpi/battery_charge_background.png
similarity index 100%
rename from core/res/res/drawable/battery_charge_background.png
rename to core/res/res/drawable-mdpi/battery_charge_background.png
Binary files differ

core/res/res/drawable-mdpi/battery_charge_fill_empty.9.png

diff --git a/core/res/res/drawable/battery_charge_fill_empty.9.png b/core/res/res/drawable-mdpi/battery_charge_fill_empty.9.png
similarity index 100%
rename from core/res/res/drawable/battery_charge_fill_empty.9.png
rename to core/res/res/drawable-mdpi/battery_charge_fill_empty.9.png
Binary files differ

core/res/res/drawable-mdpi/battery_charge_fill_full.9.png

diff --git a/core/res/res/drawable/battery_charge_fill_full.9.png b/core/res/res/drawable-mdpi/battery_charge_fill_full.9.png
similarity index 100%
rename from core/res/res/drawable/battery_charge_fill_full.9.png
rename to core/res/res/drawable-mdpi/battery_charge_fill_full.9.png
Binary files differ

core/res/res/drawable-mdpi/battery_charge_fill_warning.9.png

diff --git a/core/res/res/drawable/battery_charge_fill_warning.9.png b/core/res/res/drawable-mdpi/battery_charge_fill_warning.9.png
similarity index 100%
rename from core/res/res/drawable/battery_charge_fill_warning.9.png
rename to core/res/res/drawable-mdpi/battery_charge_fill_warning.9.png
Binary files differ

core/res/res/drawable-mdpi/battery_low_battery.png

diff --git a/core/res/res/drawable/battery_low_battery.png b/core/res/res/drawable-mdpi/battery_low_battery.png
similarity index 100%
rename from core/res/res/drawable/battery_low_battery.png
rename to core/res/res/drawable-mdpi/battery_low_battery.png
Binary files differ

core/res/res/drawable-mdpi/blank_tile.png

diff --git a/core/res/res/drawable/blank_tile.png b/core/res/res/drawable-mdpi/blank_tile.png
similarity index 100%
rename from core/res/res/drawable/blank_tile.png
rename to core/res/res/drawable-mdpi/blank_tile.png
Binary files differ

core/res/res/drawable-mdpi/bottom_bar.png

diff --git a/core/res/res/drawable/bottom_bar.png b/core/res/res/drawable-mdpi/bottom_bar.png
similarity index 100%
rename from core/res/res/drawable/bottom_bar.png
rename to core/res/res/drawable-mdpi/bottom_bar.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_buttonless_off.png

diff --git a/core/res/res/drawable/btn_check_buttonless_off.png b/core/res/res/drawable-mdpi/btn_check_buttonless_off.png
similarity index 100%
rename from core/res/res/drawable/btn_check_buttonless_off.png
rename to core/res/res/drawable-mdpi/btn_check_buttonless_off.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_buttonless_on.png

diff --git a/core/res/res/drawable/btn_check_buttonless_on.png b/core/res/res/drawable-mdpi/btn_check_buttonless_on.png
similarity index 100%
rename from core/res/res/drawable/btn_check_buttonless_on.png
rename to core/res/res/drawable-mdpi/btn_check_buttonless_on.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_label_background.9.png

diff --git a/core/res/res/drawable/btn_check_label_background.9.png b/core/res/res/drawable-mdpi/btn_check_label_background.9.png
similarity index 100%
rename from core/res/res/drawable/btn_check_label_background.9.png
rename to core/res/res/drawable-mdpi/btn_check_label_background.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_off.png

diff --git a/core/res/res/drawable/btn_check_off.png b/core/res/res/drawable-mdpi/btn_check_off.png
similarity index 100%
rename from core/res/res/drawable/btn_check_off.png
rename to core/res/res/drawable-mdpi/btn_check_off.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_off_disable.png

diff --git a/core/res/res/drawable/btn_check_off_disable.png b/core/res/res/drawable-mdpi/btn_check_off_disable.png
similarity index 100%
rename from core/res/res/drawable/btn_check_off_disable.png
rename to core/res/res/drawable-mdpi/btn_check_off_disable.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_off_disable_focused.png

diff --git a/core/res/res/drawable/btn_check_off_disable_focused.png b/core/res/res/drawable-mdpi/btn_check_off_disable_focused.png
similarity index 100%
rename from core/res/res/drawable/btn_check_off_disable_focused.png
rename to core/res/res/drawable-mdpi/btn_check_off_disable_focused.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_off_pressed.png

diff --git a/core/res/res/drawable/btn_check_off_pressed.png b/core/res/res/drawable-mdpi/btn_check_off_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_check_off_pressed.png
rename to core/res/res/drawable-mdpi/btn_check_off_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_off_selected.png

diff --git a/core/res/res/drawable/btn_check_off_selected.png b/core/res/res/drawable-mdpi/btn_check_off_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_check_off_selected.png
rename to core/res/res/drawable-mdpi/btn_check_off_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_on.png

diff --git a/core/res/res/drawable/btn_check_on.png b/core/res/res/drawable-mdpi/btn_check_on.png
similarity index 100%
rename from core/res/res/drawable/btn_check_on.png
rename to core/res/res/drawable-mdpi/btn_check_on.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_on_disable.png

diff --git a/core/res/res/drawable/btn_check_on_disable.png b/core/res/res/drawable-mdpi/btn_check_on_disable.png
similarity index 100%
rename from core/res/res/drawable/btn_check_on_disable.png
rename to core/res/res/drawable-mdpi/btn_check_on_disable.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_on_disable_focused.png

diff --git a/core/res/res/drawable/btn_check_on_disable_focused.png b/core/res/res/drawable-mdpi/btn_check_on_disable_focused.png
similarity index 100%
rename from core/res/res/drawable/btn_check_on_disable_focused.png
rename to core/res/res/drawable-mdpi/btn_check_on_disable_focused.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_on_pressed.png

diff --git a/core/res/res/drawable/btn_check_on_pressed.png b/core/res/res/drawable-mdpi/btn_check_on_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_check_on_pressed.png
rename to core/res/res/drawable-mdpi/btn_check_on_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_check_on_selected.png

diff --git a/core/res/res/drawable/btn_check_on_selected.png b/core/res/res/drawable-mdpi/btn_check_on_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_check_on_selected.png
rename to core/res/res/drawable-mdpi/btn_check_on_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_circle_disable.png

diff --git a/core/res/res/drawable/btn_circle_disable.png b/core/res/res/drawable-mdpi/btn_circle_disable.png
similarity index 100%
rename from core/res/res/drawable/btn_circle_disable.png
rename to core/res/res/drawable-mdpi/btn_circle_disable.png
Binary files differ

core/res/res/drawable-mdpi/btn_circle_disable_focused.png

diff --git a/core/res/res/drawable/btn_circle_disable_focused.png b/core/res/res/drawable-mdpi/btn_circle_disable_focused.png
similarity index 100%
rename from core/res/res/drawable/btn_circle_disable_focused.png
rename to core/res/res/drawable-mdpi/btn_circle_disable_focused.png
Binary files differ

core/res/res/drawable-mdpi/btn_circle_normal.png

diff --git a/core/res/res/drawable/btn_circle_normal.png b/core/res/res/drawable-mdpi/btn_circle_normal.png
similarity index 100%
rename from core/res/res/drawable/btn_circle_normal.png
rename to core/res/res/drawable-mdpi/btn_circle_normal.png
Binary files differ

core/res/res/drawable-mdpi/btn_circle_pressed.png

diff --git a/core/res/res/drawable/btn_circle_pressed.png b/core/res/res/drawable-mdpi/btn_circle_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_circle_pressed.png
rename to core/res/res/drawable-mdpi/btn_circle_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_circle_selected.png

diff --git a/core/res/res/drawable/btn_circle_selected.png b/core/res/res/drawable-mdpi/btn_circle_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_circle_selected.png
rename to core/res/res/drawable-mdpi/btn_circle_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_close_normal.png

diff --git a/core/res/res/drawable/btn_close_normal.png b/core/res/res/drawable-mdpi/btn_close_normal.png
similarity index 100%
rename from core/res/res/drawable/btn_close_normal.png
rename to core/res/res/drawable-mdpi/btn_close_normal.png
Binary files differ

core/res/res/drawable-mdpi/btn_close_pressed.png

diff --git a/core/res/res/drawable/btn_close_pressed.png b/core/res/res/drawable-mdpi/btn_close_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_close_pressed.png
rename to core/res/res/drawable-mdpi/btn_close_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_code_lock_default.png

diff --git a/core/res/res/drawable/btn_code_lock_default.png b/core/res/res/drawable-mdpi/btn_code_lock_default.png
similarity index 100%
rename from core/res/res/drawable/btn_code_lock_default.png
rename to core/res/res/drawable-mdpi/btn_code_lock_default.png
Binary files differ

core/res/res/drawable-mdpi/btn_code_lock_touched.png

diff --git a/core/res/res/drawable/btn_code_lock_touched.png b/core/res/res/drawable-mdpi/btn_code_lock_touched.png
similarity index 100%
rename from core/res/res/drawable/btn_code_lock_touched.png
rename to core/res/res/drawable-mdpi/btn_code_lock_touched.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_normal.9.png

diff --git a/core/res/res/drawable/btn_default_normal.9.png b/core/res/res/drawable-mdpi/btn_default_normal.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_normal.9.png
rename to core/res/res/drawable-mdpi/btn_default_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_normal_disable.9.png

diff --git a/core/res/res/drawable/btn_default_normal_disable.9.png b/core/res/res/drawable-mdpi/btn_default_normal_disable.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_normal_disable.9.png
rename to core/res/res/drawable-mdpi/btn_default_normal_disable.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_normal_disable_focused.9.png

diff --git a/core/res/res/drawable/btn_default_normal_disable_focused.9.png b/core/res/res/drawable-mdpi/btn_default_normal_disable_focused.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_normal_disable_focused.9.png
rename to core/res/res/drawable-mdpi/btn_default_normal_disable_focused.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_pressed.9.png

diff --git a/core/res/res/drawable/btn_default_pressed.9.png b/core/res/res/drawable-mdpi/btn_default_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_default_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_selected.9.png

diff --git a/core/res/res/drawable/btn_default_selected.9.png b/core/res/res/drawable-mdpi/btn_default_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_selected.9.png
rename to core/res/res/drawable-mdpi/btn_default_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_small_normal.9.png

diff --git a/core/res/res/drawable/btn_default_small_normal.9.png b/core/res/res/drawable-mdpi/btn_default_small_normal.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_small_normal.9.png
rename to core/res/res/drawable-mdpi/btn_default_small_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_small_normal_disable.9.png

diff --git a/core/res/res/drawable/btn_default_small_normal_disable.9.png b/core/res/res/drawable-mdpi/btn_default_small_normal_disable.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_small_normal_disable.9.png
rename to core/res/res/drawable-mdpi/btn_default_small_normal_disable.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png

diff --git a/core/res/res/drawable/btn_default_small_normal_disable_focused.9.png b/core/res/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_small_normal_disable_focused.9.png
rename to core/res/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_small_pressed.9.png

diff --git a/core/res/res/drawable/btn_default_small_pressed.9.png b/core/res/res/drawable-mdpi/btn_default_small_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_small_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_default_small_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_default_small_selected.9.png

diff --git a/core/res/res/drawable/btn_default_small_selected.9.png b/core/res/res/drawable-mdpi/btn_default_small_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_default_small_selected.9.png
rename to core/res/res/drawable-mdpi/btn_default_small_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_dialog_disable.png

diff --git a/core/res/res/drawable/btn_dialog_disable.png b/core/res/res/drawable-mdpi/btn_dialog_disable.png
similarity index 100%
rename from core/res/res/drawable/btn_dialog_disable.png
rename to core/res/res/drawable-mdpi/btn_dialog_disable.png
Binary files differ

core/res/res/drawable-mdpi/btn_dialog_normal.png

diff --git a/core/res/res/drawable/btn_dialog_normal.png b/core/res/res/drawable-mdpi/btn_dialog_normal.png
similarity index 100%
rename from core/res/res/drawable/btn_dialog_normal.png
rename to core/res/res/drawable-mdpi/btn_dialog_normal.png
Binary files differ

core/res/res/drawable-mdpi/btn_dialog_pressed.png

diff --git a/core/res/res/drawable/btn_dialog_pressed.png b/core/res/res/drawable-mdpi/btn_dialog_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_dialog_pressed.png
rename to core/res/res/drawable-mdpi/btn_dialog_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_dialog_selected.png

diff --git a/core/res/res/drawable/btn_dialog_selected.png b/core/res/res/drawable-mdpi/btn_dialog_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_dialog_selected.png
rename to core/res/res/drawable-mdpi/btn_dialog_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_dropdown_normal.9.png

diff --git a/core/res/res/drawable/btn_dropdown_normal.9.png b/core/res/res/drawable-mdpi/btn_dropdown_normal.9.png
similarity index 100%
rename from core/res/res/drawable/btn_dropdown_normal.9.png
rename to core/res/res/drawable-mdpi/btn_dropdown_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_dropdown_pressed.9.png

diff --git a/core/res/res/drawable/btn_dropdown_pressed.9.png b/core/res/res/drawable-mdpi/btn_dropdown_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_dropdown_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_dropdown_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_dropdown_selected.9.png

diff --git a/core/res/res/drawable/btn_dropdown_selected.9.png b/core/res/res/drawable-mdpi/btn_dropdown_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_dropdown_selected.9.png
rename to core/res/res/drawable-mdpi/btn_dropdown_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_erase_default.9.png

diff --git a/core/res/res/drawable/btn_erase_default.9.png b/core/res/res/drawable-mdpi/btn_erase_default.9.png
similarity index 100%
rename from core/res/res/drawable/btn_erase_default.9.png
rename to core/res/res/drawable-mdpi/btn_erase_default.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_erase_pressed.9.png

diff --git a/core/res/res/drawable/btn_erase_pressed.9.png b/core/res/res/drawable-mdpi/btn_erase_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_erase_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_erase_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_erase_selected.9.png

diff --git a/core/res/res/drawable/btn_erase_selected.9.png b/core/res/res/drawable-mdpi/btn_erase_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_erase_selected.9.png
rename to core/res/res/drawable-mdpi/btn_erase_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_global_search_normal.9.png

diff --git a/core/res/res/drawable/btn_global_search_normal.9.png b/core/res/res/drawable-mdpi/btn_global_search_normal.9.png
similarity index 100%
rename from core/res/res/drawable/btn_global_search_normal.9.png
rename to core/res/res/drawable-mdpi/btn_global_search_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_keyboard_key_normal.9.png

diff --git a/core/res/res/drawable/btn_keyboard_key_normal.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_normal.9.png
similarity index 100%
rename from core/res/res/drawable/btn_keyboard_key_normal.9.png
rename to core/res/res/drawable-mdpi/btn_keyboard_key_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png

diff --git a/core/res/res/drawable/btn_keyboard_key_normal_off.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
similarity index 100%
rename from core/res/res/drawable/btn_keyboard_key_normal_off.9.png
rename to core/res/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png

diff --git a/core/res/res/drawable/btn_keyboard_key_normal_on.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
similarity index 100%
rename from core/res/res/drawable/btn_keyboard_key_normal_on.9.png
rename to core/res/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_keyboard_key_pressed.9.png

diff --git a/core/res/res/drawable/btn_keyboard_key_pressed.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_keyboard_key_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png

diff --git a/core/res/res/drawable/btn_keyboard_key_pressed_off.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
similarity index 100%
rename from core/res/res/drawable/btn_keyboard_key_pressed_off.9.png
rename to core/res/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png

diff --git a/core/res/res/drawable/btn_keyboard_key_pressed_on.9.png b/core/res/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
similarity index 100%
rename from core/res/res/drawable/btn_keyboard_key_pressed_on.9.png
rename to core/res/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_media_player.9.png

diff --git a/core/res/res/drawable/btn_media_player.9.png b/core/res/res/drawable-mdpi/btn_media_player.9.png
similarity index 100%
rename from core/res/res/drawable/btn_media_player.9.png
rename to core/res/res/drawable-mdpi/btn_media_player.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_media_player_disabled.9.png

diff --git a/core/res/res/drawable/btn_media_player_disabled.9.png b/core/res/res/drawable-mdpi/btn_media_player_disabled.9.png
similarity index 100%
rename from core/res/res/drawable/btn_media_player_disabled.9.png
rename to core/res/res/drawable-mdpi/btn_media_player_disabled.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_media_player_disabled_selected.9.png

diff --git a/core/res/res/drawable/btn_media_player_disabled_selected.9.png b/core/res/res/drawable-mdpi/btn_media_player_disabled_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_media_player_disabled_selected.9.png
rename to core/res/res/drawable-mdpi/btn_media_player_disabled_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_media_player_pressed.9.png

diff --git a/core/res/res/drawable/btn_media_player_pressed.9.png b/core/res/res/drawable-mdpi/btn_media_player_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_media_player_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_media_player_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_media_player_selected.9.png

diff --git a/core/res/res/drawable/btn_media_player_selected.9.png b/core/res/res/drawable-mdpi/btn_media_player_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_media_player_selected.9.png
rename to core/res/res/drawable-mdpi/btn_media_player_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_minus_default.png

diff --git a/core/res/res/drawable/btn_minus_default.png b/core/res/res/drawable-mdpi/btn_minus_default.png
similarity index 100%
rename from core/res/res/drawable/btn_minus_default.png
rename to core/res/res/drawable-mdpi/btn_minus_default.png
Binary files differ

core/res/res/drawable-mdpi/btn_minus_disable.png

diff --git a/core/res/res/drawable/btn_minus_disable.png b/core/res/res/drawable-mdpi/btn_minus_disable.png
similarity index 100%
rename from core/res/res/drawable/btn_minus_disable.png
rename to core/res/res/drawable-mdpi/btn_minus_disable.png
Binary files differ

core/res/res/drawable-mdpi/btn_minus_disable_focused.png

diff --git a/core/res/res/drawable/btn_minus_disable_focused.png b/core/res/res/drawable-mdpi/btn_minus_disable_focused.png
similarity index 100%
rename from core/res/res/drawable/btn_minus_disable_focused.png
rename to core/res/res/drawable-mdpi/btn_minus_disable_focused.png
Binary files differ

core/res/res/drawable-mdpi/btn_minus_pressed.png

diff --git a/core/res/res/drawable/btn_minus_pressed.png b/core/res/res/drawable-mdpi/btn_minus_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_minus_pressed.png
rename to core/res/res/drawable-mdpi/btn_minus_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_minus_selected.png

diff --git a/core/res/res/drawable/btn_minus_selected.png b/core/res/res/drawable-mdpi/btn_minus_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_minus_selected.png
rename to core/res/res/drawable-mdpi/btn_minus_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_plus_default.png

diff --git a/core/res/res/drawable/btn_plus_default.png b/core/res/res/drawable-mdpi/btn_plus_default.png
similarity index 100%
rename from core/res/res/drawable/btn_plus_default.png
rename to core/res/res/drawable-mdpi/btn_plus_default.png
Binary files differ

core/res/res/drawable-mdpi/btn_plus_disable.png

diff --git a/core/res/res/drawable/btn_plus_disable.png b/core/res/res/drawable-mdpi/btn_plus_disable.png
similarity index 100%
rename from core/res/res/drawable/btn_plus_disable.png
rename to core/res/res/drawable-mdpi/btn_plus_disable.png
Binary files differ

core/res/res/drawable-mdpi/btn_plus_disable_focused.png

diff --git a/core/res/res/drawable/btn_plus_disable_focused.png b/core/res/res/drawable-mdpi/btn_plus_disable_focused.png
similarity index 100%
rename from core/res/res/drawable/btn_plus_disable_focused.png
rename to core/res/res/drawable-mdpi/btn_plus_disable_focused.png
Binary files differ

core/res/res/drawable-mdpi/btn_plus_pressed.png

diff --git a/core/res/res/drawable/btn_plus_pressed.png b/core/res/res/drawable-mdpi/btn_plus_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_plus_pressed.png
rename to core/res/res/drawable-mdpi/btn_plus_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_plus_selected.png

diff --git a/core/res/res/drawable/btn_plus_selected.png b/core/res/res/drawable-mdpi/btn_plus_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_plus_selected.png
rename to core/res/res/drawable-mdpi/btn_plus_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_radio_label_background.9.png

diff --git a/core/res/res/drawable/btn_radio_label_background.9.png b/core/res/res/drawable-mdpi/btn_radio_label_background.9.png
similarity index 100%
rename from core/res/res/drawable/btn_radio_label_background.9.png
rename to core/res/res/drawable-mdpi/btn_radio_label_background.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_radio_off.png

diff --git a/core/res/res/drawable/btn_radio_off.png b/core/res/res/drawable-mdpi/btn_radio_off.png
similarity index 100%
rename from core/res/res/drawable/btn_radio_off.png
rename to core/res/res/drawable-mdpi/btn_radio_off.png
Binary files differ

core/res/res/drawable-mdpi/btn_radio_off_pressed.png

diff --git a/core/res/res/drawable/btn_radio_off_pressed.png b/core/res/res/drawable-mdpi/btn_radio_off_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_radio_off_pressed.png
rename to core/res/res/drawable-mdpi/btn_radio_off_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_radio_off_selected.png

diff --git a/core/res/res/drawable/btn_radio_off_selected.png b/core/res/res/drawable-mdpi/btn_radio_off_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_radio_off_selected.png
rename to core/res/res/drawable-mdpi/btn_radio_off_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_radio_on.png

diff --git a/core/res/res/drawable/btn_radio_on.png b/core/res/res/drawable-mdpi/btn_radio_on.png
similarity index 100%
rename from core/res/res/drawable/btn_radio_on.png
rename to core/res/res/drawable-mdpi/btn_radio_on.png
Binary files differ

core/res/res/drawable-mdpi/btn_radio_on_pressed.png

diff --git a/core/res/res/drawable/btn_radio_on_pressed.png b/core/res/res/drawable-mdpi/btn_radio_on_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_radio_on_pressed.png
rename to core/res/res/drawable-mdpi/btn_radio_on_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_radio_on_selected.png

diff --git a/core/res/res/drawable/btn_radio_on_selected.png b/core/res/res/drawable-mdpi/btn_radio_on_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_radio_on_selected.png
rename to core/res/res/drawable-mdpi/btn_radio_on_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_rating_star_off_normal.png

diff --git a/core/res/res/drawable/btn_rating_star_off_normal.png b/core/res/res/drawable-mdpi/btn_rating_star_off_normal.png
similarity index 100%
rename from core/res/res/drawable/btn_rating_star_off_normal.png
rename to core/res/res/drawable-mdpi/btn_rating_star_off_normal.png
Binary files differ

core/res/res/drawable-mdpi/btn_rating_star_off_pressed.png

diff --git a/core/res/res/drawable/btn_rating_star_off_pressed.png b/core/res/res/drawable-mdpi/btn_rating_star_off_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_rating_star_off_pressed.png
rename to core/res/res/drawable-mdpi/btn_rating_star_off_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_rating_star_off_selected.png

diff --git a/core/res/res/drawable/btn_rating_star_off_selected.png b/core/res/res/drawable-mdpi/btn_rating_star_off_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_rating_star_off_selected.png
rename to core/res/res/drawable-mdpi/btn_rating_star_off_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_rating_star_on_normal.png

diff --git a/core/res/res/drawable/btn_rating_star_on_normal.png b/core/res/res/drawable-mdpi/btn_rating_star_on_normal.png
similarity index 100%
rename from core/res/res/drawable/btn_rating_star_on_normal.png
rename to core/res/res/drawable-mdpi/btn_rating_star_on_normal.png
Binary files differ

core/res/res/drawable-mdpi/btn_rating_star_on_pressed.png

diff --git a/core/res/res/drawable/btn_rating_star_on_pressed.png b/core/res/res/drawable-mdpi/btn_rating_star_on_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_rating_star_on_pressed.png
rename to core/res/res/drawable-mdpi/btn_rating_star_on_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_rating_star_on_selected.png

diff --git a/core/res/res/drawable/btn_rating_star_on_selected.png b/core/res/res/drawable-mdpi/btn_rating_star_on_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_rating_star_on_selected.png
rename to core/res/res/drawable-mdpi/btn_rating_star_on_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_search_dialog_default.9.png

diff --git a/core/res/res/drawable/btn_search_dialog_default.9.png b/core/res/res/drawable-mdpi/btn_search_dialog_default.9.png
similarity index 100%
rename from core/res/res/drawable/btn_search_dialog_default.9.png
rename to core/res/res/drawable-mdpi/btn_search_dialog_default.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_search_dialog_pressed.9.png

diff --git a/core/res/res/drawable/btn_search_dialog_pressed.9.png b/core/res/res/drawable-mdpi/btn_search_dialog_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_search_dialog_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_search_dialog_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_search_dialog_selected.9.png

diff --git a/core/res/res/drawable/btn_search_dialog_selected.9.png b/core/res/res/drawable-mdpi/btn_search_dialog_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_search_dialog_selected.9.png
rename to core/res/res/drawable-mdpi/btn_search_dialog_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_search_dialog_voice_default.9.png

diff --git a/core/res/res/drawable/btn_search_dialog_voice_default.9.png b/core/res/res/drawable-mdpi/btn_search_dialog_voice_default.9.png
similarity index 100%
rename from core/res/res/drawable/btn_search_dialog_voice_default.9.png
rename to core/res/res/drawable-mdpi/btn_search_dialog_voice_default.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png

diff --git a/core/res/res/drawable/btn_search_dialog_voice_pressed.9.png b/core/res/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_search_dialog_voice_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png

diff --git a/core/res/res/drawable/btn_search_dialog_voice_selected.9.png b/core/res/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_search_dialog_voice_selected.9.png
rename to core/res/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_square_overlay_disabled.png

diff --git a/core/res/res/drawable/btn_square_overlay_disabled.png b/core/res/res/drawable-mdpi/btn_square_overlay_disabled.png
similarity index 100%
rename from core/res/res/drawable/btn_square_overlay_disabled.png
rename to core/res/res/drawable-mdpi/btn_square_overlay_disabled.png
Binary files differ

core/res/res/drawable-mdpi/btn_square_overlay_disabled_focused.png

diff --git a/core/res/res/drawable/btn_square_overlay_disabled_focused.png b/core/res/res/drawable-mdpi/btn_square_overlay_disabled_focused.png
similarity index 100%
rename from core/res/res/drawable/btn_square_overlay_disabled_focused.png
rename to core/res/res/drawable-mdpi/btn_square_overlay_disabled_focused.png
Binary files differ

core/res/res/drawable-mdpi/btn_square_overlay_normal.png

diff --git a/core/res/res/drawable/btn_square_overlay_normal.png b/core/res/res/drawable-mdpi/btn_square_overlay_normal.png
similarity index 100%
rename from core/res/res/drawable/btn_square_overlay_normal.png
rename to core/res/res/drawable-mdpi/btn_square_overlay_normal.png
Binary files differ

core/res/res/drawable-mdpi/btn_square_overlay_pressed.png

diff --git a/core/res/res/drawable/btn_square_overlay_pressed.png b/core/res/res/drawable-mdpi/btn_square_overlay_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_square_overlay_pressed.png
rename to core/res/res/drawable-mdpi/btn_square_overlay_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_square_overlay_selected.png

diff --git a/core/res/res/drawable/btn_square_overlay_selected.png b/core/res/res/drawable-mdpi/btn_square_overlay_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_square_overlay_selected.png
rename to core/res/res/drawable-mdpi/btn_square_overlay_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_off.png

diff --git a/core/res/res/drawable/btn_star_big_off.png b/core/res/res/drawable-mdpi/btn_star_big_off.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_off.png
rename to core/res/res/drawable-mdpi/btn_star_big_off.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_off_disable.png

diff --git a/core/res/res/drawable/btn_star_big_off_disable.png b/core/res/res/drawable-mdpi/btn_star_big_off_disable.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_off_disable.png
rename to core/res/res/drawable-mdpi/btn_star_big_off_disable.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_off_disable_focused.png

diff --git a/core/res/res/drawable/btn_star_big_off_disable_focused.png b/core/res/res/drawable-mdpi/btn_star_big_off_disable_focused.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_off_disable_focused.png
rename to core/res/res/drawable-mdpi/btn_star_big_off_disable_focused.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_off_pressed.png

diff --git a/core/res/res/drawable/btn_star_big_off_pressed.png b/core/res/res/drawable-mdpi/btn_star_big_off_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_off_pressed.png
rename to core/res/res/drawable-mdpi/btn_star_big_off_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_off_selected.png

diff --git a/core/res/res/drawable/btn_star_big_off_selected.png b/core/res/res/drawable-mdpi/btn_star_big_off_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_off_selected.png
rename to core/res/res/drawable-mdpi/btn_star_big_off_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_on.png

diff --git a/core/res/res/drawable/btn_star_big_on.png b/core/res/res/drawable-mdpi/btn_star_big_on.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_on.png
rename to core/res/res/drawable-mdpi/btn_star_big_on.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_on_disable.png

diff --git a/core/res/res/drawable/btn_star_big_on_disable.png b/core/res/res/drawable-mdpi/btn_star_big_on_disable.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_on_disable.png
rename to core/res/res/drawable-mdpi/btn_star_big_on_disable.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_on_disable_focused.png

diff --git a/core/res/res/drawable/btn_star_big_on_disable_focused.png b/core/res/res/drawable-mdpi/btn_star_big_on_disable_focused.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_on_disable_focused.png
rename to core/res/res/drawable-mdpi/btn_star_big_on_disable_focused.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_on_pressed.png

diff --git a/core/res/res/drawable/btn_star_big_on_pressed.png b/core/res/res/drawable-mdpi/btn_star_big_on_pressed.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_on_pressed.png
rename to core/res/res/drawable-mdpi/btn_star_big_on_pressed.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_big_on_selected.png

diff --git a/core/res/res/drawable/btn_star_big_on_selected.png b/core/res/res/drawable-mdpi/btn_star_big_on_selected.png
similarity index 100%
rename from core/res/res/drawable/btn_star_big_on_selected.png
rename to core/res/res/drawable-mdpi/btn_star_big_on_selected.png
Binary files differ

core/res/res/drawable-mdpi/btn_star_label_background.9.png

diff --git a/core/res/res/drawable/btn_star_label_background.9.png b/core/res/res/drawable-mdpi/btn_star_label_background.9.png
similarity index 100%
rename from core/res/res/drawable/btn_star_label_background.9.png
rename to core/res/res/drawable-mdpi/btn_star_label_background.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_toggle_off.9.png

diff --git a/core/res/res/drawable/btn_toggle_off.9.png b/core/res/res/drawable-mdpi/btn_toggle_off.9.png
similarity index 100%
rename from core/res/res/drawable/btn_toggle_off.9.png
rename to core/res/res/drawable-mdpi/btn_toggle_off.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_toggle_on.9.png

diff --git a/core/res/res/drawable/btn_toggle_on.9.png b/core/res/res/drawable-mdpi/btn_toggle_on.9.png
similarity index 100%
rename from core/res/res/drawable/btn_toggle_on.9.png
rename to core/res/res/drawable-mdpi/btn_toggle_on.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_down_disabled.9.png

diff --git a/core/res/res/drawable/btn_zoom_down_disabled.9.png b/core/res/res/drawable-mdpi/btn_zoom_down_disabled.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_down_disabled.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_down_disabled.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_down_disabled_focused.9.png

diff --git a/core/res/res/drawable/btn_zoom_down_disabled_focused.9.png b/core/res/res/drawable-mdpi/btn_zoom_down_disabled_focused.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_down_disabled_focused.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_down_disabled_focused.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_down_normal.9.png

diff --git a/core/res/res/drawable/btn_zoom_down_normal.9.png b/core/res/res/drawable-mdpi/btn_zoom_down_normal.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_down_normal.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_down_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_down_pressed.9.png

diff --git a/core/res/res/drawable/btn_zoom_down_pressed.9.png b/core/res/res/drawable-mdpi/btn_zoom_down_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_down_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_down_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_down_selected.9.png

diff --git a/core/res/res/drawable/btn_zoom_down_selected.9.png b/core/res/res/drawable-mdpi/btn_zoom_down_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_down_selected.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_down_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_page_normal.png

diff --git a/core/res/res/drawable/btn_zoom_page_normal.png b/core/res/res/drawable-mdpi/btn_zoom_page_normal.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_page_normal.png
rename to core/res/res/drawable-mdpi/btn_zoom_page_normal.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_page_press.png

diff --git a/core/res/res/drawable/btn_zoom_page_press.png b/core/res/res/drawable-mdpi/btn_zoom_page_press.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_page_press.png
rename to core/res/res/drawable-mdpi/btn_zoom_page_press.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_up_disabled.9.png

diff --git a/core/res/res/drawable/btn_zoom_up_disabled.9.png b/core/res/res/drawable-mdpi/btn_zoom_up_disabled.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_up_disabled.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_up_disabled.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_up_disabled_focused.9.png

diff --git a/core/res/res/drawable/btn_zoom_up_disabled_focused.9.png b/core/res/res/drawable-mdpi/btn_zoom_up_disabled_focused.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_up_disabled_focused.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_up_disabled_focused.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_up_normal.9.png

diff --git a/core/res/res/drawable/btn_zoom_up_normal.9.png b/core/res/res/drawable-mdpi/btn_zoom_up_normal.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_up_normal.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_up_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_up_pressed.9.png

diff --git a/core/res/res/drawable/btn_zoom_up_pressed.9.png b/core/res/res/drawable-mdpi/btn_zoom_up_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_up_pressed.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_up_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/btn_zoom_up_selected.9.png

diff --git a/core/res/res/drawable/btn_zoom_up_selected.9.png b/core/res/res/drawable-mdpi/btn_zoom_up_selected.9.png
similarity index 100%
rename from core/res/res/drawable/btn_zoom_up_selected.9.png
rename to core/res/res/drawable-mdpi/btn_zoom_up_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/button_onoff_indicator_off.png

diff --git a/core/res/res/drawable/button_onoff_indicator_off.png b/core/res/res/drawable-mdpi/button_onoff_indicator_off.png
similarity index 100%
rename from core/res/res/drawable/button_onoff_indicator_off.png
rename to core/res/res/drawable-mdpi/button_onoff_indicator_off.png
Binary files differ

core/res/res/drawable-mdpi/button_onoff_indicator_on.png

diff --git a/core/res/res/drawable/button_onoff_indicator_on.png b/core/res/res/drawable-mdpi/button_onoff_indicator_on.png
similarity index 100%
rename from core/res/res/drawable/button_onoff_indicator_on.png
rename to core/res/res/drawable-mdpi/button_onoff_indicator_on.png
Binary files differ

core/res/res/drawable-mdpi/call_contact.png

diff --git a/core/res/res/drawable/call_contact.png b/core/res/res/drawable-mdpi/call_contact.png
similarity index 100%
rename from core/res/res/drawable/call_contact.png
rename to core/res/res/drawable-mdpi/call_contact.png
Binary files differ

core/res/res/drawable-mdpi/checkbox_off_background.png

diff --git a/core/res/res/drawable/checkbox_off_background.png b/core/res/res/drawable-mdpi/checkbox_off_background.png
similarity index 100%
rename from core/res/res/drawable/checkbox_off_background.png
rename to core/res/res/drawable-mdpi/checkbox_off_background.png
Binary files differ

core/res/res/drawable-mdpi/checkbox_on_background.png

diff --git a/core/res/res/drawable/checkbox_on_background.png b/core/res/res/drawable-mdpi/checkbox_on_background.png
similarity index 100%
rename from core/res/res/drawable/checkbox_on_background.png
rename to core/res/res/drawable-mdpi/checkbox_on_background.png
Binary files differ

core/res/res/drawable-mdpi/clock_dial.png

diff --git a/core/res/res/drawable/clock_dial.png b/core/res/res/drawable-mdpi/clock_dial.png
similarity index 100%
rename from core/res/res/drawable/clock_dial.png
rename to core/res/res/drawable-mdpi/clock_dial.png
Binary files differ

core/res/res/drawable-mdpi/clock_hand_hour.png

diff --git a/core/res/res/drawable/clock_hand_hour.png b/core/res/res/drawable-mdpi/clock_hand_hour.png
similarity index 100%
rename from core/res/res/drawable/clock_hand_hour.png
rename to core/res/res/drawable-mdpi/clock_hand_hour.png
Binary files differ

core/res/res/drawable-mdpi/clock_hand_minute.png

diff --git a/core/res/res/drawable/clock_hand_minute.png b/core/res/res/drawable-mdpi/clock_hand_minute.png
similarity index 100%
rename from core/res/res/drawable/clock_hand_minute.png
rename to core/res/res/drawable-mdpi/clock_hand_minute.png
Binary files differ

core/res/res/drawable-mdpi/code_lock_bottom.9.png

diff --git a/core/res/res/drawable/code_lock_bottom.9.png b/core/res/res/drawable-mdpi/code_lock_bottom.9.png
similarity index 100%
rename from core/res/res/drawable/code_lock_bottom.9.png
rename to core/res/res/drawable-mdpi/code_lock_bottom.9.png
Binary files differ

core/res/res/drawable-mdpi/code_lock_left.9.png

diff --git a/core/res/res/drawable/code_lock_left.9.png b/core/res/res/drawable-mdpi/code_lock_left.9.png
similarity index 100%
rename from core/res/res/drawable/code_lock_left.9.png
rename to core/res/res/drawable-mdpi/code_lock_left.9.png
Binary files differ

core/res/res/drawable-mdpi/code_lock_top.9.png

diff --git a/core/res/res/drawable/code_lock_top.9.png b/core/res/res/drawable-mdpi/code_lock_top.9.png
similarity index 100%
rename from core/res/res/drawable/code_lock_top.9.png
rename to core/res/res/drawable-mdpi/code_lock_top.9.png
Binary files differ

core/res/res/drawable-mdpi/compass_arrow.png

diff --git a/core/res/res/drawable/compass_arrow.png b/core/res/res/drawable-mdpi/compass_arrow.png
similarity index 100%
rename from core/res/res/drawable/compass_arrow.png
rename to core/res/res/drawable-mdpi/compass_arrow.png
Binary files differ

core/res/res/drawable-mdpi/compass_base.png

diff --git a/core/res/res/drawable/compass_base.png b/core/res/res/drawable-mdpi/compass_base.png
similarity index 100%
rename from core/res/res/drawable/compass_base.png
rename to core/res/res/drawable-mdpi/compass_base.png
Binary files differ

core/res/res/drawable-mdpi/create_contact.png

diff --git a/core/res/res/drawable/create_contact.png b/core/res/res/drawable-mdpi/create_contact.png
similarity index 100%
rename from core/res/res/drawable/create_contact.png
rename to core/res/res/drawable-mdpi/create_contact.png
Binary files differ

core/res/res/drawable-mdpi/dark_header.9.png

diff --git a/core/res/res/drawable/dark_header.9.png b/core/res/res/drawable-mdpi/dark_header.9.png
similarity index 100%
rename from core/res/res/drawable/dark_header.9.png
rename to core/res/res/drawable-mdpi/dark_header.9.png
Binary files differ

core/res/res/drawable-mdpi/dialog_divider_horizontal_light.9.png

diff --git a/core/res/res/drawable/dialog_divider_horizontal_light.9.png b/core/res/res/drawable-mdpi/dialog_divider_horizontal_light.9.png
similarity index 100%
rename from core/res/res/drawable/dialog_divider_horizontal_light.9.png
rename to core/res/res/drawable-mdpi/dialog_divider_horizontal_light.9.png
Binary files differ

core/res/res/drawable-mdpi/divider_horizontal_bright.9.png

diff --git a/core/res/res/drawable/divider_horizontal_bright.9.png b/core/res/res/drawable-mdpi/divider_horizontal_bright.9.png
similarity index 100%
rename from core/res/res/drawable/divider_horizontal_bright.9.png
rename to core/res/res/drawable-mdpi/divider_horizontal_bright.9.png
Binary files differ

core/res/res/drawable-mdpi/divider_horizontal_bright_opaque.9.png

diff --git a/core/res/res/drawable/divider_horizontal_bright_opaque.9.png b/core/res/res/drawable-mdpi/divider_horizontal_bright_opaque.9.png
similarity index 100%
rename from core/res/res/drawable/divider_horizontal_bright_opaque.9.png
rename to core/res/res/drawable-mdpi/divider_horizontal_bright_opaque.9.png
Binary files differ

core/res/res/drawable-mdpi/divider_horizontal_dark.9.png

diff --git a/core/res/res/drawable/divider_horizontal_dark.9.png b/core/res/res/drawable-mdpi/divider_horizontal_dark.9.png
similarity index 100%
rename from core/res/res/drawable/divider_horizontal_dark.9.png
rename to core/res/res/drawable-mdpi/divider_horizontal_dark.9.png
Binary files differ

core/res/res/drawable-mdpi/divider_horizontal_dark_opaque.9.png

diff --git a/core/res/res/drawable/divider_horizontal_dark_opaque.9.png b/core/res/res/drawable-mdpi/divider_horizontal_dark_opaque.9.png
similarity index 100%
rename from core/res/res/drawable/divider_horizontal_dark_opaque.9.png
rename to core/res/res/drawable-mdpi/divider_horizontal_dark_opaque.9.png
Binary files differ

core/res/res/drawable-mdpi/divider_horizontal_dim_dark.9.png

diff --git a/core/res/res/drawable/divider_horizontal_dim_dark.9.png b/core/res/res/drawable-mdpi/divider_horizontal_dim_dark.9.png
similarity index 100%
rename from core/res/res/drawable/divider_horizontal_dim_dark.9.png
rename to core/res/res/drawable-mdpi/divider_horizontal_dim_dark.9.png
Binary files differ

core/res/res/drawable-mdpi/divider_horizontal_textfield.9.png

diff --git a/core/res/res/drawable/divider_horizontal_textfield.9.png b/core/res/res/drawable-mdpi/divider_horizontal_textfield.9.png
similarity index 100%
rename from core/res/res/drawable/divider_horizontal_textfield.9.png
rename to core/res/res/drawable-mdpi/divider_horizontal_textfield.9.png
Binary files differ

core/res/res/drawable-mdpi/divider_vertical_bright.9.png

diff --git a/core/res/res/drawable/divider_vertical_bright.9.png b/core/res/res/drawable-mdpi/divider_vertical_bright.9.png
similarity index 100%
rename from core/res/res/drawable/divider_vertical_bright.9.png
rename to core/res/res/drawable-mdpi/divider_vertical_bright.9.png
Binary files differ

core/res/res/drawable-mdpi/editbox_background_focus_yellow.9.png

diff --git a/core/res/res/drawable/editbox_background_focus_yellow.9.png b/core/res/res/drawable-mdpi/editbox_background_focus_yellow.9.png
similarity index 100%
rename from core/res/res/drawable/editbox_background_focus_yellow.9.png
rename to core/res/res/drawable-mdpi/editbox_background_focus_yellow.9.png
Binary files differ

core/res/res/drawable-mdpi/editbox_background_normal.9.png

diff --git a/core/res/res/drawable/editbox_background_normal.9.png b/core/res/res/drawable-mdpi/editbox_background_normal.9.png
similarity index 100%
rename from core/res/res/drawable/editbox_background_normal.9.png
rename to core/res/res/drawable-mdpi/editbox_background_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/editbox_dropdown_background.9.png

diff --git a/core/res/res/drawable/editbox_dropdown_background.9.png b/core/res/res/drawable-mdpi/editbox_dropdown_background.9.png
similarity index 100%
rename from core/res/res/drawable/editbox_dropdown_background.9.png
rename to core/res/res/drawable-mdpi/editbox_dropdown_background.9.png
Binary files differ

core/res/res/drawable-mdpi/editbox_dropdown_background_dark.9.png

diff --git a/core/res/res/drawable/editbox_dropdown_background_dark.9.png b/core/res/res/drawable-mdpi/editbox_dropdown_background_dark.9.png
similarity index 100%
rename from core/res/res/drawable/editbox_dropdown_background_dark.9.png
rename to core/res/res/drawable-mdpi/editbox_dropdown_background_dark.9.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_angel.png

diff --git a/core/res/res/drawable/emo_im_angel.png b/core/res/res/drawable-mdpi/emo_im_angel.png
similarity index 100%
rename from core/res/res/drawable/emo_im_angel.png
rename to core/res/res/drawable-mdpi/emo_im_angel.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_cool.png

diff --git a/core/res/res/drawable/emo_im_cool.png b/core/res/res/drawable-mdpi/emo_im_cool.png
similarity index 100%
rename from core/res/res/drawable/emo_im_cool.png
rename to core/res/res/drawable-mdpi/emo_im_cool.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_crying.png

diff --git a/core/res/res/drawable/emo_im_crying.png b/core/res/res/drawable-mdpi/emo_im_crying.png
similarity index 100%
rename from core/res/res/drawable/emo_im_crying.png
rename to core/res/res/drawable-mdpi/emo_im_crying.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_foot_in_mouth.png

diff --git a/core/res/res/drawable/emo_im_foot_in_mouth.png b/core/res/res/drawable-mdpi/emo_im_foot_in_mouth.png
similarity index 100%
rename from core/res/res/drawable/emo_im_foot_in_mouth.png
rename to core/res/res/drawable-mdpi/emo_im_foot_in_mouth.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_happy.png

diff --git a/core/res/res/drawable/emo_im_happy.png b/core/res/res/drawable-mdpi/emo_im_happy.png
similarity index 100%
rename from core/res/res/drawable/emo_im_happy.png
rename to core/res/res/drawable-mdpi/emo_im_happy.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_kissing.png

diff --git a/core/res/res/drawable/emo_im_kissing.png b/core/res/res/drawable-mdpi/emo_im_kissing.png
similarity index 100%
rename from core/res/res/drawable/emo_im_kissing.png
rename to core/res/res/drawable-mdpi/emo_im_kissing.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_laughing.png

diff --git a/core/res/res/drawable/emo_im_laughing.png b/core/res/res/drawable-mdpi/emo_im_laughing.png
similarity index 100%
rename from core/res/res/drawable/emo_im_laughing.png
rename to core/res/res/drawable-mdpi/emo_im_laughing.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_lips_are_sealed.png

diff --git a/core/res/res/drawable/emo_im_lips_are_sealed.png b/core/res/res/drawable-mdpi/emo_im_lips_are_sealed.png
similarity index 100%
rename from core/res/res/drawable/emo_im_lips_are_sealed.png
rename to core/res/res/drawable-mdpi/emo_im_lips_are_sealed.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_money_mouth.png

diff --git a/core/res/res/drawable/emo_im_money_mouth.png b/core/res/res/drawable-mdpi/emo_im_money_mouth.png
similarity index 100%
rename from core/res/res/drawable/emo_im_money_mouth.png
rename to core/res/res/drawable-mdpi/emo_im_money_mouth.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_sad.png

diff --git a/core/res/res/drawable/emo_im_sad.png b/core/res/res/drawable-mdpi/emo_im_sad.png
similarity index 100%
rename from core/res/res/drawable/emo_im_sad.png
rename to core/res/res/drawable-mdpi/emo_im_sad.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_surprised.png

diff --git a/core/res/res/drawable/emo_im_surprised.png b/core/res/res/drawable-mdpi/emo_im_surprised.png
similarity index 100%
rename from core/res/res/drawable/emo_im_surprised.png
rename to core/res/res/drawable-mdpi/emo_im_surprised.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_tongue_sticking_out.png

diff --git a/core/res/res/drawable/emo_im_tongue_sticking_out.png b/core/res/res/drawable-mdpi/emo_im_tongue_sticking_out.png
similarity index 100%
rename from core/res/res/drawable/emo_im_tongue_sticking_out.png
rename to core/res/res/drawable-mdpi/emo_im_tongue_sticking_out.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_undecided.png

diff --git a/core/res/res/drawable/emo_im_undecided.png b/core/res/res/drawable-mdpi/emo_im_undecided.png
similarity index 100%
rename from core/res/res/drawable/emo_im_undecided.png
rename to core/res/res/drawable-mdpi/emo_im_undecided.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_winking.png

diff --git a/core/res/res/drawable/emo_im_winking.png b/core/res/res/drawable-mdpi/emo_im_winking.png
similarity index 100%
rename from core/res/res/drawable/emo_im_winking.png
rename to core/res/res/drawable-mdpi/emo_im_winking.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_wtf.png

diff --git a/core/res/res/drawable/emo_im_wtf.png b/core/res/res/drawable-mdpi/emo_im_wtf.png
similarity index 100%
rename from core/res/res/drawable/emo_im_wtf.png
rename to core/res/res/drawable-mdpi/emo_im_wtf.png
Binary files differ

core/res/res/drawable-mdpi/emo_im_yelling.png

diff --git a/core/res/res/drawable/emo_im_yelling.png b/core/res/res/drawable-mdpi/emo_im_yelling.png
similarity index 100%
rename from core/res/res/drawable/emo_im_yelling.png
rename to core/res/res/drawable-mdpi/emo_im_yelling.png
Binary files differ

core/res/res/drawable-mdpi/expander_ic_maximized.9.png

diff --git a/core/res/res/drawable/expander_ic_maximized.9.png b/core/res/res/drawable-mdpi/expander_ic_maximized.9.png
similarity index 100%
rename from core/res/res/drawable/expander_ic_maximized.9.png
rename to core/res/res/drawable-mdpi/expander_ic_maximized.9.png
Binary files differ

core/res/res/drawable-mdpi/expander_ic_minimized.9.png

diff --git a/core/res/res/drawable/expander_ic_minimized.9.png b/core/res/res/drawable-mdpi/expander_ic_minimized.9.png
similarity index 100%
rename from core/res/res/drawable/expander_ic_minimized.9.png
rename to core/res/res/drawable-mdpi/expander_ic_minimized.9.png
Binary files differ

core/res/res/drawable-mdpi/focused_application_background_static.png

diff --git a/core/res/res/drawable/focused_application_background_static.png b/core/res/res/drawable-mdpi/focused_application_background_static.png
similarity index 100%
rename from core/res/res/drawable/focused_application_background_static.png
rename to core/res/res/drawable-mdpi/focused_application_background_static.png
Binary files differ

core/res/res/drawable-mdpi/frame_gallery_thumb.9.png

diff --git a/core/res/res/drawable/frame_gallery_thumb.9.png b/core/res/res/drawable-mdpi/frame_gallery_thumb.9.png
similarity index 100%
rename from core/res/res/drawable/frame_gallery_thumb.9.png
rename to core/res/res/drawable-mdpi/frame_gallery_thumb.9.png
Binary files differ

core/res/res/drawable-mdpi/frame_gallery_thumb_pressed.9.png

diff --git a/core/res/res/drawable/frame_gallery_thumb_pressed.9.png b/core/res/res/drawable-mdpi/frame_gallery_thumb_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/frame_gallery_thumb_pressed.9.png
rename to core/res/res/drawable-mdpi/frame_gallery_thumb_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/frame_gallery_thumb_selected.9.png

diff --git a/core/res/res/drawable/frame_gallery_thumb_selected.9.png b/core/res/res/drawable-mdpi/frame_gallery_thumb_selected.9.png
similarity index 100%
rename from core/res/res/drawable/frame_gallery_thumb_selected.9.png
rename to core/res/res/drawable-mdpi/frame_gallery_thumb_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/gallery_selected_default.9.png

diff --git a/core/res/res/drawable/gallery_selected_default.9.png b/core/res/res/drawable-mdpi/gallery_selected_default.9.png
similarity index 100%
rename from core/res/res/drawable/gallery_selected_default.9.png
rename to core/res/res/drawable-mdpi/gallery_selected_default.9.png
Binary files differ

core/res/res/drawable-mdpi/gallery_selected_focused.9.png

diff --git a/core/res/res/drawable/gallery_selected_focused.9.png b/core/res/res/drawable-mdpi/gallery_selected_focused.9.png
similarity index 100%
rename from core/res/res/drawable/gallery_selected_focused.9.png
rename to core/res/res/drawable-mdpi/gallery_selected_focused.9.png
Binary files differ

core/res/res/drawable-mdpi/gallery_selected_pressed.9.png

diff --git a/core/res/res/drawable/gallery_selected_pressed.9.png b/core/res/res/drawable-mdpi/gallery_selected_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/gallery_selected_pressed.9.png
rename to core/res/res/drawable-mdpi/gallery_selected_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/gallery_unselected_default.9.png

diff --git a/core/res/res/drawable/gallery_unselected_default.9.png b/core/res/res/drawable-mdpi/gallery_unselected_default.9.png
similarity index 100%
rename from core/res/res/drawable/gallery_unselected_default.9.png
rename to core/res/res/drawable-mdpi/gallery_unselected_default.9.png
Binary files differ

core/res/res/drawable-mdpi/gallery_unselected_pressed.9.png

diff --git a/core/res/res/drawable/gallery_unselected_pressed.9.png b/core/res/res/drawable-mdpi/gallery_unselected_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/gallery_unselected_pressed.9.png
rename to core/res/res/drawable-mdpi/gallery_unselected_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/grid_selector_background_focus.9.png

diff --git a/core/res/res/drawable/grid_selector_background_focus.9.png b/core/res/res/drawable-mdpi/grid_selector_background_focus.9.png
similarity index 100%
rename from core/res/res/drawable/grid_selector_background_focus.9.png
rename to core/res/res/drawable-mdpi/grid_selector_background_focus.9.png
Binary files differ

core/res/res/drawable-mdpi/grid_selector_background_pressed.9.png

diff --git a/core/res/res/drawable/grid_selector_background_pressed.9.png b/core/res/res/drawable-mdpi/grid_selector_background_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/grid_selector_background_pressed.9.png
rename to core/res/res/drawable-mdpi/grid_selector_background_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/highlight_disabled.9.png

diff --git a/core/res/res/drawable/highlight_disabled.9.png b/core/res/res/drawable-mdpi/highlight_disabled.9.png
similarity index 100%
rename from core/res/res/drawable/highlight_disabled.9.png
rename to core/res/res/drawable-mdpi/highlight_disabled.9.png
Binary files differ

core/res/res/drawable-mdpi/highlight_pressed.9.png

diff --git a/core/res/res/drawable/highlight_pressed.9.png b/core/res/res/drawable-mdpi/highlight_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/highlight_pressed.9.png
rename to core/res/res/drawable-mdpi/highlight_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/highlight_selected.9.png

diff --git a/core/res/res/drawable/highlight_selected.9.png b/core/res/res/drawable-mdpi/highlight_selected.9.png
similarity index 100%
rename from core/res/res/drawable/highlight_selected.9.png
rename to core/res/res/drawable-mdpi/highlight_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/ic_btn_round_more_disabled.png

diff --git a/core/res/res/drawable/ic_btn_round_more_disabled.png b/core/res/res/drawable-mdpi/ic_btn_round_more_disabled.png
similarity index 100%
rename from core/res/res/drawable/ic_btn_round_more_disabled.png
rename to core/res/res/drawable-mdpi/ic_btn_round_more_disabled.png
Binary files differ

core/res/res/drawable-mdpi/ic_btn_round_more_normal.png

diff --git a/core/res/res/drawable/ic_btn_round_more_normal.png b/core/res/res/drawable-mdpi/ic_btn_round_more_normal.png
similarity index 100%
rename from core/res/res/drawable/ic_btn_round_more_normal.png
rename to core/res/res/drawable-mdpi/ic_btn_round_more_normal.png
Binary files differ

core/res/res/drawable-mdpi/ic_btn_search.png

diff --git a/core/res/res/drawable/ic_btn_search.png b/core/res/res/drawable-mdpi/ic_btn_search.png
similarity index 100%
rename from core/res/res/drawable/ic_btn_search.png
rename to core/res/res/drawable-mdpi/ic_btn_search.png
Binary files differ

core/res/res/drawable-mdpi/ic_btn_speak_now.png

diff --git a/core/res/res/drawable/ic_btn_speak_now.png b/core/res/res/drawable-mdpi/ic_btn_speak_now.png
similarity index 100%
rename from core/res/res/drawable/ic_btn_speak_now.png
rename to core/res/res/drawable-mdpi/ic_btn_speak_now.png
Binary files differ

core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_disabled.png

diff --git a/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_disabled.png b/core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_disabled.png
similarity index 100%
rename from core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_disabled.png
rename to core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_disabled.png
Binary files differ

core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_normal.png

diff --git a/core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_normal.png b/core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_normal.png
similarity index 100%
rename from core/res/res/drawable/ic_btn_square_browser_zoom_fit_page_normal.png
rename to core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_fit_page_normal.png
Binary files differ

core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_disabled.png

diff --git a/core/res/res/drawable/ic_btn_square_browser_zoom_page_overview_disabled.png b/core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_disabled.png
similarity index 100%
rename from core/res/res/drawable/ic_btn_square_browser_zoom_page_overview_disabled.png
rename to core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_disabled.png
Binary files differ

core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_normal.png

diff --git a/core/res/res/drawable/ic_btn_square_browser_zoom_page_overview_normal.png b/core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_normal.png
similarity index 100%
rename from core/res/res/drawable/ic_btn_square_browser_zoom_page_overview_normal.png
rename to core/res/res/drawable-mdpi/ic_btn_square_browser_zoom_page_overview_normal.png
Binary files differ

core/res/res/drawable-mdpi/ic_bullet_key_permission.png

diff --git a/core/res/res/drawable/ic_bullet_key_permission.png b/core/res/res/drawable-mdpi/ic_bullet_key_permission.png
similarity index 100%
rename from core/res/res/drawable/ic_bullet_key_permission.png
rename to core/res/res/drawable-mdpi/ic_bullet_key_permission.png
Binary files differ

core/res/res/drawable-mdpi/ic_contact_picture.png

diff --git a/core/res/res/drawable/ic_contact_picture.png b/core/res/res/drawable-mdpi/ic_contact_picture.png
similarity index 100%
rename from core/res/res/drawable/ic_contact_picture.png
rename to core/res/res/drawable-mdpi/ic_contact_picture.png
Binary files differ

core/res/res/drawable-mdpi/ic_delete.png

diff --git a/core/res/res/drawable/ic_delete.png b/core/res/res/drawable-mdpi/ic_delete.png
similarity index 100%
rename from core/res/res/drawable/ic_delete.png
rename to core/res/res/drawable-mdpi/ic_delete.png
Binary files differ

core/res/res/drawable-mdpi/ic_dialog_alert.png

diff --git a/core/res/res/drawable/ic_dialog_alert.png b/core/res/res/drawable-mdpi/ic_dialog_alert.png
similarity index 100%
rename from core/res/res/drawable/ic_dialog_alert.png
rename to core/res/res/drawable-mdpi/ic_dialog_alert.png
Binary files differ

core/res/res/drawable-mdpi/ic_dialog_dialer.png

diff --git a/core/res/res/drawable/ic_dialog_dialer.png b/core/res/res/drawable-mdpi/ic_dialog_dialer.png
similarity index 100%
rename from core/res/res/drawable/ic_dialog_dialer.png
rename to core/res/res/drawable-mdpi/ic_dialog_dialer.png
Binary files differ

core/res/res/drawable-mdpi/ic_dialog_email.png

diff --git a/core/res/res/drawable/ic_dialog_email.png b/core/res/res/drawable-mdpi/ic_dialog_email.png
similarity index 100%
rename from core/res/res/drawable/ic_dialog_email.png
rename to core/res/res/drawable-mdpi/ic_dialog_email.png
Binary files differ

core/res/res/drawable-mdpi/ic_dialog_info.png

diff --git a/core/res/res/drawable/ic_dialog_info.png b/core/res/res/drawable-mdpi/ic_dialog_info.png
similarity index 100%
rename from core/res/res/drawable/ic_dialog_info.png
rename to core/res/res/drawable-mdpi/ic_dialog_info.png
Binary files differ

core/res/res/drawable-mdpi/ic_dialog_map.png

diff --git a/core/res/res/drawable/ic_dialog_map.png b/core/res/res/drawable-mdpi/ic_dialog_map.png
similarity index 100%
rename from core/res/res/drawable/ic_dialog_map.png
rename to core/res/res/drawable-mdpi/ic_dialog_map.png
Binary files differ

core/res/res/drawable-mdpi/ic_dialog_menu_generic.png

diff --git a/core/res/res/drawable/ic_dialog_menu_generic.png b/core/res/res/drawable-mdpi/ic_dialog_menu_generic.png
similarity index 100%
rename from core/res/res/drawable/ic_dialog_menu_generic.png
rename to core/res/res/drawable-mdpi/ic_dialog_menu_generic.png
Binary files differ

core/res/res/drawable-mdpi/ic_dialog_time.png

diff --git a/core/res/res/drawable/ic_dialog_time.png b/core/res/res/drawable-mdpi/ic_dialog_time.png
similarity index 100%
rename from core/res/res/drawable/ic_dialog_time.png
rename to core/res/res/drawable-mdpi/ic_dialog_time.png
Binary files differ

core/res/res/drawable-mdpi/ic_dialog_usb.png

diff --git a/core/res/res/drawable/ic_dialog_usb.png b/core/res/res/drawable-mdpi/ic_dialog_usb.png
similarity index 100%
rename from core/res/res/drawable/ic_dialog_usb.png
rename to core/res/res/drawable-mdpi/ic_dialog_usb.png
Binary files differ

core/res/res/drawable-mdpi/ic_emergency.png

diff --git a/core/res/res/drawable/ic_emergency.png b/core/res/res/drawable-mdpi/ic_emergency.png
similarity index 100%
rename from core/res/res/drawable/ic_emergency.png
rename to core/res/res/drawable-mdpi/ic_emergency.png
Binary files differ

core/res/res/drawable-mdpi/ic_input_add.png

diff --git a/core/res/res/drawable/ic_input_add.png b/core/res/res/drawable-mdpi/ic_input_add.png
similarity index 100%
rename from core/res/res/drawable/ic_input_add.png
rename to core/res/res/drawable-mdpi/ic_input_add.png
Binary files differ

core/res/res/drawable-mdpi/ic_input_delete.png

diff --git a/core/res/res/drawable/ic_input_delete.png b/core/res/res/drawable-mdpi/ic_input_delete.png
similarity index 100%
rename from core/res/res/drawable/ic_input_delete.png
rename to core/res/res/drawable-mdpi/ic_input_delete.png
Binary files differ

core/res/res/drawable-mdpi/ic_input_get.png

diff --git a/core/res/res/drawable/ic_input_get.png b/core/res/res/drawable-mdpi/ic_input_get.png
similarity index 100%
rename from core/res/res/drawable/ic_input_get.png
rename to core/res/res/drawable-mdpi/ic_input_get.png
Binary files differ

core/res/res/drawable-mdpi/ic_launcher_android.png

diff --git a/core/res/res/drawable/ic_launcher_android.png b/core/res/res/drawable-mdpi/ic_launcher_android.png
similarity index 100%
rename from core/res/res/drawable/ic_launcher_android.png
rename to core/res/res/drawable-mdpi/ic_launcher_android.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_airplane_mode.png

diff --git a/core/res/res/drawable/ic_lock_airplane_mode.png b/core/res/res/drawable-mdpi/ic_lock_airplane_mode.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_airplane_mode.png
rename to core/res/res/drawable-mdpi/ic_lock_airplane_mode.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_airplane_mode_off.png

diff --git a/core/res/res/drawable/ic_lock_airplane_mode_off.png b/core/res/res/drawable-mdpi/ic_lock_airplane_mode_off.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_airplane_mode_off.png
rename to core/res/res/drawable-mdpi/ic_lock_airplane_mode_off.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_idle_alarm.png

diff --git a/core/res/res/drawable/ic_lock_idle_alarm.png b/core/res/res/drawable-mdpi/ic_lock_idle_alarm.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_idle_alarm.png
rename to core/res/res/drawable-mdpi/ic_lock_idle_alarm.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_idle_charging.png

diff --git a/core/res/res/drawable/ic_lock_idle_charging.png b/core/res/res/drawable-mdpi/ic_lock_idle_charging.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_idle_charging.png
rename to core/res/res/drawable-mdpi/ic_lock_idle_charging.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_idle_lock.png

diff --git a/core/res/res/drawable/ic_lock_idle_lock.png b/core/res/res/drawable-mdpi/ic_lock_idle_lock.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_idle_lock.png
rename to core/res/res/drawable-mdpi/ic_lock_idle_lock.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png

diff --git a/core/res/res/drawable/ic_lock_idle_low_battery.png b/core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_idle_low_battery.png
rename to core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_lock.png

diff --git a/core/res/res/drawable/ic_lock_lock.png b/core/res/res/drawable-mdpi/ic_lock_lock.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_lock.png
rename to core/res/res/drawable-mdpi/ic_lock_lock.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_power_off.png

diff --git a/core/res/res/drawable/ic_lock_power_off.png b/core/res/res/drawable-mdpi/ic_lock_power_off.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_power_off.png
rename to core/res/res/drawable-mdpi/ic_lock_power_off.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_silent_mode.png

diff --git a/core/res/res/drawable/ic_lock_silent_mode.png b/core/res/res/drawable-mdpi/ic_lock_silent_mode.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_silent_mode.png
rename to core/res/res/drawable-mdpi/ic_lock_silent_mode.png
Binary files differ

core/res/res/drawable-mdpi/ic_lock_silent_mode_off.png

diff --git a/core/res/res/drawable/ic_lock_silent_mode_off.png b/core/res/res/drawable-mdpi/ic_lock_silent_mode_off.png
similarity index 100%
rename from core/res/res/drawable/ic_lock_silent_mode_off.png
rename to core/res/res/drawable-mdpi/ic_lock_silent_mode_off.png
Binary files differ

core/res/res/drawable-mdpi/ic_maps_indicator_current_position.png

diff --git a/core/res/res/drawable/ic_maps_indicator_current_position.png b/core/res/res/drawable-mdpi/ic_maps_indicator_current_position.png
similarity index 100%
rename from core/res/res/drawable/ic_maps_indicator_current_position.png
rename to core/res/res/drawable-mdpi/ic_maps_indicator_current_position.png
Binary files differ

core/res/res/drawable-mdpi/ic_maps_indicator_current_position_anim1.png

diff --git a/core/res/res/drawable/ic_maps_indicator_current_position_anim1.png b/core/res/res/drawable-mdpi/ic_maps_indicator_current_position_anim1.png
similarity index 100%
rename from core/res/res/drawable/ic_maps_indicator_current_position_anim1.png
rename to core/res/res/drawable-mdpi/ic_maps_indicator_current_position_anim1.png
Binary files differ

core/res/res/drawable-mdpi/ic_maps_indicator_current_position_anim2.png

diff --git a/core/res/res/drawable/ic_maps_indicator_current_position_anim2.png b/core/res/res/drawable-mdpi/ic_maps_indicator_current_position_anim2.png
similarity index 100%
rename from core/res/res/drawable/ic_maps_indicator_current_position_anim2.png
rename to core/res/res/drawable-mdpi/ic_maps_indicator_current_position_anim2.png
Binary files differ

core/res/res/drawable-mdpi/ic_maps_indicator_current_position_anim3.png

diff --git a/core/res/res/drawable/ic_maps_indicator_current_position_anim3.png b/core/res/res/drawable-mdpi/ic_maps_indicator_current_position_anim3.png
similarity index 100%
rename from core/res/res/drawable/ic_maps_indicator_current_position_anim3.png
rename to core/res/res/drawable-mdpi/ic_maps_indicator_current_position_anim3.png
Binary files differ

core/res/res/drawable-mdpi/ic_media_ff.png

diff --git a/core/res/res/drawable/ic_media_ff.png b/core/res/res/drawable-mdpi/ic_media_ff.png
similarity index 100%
rename from core/res/res/drawable/ic_media_ff.png
rename to core/res/res/drawable-mdpi/ic_media_ff.png
Binary files differ

core/res/res/drawable-mdpi/ic_media_next.png

diff --git a/core/res/res/drawable/ic_media_next.png b/core/res/res/drawable-mdpi/ic_media_next.png
similarity index 100%
rename from core/res/res/drawable/ic_media_next.png
rename to core/res/res/drawable-mdpi/ic_media_next.png
Binary files differ

core/res/res/drawable-mdpi/ic_media_pause.png

diff --git a/core/res/res/drawable/ic_media_pause.png b/core/res/res/drawable-mdpi/ic_media_pause.png
similarity index 100%
rename from core/res/res/drawable/ic_media_pause.png
rename to core/res/res/drawable-mdpi/ic_media_pause.png
Binary files differ

core/res/res/drawable-mdpi/ic_media_play.png

diff --git a/core/res/res/drawable/ic_media_play.png b/core/res/res/drawable-mdpi/ic_media_play.png
similarity index 100%
rename from core/res/res/drawable/ic_media_play.png
rename to core/res/res/drawable-mdpi/ic_media_play.png
Binary files differ

core/res/res/drawable-mdpi/ic_media_previous.png

diff --git a/core/res/res/drawable/ic_media_previous.png b/core/res/res/drawable-mdpi/ic_media_previous.png
similarity index 100%
rename from core/res/res/drawable/ic_media_previous.png
rename to core/res/res/drawable-mdpi/ic_media_previous.png
Binary files differ

core/res/res/drawable-mdpi/ic_media_rew.png

diff --git a/core/res/res/drawable/ic_media_rew.png b/core/res/res/drawable-mdpi/ic_media_rew.png
similarity index 100%
rename from core/res/res/drawable/ic_media_rew.png
rename to core/res/res/drawable-mdpi/ic_media_rew.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_account_list.png

diff --git a/core/res/res/drawable/ic_menu_account_list.png b/core/res/res/drawable-mdpi/ic_menu_account_list.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_account_list.png
rename to core/res/res/drawable-mdpi/ic_menu_account_list.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_add.png

diff --git a/core/res/res/drawable/ic_menu_add.png b/core/res/res/drawable-mdpi/ic_menu_add.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_add.png
rename to core/res/res/drawable-mdpi/ic_menu_add.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_agenda.png

diff --git a/core/res/res/drawable/ic_menu_agenda.png b/core/res/res/drawable-mdpi/ic_menu_agenda.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_agenda.png
rename to core/res/res/drawable-mdpi/ic_menu_agenda.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_allfriends.png

diff --git a/core/res/res/drawable/ic_menu_allfriends.png b/core/res/res/drawable-mdpi/ic_menu_allfriends.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_allfriends.png
rename to core/res/res/drawable-mdpi/ic_menu_allfriends.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_always_landscape_portrait.png

diff --git a/core/res/res/drawable/ic_menu_always_landscape_portrait.png b/core/res/res/drawable-mdpi/ic_menu_always_landscape_portrait.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_always_landscape_portrait.png
rename to core/res/res/drawable-mdpi/ic_menu_always_landscape_portrait.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_archive.png

diff --git a/core/res/res/drawable/ic_menu_archive.png b/core/res/res/drawable-mdpi/ic_menu_archive.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_archive.png
rename to core/res/res/drawable-mdpi/ic_menu_archive.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_attachment.png

diff --git a/core/res/res/drawable/ic_menu_attachment.png b/core/res/res/drawable-mdpi/ic_menu_attachment.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_attachment.png
rename to core/res/res/drawable-mdpi/ic_menu_attachment.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_back.png

diff --git a/core/res/res/drawable/ic_menu_back.png b/core/res/res/drawable-mdpi/ic_menu_back.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_back.png
rename to core/res/res/drawable-mdpi/ic_menu_back.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_block.png

diff --git a/core/res/res/drawable/ic_menu_block.png b/core/res/res/drawable-mdpi/ic_menu_block.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_block.png
rename to core/res/res/drawable-mdpi/ic_menu_block.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_blocked_user.png

diff --git a/core/res/res/drawable/ic_menu_blocked_user.png b/core/res/res/drawable-mdpi/ic_menu_blocked_user.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_blocked_user.png
rename to core/res/res/drawable-mdpi/ic_menu_blocked_user.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_call.png

diff --git a/core/res/res/drawable/ic_menu_call.png b/core/res/res/drawable-mdpi/ic_menu_call.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_call.png
rename to core/res/res/drawable-mdpi/ic_menu_call.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_camera.png

diff --git a/core/res/res/drawable/ic_menu_camera.png b/core/res/res/drawable-mdpi/ic_menu_camera.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_camera.png
rename to core/res/res/drawable-mdpi/ic_menu_camera.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_cc.png

diff --git a/core/res/res/drawable/ic_menu_cc.png b/core/res/res/drawable-mdpi/ic_menu_cc.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_cc.png
rename to core/res/res/drawable-mdpi/ic_menu_cc.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_chat_dashboard.png

diff --git a/core/res/res/drawable/ic_menu_chat_dashboard.png b/core/res/res/drawable-mdpi/ic_menu_chat_dashboard.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_chat_dashboard.png
rename to core/res/res/drawable-mdpi/ic_menu_chat_dashboard.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_clear_playlist.png

diff --git a/core/res/res/drawable/ic_menu_clear_playlist.png b/core/res/res/drawable-mdpi/ic_menu_clear_playlist.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_clear_playlist.png
rename to core/res/res/drawable-mdpi/ic_menu_clear_playlist.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_close_clear_cancel.png

diff --git a/core/res/res/drawable/ic_menu_close_clear_cancel.png b/core/res/res/drawable-mdpi/ic_menu_close_clear_cancel.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_close_clear_cancel.png
rename to core/res/res/drawable-mdpi/ic_menu_close_clear_cancel.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_compass.png

diff --git a/core/res/res/drawable/ic_menu_compass.png b/core/res/res/drawable-mdpi/ic_menu_compass.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_compass.png
rename to core/res/res/drawable-mdpi/ic_menu_compass.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_compose.png

diff --git a/core/res/res/drawable/ic_menu_compose.png b/core/res/res/drawable-mdpi/ic_menu_compose.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_compose.png
rename to core/res/res/drawable-mdpi/ic_menu_compose.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_crop.png

diff --git a/core/res/res/drawable/ic_menu_crop.png b/core/res/res/drawable-mdpi/ic_menu_crop.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_crop.png
rename to core/res/res/drawable-mdpi/ic_menu_crop.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_day.png

diff --git a/core/res/res/drawable/ic_menu_day.png b/core/res/res/drawable-mdpi/ic_menu_day.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_day.png
rename to core/res/res/drawable-mdpi/ic_menu_day.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_delete.png

diff --git a/core/res/res/drawable/ic_menu_delete.png b/core/res/res/drawable-mdpi/ic_menu_delete.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_delete.png
rename to core/res/res/drawable-mdpi/ic_menu_delete.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_directions.png

diff --git a/core/res/res/drawable/ic_menu_directions.png b/core/res/res/drawable-mdpi/ic_menu_directions.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_directions.png
rename to core/res/res/drawable-mdpi/ic_menu_directions.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_edit.png

diff --git a/core/res/res/drawable/ic_menu_edit.png b/core/res/res/drawable-mdpi/ic_menu_edit.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_edit.png
rename to core/res/res/drawable-mdpi/ic_menu_edit.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_emoticons.png

diff --git a/core/res/res/drawable/ic_menu_emoticons.png b/core/res/res/drawable-mdpi/ic_menu_emoticons.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_emoticons.png
rename to core/res/res/drawable-mdpi/ic_menu_emoticons.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_end_conversation.png

diff --git a/core/res/res/drawable/ic_menu_end_conversation.png b/core/res/res/drawable-mdpi/ic_menu_end_conversation.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_end_conversation.png
rename to core/res/res/drawable-mdpi/ic_menu_end_conversation.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_forward.png

diff --git a/core/res/res/drawable/ic_menu_forward.png b/core/res/res/drawable-mdpi/ic_menu_forward.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_forward.png
rename to core/res/res/drawable-mdpi/ic_menu_forward.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_friendslist.png

diff --git a/core/res/res/drawable/ic_menu_friendslist.png b/core/res/res/drawable-mdpi/ic_menu_friendslist.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_friendslist.png
rename to core/res/res/drawable-mdpi/ic_menu_friendslist.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_gallery.png

diff --git a/core/res/res/drawable/ic_menu_gallery.png b/core/res/res/drawable-mdpi/ic_menu_gallery.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_gallery.png
rename to core/res/res/drawable-mdpi/ic_menu_gallery.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_goto.png

diff --git a/core/res/res/drawable/ic_menu_goto.png b/core/res/res/drawable-mdpi/ic_menu_goto.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_goto.png
rename to core/res/res/drawable-mdpi/ic_menu_goto.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_help.png

diff --git a/core/res/res/drawable/ic_menu_help.png b/core/res/res/drawable-mdpi/ic_menu_help.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_help.png
rename to core/res/res/drawable-mdpi/ic_menu_help.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_home.png

diff --git a/core/res/res/drawable/ic_menu_home.png b/core/res/res/drawable-mdpi/ic_menu_home.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_home.png
rename to core/res/res/drawable-mdpi/ic_menu_home.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_info_details.png

diff --git a/core/res/res/drawable/ic_menu_info_details.png b/core/res/res/drawable-mdpi/ic_menu_info_details.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_info_details.png
rename to core/res/res/drawable-mdpi/ic_menu_info_details.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_invite.png

diff --git a/core/res/res/drawable/ic_menu_invite.png b/core/res/res/drawable-mdpi/ic_menu_invite.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_invite.png
rename to core/res/res/drawable-mdpi/ic_menu_invite.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_login.png

diff --git a/core/res/res/drawable/ic_menu_login.png b/core/res/res/drawable-mdpi/ic_menu_login.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_login.png
rename to core/res/res/drawable-mdpi/ic_menu_login.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_manage.png

diff --git a/core/res/res/drawable/ic_menu_manage.png b/core/res/res/drawable-mdpi/ic_menu_manage.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_manage.png
rename to core/res/res/drawable-mdpi/ic_menu_manage.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_mapmode.png

diff --git a/core/res/res/drawable/ic_menu_mapmode.png b/core/res/res/drawable-mdpi/ic_menu_mapmode.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_mapmode.png
rename to core/res/res/drawable-mdpi/ic_menu_mapmode.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_mark.png

diff --git a/core/res/res/drawable/ic_menu_mark.png b/core/res/res/drawable-mdpi/ic_menu_mark.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_mark.png
rename to core/res/res/drawable-mdpi/ic_menu_mark.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_month.png

diff --git a/core/res/res/drawable/ic_menu_month.png b/core/res/res/drawable-mdpi/ic_menu_month.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_month.png
rename to core/res/res/drawable-mdpi/ic_menu_month.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_more.png

diff --git a/core/res/res/drawable/ic_menu_more.png b/core/res/res/drawable-mdpi/ic_menu_more.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_more.png
rename to core/res/res/drawable-mdpi/ic_menu_more.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_my_calendar.png

diff --git a/core/res/res/drawable/ic_menu_my_calendar.png b/core/res/res/drawable-mdpi/ic_menu_my_calendar.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_my_calendar.png
rename to core/res/res/drawable-mdpi/ic_menu_my_calendar.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_mylocation.png

diff --git a/core/res/res/drawable/ic_menu_mylocation.png b/core/res/res/drawable-mdpi/ic_menu_mylocation.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_mylocation.png
rename to core/res/res/drawable-mdpi/ic_menu_mylocation.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_myplaces.png

diff --git a/core/res/res/drawable/ic_menu_myplaces.png b/core/res/res/drawable-mdpi/ic_menu_myplaces.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_myplaces.png
rename to core/res/res/drawable-mdpi/ic_menu_myplaces.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_notifications.png

diff --git a/core/res/res/drawable/ic_menu_notifications.png b/core/res/res/drawable-mdpi/ic_menu_notifications.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_notifications.png
rename to core/res/res/drawable-mdpi/ic_menu_notifications.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_play_clip.png

diff --git a/core/res/res/drawable/ic_menu_play_clip.png b/core/res/res/drawable-mdpi/ic_menu_play_clip.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_play_clip.png
rename to core/res/res/drawable-mdpi/ic_menu_play_clip.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_preferences.png

diff --git a/core/res/res/drawable/ic_menu_preferences.png b/core/res/res/drawable-mdpi/ic_menu_preferences.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_preferences.png
rename to core/res/res/drawable-mdpi/ic_menu_preferences.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_recent_history.png

diff --git a/core/res/res/drawable/ic_menu_recent_history.png b/core/res/res/drawable-mdpi/ic_menu_recent_history.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_recent_history.png
rename to core/res/res/drawable-mdpi/ic_menu_recent_history.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_refresh.png

diff --git a/core/res/res/drawable/ic_menu_refresh.png b/core/res/res/drawable-mdpi/ic_menu_refresh.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_refresh.png
rename to core/res/res/drawable-mdpi/ic_menu_refresh.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_report_image.png

diff --git a/core/res/res/drawable/ic_menu_report_image.png b/core/res/res/drawable-mdpi/ic_menu_report_image.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_report_image.png
rename to core/res/res/drawable-mdpi/ic_menu_report_image.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_revert.png

diff --git a/core/res/res/drawable/ic_menu_revert.png b/core/res/res/drawable-mdpi/ic_menu_revert.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_revert.png
rename to core/res/res/drawable-mdpi/ic_menu_revert.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_rotate.png

diff --git a/core/res/res/drawable/ic_menu_rotate.png b/core/res/res/drawable-mdpi/ic_menu_rotate.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_rotate.png
rename to core/res/res/drawable-mdpi/ic_menu_rotate.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_save.png

diff --git a/core/res/res/drawable/ic_menu_save.png b/core/res/res/drawable-mdpi/ic_menu_save.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_save.png
rename to core/res/res/drawable-mdpi/ic_menu_save.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_search.png

diff --git a/core/res/res/drawable/ic_menu_search.png b/core/res/res/drawable-mdpi/ic_menu_search.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_search.png
rename to core/res/res/drawable-mdpi/ic_menu_search.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_send.png

diff --git a/core/res/res/drawable/ic_menu_send.png b/core/res/res/drawable-mdpi/ic_menu_send.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_send.png
rename to core/res/res/drawable-mdpi/ic_menu_send.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_set_as.png

diff --git a/core/res/res/drawable/ic_menu_set_as.png b/core/res/res/drawable-mdpi/ic_menu_set_as.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_set_as.png
rename to core/res/res/drawable-mdpi/ic_menu_set_as.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_share.png

diff --git a/core/res/res/drawable/ic_menu_share.png b/core/res/res/drawable-mdpi/ic_menu_share.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_share.png
rename to core/res/res/drawable-mdpi/ic_menu_share.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_slideshow.png

diff --git a/core/res/res/drawable/ic_menu_slideshow.png b/core/res/res/drawable-mdpi/ic_menu_slideshow.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_slideshow.png
rename to core/res/res/drawable-mdpi/ic_menu_slideshow.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_sort_alphabetically.png

diff --git a/core/res/res/drawable/ic_menu_sort_alphabetically.png b/core/res/res/drawable-mdpi/ic_menu_sort_alphabetically.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_sort_alphabetically.png
rename to core/res/res/drawable-mdpi/ic_menu_sort_alphabetically.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_sort_by_size.png

diff --git a/core/res/res/drawable/ic_menu_sort_by_size.png b/core/res/res/drawable-mdpi/ic_menu_sort_by_size.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_sort_by_size.png
rename to core/res/res/drawable-mdpi/ic_menu_sort_by_size.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_star.png

diff --git a/core/res/res/drawable/ic_menu_star.png b/core/res/res/drawable-mdpi/ic_menu_star.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_star.png
rename to core/res/res/drawable-mdpi/ic_menu_star.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_start_conversation.png

diff --git a/core/res/res/drawable/ic_menu_start_conversation.png b/core/res/res/drawable-mdpi/ic_menu_start_conversation.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_start_conversation.png
rename to core/res/res/drawable-mdpi/ic_menu_start_conversation.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_stop.png

diff --git a/core/res/res/drawable/ic_menu_stop.png b/core/res/res/drawable-mdpi/ic_menu_stop.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_stop.png
rename to core/res/res/drawable-mdpi/ic_menu_stop.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_today.png

diff --git a/core/res/res/drawable/ic_menu_today.png b/core/res/res/drawable-mdpi/ic_menu_today.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_today.png
rename to core/res/res/drawable-mdpi/ic_menu_today.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_upload.png

diff --git a/core/res/res/drawable/ic_menu_upload.png b/core/res/res/drawable-mdpi/ic_menu_upload.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_upload.png
rename to core/res/res/drawable-mdpi/ic_menu_upload.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_upload_you_tube.png

diff --git a/core/res/res/drawable/ic_menu_upload_you_tube.png b/core/res/res/drawable-mdpi/ic_menu_upload_you_tube.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_upload_you_tube.png
rename to core/res/res/drawable-mdpi/ic_menu_upload_you_tube.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_view.png

diff --git a/core/res/res/drawable/ic_menu_view.png b/core/res/res/drawable-mdpi/ic_menu_view.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_view.png
rename to core/res/res/drawable-mdpi/ic_menu_view.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_week.png

diff --git a/core/res/res/drawable/ic_menu_week.png b/core/res/res/drawable-mdpi/ic_menu_week.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_week.png
rename to core/res/res/drawable-mdpi/ic_menu_week.png
Binary files differ

core/res/res/drawable-mdpi/ic_menu_zoom.png

diff --git a/core/res/res/drawable/ic_menu_zoom.png b/core/res/res/drawable-mdpi/ic_menu_zoom.png
similarity index 100%
rename from core/res/res/drawable/ic_menu_zoom.png
rename to core/res/res/drawable-mdpi/ic_menu_zoom.png
Binary files differ

core/res/res/drawable-mdpi/ic_notification_clear_all.png

diff --git a/core/res/res/drawable/ic_notification_clear_all.png b/core/res/res/drawable-mdpi/ic_notification_clear_all.png
similarity index 100%
rename from core/res/res/drawable/ic_notification_clear_all.png
rename to core/res/res/drawable-mdpi/ic_notification_clear_all.png
Binary files differ

core/res/res/drawable-mdpi/ic_notification_overlay.9.png

diff --git a/core/res/res/drawable/ic_notification_overlay.9.png b/core/res/res/drawable-mdpi/ic_notification_overlay.9.png
similarity index 100%
rename from core/res/res/drawable/ic_notification_overlay.9.png
rename to core/res/res/drawable-mdpi/ic_notification_overlay.9.png
Binary files differ

core/res/res/drawable-mdpi/ic_partial_secure.png

diff --git a/core/res/res/drawable/ic_partial_secure.png b/core/res/res/drawable-mdpi/ic_partial_secure.png
similarity index 100%
rename from core/res/res/drawable/ic_partial_secure.png
rename to core/res/res/drawable-mdpi/ic_partial_secure.png
Binary files differ

core/res/res/drawable-mdpi/ic_popup_disk_full.png

diff --git a/core/res/res/drawable/ic_popup_disk_full.png b/core/res/res/drawable-mdpi/ic_popup_disk_full.png
similarity index 100%
rename from core/res/res/drawable/ic_popup_disk_full.png
rename to core/res/res/drawable-mdpi/ic_popup_disk_full.png
Binary files differ

core/res/res/drawable-mdpi/ic_popup_reminder.png

diff --git a/core/res/res/drawable/ic_popup_reminder.png b/core/res/res/drawable-mdpi/ic_popup_reminder.png
similarity index 100%
rename from core/res/res/drawable/ic_popup_reminder.png
rename to core/res/res/drawable-mdpi/ic_popup_reminder.png
Binary files differ

core/res/res/drawable-mdpi/ic_popup_sync_1.png

diff --git a/core/res/res/drawable/ic_popup_sync_1.png b/core/res/res/drawable-mdpi/ic_popup_sync_1.png
similarity index 100%
rename from core/res/res/drawable/ic_popup_sync_1.png
rename to core/res/res/drawable-mdpi/ic_popup_sync_1.png
Binary files differ

core/res/res/drawable-mdpi/ic_popup_sync_2.png

diff --git a/core/res/res/drawable/ic_popup_sync_2.png b/core/res/res/drawable-mdpi/ic_popup_sync_2.png
similarity index 100%
rename from core/res/res/drawable/ic_popup_sync_2.png
rename to core/res/res/drawable-mdpi/ic_popup_sync_2.png
Binary files differ

core/res/res/drawable-mdpi/ic_popup_sync_3.png

diff --git a/core/res/res/drawable/ic_popup_sync_3.png b/core/res/res/drawable-mdpi/ic_popup_sync_3.png
similarity index 100%
rename from core/res/res/drawable/ic_popup_sync_3.png
rename to core/res/res/drawable-mdpi/ic_popup_sync_3.png
Binary files differ

core/res/res/drawable-mdpi/ic_popup_sync_4.png

diff --git a/core/res/res/drawable/ic_popup_sync_4.png b/core/res/res/drawable-mdpi/ic_popup_sync_4.png
similarity index 100%
rename from core/res/res/drawable/ic_popup_sync_4.png
rename to core/res/res/drawable-mdpi/ic_popup_sync_4.png
Binary files differ

core/res/res/drawable-mdpi/ic_popup_sync_5.png

diff --git a/core/res/res/drawable/ic_popup_sync_5.png b/core/res/res/drawable-mdpi/ic_popup_sync_5.png
similarity index 100%
rename from core/res/res/drawable/ic_popup_sync_5.png
rename to core/res/res/drawable-mdpi/ic_popup_sync_5.png
Binary files differ

core/res/res/drawable-mdpi/ic_popup_sync_6.png

diff --git a/core/res/res/drawable/ic_popup_sync_6.png b/core/res/res/drawable-mdpi/ic_popup_sync_6.png
similarity index 100%
rename from core/res/res/drawable/ic_popup_sync_6.png
rename to core/res/res/drawable-mdpi/ic_popup_sync_6.png
Binary files differ

core/res/res/drawable-mdpi/ic_search_category_default.png

diff --git a/core/res/res/drawable/ic_search_category_default.png b/core/res/res/drawable-mdpi/ic_search_category_default.png
similarity index 100%
rename from core/res/res/drawable/ic_search_category_default.png
rename to core/res/res/drawable-mdpi/ic_search_category_default.png
Binary files differ

core/res/res/drawable-mdpi/ic_secure.png

diff --git a/core/res/res/drawable/ic_secure.png b/core/res/res/drawable-mdpi/ic_secure.png
similarity index 100%
rename from core/res/res/drawable/ic_secure.png
rename to core/res/res/drawable-mdpi/ic_secure.png
Binary files differ

core/res/res/drawable-mdpi/ic_text_dot.png

diff --git a/core/res/res/drawable/ic_text_dot.png b/core/res/res/drawable-mdpi/ic_text_dot.png
similarity index 100%
rename from core/res/res/drawable/ic_text_dot.png
rename to core/res/res/drawable-mdpi/ic_text_dot.png
Binary files differ

core/res/res/drawable-mdpi/ic_vibrate.png

diff --git a/core/res/res/drawable/ic_vibrate.png b/core/res/res/drawable-mdpi/ic_vibrate.png
similarity index 100%
rename from core/res/res/drawable/ic_vibrate.png
rename to core/res/res/drawable-mdpi/ic_vibrate.png
Binary files differ

core/res/res/drawable-mdpi/ic_volume.png

diff --git a/core/res/res/drawable/ic_volume.png b/core/res/res/drawable-mdpi/ic_volume.png
similarity index 100%
rename from core/res/res/drawable/ic_volume.png
rename to core/res/res/drawable-mdpi/ic_volume.png
Binary files differ

core/res/res/drawable-mdpi/ic_volume_bluetooth_ad2p.png

diff --git a/core/res/res/drawable/ic_volume_bluetooth_ad2p.png b/core/res/res/drawable-mdpi/ic_volume_bluetooth_ad2p.png
similarity index 100%
rename from core/res/res/drawable/ic_volume_bluetooth_ad2p.png
rename to core/res/res/drawable-mdpi/ic_volume_bluetooth_ad2p.png
Binary files differ

core/res/res/drawable-mdpi/ic_volume_bluetooth_in_call.png

diff --git a/core/res/res/drawable/ic_volume_bluetooth_in_call.png b/core/res/res/drawable-mdpi/ic_volume_bluetooth_in_call.png
similarity index 100%
rename from core/res/res/drawable/ic_volume_bluetooth_in_call.png
rename to core/res/res/drawable-mdpi/ic_volume_bluetooth_in_call.png
Binary files differ

core/res/res/drawable-mdpi/ic_volume_off.png

diff --git a/core/res/res/drawable/ic_volume_off.png b/core/res/res/drawable-mdpi/ic_volume_off.png
similarity index 100%
rename from core/res/res/drawable/ic_volume_off.png
rename to core/res/res/drawable-mdpi/ic_volume_off.png
Binary files differ

core/res/res/drawable-mdpi/ic_volume_off_small.png

diff --git a/core/res/res/drawable/ic_volume_off_small.png b/core/res/res/drawable-mdpi/ic_volume_off_small.png
similarity index 100%
rename from core/res/res/drawable/ic_volume_off_small.png
rename to core/res/res/drawable-mdpi/ic_volume_off_small.png
Binary files differ

core/res/res/drawable-mdpi/ic_volume_small.png

diff --git a/core/res/res/drawable/ic_volume_small.png b/core/res/res/drawable-mdpi/ic_volume_small.png
similarity index 100%
rename from core/res/res/drawable/ic_volume_small.png
rename to core/res/res/drawable-mdpi/ic_volume_small.png
Binary files differ

core/res/res/drawable-mdpi/icon_highlight_rectangle.9.png

diff --git a/core/res/res/drawable/icon_highlight_rectangle.9.png b/core/res/res/drawable-mdpi/icon_highlight_rectangle.9.png
similarity index 100%
rename from core/res/res/drawable/icon_highlight_rectangle.9.png
rename to core/res/res/drawable-mdpi/icon_highlight_rectangle.9.png
Binary files differ

core/res/res/drawable-mdpi/icon_highlight_square.9.png

diff --git a/core/res/res/drawable/icon_highlight_square.9.png b/core/res/res/drawable-mdpi/icon_highlight_square.9.png
similarity index 100%
rename from core/res/res/drawable/icon_highlight_square.9.png
rename to core/res/res/drawable-mdpi/icon_highlight_square.9.png
Binary files differ

core/res/res/drawable-mdpi/ime_qwerty.png

diff --git a/core/res/res/drawable/ime_qwerty.png b/core/res/res/drawable-mdpi/ime_qwerty.png
similarity index 100%
rename from core/res/res/drawable/ime_qwerty.png
rename to core/res/res/drawable-mdpi/ime_qwerty.png
Binary files differ

core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png

diff --git a/core/res/res/drawable/indicator_code_lock_drag_direction_green_up.png b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png
similarity index 100%
rename from core/res/res/drawable/indicator_code_lock_drag_direction_green_up.png
rename to core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png
Binary files differ

core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png

diff --git a/core/res/res/drawable/indicator_code_lock_drag_direction_red_up.png b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png
similarity index 100%
rename from core/res/res/drawable/indicator_code_lock_drag_direction_red_up.png
rename to core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png
Binary files differ

core/res/res/drawable-mdpi/indicator_code_lock_point_area_default.png

diff --git a/core/res/res/drawable/indicator_code_lock_point_area_default.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default.png
similarity index 100%
rename from core/res/res/drawable/indicator_code_lock_point_area_default.png
rename to core/res/res/drawable-mdpi/indicator_code_lock_point_area_default.png
Binary files differ

core/res/res/drawable-mdpi/indicator_code_lock_point_area_green.png

diff --git a/core/res/res/drawable/indicator_code_lock_point_area_green.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green.png
similarity index 100%
rename from core/res/res/drawable/indicator_code_lock_point_area_green.png
rename to core/res/res/drawable-mdpi/indicator_code_lock_point_area_green.png
Binary files differ

core/res/res/drawable-mdpi/indicator_code_lock_point_area_red.png

diff --git a/core/res/res/drawable/indicator_code_lock_point_area_red.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red.png
similarity index 100%
rename from core/res/res/drawable/indicator_code_lock_point_area_red.png
rename to core/res/res/drawable-mdpi/indicator_code_lock_point_area_red.png
Binary files differ

core/res/res/drawable-mdpi/indicator_input_error.png

diff --git a/core/res/res/drawable/indicator_input_error.png b/core/res/res/drawable-mdpi/indicator_input_error.png
similarity index 100%
rename from core/res/res/drawable/indicator_input_error.png
rename to core/res/res/drawable-mdpi/indicator_input_error.png
Binary files differ

core/res/res/drawable-mdpi/keyboard_accessory_bg_landscape.9.png

diff --git a/core/res/res/drawable/keyboard_accessory_bg_landscape.9.png b/core/res/res/drawable-mdpi/keyboard_accessory_bg_landscape.9.png
similarity index 100%
rename from core/res/res/drawable/keyboard_accessory_bg_landscape.9.png
rename to core/res/res/drawable-mdpi/keyboard_accessory_bg_landscape.9.png
Binary files differ

core/res/res/drawable-mdpi/keyboard_background.9.png

diff --git a/core/res/res/drawable/keyboard_background.9.png b/core/res/res/drawable-mdpi/keyboard_background.9.png
similarity index 100%
rename from core/res/res/drawable/keyboard_background.9.png
rename to core/res/res/drawable-mdpi/keyboard_background.9.png
Binary files differ

core/res/res/drawable-mdpi/keyboard_key_feedback_background.9.png

diff --git a/core/res/res/drawable/keyboard_key_feedback_background.9.png b/core/res/res/drawable-mdpi/keyboard_key_feedback_background.9.png
similarity index 100%
rename from core/res/res/drawable/keyboard_key_feedback_background.9.png
rename to core/res/res/drawable-mdpi/keyboard_key_feedback_background.9.png
Binary files differ

core/res/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png

diff --git a/core/res/res/drawable/keyboard_key_feedback_more_background.9.png b/core/res/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png
similarity index 100%
rename from core/res/res/drawable/keyboard_key_feedback_more_background.9.png
rename to core/res/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png
Binary files differ

core/res/res/drawable-mdpi/keyboard_popup_panel_background.9.png

diff --git a/core/res/res/drawable/keyboard_popup_panel_background.9.png b/core/res/res/drawable-mdpi/keyboard_popup_panel_background.9.png
similarity index 100%
rename from core/res/res/drawable/keyboard_popup_panel_background.9.png
rename to core/res/res/drawable-mdpi/keyboard_popup_panel_background.9.png
Binary files differ

core/res/res/drawable-mdpi/keyboard_textfield_selected.9.png

diff --git a/core/res/res/drawable/keyboard_textfield_selected.9.png b/core/res/res/drawable-mdpi/keyboard_textfield_selected.9.png
similarity index 100%
rename from core/res/res/drawable/keyboard_textfield_selected.9.png
rename to core/res/res/drawable-mdpi/keyboard_textfield_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/light_header.9.png

diff --git a/core/res/res/drawable/light_header.9.png b/core/res/res/drawable-mdpi/light_header.9.png
similarity index 100%
rename from core/res/res/drawable/light_header.9.png
rename to core/res/res/drawable-mdpi/light_header.9.png
Binary files differ

core/res/res/drawable-mdpi/list_selector_background_disabled.9.png

diff --git a/core/res/res/drawable/list_selector_background_disabled.9.png b/core/res/res/drawable-mdpi/list_selector_background_disabled.9.png
similarity index 100%
rename from core/res/res/drawable/list_selector_background_disabled.9.png
rename to core/res/res/drawable-mdpi/list_selector_background_disabled.9.png
Binary files differ

core/res/res/drawable-mdpi/list_selector_background_focus.9.png

diff --git a/core/res/res/drawable/list_selector_background_focus.9.png b/core/res/res/drawable-mdpi/list_selector_background_focus.9.png
similarity index 100%
rename from core/res/res/drawable/list_selector_background_focus.9.png
rename to core/res/res/drawable-mdpi/list_selector_background_focus.9.png
Binary files differ

core/res/res/drawable-mdpi/list_selector_background_longpress.9.png

diff --git a/core/res/res/drawable/list_selector_background_longpress.9.png b/core/res/res/drawable-mdpi/list_selector_background_longpress.9.png
similarity index 100%
rename from core/res/res/drawable/list_selector_background_longpress.9.png
rename to core/res/res/drawable-mdpi/list_selector_background_longpress.9.png
Binary files differ

core/res/res/drawable-mdpi/list_selector_background_pressed.9.png

diff --git a/core/res/res/drawable/list_selector_background_pressed.9.png b/core/res/res/drawable-mdpi/list_selector_background_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/list_selector_background_pressed.9.png
rename to core/res/res/drawable-mdpi/list_selector_background_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/loading_tile.png

diff --git a/core/res/res/drawable/loading_tile.png b/core/res/res/drawable-mdpi/loading_tile.png
similarity index 100%
rename from core/res/res/drawable/loading_tile.png
rename to core/res/res/drawable-mdpi/loading_tile.png
Binary files differ

core/res/res/drawable-mdpi/maps_google_logo.png

diff --git a/core/res/res/drawable/maps_google_logo.png b/core/res/res/drawable-mdpi/maps_google_logo.png
similarity index 100%
rename from core/res/res/drawable/maps_google_logo.png
rename to core/res/res/drawable-mdpi/maps_google_logo.png
Binary files differ

core/res/res/drawable-mdpi/menu_background.9.png

diff --git a/core/res/res/drawable/menu_background.9.png b/core/res/res/drawable-mdpi/menu_background.9.png
similarity index 100%
rename from core/res/res/drawable/menu_background.9.png
rename to core/res/res/drawable-mdpi/menu_background.9.png
Binary files differ

core/res/res/drawable-mdpi/menu_background_fill_parent_width.9.png

diff --git a/core/res/res/drawable/menu_background_fill_parent_width.9.png b/core/res/res/drawable-mdpi/menu_background_fill_parent_width.9.png
similarity index 100%
rename from core/res/res/drawable/menu_background_fill_parent_width.9.png
rename to core/res/res/drawable-mdpi/menu_background_fill_parent_width.9.png
Binary files differ

core/res/res/drawable-mdpi/menu_separator.9.png

diff --git a/core/res/res/drawable/menu_separator.9.png b/core/res/res/drawable-mdpi/menu_separator.9.png
similarity index 100%
rename from core/res/res/drawable/menu_separator.9.png
rename to core/res/res/drawable-mdpi/menu_separator.9.png
Binary files differ

core/res/res/drawable-mdpi/menu_submenu_background.9.png

diff --git a/core/res/res/drawable/menu_submenu_background.9.png b/core/res/res/drawable-mdpi/menu_submenu_background.9.png
similarity index 100%
rename from core/res/res/drawable/menu_submenu_background.9.png
rename to core/res/res/drawable-mdpi/menu_submenu_background.9.png
Binary files differ

core/res/res/drawable-mdpi/menuitem_background_focus.9.png

diff --git a/core/res/res/drawable/menuitem_background_focus.9.png b/core/res/res/drawable-mdpi/menuitem_background_focus.9.png
similarity index 100%
rename from core/res/res/drawable/menuitem_background_focus.9.png
rename to core/res/res/drawable-mdpi/menuitem_background_focus.9.png
Binary files differ

core/res/res/drawable-mdpi/menuitem_background_pressed.9.png

diff --git a/core/res/res/drawable/menuitem_background_pressed.9.png b/core/res/res/drawable-mdpi/menuitem_background_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/menuitem_background_pressed.9.png
rename to core/res/res/drawable-mdpi/menuitem_background_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/menuitem_background_solid_focused.9.png

diff --git a/core/res/res/drawable/menuitem_background_solid_focused.9.png b/core/res/res/drawable-mdpi/menuitem_background_solid_focused.9.png
similarity index 100%
copy from core/res/res/drawable/menuitem_background_solid_focused.9.png
copy to core/res/res/drawable-mdpi/menuitem_background_solid_focused.9.png
Binary files differ

core/res/res/drawable-mdpi/menuitem_background_solid_pressed.9.png

diff --git a/core/res/res/drawable/menuitem_background_solid_pressed.9.png b/core/res/res/drawable-mdpi/menuitem_background_solid_pressed.9.png
similarity index 100%
copy from core/res/res/drawable/menuitem_background_solid_pressed.9.png
copy to core/res/res/drawable-mdpi/menuitem_background_solid_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/menuitem_checkbox_on.png

diff --git a/core/res/res/drawable/menuitem_checkbox_on.png b/core/res/res/drawable-mdpi/menuitem_checkbox_on.png
similarity index 100%
rename from core/res/res/drawable/menuitem_checkbox_on.png
rename to core/res/res/drawable-mdpi/menuitem_checkbox_on.png
Binary files differ

core/res/res/drawable-mdpi/no_tile_128.png

diff --git a/core/res/res/drawable/no_tile_128.png b/core/res/res/drawable-mdpi/no_tile_128.png
similarity index 100%
rename from core/res/res/drawable/no_tile_128.png
rename to core/res/res/drawable-mdpi/no_tile_128.png
Binary files differ

core/res/res/drawable-mdpi/panel_background.9.png

diff --git a/core/res/res/drawable/panel_background.9.png b/core/res/res/drawable-mdpi/panel_background.9.png
similarity index 100%
rename from core/res/res/drawable/panel_background.9.png
rename to core/res/res/drawable-mdpi/panel_background.9.png
Binary files differ

core/res/res/drawable-mdpi/panel_picture_frame_bg_focus_blue.9.png

diff --git a/core/res/res/drawable/panel_picture_frame_bg_focus_blue.9.png b/core/res/res/drawable-mdpi/panel_picture_frame_bg_focus_blue.9.png
similarity index 100%
rename from core/res/res/drawable/panel_picture_frame_bg_focus_blue.9.png
rename to core/res/res/drawable-mdpi/panel_picture_frame_bg_focus_blue.9.png
Binary files differ

core/res/res/drawable-mdpi/panel_picture_frame_bg_normal.9.png

diff --git a/core/res/res/drawable/panel_picture_frame_bg_normal.9.png b/core/res/res/drawable-mdpi/panel_picture_frame_bg_normal.9.png
similarity index 100%
rename from core/res/res/drawable/panel_picture_frame_bg_normal.9.png
rename to core/res/res/drawable-mdpi/panel_picture_frame_bg_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/panel_picture_frame_bg_pressed_blue.9.png

diff --git a/core/res/res/drawable/panel_picture_frame_bg_pressed_blue.9.png b/core/res/res/drawable-mdpi/panel_picture_frame_bg_pressed_blue.9.png
similarity index 100%
rename from core/res/res/drawable/panel_picture_frame_bg_pressed_blue.9.png
rename to core/res/res/drawable-mdpi/panel_picture_frame_bg_pressed_blue.9.png
Binary files differ

core/res/res/drawable-mdpi/pickerbox_background.png

diff --git a/core/res/res/drawable/pickerbox_background.png b/core/res/res/drawable-mdpi/pickerbox_background.png
similarity index 100%
rename from core/res/res/drawable/pickerbox_background.png
rename to core/res/res/drawable-mdpi/pickerbox_background.png
Binary files differ

core/res/res/drawable-mdpi/pickerbox_selected.9.png

diff --git a/core/res/res/drawable/pickerbox_selected.9.png b/core/res/res/drawable-mdpi/pickerbox_selected.9.png
similarity index 100%
rename from core/res/res/drawable/pickerbox_selected.9.png
rename to core/res/res/drawable-mdpi/pickerbox_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/pickerbox_unselected.9.png

diff --git a/core/res/res/drawable/pickerbox_unselected.9.png b/core/res/res/drawable-mdpi/pickerbox_unselected.9.png
similarity index 100%
rename from core/res/res/drawable/pickerbox_unselected.9.png
rename to core/res/res/drawable-mdpi/pickerbox_unselected.9.png
Binary files differ

core/res/res/drawable-mdpi/picture_emergency.png

diff --git a/core/res/res/drawable/picture_emergency.png b/core/res/res/drawable-mdpi/picture_emergency.png
similarity index 100%
rename from core/res/res/drawable/picture_emergency.png
rename to core/res/res/drawable-mdpi/picture_emergency.png
Binary files differ

core/res/res/drawable-mdpi/picture_frame.9.png

diff --git a/core/res/res/drawable/picture_frame.9.png b/core/res/res/drawable-mdpi/picture_frame.9.png
similarity index 100%
rename from core/res/res/drawable/picture_frame.9.png
rename to core/res/res/drawable-mdpi/picture_frame.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_bottom_bright.9.png

diff --git a/core/res/res/drawable/popup_bottom_bright.9.png b/core/res/res/drawable-mdpi/popup_bottom_bright.9.png
similarity index 100%
rename from core/res/res/drawable/popup_bottom_bright.9.png
rename to core/res/res/drawable-mdpi/popup_bottom_bright.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_bottom_dark.9.png

diff --git a/core/res/res/drawable/popup_bottom_dark.9.png b/core/res/res/drawable-mdpi/popup_bottom_dark.9.png
similarity index 100%
rename from core/res/res/drawable/popup_bottom_dark.9.png
rename to core/res/res/drawable-mdpi/popup_bottom_dark.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_bottom_medium.9.png

diff --git a/core/res/res/drawable/popup_bottom_medium.9.png b/core/res/res/drawable-mdpi/popup_bottom_medium.9.png
similarity index 100%
rename from core/res/res/drawable/popup_bottom_medium.9.png
rename to core/res/res/drawable-mdpi/popup_bottom_medium.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_center_bright.9.png

diff --git a/core/res/res/drawable/popup_center_bright.9.png b/core/res/res/drawable-mdpi/popup_center_bright.9.png
similarity index 100%
rename from core/res/res/drawable/popup_center_bright.9.png
rename to core/res/res/drawable-mdpi/popup_center_bright.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_center_dark.9.png

diff --git a/core/res/res/drawable/popup_center_dark.9.png b/core/res/res/drawable-mdpi/popup_center_dark.9.png
similarity index 100%
rename from core/res/res/drawable/popup_center_dark.9.png
rename to core/res/res/drawable-mdpi/popup_center_dark.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_center_medium.9.png

diff --git a/core/res/res/drawable/popup_center_medium.9.png b/core/res/res/drawable-mdpi/popup_center_medium.9.png
similarity index 100%
rename from core/res/res/drawable/popup_center_medium.9.png
rename to core/res/res/drawable-mdpi/popup_center_medium.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_full_bright.9.png

diff --git a/core/res/res/drawable/popup_full_bright.9.png b/core/res/res/drawable-mdpi/popup_full_bright.9.png
similarity index 100%
rename from core/res/res/drawable/popup_full_bright.9.png
rename to core/res/res/drawable-mdpi/popup_full_bright.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_full_dark.9.png

diff --git a/core/res/res/drawable/popup_full_dark.9.png b/core/res/res/drawable-mdpi/popup_full_dark.9.png
similarity index 100%
rename from core/res/res/drawable/popup_full_dark.9.png
rename to core/res/res/drawable-mdpi/popup_full_dark.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_inline_error.9.png

diff --git a/core/res/res/drawable/popup_inline_error.9.png b/core/res/res/drawable-mdpi/popup_inline_error.9.png
similarity index 100%
rename from core/res/res/drawable/popup_inline_error.9.png
rename to core/res/res/drawable-mdpi/popup_inline_error.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_inline_error_above.9.png

diff --git a/core/res/res/drawable/popup_inline_error_above.9.png b/core/res/res/drawable-mdpi/popup_inline_error_above.9.png
similarity index 100%
rename from core/res/res/drawable/popup_inline_error_above.9.png
rename to core/res/res/drawable-mdpi/popup_inline_error_above.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_top_bright.9.png

diff --git a/core/res/res/drawable/popup_top_bright.9.png b/core/res/res/drawable-mdpi/popup_top_bright.9.png
similarity index 100%
rename from core/res/res/drawable/popup_top_bright.9.png
rename to core/res/res/drawable-mdpi/popup_top_bright.9.png
Binary files differ

core/res/res/drawable-mdpi/popup_top_dark.9.png

diff --git a/core/res/res/drawable/popup_top_dark.9.png b/core/res/res/drawable-mdpi/popup_top_dark.9.png
similarity index 100%
rename from core/res/res/drawable/popup_top_dark.9.png
rename to core/res/res/drawable-mdpi/popup_top_dark.9.png
Binary files differ

core/res/res/drawable-mdpi/presence_away.png

diff --git a/core/res/res/drawable/presence_away.png b/core/res/res/drawable-mdpi/presence_away.png
similarity index 100%
rename from core/res/res/drawable/presence_away.png
rename to core/res/res/drawable-mdpi/presence_away.png
Binary files differ

core/res/res/drawable-mdpi/presence_busy.png

diff --git a/core/res/res/drawable/presence_busy.png b/core/res/res/drawable-mdpi/presence_busy.png
similarity index 100%
rename from core/res/res/drawable/presence_busy.png
rename to core/res/res/drawable-mdpi/presence_busy.png
Binary files differ

core/res/res/drawable-mdpi/presence_invisible.png

diff --git a/core/res/res/drawable/presence_invisible.png b/core/res/res/drawable-mdpi/presence_invisible.png
similarity index 100%
rename from core/res/res/drawable/presence_invisible.png
rename to core/res/res/drawable-mdpi/presence_invisible.png
Binary files differ

core/res/res/drawable-mdpi/presence_offline.png

diff --git a/core/res/res/drawable/presence_offline.png b/core/res/res/drawable-mdpi/presence_offline.png
similarity index 100%
rename from core/res/res/drawable/presence_offline.png
rename to core/res/res/drawable-mdpi/presence_offline.png
Binary files differ

core/res/res/drawable-mdpi/presence_online.png

diff --git a/core/res/res/drawable/presence_online.png b/core/res/res/drawable-mdpi/presence_online.png
similarity index 100%
rename from core/res/res/drawable/presence_online.png
rename to core/res/res/drawable-mdpi/presence_online.png
Binary files differ

core/res/res/drawable-mdpi/pressed_application_background_static.png

diff --git a/core/res/res/drawable/pressed_application_background_static.png b/core/res/res/drawable-mdpi/pressed_application_background_static.png
similarity index 100%
rename from core/res/res/drawable/pressed_application_background_static.png
rename to core/res/res/drawable-mdpi/pressed_application_background_static.png
Binary files differ

core/res/res/drawable-mdpi/progressbar_indeterminate1.png

diff --git a/core/res/res/drawable/progressbar_indeterminate1.png b/core/res/res/drawable-mdpi/progressbar_indeterminate1.png
similarity index 100%
rename from core/res/res/drawable/progressbar_indeterminate1.png
rename to core/res/res/drawable-mdpi/progressbar_indeterminate1.png
Binary files differ

core/res/res/drawable-mdpi/progressbar_indeterminate2.png

diff --git a/core/res/res/drawable/progressbar_indeterminate2.png b/core/res/res/drawable-mdpi/progressbar_indeterminate2.png
similarity index 100%
rename from core/res/res/drawable/progressbar_indeterminate2.png
rename to core/res/res/drawable-mdpi/progressbar_indeterminate2.png
Binary files differ

core/res/res/drawable-mdpi/progressbar_indeterminate3.png

diff --git a/core/res/res/drawable/progressbar_indeterminate3.png b/core/res/res/drawable-mdpi/progressbar_indeterminate3.png
similarity index 100%
rename from core/res/res/drawable/progressbar_indeterminate3.png
rename to core/res/res/drawable-mdpi/progressbar_indeterminate3.png
Binary files differ

core/res/res/drawable-mdpi/radiobutton_off_background.png

diff --git a/core/res/res/drawable/radiobutton_off_background.png b/core/res/res/drawable-mdpi/radiobutton_off_background.png
similarity index 100%
rename from core/res/res/drawable/radiobutton_off_background.png
rename to core/res/res/drawable-mdpi/radiobutton_off_background.png
Binary files differ

core/res/res/drawable-mdpi/radiobutton_on_background.png

diff --git a/core/res/res/drawable/radiobutton_on_background.png b/core/res/res/drawable-mdpi/radiobutton_on_background.png
similarity index 100%
rename from core/res/res/drawable/radiobutton_on_background.png
rename to core/res/res/drawable-mdpi/radiobutton_on_background.png
Binary files differ

core/res/res/drawable-mdpi/rate_star_big_half.png

diff --git a/core/res/res/drawable/rate_star_big_half.png b/core/res/res/drawable-mdpi/rate_star_big_half.png
similarity index 100%
rename from core/res/res/drawable/rate_star_big_half.png
rename to core/res/res/drawable-mdpi/rate_star_big_half.png
Binary files differ

core/res/res/drawable-mdpi/rate_star_big_off.png

diff --git a/core/res/res/drawable/rate_star_big_off.png b/core/res/res/drawable-mdpi/rate_star_big_off.png
similarity index 100%
rename from core/res/res/drawable/rate_star_big_off.png
rename to core/res/res/drawable-mdpi/rate_star_big_off.png
Binary files differ

core/res/res/drawable-mdpi/rate_star_big_on.png

diff --git a/core/res/res/drawable/rate_star_big_on.png b/core/res/res/drawable-mdpi/rate_star_big_on.png
similarity index 100%
rename from core/res/res/drawable/rate_star_big_on.png
rename to core/res/res/drawable-mdpi/rate_star_big_on.png
Binary files differ

core/res/res/drawable-mdpi/rate_star_small_half.png

diff --git a/core/res/res/drawable/rate_star_small_half.png b/core/res/res/drawable-mdpi/rate_star_small_half.png
similarity index 100%
rename from core/res/res/drawable/rate_star_small_half.png
rename to core/res/res/drawable-mdpi/rate_star_small_half.png
Binary files differ

core/res/res/drawable-mdpi/rate_star_small_off.png

diff --git a/core/res/res/drawable/rate_star_small_off.png b/core/res/res/drawable-mdpi/rate_star_small_off.png
similarity index 100%
rename from core/res/res/drawable/rate_star_small_off.png
rename to core/res/res/drawable-mdpi/rate_star_small_off.png
Binary files differ

core/res/res/drawable-mdpi/rate_star_small_on.png

diff --git a/core/res/res/drawable/rate_star_small_on.png b/core/res/res/drawable-mdpi/rate_star_small_on.png
similarity index 100%
rename from core/res/res/drawable/rate_star_small_on.png
rename to core/res/res/drawable-mdpi/rate_star_small_on.png
Binary files differ

core/res/res/drawable-mdpi/reticle.png

diff --git a/core/res/res/drawable/reticle.png b/core/res/res/drawable-mdpi/reticle.png
similarity index 100%
rename from core/res/res/drawable/reticle.png
rename to core/res/res/drawable-mdpi/reticle.png
Binary files differ

core/res/res/drawable-mdpi/screen_progress_frame.9.png

diff --git a/core/res/res/drawable/screen_progress_frame.9.png b/core/res/res/drawable-mdpi/screen_progress_frame.9.png
similarity index 100%
rename from core/res/res/drawable/screen_progress_frame.9.png
rename to core/res/res/drawable-mdpi/screen_progress_frame.9.png
Binary files differ

core/res/res/drawable-mdpi/screen_progress_inner.9.png

diff --git a/core/res/res/drawable/screen_progress_inner.9.png b/core/res/res/drawable-mdpi/screen_progress_inner.9.png
similarity index 100%
rename from core/res/res/drawable/screen_progress_inner.9.png
rename to core/res/res/drawable-mdpi/screen_progress_inner.9.png
Binary files differ

core/res/res/drawable-mdpi/scrollbar_handle_accelerated_anim2.9.png

diff --git a/core/res/res/drawable/scrollbar_handle_accelerated_anim2.9.png b/core/res/res/drawable-mdpi/scrollbar_handle_accelerated_anim2.9.png
similarity index 100%
rename from core/res/res/drawable/scrollbar_handle_accelerated_anim2.9.png
rename to core/res/res/drawable-mdpi/scrollbar_handle_accelerated_anim2.9.png
Binary files differ

core/res/res/drawable-mdpi/scrollbar_handle_horizontal.9.png

diff --git a/core/res/res/drawable/scrollbar_handle_horizontal.9.png b/core/res/res/drawable-mdpi/scrollbar_handle_horizontal.9.png
similarity index 100%
rename from core/res/res/drawable/scrollbar_handle_horizontal.9.png
rename to core/res/res/drawable-mdpi/scrollbar_handle_horizontal.9.png
Binary files differ

core/res/res/drawable-mdpi/scrollbar_handle_vertical.9.png

diff --git a/core/res/res/drawable/scrollbar_handle_vertical.9.png b/core/res/res/drawable-mdpi/scrollbar_handle_vertical.9.png
similarity index 100%
rename from core/res/res/drawable/scrollbar_handle_vertical.9.png
rename to core/res/res/drawable-mdpi/scrollbar_handle_vertical.9.png
Binary files differ

core/res/res/drawable-mdpi/search_dropdown_background.9.png

diff --git a/core/res/res/drawable/search_dropdown_background.9.png b/core/res/res/drawable-mdpi/search_dropdown_background.9.png
similarity index 100%
rename from core/res/res/drawable/search_dropdown_background.9.png
rename to core/res/res/drawable-mdpi/search_dropdown_background.9.png
Binary files differ

core/res/res/drawable-mdpi/search_plate.9.png

diff --git a/core/res/res/drawable/search_plate.9.png b/core/res/res/drawable-mdpi/search_plate.9.png
similarity index 100%
rename from core/res/res/drawable/search_plate.9.png
rename to core/res/res/drawable-mdpi/search_plate.9.png
Binary files differ

core/res/res/drawable-mdpi/search_plate_global.9.png

diff --git a/core/res/res/drawable/search_plate_global.9.png b/core/res/res/drawable-mdpi/search_plate_global.9.png
similarity index 100%
rename from core/res/res/drawable/search_plate_global.9.png
rename to core/res/res/drawable-mdpi/search_plate_global.9.png
Binary files differ

core/res/res/drawable-mdpi/seek_thumb_normal.png

diff --git a/core/res/res/drawable/seek_thumb_normal.png b/core/res/res/drawable-mdpi/seek_thumb_normal.png
similarity index 100%
rename from core/res/res/drawable/seek_thumb_normal.png
rename to core/res/res/drawable-mdpi/seek_thumb_normal.png
Binary files differ

core/res/res/drawable-mdpi/seek_thumb_pressed.png

diff --git a/core/res/res/drawable/seek_thumb_pressed.png b/core/res/res/drawable-mdpi/seek_thumb_pressed.png
similarity index 100%
rename from core/res/res/drawable/seek_thumb_pressed.png
rename to core/res/res/drawable-mdpi/seek_thumb_pressed.png
Binary files differ

core/res/res/drawable-mdpi/seek_thumb_selected.png

diff --git a/core/res/res/drawable/seek_thumb_selected.png b/core/res/res/drawable-mdpi/seek_thumb_selected.png
similarity index 100%
rename from core/res/res/drawable/seek_thumb_selected.png
rename to core/res/res/drawable-mdpi/seek_thumb_selected.png
Binary files differ

core/res/res/drawable-mdpi/settings_header_raw.9.png

diff --git a/core/res/res/drawable/settings_header_raw.9.png b/core/res/res/drawable-mdpi/settings_header_raw.9.png
similarity index 100%
rename from core/res/res/drawable/settings_header_raw.9.png
rename to core/res/res/drawable-mdpi/settings_header_raw.9.png
Binary files differ

core/res/res/drawable-mdpi/spinner_black_16.png

diff --git a/core/res/res/drawable/spinner_black_16.png b/core/res/res/drawable-mdpi/spinner_black_16.png
similarity index 100%
rename from core/res/res/drawable/spinner_black_16.png
rename to core/res/res/drawable-mdpi/spinner_black_16.png
Binary files differ

core/res/res/drawable-mdpi/spinner_black_20.png

diff --git a/core/res/res/drawable/spinner_black_20.png b/core/res/res/drawable-mdpi/spinner_black_20.png
similarity index 100%
rename from core/res/res/drawable/spinner_black_20.png
rename to core/res/res/drawable-mdpi/spinner_black_20.png
Binary files differ

core/res/res/drawable-mdpi/spinner_black_48.png

diff --git a/core/res/res/drawable/spinner_black_48.png b/core/res/res/drawable-mdpi/spinner_black_48.png
similarity index 100%
rename from core/res/res/drawable/spinner_black_48.png
rename to core/res/res/drawable-mdpi/spinner_black_48.png
Binary files differ

core/res/res/drawable-mdpi/spinner_black_76.png

diff --git a/core/res/res/drawable/spinner_black_76.png b/core/res/res/drawable-mdpi/spinner_black_76.png
similarity index 100%
rename from core/res/res/drawable/spinner_black_76.png
rename to core/res/res/drawable-mdpi/spinner_black_76.png
Binary files differ

core/res/res/drawable-mdpi/spinner_dropdown_background_down.9.png

diff --git a/core/res/res/drawable/spinner_dropdown_background_down.9.png b/core/res/res/drawable-mdpi/spinner_dropdown_background_down.9.png
similarity index 100%
rename from core/res/res/drawable/spinner_dropdown_background_down.9.png
rename to core/res/res/drawable-mdpi/spinner_dropdown_background_down.9.png
Binary files differ

core/res/res/drawable-mdpi/spinner_dropdown_background_up.9.png

diff --git a/core/res/res/drawable/spinner_dropdown_background_up.9.png b/core/res/res/drawable-mdpi/spinner_dropdown_background_up.9.png
similarity index 100%
rename from core/res/res/drawable/spinner_dropdown_background_up.9.png
rename to core/res/res/drawable-mdpi/spinner_dropdown_background_up.9.png
Binary files differ

core/res/res/drawable-mdpi/spinner_normal.9.png

diff --git a/core/res/res/drawable/spinner_normal.9.png b/core/res/res/drawable-mdpi/spinner_normal.9.png
similarity index 100%
rename from core/res/res/drawable/spinner_normal.9.png
rename to core/res/res/drawable-mdpi/spinner_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/spinner_press.9.png

diff --git a/core/res/res/drawable/spinner_press.9.png b/core/res/res/drawable-mdpi/spinner_press.9.png
similarity index 100%
rename from core/res/res/drawable/spinner_press.9.png
rename to core/res/res/drawable-mdpi/spinner_press.9.png
Binary files differ

core/res/res/drawable-mdpi/spinner_select.9.png

diff --git a/core/res/res/drawable/spinner_select.9.png b/core/res/res/drawable-mdpi/spinner_select.9.png
similarity index 100%
rename from core/res/res/drawable/spinner_select.9.png
rename to core/res/res/drawable-mdpi/spinner_select.9.png
Binary files differ

core/res/res/drawable-mdpi/spinner_white_16.png

diff --git a/core/res/res/drawable/spinner_white_16.png b/core/res/res/drawable-mdpi/spinner_white_16.png
similarity index 100%
rename from core/res/res/drawable/spinner_white_16.png
rename to core/res/res/drawable-mdpi/spinner_white_16.png
Binary files differ

core/res/res/drawable-mdpi/spinner_white_48.png

diff --git a/core/res/res/drawable/spinner_white_48.png b/core/res/res/drawable-mdpi/spinner_white_48.png
similarity index 100%
rename from core/res/res/drawable/spinner_white_48.png
rename to core/res/res/drawable-mdpi/spinner_white_48.png
Binary files differ

core/res/res/drawable-mdpi/spinner_white_76.png

diff --git a/core/res/res/drawable/spinner_white_76.png b/core/res/res/drawable-mdpi/spinner_white_76.png
similarity index 100%
rename from core/res/res/drawable/spinner_white_76.png
rename to core/res/res/drawable-mdpi/spinner_white_76.png
Binary files differ

core/res/res/drawable-mdpi/spinnerbox_arrow_first.9.png

diff --git a/core/res/res/drawable/spinnerbox_arrow_first.9.png b/core/res/res/drawable-mdpi/spinnerbox_arrow_first.9.png
similarity index 100%
rename from core/res/res/drawable/spinnerbox_arrow_first.9.png
rename to core/res/res/drawable-mdpi/spinnerbox_arrow_first.9.png
Binary files differ

core/res/res/drawable-mdpi/spinnerbox_arrow_last.9.png

diff --git a/core/res/res/drawable/spinnerbox_arrow_last.9.png b/core/res/res/drawable-mdpi/spinnerbox_arrow_last.9.png
similarity index 100%
rename from core/res/res/drawable/spinnerbox_arrow_last.9.png
rename to core/res/res/drawable-mdpi/spinnerbox_arrow_last.9.png
Binary files differ

core/res/res/drawable-mdpi/spinnerbox_arrow_middle.9.png

diff --git a/core/res/res/drawable/spinnerbox_arrow_middle.9.png b/core/res/res/drawable-mdpi/spinnerbox_arrow_middle.9.png
similarity index 100%
rename from core/res/res/drawable/spinnerbox_arrow_middle.9.png
rename to core/res/res/drawable-mdpi/spinnerbox_arrow_middle.9.png
Binary files differ

core/res/res/drawable-mdpi/spinnerbox_arrow_single.9.png

diff --git a/core/res/res/drawable/spinnerbox_arrow_single.9.png b/core/res/res/drawable-mdpi/spinnerbox_arrow_single.9.png
similarity index 100%
rename from core/res/res/drawable/spinnerbox_arrow_single.9.png
rename to core/res/res/drawable-mdpi/spinnerbox_arrow_single.9.png
Binary files differ

core/res/res/drawable-mdpi/star_big_off.png

diff --git a/core/res/res/drawable/star_big_off.png b/core/res/res/drawable-mdpi/star_big_off.png
similarity index 100%
rename from core/res/res/drawable/star_big_off.png
rename to core/res/res/drawable-mdpi/star_big_off.png
Binary files differ

core/res/res/drawable-mdpi/star_big_on.png

diff --git a/core/res/res/drawable/star_big_on.png b/core/res/res/drawable-mdpi/star_big_on.png
similarity index 100%
rename from core/res/res/drawable/star_big_on.png
rename to core/res/res/drawable-mdpi/star_big_on.png
Binary files differ

core/res/res/drawable-mdpi/star_off.png

diff --git a/core/res/res/drawable/star_off.png b/core/res/res/drawable-mdpi/star_off.png
similarity index 100%
rename from core/res/res/drawable/star_off.png
rename to core/res/res/drawable-mdpi/star_off.png
Binary files differ

core/res/res/drawable-mdpi/star_on.png

diff --git a/core/res/res/drawable/star_on.png b/core/res/res/drawable-mdpi/star_on.png
similarity index 100%
rename from core/res/res/drawable/star_on.png
rename to core/res/res/drawable-mdpi/star_on.png
Binary files differ

core/res/res/drawable-mdpi/stat_ecb_mode.png

diff --git a/core/res/res/drawable/stat_ecb_mode.png b/core/res/res/drawable-mdpi/stat_ecb_mode.png
similarity index 100%
rename from core/res/res/drawable/stat_ecb_mode.png
rename to core/res/res/drawable-mdpi/stat_ecb_mode.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_alarm.png

diff --git a/core/res/res/drawable/stat_notify_alarm.png b/core/res/res/drawable-mdpi/stat_notify_alarm.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_alarm.png
rename to core/res/res/drawable-mdpi/stat_notify_alarm.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_call_mute.png

diff --git a/core/res/res/drawable/stat_notify_call_mute.png b/core/res/res/drawable-mdpi/stat_notify_call_mute.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_call_mute.png
rename to core/res/res/drawable-mdpi/stat_notify_call_mute.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_chat.png

diff --git a/core/res/res/drawable/stat_notify_chat.png b/core/res/res/drawable-mdpi/stat_notify_chat.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_chat.png
rename to core/res/res/drawable-mdpi/stat_notify_chat.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_disk_full.png

diff --git a/core/res/res/drawable/stat_notify_disk_full.png b/core/res/res/drawable-mdpi/stat_notify_disk_full.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_disk_full.png
rename to core/res/res/drawable-mdpi/stat_notify_disk_full.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_error.png

diff --git a/core/res/res/drawable/stat_notify_error.png b/core/res/res/drawable-mdpi/stat_notify_error.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_error.png
rename to core/res/res/drawable-mdpi/stat_notify_error.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_missed_call.png

diff --git a/core/res/res/drawable/stat_notify_missed_call.png b/core/res/res/drawable-mdpi/stat_notify_missed_call.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_missed_call.png
rename to core/res/res/drawable-mdpi/stat_notify_missed_call.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_more.png

diff --git a/core/res/res/drawable/stat_notify_more.png b/core/res/res/drawable-mdpi/stat_notify_more.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_more.png
rename to core/res/res/drawable-mdpi/stat_notify_more.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_sdcard.png

diff --git a/core/res/res/drawable/stat_notify_sdcard.png b/core/res/res/drawable-mdpi/stat_notify_sdcard.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_sdcard.png
rename to core/res/res/drawable-mdpi/stat_notify_sdcard.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_sdcard_usb.png

diff --git a/core/res/res/drawable/stat_notify_sdcard_usb.png b/core/res/res/drawable-mdpi/stat_notify_sdcard_usb.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_sdcard_usb.png
rename to core/res/res/drawable-mdpi/stat_notify_sdcard_usb.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_sim_toolkit.png

diff --git a/core/res/res/drawable/stat_notify_sim_toolkit.png b/core/res/res/drawable-mdpi/stat_notify_sim_toolkit.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_sim_toolkit.png
rename to core/res/res/drawable-mdpi/stat_notify_sim_toolkit.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_sync.png

diff --git a/core/res/res/drawable/stat_notify_sync.png b/core/res/res/drawable-mdpi/stat_notify_sync.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_sync.png
rename to core/res/res/drawable-mdpi/stat_notify_sync.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_sync_anim0.png

diff --git a/core/res/res/drawable/stat_notify_sync_anim0.png b/core/res/res/drawable-mdpi/stat_notify_sync_anim0.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_sync_anim0.png
rename to core/res/res/drawable-mdpi/stat_notify_sync_anim0.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_sync_error.png

diff --git a/core/res/res/drawable/stat_notify_sync_error.png b/core/res/res/drawable-mdpi/stat_notify_sync_error.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_sync_error.png
rename to core/res/res/drawable-mdpi/stat_notify_sync_error.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_voicemail.png

diff --git a/core/res/res/drawable/stat_notify_voicemail.png b/core/res/res/drawable-mdpi/stat_notify_voicemail.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_voicemail.png
rename to core/res/res/drawable-mdpi/stat_notify_voicemail.png
Binary files differ

core/res/res/drawable-mdpi/stat_notify_wifi_in_range.png

diff --git a/core/res/res/drawable/stat_notify_wifi_in_range.png b/core/res/res/drawable-mdpi/stat_notify_wifi_in_range.png
similarity index 100%
rename from core/res/res/drawable/stat_notify_wifi_in_range.png
rename to core/res/res/drawable-mdpi/stat_notify_wifi_in_range.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_0.png

diff --git a/core/res/res/drawable/stat_sys_battery_0.png b/core/res/res/drawable-mdpi/stat_sys_battery_0.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_0.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_0.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_10.png

diff --git a/core/res/res/drawable/stat_sys_battery_10.png b/core/res/res/drawable-mdpi/stat_sys_battery_10.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_10.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_10.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_100.png

diff --git a/core/res/res/drawable/stat_sys_battery_100.png b/core/res/res/drawable-mdpi/stat_sys_battery_100.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_100.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_100.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_20.png

diff --git a/core/res/res/drawable/stat_sys_battery_20.png b/core/res/res/drawable-mdpi/stat_sys_battery_20.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_20.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_20.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_40.png

diff --git a/core/res/res/drawable/stat_sys_battery_40.png b/core/res/res/drawable-mdpi/stat_sys_battery_40.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_40.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_40.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_60.png

diff --git a/core/res/res/drawable/stat_sys_battery_60.png b/core/res/res/drawable-mdpi/stat_sys_battery_60.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_60.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_60.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_80.png

diff --git a/core/res/res/drawable/stat_sys_battery_80.png b/core/res/res/drawable-mdpi/stat_sys_battery_80.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_80.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_80.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png

diff --git a/core/res/res/drawable/stat_sys_battery_charge_anim0.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_charge_anim0.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png

diff --git a/core/res/res/drawable/stat_sys_battery_charge_anim1.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_charge_anim1.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png

diff --git a/core/res/res/drawable/stat_sys_battery_charge_anim2.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_charge_anim2.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png

diff --git a/core/res/res/drawable/stat_sys_battery_charge_anim3.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_charge_anim3.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png

diff --git a/core/res/res/drawable/stat_sys_battery_charge_anim4.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_charge_anim4.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png

diff --git a/core/res/res/drawable/stat_sys_battery_charge_anim5.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_charge_anim5.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_battery_unknown.png

diff --git a/core/res/res/drawable/stat_sys_battery_unknown.png b/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_battery_unknown.png
rename to core/res/res/drawable-mdpi/stat_sys_battery_unknown.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_bluetooth.png

diff --git a/core/res/res/drawable/stat_sys_data_bluetooth.png b/core/res/res/drawable-mdpi/stat_sys_data_bluetooth.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_bluetooth.png
rename to core/res/res/drawable-mdpi/stat_sys_data_bluetooth.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png

diff --git a/core/res/res/drawable/stat_sys_data_bluetooth_connected.png b/core/res/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_bluetooth_connected.png
rename to core/res/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_connected_3g.png

diff --git a/core/res/res/drawable/stat_sys_data_connected_3g.png b/core/res/res/drawable-mdpi/stat_sys_data_connected_3g.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_connected_3g.png
rename to core/res/res/drawable-mdpi/stat_sys_data_connected_3g.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_connected_e.png

diff --git a/core/res/res/drawable/stat_sys_data_connected_e.png b/core/res/res/drawable-mdpi/stat_sys_data_connected_e.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_connected_e.png
rename to core/res/res/drawable-mdpi/stat_sys_data_connected_e.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_connected_g.png

diff --git a/core/res/res/drawable/stat_sys_data_connected_g.png b/core/res/res/drawable-mdpi/stat_sys_data_connected_g.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_connected_g.png
rename to core/res/res/drawable-mdpi/stat_sys_data_connected_g.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_in_3g.png

diff --git a/core/res/res/drawable/stat_sys_data_in_3g.png b/core/res/res/drawable-mdpi/stat_sys_data_in_3g.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_in_3g.png
rename to core/res/res/drawable-mdpi/stat_sys_data_in_3g.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_in_e.png

diff --git a/core/res/res/drawable/stat_sys_data_in_e.png b/core/res/res/drawable-mdpi/stat_sys_data_in_e.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_in_e.png
rename to core/res/res/drawable-mdpi/stat_sys_data_in_e.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_in_g.png

diff --git a/core/res/res/drawable/stat_sys_data_in_g.png b/core/res/res/drawable-mdpi/stat_sys_data_in_g.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_in_g.png
rename to core/res/res/drawable-mdpi/stat_sys_data_in_g.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_inandout_3g.png

diff --git a/core/res/res/drawable/stat_sys_data_inandout_3g.png b/core/res/res/drawable-mdpi/stat_sys_data_inandout_3g.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_inandout_3g.png
rename to core/res/res/drawable-mdpi/stat_sys_data_inandout_3g.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_inandout_e.png

diff --git a/core/res/res/drawable/stat_sys_data_inandout_e.png b/core/res/res/drawable-mdpi/stat_sys_data_inandout_e.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_inandout_e.png
rename to core/res/res/drawable-mdpi/stat_sys_data_inandout_e.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_inandout_g.png

diff --git a/core/res/res/drawable/stat_sys_data_inandout_g.png b/core/res/res/drawable-mdpi/stat_sys_data_inandout_g.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_inandout_g.png
rename to core/res/res/drawable-mdpi/stat_sys_data_inandout_g.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_out_3g.png

diff --git a/core/res/res/drawable/stat_sys_data_out_3g.png b/core/res/res/drawable-mdpi/stat_sys_data_out_3g.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_out_3g.png
rename to core/res/res/drawable-mdpi/stat_sys_data_out_3g.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_out_e.png

diff --git a/core/res/res/drawable/stat_sys_data_out_e.png b/core/res/res/drawable-mdpi/stat_sys_data_out_e.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_out_e.png
rename to core/res/res/drawable-mdpi/stat_sys_data_out_e.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_out_g.png

diff --git a/core/res/res/drawable/stat_sys_data_out_g.png b/core/res/res/drawable-mdpi/stat_sys_data_out_g.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_out_g.png
rename to core/res/res/drawable-mdpi/stat_sys_data_out_g.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_data_usb.png

diff --git a/core/res/res/drawable/stat_sys_data_usb.png b/core/res/res/drawable-mdpi/stat_sys_data_usb.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_data_usb.png
rename to core/res/res/drawable-mdpi/stat_sys_data_usb.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_download_anim0.png

diff --git a/core/res/res/drawable/stat_sys_download_anim0.png b/core/res/res/drawable-mdpi/stat_sys_download_anim0.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_download_anim0.png
rename to core/res/res/drawable-mdpi/stat_sys_download_anim0.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_download_anim1.png

diff --git a/core/res/res/drawable/stat_sys_download_anim1.png b/core/res/res/drawable-mdpi/stat_sys_download_anim1.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_download_anim1.png
rename to core/res/res/drawable-mdpi/stat_sys_download_anim1.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_download_anim2.png

diff --git a/core/res/res/drawable/stat_sys_download_anim2.png b/core/res/res/drawable-mdpi/stat_sys_download_anim2.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_download_anim2.png
rename to core/res/res/drawable-mdpi/stat_sys_download_anim2.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_download_anim3.png

diff --git a/core/res/res/drawable/stat_sys_download_anim3.png b/core/res/res/drawable-mdpi/stat_sys_download_anim3.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_download_anim3.png
rename to core/res/res/drawable-mdpi/stat_sys_download_anim3.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_download_anim4.png

diff --git a/core/res/res/drawable/stat_sys_download_anim4.png b/core/res/res/drawable-mdpi/stat_sys_download_anim4.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_download_anim4.png
rename to core/res/res/drawable-mdpi/stat_sys_download_anim4.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_download_anim5.png

diff --git a/core/res/res/drawable/stat_sys_download_anim5.png b/core/res/res/drawable-mdpi/stat_sys_download_anim5.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_download_anim5.png
rename to core/res/res/drawable-mdpi/stat_sys_download_anim5.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_gps_acquiring.png

diff --git a/core/res/res/drawable/stat_sys_gps_acquiring.png b/core/res/res/drawable-mdpi/stat_sys_gps_acquiring.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_gps_acquiring.png
rename to core/res/res/drawable-mdpi/stat_sys_gps_acquiring.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_gps_on.png

diff --git a/core/res/res/drawable/stat_sys_gps_on.png b/core/res/res/drawable-mdpi/stat_sys_gps_on.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_gps_on.png
rename to core/res/res/drawable-mdpi/stat_sys_gps_on.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_headset.png

diff --git a/core/res/res/drawable/stat_sys_headset.png b/core/res/res/drawable-mdpi/stat_sys_headset.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_headset.png
rename to core/res/res/drawable-mdpi/stat_sys_headset.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_no_sim.png

diff --git a/core/res/res/drawable/stat_sys_no_sim.png b/core/res/res/drawable-mdpi/stat_sys_no_sim.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_no_sim.png
rename to core/res/res/drawable-mdpi/stat_sys_no_sim.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_phone_call.png

diff --git a/core/res/res/drawable/stat_sys_phone_call.png b/core/res/res/drawable-mdpi/stat_sys_phone_call.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_phone_call.png
rename to core/res/res/drawable-mdpi/stat_sys_phone_call.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_phone_call_bluetooth.png

diff --git a/core/res/res/drawable/stat_sys_phone_call_bluetooth.png b/core/res/res/drawable-mdpi/stat_sys_phone_call_bluetooth.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_phone_call_bluetooth.png
rename to core/res/res/drawable-mdpi/stat_sys_phone_call_bluetooth.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_phone_call_forward.png

diff --git a/core/res/res/drawable/stat_sys_phone_call_forward.png b/core/res/res/drawable-mdpi/stat_sys_phone_call_forward.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_phone_call_forward.png
rename to core/res/res/drawable-mdpi/stat_sys_phone_call_forward.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_phone_call_on_hold.png

diff --git a/core/res/res/drawable/stat_sys_phone_call_on_hold.png b/core/res/res/drawable-mdpi/stat_sys_phone_call_on_hold.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_phone_call_on_hold.png
rename to core/res/res/drawable-mdpi/stat_sys_phone_call_on_hold.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_0.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_0.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_0.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_0.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_0.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_0_cdma.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_0_cdma.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_0_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_0_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_0_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_1.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_1.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_1.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_1.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_1.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_1_cdma.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_1_cdma.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_1_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_1_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_1_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_2.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_2.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_2.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_2.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_2.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_2_cdma.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_2_cdma.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_2_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_2_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_2_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_3.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_3.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_3.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_3.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_3.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_3_cdma.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_3_cdma.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_3_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_3_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_3_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_4.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_4.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_4.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_4.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_4.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_r_signal_4_cdma.png

diff --git a/core/res/res/drawable/stat_sys_r_signal_4_cdma.png b/core/res/res/drawable-mdpi/stat_sys_r_signal_4_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_r_signal_4_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_r_signal_4_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_ra_signal_0_cdma.png

diff --git a/core/res/res/drawable/stat_sys_ra_signal_0_cdma.png b/core/res/res/drawable-mdpi/stat_sys_ra_signal_0_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_ra_signal_0_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_ra_signal_0_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_ra_signal_1_cdma.png

diff --git a/core/res/res/drawable/stat_sys_ra_signal_1_cdma.png b/core/res/res/drawable-mdpi/stat_sys_ra_signal_1_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_ra_signal_1_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_ra_signal_1_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_ra_signal_2_cdma.png

diff --git a/core/res/res/drawable/stat_sys_ra_signal_2_cdma.png b/core/res/res/drawable-mdpi/stat_sys_ra_signal_2_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_ra_signal_2_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_ra_signal_2_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_ra_signal_3_cdma.png

diff --git a/core/res/res/drawable/stat_sys_ra_signal_3_cdma.png b/core/res/res/drawable-mdpi/stat_sys_ra_signal_3_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_ra_signal_3_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_ra_signal_3_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_ra_signal_4_cdma.png

diff --git a/core/res/res/drawable/stat_sys_ra_signal_4_cdma.png b/core/res/res/drawable-mdpi/stat_sys_ra_signal_4_cdma.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_ra_signal_4_cdma.png
rename to core/res/res/drawable-mdpi/stat_sys_ra_signal_4_cdma.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_ringer_silent.png

diff --git a/core/res/res/drawable/stat_sys_ringer_silent.png b/core/res/res/drawable-mdpi/stat_sys_ringer_silent.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_ringer_silent.png
rename to core/res/res/drawable-mdpi/stat_sys_ringer_silent.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_ringer_vibrate.png

diff --git a/core/res/res/drawable/stat_sys_ringer_vibrate.png b/core/res/res/drawable-mdpi/stat_sys_ringer_vibrate.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_ringer_vibrate.png
rename to core/res/res/drawable-mdpi/stat_sys_ringer_vibrate.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_roaming_cdma_0.png

diff --git a/core/res/res/drawable/stat_sys_roaming_cdma_0.png b/core/res/res/drawable-mdpi/stat_sys_roaming_cdma_0.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_roaming_cdma_0.png
rename to core/res/res/drawable-mdpi/stat_sys_roaming_cdma_0.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png

diff --git a/core/res/res/drawable/stat_sys_roaming_cdma_flash_anim0.png b/core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_roaming_cdma_flash_anim0.png
rename to core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png

diff --git a/core/res/res/drawable/stat_sys_roaming_cdma_flash_anim1.png b/core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_roaming_cdma_flash_anim1.png
rename to core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_signal_0.png

diff --git a/core/res/res/drawable/stat_sys_signal_0.png b/core/res/res/drawable-mdpi/stat_sys_signal_0.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_signal_0.png
rename to core/res/res/drawable-mdpi/stat_sys_signal_0.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_signal_1.png

diff --git a/core/res/res/drawable/stat_sys_signal_1.png b/core/res/res/drawable-mdpi/stat_sys_signal_1.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_signal_1.png
rename to core/res/res/drawable-mdpi/stat_sys_signal_1.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_signal_2.png

diff --git a/core/res/res/drawable/stat_sys_signal_2.png b/core/res/res/drawable-mdpi/stat_sys_signal_2.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_signal_2.png
rename to core/res/res/drawable-mdpi/stat_sys_signal_2.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_signal_3.png

diff --git a/core/res/res/drawable/stat_sys_signal_3.png b/core/res/res/drawable-mdpi/stat_sys_signal_3.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_signal_3.png
rename to core/res/res/drawable-mdpi/stat_sys_signal_3.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_signal_4.png

diff --git a/core/res/res/drawable/stat_sys_signal_4.png b/core/res/res/drawable-mdpi/stat_sys_signal_4.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_signal_4.png
rename to core/res/res/drawable-mdpi/stat_sys_signal_4.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_signal_flightmode.png

diff --git a/core/res/res/drawable/stat_sys_signal_flightmode.png b/core/res/res/drawable-mdpi/stat_sys_signal_flightmode.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_signal_flightmode.png
rename to core/res/res/drawable-mdpi/stat_sys_signal_flightmode.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_signal_null.png

diff --git a/core/res/res/drawable/stat_sys_signal_null.png b/core/res/res/drawable-mdpi/stat_sys_signal_null.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_signal_null.png
rename to core/res/res/drawable-mdpi/stat_sys_signal_null.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_speakerphone.png

diff --git a/core/res/res/drawable/stat_sys_speakerphone.png b/core/res/res/drawable-mdpi/stat_sys_speakerphone.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_speakerphone.png
rename to core/res/res/drawable-mdpi/stat_sys_speakerphone.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_tty_mode.png

diff --git a/core/res/res/drawable/stat_sys_tty_mode.png b/core/res/res/drawable-mdpi/stat_sys_tty_mode.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_tty_mode.png
rename to core/res/res/drawable-mdpi/stat_sys_tty_mode.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_upload_anim0.png

diff --git a/core/res/res/drawable/stat_sys_upload_anim0.png b/core/res/res/drawable-mdpi/stat_sys_upload_anim0.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_upload_anim0.png
rename to core/res/res/drawable-mdpi/stat_sys_upload_anim0.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_upload_anim1.png

diff --git a/core/res/res/drawable/stat_sys_upload_anim1.png b/core/res/res/drawable-mdpi/stat_sys_upload_anim1.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_upload_anim1.png
rename to core/res/res/drawable-mdpi/stat_sys_upload_anim1.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_upload_anim2.png

diff --git a/core/res/res/drawable/stat_sys_upload_anim2.png b/core/res/res/drawable-mdpi/stat_sys_upload_anim2.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_upload_anim2.png
rename to core/res/res/drawable-mdpi/stat_sys_upload_anim2.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_upload_anim3.png

diff --git a/core/res/res/drawable/stat_sys_upload_anim3.png b/core/res/res/drawable-mdpi/stat_sys_upload_anim3.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_upload_anim3.png
rename to core/res/res/drawable-mdpi/stat_sys_upload_anim3.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_upload_anim4.png

diff --git a/core/res/res/drawable/stat_sys_upload_anim4.png b/core/res/res/drawable-mdpi/stat_sys_upload_anim4.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_upload_anim4.png
rename to core/res/res/drawable-mdpi/stat_sys_upload_anim4.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_upload_anim5.png

diff --git a/core/res/res/drawable/stat_sys_upload_anim5.png b/core/res/res/drawable-mdpi/stat_sys_upload_anim5.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_upload_anim5.png
rename to core/res/res/drawable-mdpi/stat_sys_upload_anim5.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_vp_phone_call.png

diff --git a/core/res/res/drawable/stat_sys_vp_phone_call.png b/core/res/res/drawable-mdpi/stat_sys_vp_phone_call.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_vp_phone_call.png
rename to core/res/res/drawable-mdpi/stat_sys_vp_phone_call.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_vp_phone_call_bluetooth.png

diff --git a/core/res/res/drawable/stat_sys_vp_phone_call_bluetooth.png b/core/res/res/drawable-mdpi/stat_sys_vp_phone_call_bluetooth.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_vp_phone_call_bluetooth.png
rename to core/res/res/drawable-mdpi/stat_sys_vp_phone_call_bluetooth.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_vp_phone_call_on_hold.png

diff --git a/core/res/res/drawable/stat_sys_vp_phone_call_on_hold.png b/core/res/res/drawable-mdpi/stat_sys_vp_phone_call_on_hold.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_vp_phone_call_on_hold.png
rename to core/res/res/drawable-mdpi/stat_sys_vp_phone_call_on_hold.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_warning.png

diff --git a/core/res/res/drawable/stat_sys_warning.png b/core/res/res/drawable-mdpi/stat_sys_warning.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_warning.png
rename to core/res/res/drawable-mdpi/stat_sys_warning.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_wifi_signal_0.png

diff --git a/core/res/res/drawable/stat_sys_wifi_signal_0.png b/core/res/res/drawable-mdpi/stat_sys_wifi_signal_0.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_wifi_signal_0.png
rename to core/res/res/drawable-mdpi/stat_sys_wifi_signal_0.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_wifi_signal_1.png

diff --git a/core/res/res/drawable/stat_sys_wifi_signal_1.png b/core/res/res/drawable-mdpi/stat_sys_wifi_signal_1.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_wifi_signal_1.png
rename to core/res/res/drawable-mdpi/stat_sys_wifi_signal_1.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_wifi_signal_2.png

diff --git a/core/res/res/drawable/stat_sys_wifi_signal_2.png b/core/res/res/drawable-mdpi/stat_sys_wifi_signal_2.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_wifi_signal_2.png
rename to core/res/res/drawable-mdpi/stat_sys_wifi_signal_2.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_wifi_signal_3.png

diff --git a/core/res/res/drawable/stat_sys_wifi_signal_3.png b/core/res/res/drawable-mdpi/stat_sys_wifi_signal_3.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_wifi_signal_3.png
rename to core/res/res/drawable-mdpi/stat_sys_wifi_signal_3.png
Binary files differ

core/res/res/drawable-mdpi/stat_sys_wifi_signal_4.png

diff --git a/core/res/res/drawable/stat_sys_wifi_signal_4.png b/core/res/res/drawable-mdpi/stat_sys_wifi_signal_4.png
similarity index 100%
rename from core/res/res/drawable/stat_sys_wifi_signal_4.png
rename to core/res/res/drawable-mdpi/stat_sys_wifi_signal_4.png
Binary files differ

core/res/res/drawable-mdpi/status_bar_background.png

diff --git a/core/res/res/drawable/status_bar_background.png b/core/res/res/drawable-mdpi/status_bar_background.png
similarity index 100%
rename from core/res/res/drawable/status_bar_background.png
rename to core/res/res/drawable-mdpi/status_bar_background.png
Binary files differ

core/res/res/drawable-mdpi/status_bar_close_on.9.png

diff --git a/core/res/res/drawable/status_bar_close_on.9.png b/core/res/res/drawable-mdpi/status_bar_close_on.9.png
similarity index 100%
rename from core/res/res/drawable/status_bar_close_on.9.png
rename to core/res/res/drawable-mdpi/status_bar_close_on.9.png
Binary files differ

core/res/res/drawable-mdpi/status_bar_header_background.9.png

diff --git a/core/res/res/drawable/status_bar_header_background.9.png b/core/res/res/drawable-mdpi/status_bar_header_background.9.png
similarity index 100%
rename from core/res/res/drawable/status_bar_header_background.9.png
rename to core/res/res/drawable-mdpi/status_bar_header_background.9.png
Binary files differ

core/res/res/drawable-mdpi/status_bar_item_app_background_normal.9.png

diff --git a/core/res/res/drawable/status_bar_item_app_background_normal.9.png b/core/res/res/drawable-mdpi/status_bar_item_app_background_normal.9.png
similarity index 100%
rename from core/res/res/drawable/status_bar_item_app_background_normal.9.png
rename to core/res/res/drawable-mdpi/status_bar_item_app_background_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/status_bar_item_background_focus.9.png

diff --git a/core/res/res/drawable/status_bar_item_background_focus.9.png b/core/res/res/drawable-mdpi/status_bar_item_background_focus.9.png
similarity index 100%
rename from core/res/res/drawable/status_bar_item_background_focus.9.png
rename to core/res/res/drawable-mdpi/status_bar_item_background_focus.9.png
Binary files differ

core/res/res/drawable-mdpi/status_bar_item_background_normal.9.png

diff --git a/core/res/res/drawable/status_bar_item_background_normal.9.png b/core/res/res/drawable-mdpi/status_bar_item_background_normal.9.png
similarity index 100%
rename from core/res/res/drawable/status_bar_item_background_normal.9.png
rename to core/res/res/drawable-mdpi/status_bar_item_background_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/status_bar_item_background_pressed.9.png

diff --git a/core/res/res/drawable/status_bar_item_background_pressed.9.png b/core/res/res/drawable-mdpi/status_bar_item_background_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/status_bar_item_background_pressed.9.png
rename to core/res/res/drawable-mdpi/status_bar_item_background_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/statusbar_background.png

diff --git a/core/res/res/drawable/statusbar_background.png b/core/res/res/drawable-mdpi/statusbar_background.png
similarity index 100%
rename from core/res/res/drawable/statusbar_background.png
rename to core/res/res/drawable-mdpi/statusbar_background.png
Binary files differ

core/res/res/drawable-mdpi/submenu_arrow_nofocus.png

diff --git a/core/res/res/drawable/submenu_arrow_nofocus.png b/core/res/res/drawable-mdpi/submenu_arrow_nofocus.png
similarity index 100%
rename from core/res/res/drawable/submenu_arrow_nofocus.png
rename to core/res/res/drawable-mdpi/submenu_arrow_nofocus.png
Binary files differ

core/res/res/drawable-mdpi/sym_action_add.png

diff --git a/core/res/res/drawable/sym_action_add.png b/core/res/res/drawable-mdpi/sym_action_add.png
similarity index 100%
rename from core/res/res/drawable/sym_action_add.png
rename to core/res/res/drawable-mdpi/sym_action_add.png
Binary files differ

core/res/res/drawable-mdpi/sym_action_call.png

diff --git a/core/res/res/drawable/sym_action_call.png b/core/res/res/drawable-mdpi/sym_action_call.png
similarity index 100%
rename from core/res/res/drawable/sym_action_call.png
rename to core/res/res/drawable-mdpi/sym_action_call.png
Binary files differ

core/res/res/drawable-mdpi/sym_action_chat.png

diff --git a/core/res/res/drawable/sym_action_chat.png b/core/res/res/drawable-mdpi/sym_action_chat.png
similarity index 100%
rename from core/res/res/drawable/sym_action_chat.png
rename to core/res/res/drawable-mdpi/sym_action_chat.png
Binary files differ

core/res/res/drawable-mdpi/sym_action_email.png

diff --git a/core/res/res/drawable/sym_action_email.png b/core/res/res/drawable-mdpi/sym_action_email.png
similarity index 100%
rename from core/res/res/drawable/sym_action_email.png
rename to core/res/res/drawable-mdpi/sym_action_email.png
Binary files differ

core/res/res/drawable-mdpi/sym_call_incoming.png

diff --git a/core/res/res/drawable/sym_call_incoming.png b/core/res/res/drawable-mdpi/sym_call_incoming.png
similarity index 100%
rename from core/res/res/drawable/sym_call_incoming.png
rename to core/res/res/drawable-mdpi/sym_call_incoming.png
Binary files differ

core/res/res/drawable-mdpi/sym_call_missed.png

diff --git a/core/res/res/drawable/sym_call_missed.png b/core/res/res/drawable-mdpi/sym_call_missed.png
similarity index 100%
rename from core/res/res/drawable/sym_call_missed.png
rename to core/res/res/drawable-mdpi/sym_call_missed.png
Binary files differ

core/res/res/drawable-mdpi/sym_call_outgoing.png

diff --git a/core/res/res/drawable/sym_call_outgoing.png b/core/res/res/drawable-mdpi/sym_call_outgoing.png
similarity index 100%
rename from core/res/res/drawable/sym_call_outgoing.png
rename to core/res/res/drawable-mdpi/sym_call_outgoing.png
Binary files differ

core/res/res/drawable-mdpi/sym_contact_card.png

diff --git a/core/res/res/drawable/sym_contact_card.png b/core/res/res/drawable-mdpi/sym_contact_card.png
similarity index 100%
rename from core/res/res/drawable/sym_contact_card.png
rename to core/res/res/drawable-mdpi/sym_contact_card.png
Binary files differ

core/res/res/drawable-mdpi/sym_def_app_icon.png

diff --git a/core/res/res/drawable/sym_def_app_icon.png b/core/res/res/drawable-mdpi/sym_def_app_icon.png
similarity index 100%
rename from core/res/res/drawable/sym_def_app_icon.png
rename to core/res/res/drawable-mdpi/sym_def_app_icon.png
Binary files differ

core/res/res/drawable-mdpi/tab_focus.9.png

diff --git a/core/res/res/drawable/tab_focus.9.png b/core/res/res/drawable-mdpi/tab_focus.9.png
similarity index 100%
rename from core/res/res/drawable/tab_focus.9.png
rename to core/res/res/drawable-mdpi/tab_focus.9.png
Binary files differ

core/res/res/drawable-mdpi/tab_focus_bar_left.9.png

diff --git a/core/res/res/drawable/tab_focus_bar_left.9.png b/core/res/res/drawable-mdpi/tab_focus_bar_left.9.png
similarity index 100%
rename from core/res/res/drawable/tab_focus_bar_left.9.png
rename to core/res/res/drawable-mdpi/tab_focus_bar_left.9.png
Binary files differ

core/res/res/drawable-mdpi/tab_focus_bar_right.9.png

diff --git a/core/res/res/drawable/tab_focus_bar_right.9.png b/core/res/res/drawable-mdpi/tab_focus_bar_right.9.png
similarity index 100%
rename from core/res/res/drawable/tab_focus_bar_right.9.png
rename to core/res/res/drawable-mdpi/tab_focus_bar_right.9.png
Binary files differ

core/res/res/drawable-mdpi/tab_press.9.png

diff --git a/core/res/res/drawable/tab_press.9.png b/core/res/res/drawable-mdpi/tab_press.9.png
similarity index 100%
rename from core/res/res/drawable/tab_press.9.png
rename to core/res/res/drawable-mdpi/tab_press.9.png
Binary files differ

core/res/res/drawable-mdpi/tab_press_bar_left.9.png

diff --git a/core/res/res/drawable/tab_press_bar_left.9.png b/core/res/res/drawable-mdpi/tab_press_bar_left.9.png
similarity index 100%
rename from core/res/res/drawable/tab_press_bar_left.9.png
rename to core/res/res/drawable-mdpi/tab_press_bar_left.9.png
Binary files differ

core/res/res/drawable-mdpi/tab_press_bar_right.9.png

diff --git a/core/res/res/drawable/tab_press_bar_right.9.png b/core/res/res/drawable-mdpi/tab_press_bar_right.9.png
similarity index 100%
rename from core/res/res/drawable/tab_press_bar_right.9.png
rename to core/res/res/drawable-mdpi/tab_press_bar_right.9.png
Binary files differ

core/res/res/drawable-mdpi/tab_selected.9.png

diff --git a/core/res/res/drawable/tab_selected.9.png b/core/res/res/drawable-mdpi/tab_selected.9.png
similarity index 100%
rename from core/res/res/drawable/tab_selected.9.png
rename to core/res/res/drawable-mdpi/tab_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/tab_selected_bar_left.9.png

diff --git a/core/res/res/drawable/tab_selected_bar_left.9.png b/core/res/res/drawable-mdpi/tab_selected_bar_left.9.png
similarity index 100%
rename from core/res/res/drawable/tab_selected_bar_left.9.png
rename to core/res/res/drawable-mdpi/tab_selected_bar_left.9.png
Binary files differ

core/res/res/drawable-mdpi/tab_selected_bar_right.9.png

diff --git a/core/res/res/drawable/tab_selected_bar_right.9.png b/core/res/res/drawable-mdpi/tab_selected_bar_right.9.png
similarity index 100%
rename from core/res/res/drawable/tab_selected_bar_right.9.png
rename to core/res/res/drawable-mdpi/tab_selected_bar_right.9.png
Binary files differ

core/res/res/drawable-mdpi/tab_unselected.9.png

diff --git a/core/res/res/drawable/tab_unselected.9.png b/core/res/res/drawable-mdpi/tab_unselected.9.png
similarity index 100%
rename from core/res/res/drawable/tab_unselected.9.png
rename to core/res/res/drawable-mdpi/tab_unselected.9.png
Binary files differ

core/res/res/drawable-mdpi/textfield_default.9.png

diff --git a/core/res/res/drawable/textfield_default.9.png b/core/res/res/drawable-mdpi/textfield_default.9.png
similarity index 100%
rename from core/res/res/drawable/textfield_default.9.png
rename to core/res/res/drawable-mdpi/textfield_default.9.png
Binary files differ

core/res/res/drawable-mdpi/textfield_disabled.9.png

diff --git a/core/res/res/drawable/textfield_disabled.9.png b/core/res/res/drawable-mdpi/textfield_disabled.9.png
similarity index 100%
rename from core/res/res/drawable/textfield_disabled.9.png
rename to core/res/res/drawable-mdpi/textfield_disabled.9.png
Binary files differ

core/res/res/drawable-mdpi/textfield_disabled_selected.9.png

diff --git a/core/res/res/drawable/textfield_disabled_selected.9.png b/core/res/res/drawable-mdpi/textfield_disabled_selected.9.png
similarity index 100%
rename from core/res/res/drawable/textfield_disabled_selected.9.png
rename to core/res/res/drawable-mdpi/textfield_disabled_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/textfield_pressed.9.png

diff --git a/core/res/res/drawable/textfield_pressed.9.png b/core/res/res/drawable-mdpi/textfield_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/textfield_pressed.9.png
rename to core/res/res/drawable-mdpi/textfield_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/textfield_search_default.9.png

diff --git a/core/res/res/drawable/textfield_search_default.9.png b/core/res/res/drawable-mdpi/textfield_search_default.9.png
similarity index 100%
rename from core/res/res/drawable/textfield_search_default.9.png
rename to core/res/res/drawable-mdpi/textfield_search_default.9.png
Binary files differ

core/res/res/drawable-mdpi/textfield_search_pressed.9.png

diff --git a/core/res/res/drawable/textfield_search_pressed.9.png b/core/res/res/drawable-mdpi/textfield_search_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/textfield_search_pressed.9.png
rename to core/res/res/drawable-mdpi/textfield_search_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/textfield_search_selected.9.png

diff --git a/core/res/res/drawable/textfield_search_selected.9.png b/core/res/res/drawable-mdpi/textfield_search_selected.9.png
similarity index 100%
rename from core/res/res/drawable/textfield_search_selected.9.png
rename to core/res/res/drawable-mdpi/textfield_search_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/textfield_selected.9.png

diff --git a/core/res/res/drawable/textfield_selected.9.png b/core/res/res/drawable-mdpi/textfield_selected.9.png
similarity index 100%
rename from core/res/res/drawable/textfield_selected.9.png
rename to core/res/res/drawable-mdpi/textfield_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_down_disabled.9.png

diff --git a/core/res/res/drawable/timepicker_down_disabled.9.png b/core/res/res/drawable-mdpi/timepicker_down_disabled.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_down_disabled.9.png
rename to core/res/res/drawable-mdpi/timepicker_down_disabled.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_down_disabled_focused.9.png

diff --git a/core/res/res/drawable/timepicker_down_disabled_focused.9.png b/core/res/res/drawable-mdpi/timepicker_down_disabled_focused.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_down_disabled_focused.9.png
rename to core/res/res/drawable-mdpi/timepicker_down_disabled_focused.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_down_normal.9.png

diff --git a/core/res/res/drawable/timepicker_down_normal.9.png b/core/res/res/drawable-mdpi/timepicker_down_normal.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_down_normal.9.png
rename to core/res/res/drawable-mdpi/timepicker_down_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_down_pressed.9.png

diff --git a/core/res/res/drawable/timepicker_down_pressed.9.png b/core/res/res/drawable-mdpi/timepicker_down_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_down_pressed.9.png
rename to core/res/res/drawable-mdpi/timepicker_down_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_down_selected.9.png

diff --git a/core/res/res/drawable/timepicker_down_selected.9.png b/core/res/res/drawable-mdpi/timepicker_down_selected.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_down_selected.9.png
rename to core/res/res/drawable-mdpi/timepicker_down_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_input_disabled.9.png

diff --git a/core/res/res/drawable/timepicker_input_disabled.9.png b/core/res/res/drawable-mdpi/timepicker_input_disabled.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_input_disabled.9.png
rename to core/res/res/drawable-mdpi/timepicker_input_disabled.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_input_normal.9.png

diff --git a/core/res/res/drawable/timepicker_input_normal.9.png b/core/res/res/drawable-mdpi/timepicker_input_normal.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_input_normal.9.png
rename to core/res/res/drawable-mdpi/timepicker_input_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_input_pressed.9.png

diff --git a/core/res/res/drawable/timepicker_input_pressed.9.png b/core/res/res/drawable-mdpi/timepicker_input_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_input_pressed.9.png
rename to core/res/res/drawable-mdpi/timepicker_input_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_input_selected.9.png

diff --git a/core/res/res/drawable/timepicker_input_selected.9.png b/core/res/res/drawable-mdpi/timepicker_input_selected.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_input_selected.9.png
rename to core/res/res/drawable-mdpi/timepicker_input_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_up_disabled.9.png

diff --git a/core/res/res/drawable/timepicker_up_disabled.9.png b/core/res/res/drawable-mdpi/timepicker_up_disabled.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_up_disabled.9.png
rename to core/res/res/drawable-mdpi/timepicker_up_disabled.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_up_disabled_focused.9.png

diff --git a/core/res/res/drawable/timepicker_up_disabled_focused.9.png b/core/res/res/drawable-mdpi/timepicker_up_disabled_focused.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_up_disabled_focused.9.png
rename to core/res/res/drawable-mdpi/timepicker_up_disabled_focused.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_up_normal.9.png

diff --git a/core/res/res/drawable/timepicker_up_normal.9.png b/core/res/res/drawable-mdpi/timepicker_up_normal.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_up_normal.9.png
rename to core/res/res/drawable-mdpi/timepicker_up_normal.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_up_pressed.9.png

diff --git a/core/res/res/drawable/timepicker_up_pressed.9.png b/core/res/res/drawable-mdpi/timepicker_up_pressed.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_up_pressed.9.png
rename to core/res/res/drawable-mdpi/timepicker_up_pressed.9.png
Binary files differ

core/res/res/drawable-mdpi/timepicker_up_selected.9.png

diff --git a/core/res/res/drawable/timepicker_up_selected.9.png b/core/res/res/drawable-mdpi/timepicker_up_selected.9.png
similarity index 100%
rename from core/res/res/drawable/timepicker_up_selected.9.png
rename to core/res/res/drawable-mdpi/timepicker_up_selected.9.png
Binary files differ

core/res/res/drawable-mdpi/title_bar_portrait.9.png

diff --git a/core/res/res/drawable/title_bar_portrait.9.png b/core/res/res/drawable-mdpi/title_bar_portrait.9.png
similarity index 100%
rename from core/res/res/drawable/title_bar_portrait.9.png
rename to core/res/res/drawable-mdpi/title_bar_portrait.9.png
Binary files differ

core/res/res/drawable-mdpi/title_bar_shadow.9.png

diff --git a/core/res/res/drawable/title_bar_shadow.9.png b/core/res/res/drawable-mdpi/title_bar_shadow.9.png
similarity index 100%
rename from core/res/res/drawable/title_bar_shadow.9.png
rename to core/res/res/drawable-mdpi/title_bar_shadow.9.png
Binary files differ

core/res/res/drawable-mdpi/title_bar_tall.png

diff --git a/core/res/res/drawable/title_bar_tall.png b/core/res/res/drawable-mdpi/title_bar_tall.png
similarity index 100%
rename from core/res/res/drawable/title_bar_tall.png
rename to core/res/res/drawable-mdpi/title_bar_tall.png
Binary files differ

core/res/res/drawable-mdpi/toast_frame.9.png

diff --git a/core/res/res/drawable/toast_frame.9.png b/core/res/res/drawable-mdpi/toast_frame.9.png
similarity index 100%
rename from core/res/res/drawable/toast_frame.9.png
rename to core/res/res/drawable-mdpi/toast_frame.9.png
Binary files differ

core/res/res/drawable-mdpi/unknown_image.png

diff --git a/core/res/res/drawable/unknown_image.png b/core/res/res/drawable-mdpi/unknown_image.png
similarity index 100%
rename from core/res/res/drawable/unknown_image.png
rename to core/res/res/drawable-mdpi/unknown_image.png
Binary files differ

core/res/res/drawable-mdpi/zoom_plate.9.png

diff --git a/core/res/res/drawable/zoom_plate.9.png b/core/res/res/drawable-mdpi/zoom_plate.9.png
similarity index 100%
rename from core/res/res/drawable/zoom_plate.9.png
rename to core/res/res/drawable-mdpi/zoom_plate.9.png
Binary files differ

core/res/res/values/attrs.xml

diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index cd3f065..7e7bfca 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -2924,24 +2924,23 @@
             when the user clicks a suggestion.  <i>Optional attribute.</i> -->
         <attr name="searchSuggestIntentData" format="string" />
 
-        <!-- @hide If provided, this is the minimum number of characters needed to trigger
+        <!-- If provided, this is the minimum number of characters needed to trigger
              search suggestions. The default value is 0. <i>Optional attribute.</i> -->
         <attr name="searchSuggestThreshold" format="integer" />
 
-        <!-- @hide If provided and <code>true</code>, this searchable activity will be
+        <!-- If provided and <code>true</code>, this searchable activity will be
              included in any global lists of search targets.
-             The default value is <code>false</code>. <i>Optional attribute.</i>.-->
+             The default value is <code>false</code>. <i>Optional attribute.</i>. -->
         <attr name="includeInGlobalSearch" format="boolean" />
 
-        <!-- @hide If provided and <code>true</code>, this searchable activity will be invoked for all
+        <!-- If provided and <code>true</code>, this searchable activity will be invoked for all
              queries in a particular session. If set to <code>false</code> and the activity
              returned zero results for a query, it will not be invoked again in that session for
              supersets of that zero-results query. For example, if the activity returned zero
              results for "bo", it would not be queried again for "bob".
              The default value is <code>false</code>. <i>Optional attribute.</i>. -->
         <attr name="queryAfterZeroResults" format="boolean" />
-
-        <!-- @hide If provided, this string will be used to describe the searchable item in the
+        <!-- If provided, this string will be used to describe the searchable item in the
              searchable items settings within system search settings. <i>Optional
              attribute.</i> -->
         <attr name="searchSettingsDescription" format="string" />

core/res/res/values/public.xml

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 5aaf824..0fba0f6 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1094,9 +1094,7 @@
   <public type="attr" name="tension" id="0x0101026a" />
   <public type="attr" name="extraTension" id="0x0101026b" />
   <public type="attr" name="anyDensity" id="0x0101026c" />
-  <!-- {@hide} -->
   <public type="attr" name="searchSuggestThreshold" id="0x0101026d" />
-  <!-- {@hide} -->
   <public type="attr" name="includeInGlobalSearch" id="0x0101026e" />
   <public type="attr" name="onClick" id="0x0101026f" />
   <public type="attr" name="targetSdkVersion" id="0x01010270" />
@@ -1117,7 +1115,6 @@
   <public type="attr" name="backupAgent" id="0x0101027f" />
   <public type="attr" name="allowBackup" id="0x01010280" />
   <public type="attr" name="glEsVersion" id="0x01010281" />
-  <!-- {@hide} -->
   <public type="attr" name="queryAfterZeroResults" id="0x01010282" />
   <public type="attr" name="dropDownHeight" id="0x01010283" />
   <public type="attr" name="smallScreens" id="0x01010284" />
@@ -1126,7 +1123,6 @@
   <public type="attr" name="progressBarStyleInverse" id="0x01010287" />
   <public type="attr" name="progressBarStyleSmallInverse" id="0x01010288" />
   <public type="attr" name="progressBarStyleLargeInverse" id="0x01010289" />
-  <!-- {@hide} -->
   <public type="attr" name="searchSettingsDescription" id="0x0101028a" />
   <public type="attr" name="textColorPrimaryInverseDisableOnly" id="0x0101028b" />
   <public type="attr" name="autoUrlDetect" id="0x0101028c" />

core/res/res/values/strings.xml

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index f777c05..70c9385 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1541,11 +1541,11 @@
     </plurals>
 
     <!-- String used to display the date. Preposition for date display ("on May 29") -->
-    <string name="preposition_for_date">on %s</string>
+    <string name="preposition_for_date">on <xliff:g id="date" example="May 29">%s</xliff:g></string>
     <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
-    <string name="preposition_for_time">at %s</string>
+    <string name="preposition_for_time">at <xliff:g id="time" example="2:33 am">%s</xliff:g></string>
     <!-- String used to display the date. Preposition for year display ("in 2008") -->
-    <string name="preposition_for_year">in %s</string>
+    <string name="preposition_for_year">in <xliff:g id="year" example="2003">%s</xliff:g></string>
 
     <!-- Appened to express the value is this unit of time: singular day -->
     <string name="day">day</string>
@@ -1658,7 +1658,7 @@
 
     <!-- Item on EditText context menu, used to add a word to the
          input method dictionary. -->
-    <string name="addToDictionary">"Add \"%s\" to dictionary</string>
+    <string name="addToDictionary">"Add \"<xliff:g id="word" example="rickroll">%s</xliff:g>\" to dictionary</string>
 
     <!-- Title for EditText context menu -->
     <string name="editTextMenuTitle">Edit text</string>
@@ -1950,18 +1950,18 @@
      <string name="accessibility_compound_button_unselected">not checked</string>
 
      <string name="grant_credentials_permission_message_desc">The
-     listed applications are requesting permission to access the login credentials for account %s from
-     %s. Do you wish to grant this permission? If so then your answer will be remembered and you will not be prompted
+     listed applications are requesting permission to access the login credentials for account <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g> from
+     <xliff:g id="application" example="Google Apps">%2$s</xliff:g>. Do you wish to grant this permission? If so, your answer will be remembered and you will not be prompted
      again.</string>
 
      <string name="grant_credentials_permission_message_with_authtokenlabel_desc">The
-     listed applications are requesting permission to access the %s login credentials for account %s from
-     %s. Do you wish to grant this permission? If so then your answer will be remembered and you will not be prompted
+     listed applications are requesting permission to access the <xliff:g id="type" example="Contacts">%1$s</xliff:g> login credentials for account <xliff:g id="account" example="foo@gmail.com">%2$s</xliff:g> from
+     <xliff:g id="application" example="Google Apps">%3$s</xliff:g>. Do you wish to grant this permission? If so, your answer will be remembered and you will not be prompted
      again.</string>
 
      <string name="allow">Allow</string>
      <string name="deny">Deny</string>
      <string name="permission_request_notification_title">Permission Requested</string>
-     <string name="permission_request_notification_subtitle">for account %s</string>
+     <string name="permission_request_notification_subtitle">for account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g></string>
 
 </resources>

graphics/java/android/renderscript/Allocation.java

diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java
index 81848b9..3001c743 100644
--- a/graphics/java/android/renderscript/Allocation.java
+++ b/graphics/java/android/renderscript/Allocation.java
@@ -47,28 +47,62 @@
         mRS.nAllocationUploadToTexture(mID, baseMipLevel);
     }
 
+    public void uploadToBufferObject() {
+        mRS.nAllocationUploadToBufferObject(mID);
+    }
+
     public void data(int[] d) {
-        mRS.nAllocationData(mID, d);
+        int size = 0;
+        if(mType != null && mType.mElement != null) {
+            size = mType.mElement.mSize;
+            for(int ct=0; ct < mType.mValues.length; ct++) {
+                if(mType.mValues[ct] != 0) {
+                    size *= mType.mValues[ct];
+                }
+            }
+            if((d.length * 4) < size) {
+                throw new IllegalArgumentException("Array too small for allocation type.");
+            }
+            Log.e("rs", "Alloc data size=" + size);
+            mRS.nAllocationData(mID, d, size);
+            return;
+        }
+        mRS.nAllocationData(mID, d, d.length * 4);
     }
 
     public void data(float[] d) {
-        mRS.nAllocationData(mID, d);
+        int size = 0;
+        if(mType != null && mType.mElement != null) {
+            size = mType.mElement.mSize;
+            for(int ct=0; ct < mType.mValues.length; ct++) {
+                if(mType.mValues[ct] != 0) {
+                    size *= mType.mValues[ct];
+                }
+            }
+            if((d.length * 4) < size) {
+                throw new IllegalArgumentException("Array too small for allocation type.");
+            }
+            Log.e("rs", "Alloc data size=" + size);
+            mRS.nAllocationData(mID, d, size);
+            return;
+        }
+        mRS.nAllocationData(mID, d, d.length * 4);
     }
 
     public void subData1D(int off, int count, int[] d) {
-        mRS.nAllocationSubData1D(mID, off, count, d);
+        mRS.nAllocationSubData1D(mID, off, count, d, count * 4);
     }
 
     public void subData1D(int off, int count, float[] d) {
-        mRS.nAllocationSubData1D(mID, off, count, d);
+        mRS.nAllocationSubData1D(mID, off, count, d, d.length * 4);
     }
 
     public void subData2D(int xoff, int yoff, int w, int h, int[] d) {
-        mRS.nAllocationSubData2D(mID, xoff, yoff, w, h, d);
+        mRS.nAllocationSubData2D(mID, xoff, yoff, w, h, d, d.length * 4);
     }
 
     public void subData2D(int xoff, int yoff, int w, int h, float[] d) {
-        mRS.nAllocationSubData2D(mID, xoff, yoff, w, h, d);
+        mRS.nAllocationSubData2D(mID, xoff, yoff, w, h, d, d.length * 4);
     }
 
     public void readData(int[] d) {
@@ -221,20 +255,6 @@
         Bitmap b = BitmapFactory.decodeResource(res, id, mBitmapOptions);
         return createFromBitmapBoxed(rs, b, dstFmt, genMips);
     }
-/*
-    public static Allocation createFromObject(RenderScript rs, Object o) {
-        Class c = o.getClass();
-        Type t;
-        if(c.isArray()) {
-            t = Type.createFromClass(rs, c, Array.getLength(o));
-        } else {
-            t = Type.createFromClass(rs, c, 1);
-        }
-        Allocation alloc = createTyped(rs, t);
-        t.destroy();
-        return alloc;
-    }
-*/
 }
 
 

graphics/java/android/renderscript/Element.java

diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java
index aeec739..0ca112c 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/graphics/java/android/renderscript/Element.java
@@ -25,30 +25,31 @@
 public class Element extends BaseObj {
     final int mPredefinedID;
     final boolean mIsPredefined;
+    final int mSize;
 
-    public static final Element USER_U8 = new Element(0);
-    public static final Element USER_I8 = new Element(1);
-    public static final Element USER_U16 = new Element(2);
-    public static final Element USER_I16 = new Element(3);
-    public static final Element USER_U32 = new Element(4);
-    public static final Element USER_I32 = new Element(5);
-    public static final Element USER_FLOAT = new Element(6);
+    public static final Element USER_U8 = new Element(0, 1);
+    public static final Element USER_I8 = new Element(1, 1);
+    public static final Element USER_U16 = new Element(2, 2);
+    public static final Element USER_I16 = new Element(3, 2);
+    public static final Element USER_U32 = new Element(4, 4);
+    public static final Element USER_I32 = new Element(5, 4);
+    public static final Element USER_FLOAT = new Element(6, 4);
 
-    public static final Element A_8 = new Element(7);
-    public static final Element RGB_565 = new Element(8);
-    public static final Element RGB_888 = new Element(11);
-    public static final Element RGBA_5551 = new Element(9);
-    public static final Element RGBA_4444 = new Element(10);
-    public static final Element RGBA_8888 = new Element(12);
+    public static final Element A_8 = new Element(7, 1);
+    public static final Element RGB_565 = new Element(8, 2);
+    public static final Element RGB_888 = new Element(11, 2);
+    public static final Element RGBA_5551 = new Element(9, 2);
+    public static final Element RGBA_4444 = new Element(10, 2);
+    public static final Element RGBA_8888 = new Element(12, 4);
 
-    public static final Element INDEX_16 = new Element(13);
-    public static final Element INDEX_32 = new Element(14);
-    public static final Element XY_F32 = new Element(15);
-    public static final Element XYZ_F32 = new Element(16);
-    public static final Element ST_XY_F32 = new Element(17);
-    public static final Element ST_XYZ_F32 = new Element(18);
-    public static final Element NORM_XYZ_F32 = new Element(19);
-    public static final Element NORM_ST_XYZ_F32 = new Element(20);
+    public static final Element INDEX_16 = new Element(13, 2);
+    public static final Element INDEX_32 = new Element(14, 2);
+    public static final Element XY_F32 = new Element(15, 8);
+    public static final Element XYZ_F32 = new Element(16, 12);
+    public static final Element ST_XY_F32 = new Element(17, 16);
+    public static final Element ST_XYZ_F32 = new Element(18, 20);
+    public static final Element NORM_XYZ_F32 = new Element(19, 24);
+    public static final Element NORM_ST_XYZ_F32 = new Element(20, 32);
 
     void initPredef(RenderScript rs) {
         mID = rs.nElementGetPredefined(mPredefinedID);
@@ -121,18 +122,20 @@
     }
 
 
-    Element(int predef) {
+    Element(int predef, int size) {
         super(null);
         mID = 0;
         mPredefinedID = predef;
         mIsPredefined = true;
+        mSize = size;
     }
 
-    Element(int id, RenderScript rs) {
+    Element(int id, RenderScript rs, int size) {
         super(rs);
         mID = id;
         mPredefinedID = 0;
         mIsPredefined = false;
+        mSize = size;
     }
 
     public void destroy() throws IllegalStateException {
@@ -168,6 +171,7 @@
         RenderScript mRS;
         Entry[] mEntries;
         int mEntryCount;
+        int mSizeBits;
 
         private class Entry {
             Element mElement;
@@ -182,6 +186,7 @@
             mRS = rs;
             mEntryCount = 0;
             mEntries = new Entry[8];
+            mSizeBits = 0;
         }
 
         void addEntry(Entry e) {
@@ -201,6 +206,7 @@
             Entry en = new Entry();
             en.mElement = e;
             addEntry(en);
+            mSizeBits += e.mSize * 8;
             return this;
         }
 
@@ -211,6 +217,7 @@
             en.mIsNormalized = isNormalized;
             en.mBits = bits;
             en.mName = name;
+            mSizeBits += bits;
             addEntry(en);
             return this;
         }
@@ -236,6 +243,12 @@
             return this;
         }
 
+        public Builder addFloatXY(String prefix) {
+            add(DataType.FLOAT, DataKind.X, false, 32, prefix + "X");
+            add(DataType.FLOAT, DataKind.Y, false, 32, prefix + "Y");
+            return this;
+        }
+
         public Builder addFloatXYZ() {
             add(DataType.FLOAT, DataKind.X, false, 32, null);
             add(DataType.FLOAT, DataKind.Y, false, 32, null);
@@ -243,17 +256,49 @@
             return this;
         }
 
+        public Builder addFloatXYZ(String prefix) {
+            add(DataType.FLOAT, DataKind.X, false, 32, prefix + "X");
+            add(DataType.FLOAT, DataKind.Y, false, 32, prefix + "Y");
+            add(DataType.FLOAT, DataKind.Z, false, 32, prefix + "Z");
+            return this;
+        }
+
         public Builder addFloatST() {
             add(DataType.FLOAT, DataKind.S, false, 32, null);
             add(DataType.FLOAT, DataKind.T, false, 32, null);
             return this;
         }
 
+        public Builder addFloatST(String prefix) {
+            add(DataType.FLOAT, DataKind.S, false, 32, prefix + "S");
+            add(DataType.FLOAT, DataKind.T, false, 32, prefix + "T");
+            return this;
+        }
+
+        public Builder addFloatNorm() {
+            add(DataType.FLOAT, DataKind.NX, false, 32, null);
+            add(DataType.FLOAT, DataKind.NY, false, 32, null);
+            add(DataType.FLOAT, DataKind.NZ, false, 32, null);
+            return this;
+        }
+
+        public Builder addFloatNorm(String prefix) {
+            add(DataType.FLOAT, DataKind.NX, false, 32, prefix + "NX");
+            add(DataType.FLOAT, DataKind.NY, false, 32, prefix + "NY");
+            add(DataType.FLOAT, DataKind.NZ, false, 32, prefix + "NZ");
+            return this;
+        }
+
         public Builder addFloatPointSize() {
             add(DataType.FLOAT, DataKind.POINT_SIZE, false, 32, null);
             return this;
         }
 
+        public Builder addFloatPointSize(String name) {
+            add(DataType.FLOAT, DataKind.POINT_SIZE, false, 32, name);
+            return this;
+        }
+
         public Builder addFloatRGB() {
             add(DataType.FLOAT, DataKind.RED, false, 32, null);
             add(DataType.FLOAT, DataKind.GREEN, false, 32, null);
@@ -261,6 +306,13 @@
             return this;
         }
 
+        public Builder addFloatRGB(String prefix) {
+            add(DataType.FLOAT, DataKind.RED, false, 32, prefix + "R");
+            add(DataType.FLOAT, DataKind.GREEN, false, 32, prefix + "G");
+            add(DataType.FLOAT, DataKind.BLUE, false, 32, prefix + "B");
+            return this;
+        }
+
         public Builder addFloatRGBA() {
             add(DataType.FLOAT, DataKind.RED, false, 32, null);
             add(DataType.FLOAT, DataKind.GREEN, false, 32, null);
@@ -269,6 +321,14 @@
             return this;
         }
 
+        public Builder addFloatRGBA(String prefix) {
+            add(DataType.FLOAT, DataKind.RED, false, 32, prefix + "R");
+            add(DataType.FLOAT, DataKind.GREEN, false, 32, prefix + "G");
+            add(DataType.FLOAT, DataKind.BLUE, false, 32, prefix + "B");
+            add(DataType.FLOAT, DataKind.ALPHA, false, 32, prefix + "A");
+            return this;
+        }
+
         public Builder addUNorm8RGBA() {
             add(DataType.UNSIGNED, DataKind.RED, true, 8, null);
             add(DataType.UNSIGNED, DataKind.GREEN, true, 8, null);
@@ -277,6 +337,14 @@
             return this;
         }
 
+        public Builder addUNorm8RGBA(String prefix) {
+            add(DataType.UNSIGNED, DataKind.RED, true, 8, prefix + "R");
+            add(DataType.UNSIGNED, DataKind.GREEN, true, 8, prefix + "G");
+            add(DataType.UNSIGNED, DataKind.BLUE, true, 8, prefix + "B");
+            add(DataType.UNSIGNED, DataKind.ALPHA, true, 8, prefix + "A");
+            return this;
+        }
+
         static synchronized Element internalCreate(RenderScript rs, Builder b) {
             rs.nElementBegin();
             for (int ct=0; ct < b.mEntryCount; ct++) {
@@ -292,7 +360,7 @@
                 }
             }
             int id = rs.nElementCreate();
-            return new Element(id, rs);
+            return new Element(id, rs, (b.mSizeBits + 7) >> 3);
         }
 
         public Element create() {

graphics/java/android/renderscript/RenderScript.java

diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index 8489003..ee7b702 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -97,12 +97,13 @@
     native int  nAllocationCreateFromBitmapBoxed(int dstFmt, boolean genMips, Bitmap bmp);
 
     native void nAllocationUploadToTexture(int alloc, int baseMioLevel);
-    native void nAllocationData(int id, int[] d);
-    native void nAllocationData(int id, float[] d);
-    native void nAllocationSubData1D(int id, int off, int count, int[] d);
-    native void nAllocationSubData1D(int id, int off, int count, float[] d);
-    native void nAllocationSubData2D(int id, int xoff, int yoff, int w, int h, int[] d);
-    native void nAllocationSubData2D(int id, int xoff, int yoff, int w, int h, float[] d);
+    native void nAllocationUploadToBufferObject(int alloc);
+    native void nAllocationData(int id, int[] d, int sizeBytes);
+    native void nAllocationData(int id, float[] d, int sizeBytes);
+    native void nAllocationSubData1D(int id, int off, int count, int[] d, int sizeBytes);
+    native void nAllocationSubData1D(int id, int off, int count, float[] d, int sizeBytes);
+    native void nAllocationSubData2D(int id, int xoff, int yoff, int w, int h, int[] d, int sizeBytes);
+    native void nAllocationSubData2D(int id, int xoff, int yoff, int w, int h, float[] d, int sizeBytes);
     native void nAllocationRead(int id, int[] d);
     native void nAllocationRead(int id, float[] d);
     native void nAllocationDataFromObject(int id, Type t, Object o);

graphics/java/android/renderscript/SimpleMesh.java

diff --git a/graphics/java/android/renderscript/SimpleMesh.java b/graphics/java/android/renderscript/SimpleMesh.java
index d80551e..e66fb8a 100644
--- a/graphics/java/android/renderscript/SimpleMesh.java
+++ b/graphics/java/android/renderscript/SimpleMesh.java
@@ -167,5 +167,150 @@
         }
     }
 
+    public static class TriangleMeshBuilder {
+        float mVtxData[];
+        int mVtxCount;
+        int mIndexData[];
+        int mIndexCount;
+        RenderScript mRS;
+        Element mElement;
+
+        int mVtxSize;
+        boolean mNorm;
+        boolean mTex;
+
+        public TriangleMeshBuilder(RenderScript rs, int vtxSize, boolean norm, boolean tex) {
+            mRS = rs;
+            mVtxCount = 0;
+            mIndexCount = 0;
+            mVtxData = new float[128];
+            mIndexData = new int[128];
+            mVtxSize = vtxSize;
+            mNorm = norm;
+            mTex = tex;
+
+            if(vtxSize < 2 || vtxSize > 3) {
+                throw new IllegalArgumentException("Vertex size out of range.");
+            }
+        }
+
+        private void makeSpace(int count) {
+            if((mVtxCount + count) >= mVtxData.length) {
+                float t[] = new float[mVtxData.length * 2];
+                System.arraycopy(mVtxData, 0, t, 0, mVtxData.length);
+                mVtxData = t;
+            }
+        }
+
+        public void add_XY(float x, float y) {
+            if((mVtxSize != 2) || mNorm || mTex) {
+                throw new IllegalStateException("add mistmatch with declaired components.");
+            }
+            makeSpace(2);
+            mVtxData[mVtxCount++] = x;
+            mVtxData[mVtxCount++] = y;
+        }
+
+        public void add_XYZ(float x, float y, float z) {
+            if((mVtxSize != 3) || mNorm || mTex) {
+                throw new IllegalStateException("add mistmatch with declaired components.");
+            }
+            makeSpace(3);
+            mVtxData[mVtxCount++] = x;
+            mVtxData[mVtxCount++] = y;
+            mVtxData[mVtxCount++] = z;
+        }
+
+        public void add_XY_ST(float x, float y, float s, float t) {
+            if((mVtxSize != 2) || mNorm || !mTex) {
+                throw new IllegalStateException("add mistmatch with declaired components.");
+            }
+            makeSpace(4);
+            mVtxData[mVtxCount++] = x;
+            mVtxData[mVtxCount++] = y;
+            mVtxData[mVtxCount++] = s;
+            mVtxData[mVtxCount++] = t;
+        }
+
+        public void add_XYZ_ST(float x, float y, float z, float s, float t) {
+            if((mVtxSize != 3) || mNorm || !mTex) {
+                throw new IllegalStateException("add mistmatch with declaired components.");
+            }
+            makeSpace(5);
+            mVtxData[mVtxCount++] = x;
+            mVtxData[mVtxCount++] = y;
+            mVtxData[mVtxCount++] = z;
+            mVtxData[mVtxCount++] = s;
+            mVtxData[mVtxCount++] = t;
+        }
+
+        public void add_XYZ_ST_NORM(float x, float y, float z, float s, float t, float nx, float ny, float nz) {
+            if((mVtxSize != 3) || !mNorm || !mTex) {
+                throw new IllegalStateException("add mistmatch with declaired components.");
+            }
+            makeSpace(8);
+            mVtxData[mVtxCount++] = x;
+            mVtxData[mVtxCount++] = y;
+            mVtxData[mVtxCount++] = z;
+            mVtxData[mVtxCount++] = s;
+            mVtxData[mVtxCount++] = t;
+            mVtxData[mVtxCount++] = nx;
+            mVtxData[mVtxCount++] = ny;
+            mVtxData[mVtxCount++] = nz;
+        }
+
+        public void addTriangle(int idx1, int idx2, int idx3) {
+            if((mIndexCount + 3) >= mIndexData.length) {
+                int t[] = new int[mIndexData.length * 2];
+                System.arraycopy(mIndexData, 0, t, 0, mIndexData.length);
+                mIndexData = t;
+            }
+            mIndexData[mIndexCount++] = idx1;
+            mIndexData[mIndexCount++] = idx2;
+            mIndexData[mIndexCount++] = idx3;
+        }
+
+        public SimpleMesh create() {
+            Element.Builder b = new Element.Builder(mRS);
+            int floatCount = mVtxSize;
+            if(mVtxSize == 2) {
+                b.addFloatXY();
+            } else {
+                b.addFloatXYZ();
+            }
+            if(mTex) {
+                floatCount += 2;
+                b.addFloatST();
+            }
+            if(mNorm) {
+                floatCount += 3;
+                b.addFloatNorm();
+            }
+            mElement = b.create();
+
+            Builder smb = new Builder(mRS);
+            smb.addVertexType(mElement, mVtxCount / floatCount);
+            smb.setIndexType(Element.INDEX_16, mIndexCount);
+            smb.setPrimitive(Primitive.TRIANGLE);
+            SimpleMesh sm = smb.create();
+
+            Allocation vertexAlloc = sm.createVertexAllocation(0);
+            Allocation indexAlloc = sm.createIndexAllocation();
+            sm.bindVertexAllocation(vertexAlloc, 0);
+            sm.bindIndexAllocation(indexAlloc);
+
+            vertexAlloc.data(mVtxData);
+            vertexAlloc.uploadToBufferObject();
+
+            // This is safe because length is a pow2
+            for(int ct=0; ct < (mIndexCount+1); ct += 2) {
+                mIndexData[ct >> 1] = mIndexData[ct] | (mIndexData[ct+1] << 16);
+            }
+            indexAlloc.data(mIndexData);
+            indexAlloc.uploadToBufferObject();
+
+            return sm;
+        }
+    }
 }
 

graphics/jni/android_renderscript_RenderScript.cpp

diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index 2393f74..2550181 100644
--- a/graphics/jni/android_renderscript_RenderScript.cpp
+++ b/graphics/jni/android_renderscript_RenderScript.cpp
@@ -70,7 +70,7 @@
 nAssignName(JNIEnv *_env, jobject _this, jint obj, jbyteArray str)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
-    LOG_API("nAssignName, con(%p), obj(%p)", con, obj);
+    LOG_API("nAssignName, con(%p), obj(%p)", con, (void *)obj);
 
     jint len = _env->GetArrayLength(str);
     jbyte * cptr = (jbyte *) _env->GetPrimitiveArrayCritical(str, 0);
@@ -345,6 +345,14 @@
     rsAllocationUploadToTexture(con, (RsAllocation)a, mip);
 }
 
+static void
+nAllocationUploadToBufferObject(JNIEnv *_env, jobject _this, jint a)
+{
+    RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
+    LOG_API("nAllocationUploadToBufferObject, con(%p), a(%p)", con, (RsAllocation)a);
+    rsAllocationUploadToBufferObject(con, (RsAllocation)a);
+}
+
 static RsElementPredefined SkBitmapToPredefined(SkBitmap::Config cfg)
 {
     switch (cfg) {
@@ -413,68 +421,68 @@
 
 
 static void
-nAllocationData_i(JNIEnv *_env, jobject _this, jint alloc, jintArray data)
+nAllocationData_i(JNIEnv *_env, jobject _this, jint alloc, jintArray data, int sizeBytes)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
     jint len = _env->GetArrayLength(data);
     LOG_API("nAllocationData_i, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len);
     jint *ptr = _env->GetIntArrayElements(data, NULL);
-    rsAllocationData(con, (RsAllocation)alloc, ptr);
+    rsAllocationData(con, (RsAllocation)alloc, ptr, sizeBytes);
     _env->ReleaseIntArrayElements(data, ptr, JNI_ABORT);
 }
 
 static void
-nAllocationData_f(JNIEnv *_env, jobject _this, jint alloc, jfloatArray data)
+nAllocationData_f(JNIEnv *_env, jobject _this, jint alloc, jfloatArray data, int sizeBytes)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
     jint len = _env->GetArrayLength(data);
     LOG_API("nAllocationData_i, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len);
     jfloat *ptr = _env->GetFloatArrayElements(data, NULL);
-    rsAllocationData(con, (RsAllocation)alloc, ptr);
+    rsAllocationData(con, (RsAllocation)alloc, ptr, sizeBytes);
     _env->ReleaseFloatArrayElements(data, ptr, JNI_ABORT);
 }
 
 static void
-nAllocationSubData1D_i(JNIEnv *_env, jobject _this, jint alloc, jint offset, jint count, jintArray data)
+nAllocationSubData1D_i(JNIEnv *_env, jobject _this, jint alloc, jint offset, jint count, jintArray data, int sizeBytes)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
     jint len = _env->GetArrayLength(data);
     LOG_API("nAllocation1DSubData_i, con(%p), adapter(%p), offset(%i), count(%i), len(%i)", con, (RsAllocation)alloc, offset, count, len);
     jint *ptr = _env->GetIntArrayElements(data, NULL);
-    rsAllocation1DSubData(con, (RsAllocation)alloc, offset, count, ptr);
+    rsAllocation1DSubData(con, (RsAllocation)alloc, offset, count, ptr, sizeBytes);
     _env->ReleaseIntArrayElements(data, ptr, JNI_ABORT);
 }
 
 static void
-nAllocationSubData1D_f(JNIEnv *_env, jobject _this, jint alloc, jint offset, jint count, jfloatArray data)
+nAllocationSubData1D_f(JNIEnv *_env, jobject _this, jint alloc, jint offset, jint count, jfloatArray data, int sizeBytes)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
     jint len = _env->GetArrayLength(data);
     LOG_API("nAllocation1DSubData_f, con(%p), adapter(%p), offset(%i), count(%i), len(%i)", con, (RsAllocation)alloc, offset, count, len);
     jfloat *ptr = _env->GetFloatArrayElements(data, NULL);
-    rsAllocation1DSubData(con, (RsAllocation)alloc, offset, count, ptr);
+    rsAllocation1DSubData(con, (RsAllocation)alloc, offset, count, ptr, sizeBytes);
     _env->ReleaseFloatArrayElements(data, ptr, JNI_ABORT);
 }
 
 static void
-nAllocationSubData2D_i(JNIEnv *_env, jobject _this, jint alloc, jint xoff, jint yoff, jint w, jint h, jintArray data)
+nAllocationSubData2D_i(JNIEnv *_env, jobject _this, jint alloc, jint xoff, jint yoff, jint w, jint h, jintArray data, int sizeBytes)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
     jint len = _env->GetArrayLength(data);
     LOG_API("nAllocation2DSubData_i, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, w, h, len);
     jint *ptr = _env->GetIntArrayElements(data, NULL);
-    rsAllocation2DSubData(con, (RsAllocation)alloc, xoff, yoff, w, h, ptr);
+    rsAllocation2DSubData(con, (RsAllocation)alloc, xoff, yoff, w, h, ptr, sizeBytes);
     _env->ReleaseIntArrayElements(data, ptr, JNI_ABORT);
 }
 
 static void
-nAllocationSubData2D_f(JNIEnv *_env, jobject _this, jint alloc, jint xoff, jint yoff, jint w, jint h, jfloatArray data)
+nAllocationSubData2D_f(JNIEnv *_env, jobject _this, jint alloc, jint xoff, jint yoff, jint w, jint h, jfloatArray data, int sizeBytes)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
     jint len = _env->GetArrayLength(data);
     LOG_API("nAllocation2DSubData_i, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, w, h, len);
     jfloat *ptr = _env->GetFloatArrayElements(data, NULL);
-    rsAllocation2DSubData(con, (RsAllocation)alloc, xoff, yoff, w, h, ptr);
+    rsAllocation2DSubData(con, (RsAllocation)alloc, xoff, yoff, w, h, ptr, sizeBytes);
     _env->ReleaseFloatArrayElements(data, ptr, JNI_ABORT);
 }
 
@@ -516,7 +524,7 @@
         const TypeFieldCache *tfc = &tc->fields[ct];
         buf = tfc->ptr(_env, _o, tfc->field, buf);
     }
-    rsAllocationData(con, (RsAllocation)alloc, bufAlloc);
+    rsAllocationData(con, (RsAllocation)alloc, bufAlloc, tc->size);
     const uint32_t * tmp = (const uint32_t *)bufAlloc;
     free(bufAlloc);
 }
@@ -748,7 +756,7 @@
 nScriptSetClearColor(JNIEnv *_env, jobject _this, jint script, jfloat r, jfloat g, jfloat b, jfloat a)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
-    LOG_API("nScriptSetClearColor, con(%p), s(%p), r(%f), g(%f), b(%f), a(%f)", con, script, r, g, b, a);
+    LOG_API("nScriptSetClearColor, con(%p), s(%p), r(%f), g(%f), b(%f), a(%f)", con, (void *)script, r, g, b, a);
     rsScriptSetClearColor(con, (RsScript)script, r, g, b, a);
 }
 
@@ -756,7 +764,7 @@
 nScriptSetClearDepth(JNIEnv *_env, jobject _this, jint script, jfloat d)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
-    LOG_API("nScriptCSetClearDepth, con(%p), s(%p), depth(%f)", con, script, d);
+    LOG_API("nScriptCSetClearDepth, con(%p), s(%p), depth(%f)", con, (void *)script, d);
     rsScriptSetClearDepth(con, (RsScript)script, d);
 }
 
@@ -764,7 +772,7 @@
 nScriptSetClearStencil(JNIEnv *_env, jobject _this, jint script, jint stencil)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
-    LOG_API("nScriptCSetClearStencil, con(%p), s(%p), stencil(%i)", con, script, stencil);
+    LOG_API("nScriptCSetClearStencil, con(%p), s(%p), stencil(%i)", con, (void *)script, stencil);
     rsScriptSetClearStencil(con, (RsScript)script, stencil);
 }
 
@@ -772,7 +780,7 @@
 nScriptSetTimeZone(JNIEnv *_env, jobject _this, jint script, jbyteArray timeZone)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
-    LOG_API("nScriptCSetTimeZone, con(%p), s(%p), timeZone(%s)", con, script, timeZone);
+    LOG_API("nScriptCSetTimeZone, con(%p), s(%p), timeZone(%s)", con, (void *)script, (const char *)timeZone);
 
     jint length = _env->GetArrayLength(timeZone);
     jbyte* timeZone_ptr;
@@ -1005,7 +1013,7 @@
 nProgramVertexBindAllocation(JNIEnv *_env, jobject _this, jint vpv, jint a)
 {
     RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
-    LOG_API("nProgramVertexBindAllocation, con(%p), vpf(%p), slot(%i), a(%p)", con, (RsProgramVertex)vpv, slot, (RsAllocation)a);
+    LOG_API("nProgramVertexBindAllocation, con(%p), vpf(%p), a(%p)", con, (RsProgramVertex)vpv, (RsAllocation)a);
     rsProgramVertexBindAllocation(con, (RsProgramFragment)vpv, (RsAllocation)a);
 }
 
@@ -1230,14 +1238,15 @@
 {"nAllocationCreatePredefSized",   "(II)I",                                (void*)nAllocationCreatePredefSized },
 {"nAllocationCreateSized",         "(II)I",                                (void*)nAllocationCreateSized },
 {"nAllocationCreateFromBitmap",    "(IZLandroid/graphics/Bitmap;)I",       (void*)nAllocationCreateFromBitmap },
-{"nAllocationCreateFromBitmapBoxed","(IZLandroid/graphics/Bitmap;)I",       (void*)nAllocationCreateFromBitmapBoxed },
+{"nAllocationCreateFromBitmapBoxed","(IZLandroid/graphics/Bitmap;)I",      (void*)nAllocationCreateFromBitmapBoxed },
 {"nAllocationUploadToTexture",     "(II)V",                                (void*)nAllocationUploadToTexture },
-{"nAllocationData",                "(I[I)V",                               (void*)nAllocationData_i },
-{"nAllocationData",                "(I[F)V",                               (void*)nAllocationData_f },
-{"nAllocationSubData1D",           "(III[I)V",                             (void*)nAllocationSubData1D_i },
-{"nAllocationSubData1D",           "(III[F)V",                             (void*)nAllocationSubData1D_f },
-{"nAllocationSubData2D",           "(IIIII[I)V",                           (void*)nAllocationSubData2D_i },
-{"nAllocationSubData2D",           "(IIIII[F)V",                           (void*)nAllocationSubData2D_f },
+{"nAllocationUploadToBufferObject","(I)V",                                 (void*)nAllocationUploadToBufferObject },
+{"nAllocationData",                "(I[II)V",                              (void*)nAllocationData_i },
+{"nAllocationData",                "(I[FI)V",                              (void*)nAllocationData_f },
+{"nAllocationSubData1D",           "(III[II)V",                            (void*)nAllocationSubData1D_i },
+{"nAllocationSubData1D",           "(III[FI)V",                            (void*)nAllocationSubData1D_f },
+{"nAllocationSubData2D",           "(IIIII[II)V",                          (void*)nAllocationSubData2D_i },
+{"nAllocationSubData2D",           "(IIIII[FI)V",                          (void*)nAllocationSubData2D_f },
 {"nAllocationRead",                "(I[I)V",                               (void*)nAllocationRead_i },
 {"nAllocationRead",                "(I[F)V",                               (void*)nAllocationRead_f },
 {"nAllocationDataFromObject",      "(ILandroid/renderscript/Type;Ljava/lang/Object;)V",   (void*)nAllocationDataFromObject },

libs/rs/java/Film/res/raw/filmstrip.c

diff --git a/libs/rs/java/Film/res/raw/filmstrip.c b/libs/rs/java/Film/res/raw/filmstrip.c
index 255d908..8f3d930 100644
--- a/libs/rs/java/Film/res/raw/filmstrip.c
+++ b/libs/rs/java/Film/res/raw/filmstrip.c
@@ -24,15 +24,15 @@
 
     float trans = Pos_translate;
     float rot = Pos_rotate;
+
     matrixLoadScale(mat1, 2.f, 2.f, 2.f);
     matrixTranslate(mat1, 0.f, 0.f, trans);
     matrixRotate(mat1, 90.f, 0.f, 0.f, 1.f);
     matrixRotate(mat1, rot, 1.f, 0.f, 0.f);
-    storeMatrix(3, 0, mat1);
+    vpLoadModelMatrix(mat1);
 
     // Draw the lighting effect in the strip and fill the Z buffer.
-    drawTriangleMesh(NAMED_mesh);
-
+    drawSimpleMesh(NAMED_mesh);
 
     // Start of images.
     bindProgramFragmentStore(NAMED_PSImages);
@@ -74,31 +74,21 @@
         pos = pos - 0.75f;
 
         offset = offset + triangleOffsetsCount / 2;
-
-    int drawit = 1;
-    if (offset < 0) {
-        drawit = 0;
-    }
-    if (offset >= triangleOffsetsCount) {
-        drawit = 0;
-    }
-
-        //if (!((offset < 0) || (offset >= triangleOffsetsCount))) {
-        if (drawit) {
+        if (!((offset < 0) || (offset >= triangleOffsetsCount))) {
             int start = offset -2;
             int end = offset + 2;
 
             if (start < 0) {
                 start = 0;
             }
-            if (end > triangleOffsetsCount) {
-                end = triangleOffsetsCount;
+            if (end >= triangleOffsetsCount) {
+                end = triangleOffsetsCount-1;
             }
 
             bindTexture(NAMED_PFImages, 0, loadI32(0, imgId - 1));
             matrixLoadTranslate(mat1, -pos - loadF(5, triangleOffsetsCount / 2), 0, 0);
             vpLoadTextureMatrix(mat1);
-            drawTriangleMeshRange(NAMED_mesh, loadI32(4, start), loadI32(4, end) - loadI32(4, start));
+            drawSimpleMeshRange(NAMED_mesh, loadI32(4, start), (loadI32(4, end) - loadI32(4, start)));
         }
     }
     return 0;

libs/rs/java/Film/src/com/android/film/FilmRS.java

diff --git a/libs/rs/java/Film/src/com/android/film/FilmRS.java b/libs/rs/java/Film/src/com/android/film/FilmRS.java
index e6cd52d..cee827b 100644
--- a/libs/rs/java/Film/src/com/android/film/FilmRS.java
+++ b/libs/rs/java/Film/src/com/android/film/FilmRS.java
@@ -68,8 +68,6 @@
     private RenderScript mRS;
     private Script mScriptStrip;
     private Script mScriptImage;
-    private Element mElementVertex;
-    private Element mElementIndex;
     private Sampler mSampler;
     private ProgramStore mPSBackground;
     private ProgramStore mPSImages;
@@ -88,7 +86,7 @@
     private Allocation mAllocOffsetsTex;
     private Allocation mAllocOffsets;
 
-    private RenderScript.TriangleMesh mMesh;
+    private SimpleMesh mMesh;
     private Light mLight;
 
     private FilmStripMesh mFSM;
@@ -186,7 +184,6 @@
                 mip++;
                 a.setConstraint(Dimension.LOD, mip);
             }
-            a.destroy();
 
             mImages[ct].uploadToTexture(1);
             mBufferIDs[ct] = mImages[ct].getID();
@@ -204,13 +201,8 @@
     }
 
     private void initRS() {
-        mElementVertex = Element.NORM_ST_XYZ_F32;
-        mElementIndex = Element.INDEX_16;
-
-        mRS.triangleMeshBegin(mElementVertex, mElementIndex);
         mFSM = new FilmStripMesh();
-        mFSM.init(mRS);
-        mMesh = mRS.triangleMeshCreate();
+        mMesh = mFSM.init(mRS);
         mMesh.setName("mesh");
 
         initPFS();

libs/rs/java/Film/src/com/android/film/FilmStripMesh.java

diff --git a/libs/rs/java/Film/src/com/android/film/FilmStripMesh.java b/libs/rs/java/Film/src/com/android/film/FilmStripMesh.java
index 02bffd8..64aac26 100644
--- a/libs/rs/java/Film/src/com/android/film/FilmStripMesh.java
+++ b/libs/rs/java/Film/src/com/android/film/FilmStripMesh.java
@@ -22,6 +22,7 @@
 import android.util.Log;
 
 import android.renderscript.RenderScript;
+import android.renderscript.SimpleMesh;
 
 
 class FilmStripMesh {
@@ -72,27 +73,23 @@
             dx /= len;
             dy /= len;
             dz /= len;
-        
+
             nx = dx * dz;
             ny = dy * dz;
             nz = (float)java.lang.Math.sqrt(dx*dx + dy*dy);
-        
+
             len = (float)java.lang.Math.sqrt(nx*nx + ny*ny + nz*nz);
             nx /= len;
             ny /= len;
             nz /= len;
         }
-
-        void addToRS(RenderScript rs) {
-            rs.triangleMeshAddVertex_XYZ_ST_NORM(x, y, z, s, t, nx, ny, nz);
-        }
     }
 
     int[] mTriangleOffsets;
     float[] mTriangleOffsetsTex;
     int mTriangleOffsetsCount;
 
-    void init(RenderScript rs)
+    SimpleMesh init(RenderScript rs)
     {
         float vtx[] = new float[] {
             60.431003f, 124.482050f,
@@ -203,11 +200,11 @@
              -60.862074f, 120.872604f,
              -60.431003f, 124.482050f
         };
-    
-    
+
+
         mTriangleOffsets = new int[64];
         mTriangleOffsetsTex = new float[64];
-    
+
         mTriangleOffsets[0] = 0;
         mTriangleOffsetsCount = 1;
 
@@ -215,6 +212,8 @@
         t.nxyz(1, 0, 0);
         int count = vtx.length / 2;
 
+        SimpleMesh.TriangleMeshBuilder tm = new SimpleMesh.TriangleMeshBuilder(rs, 3, true, true);
+
         float runningS = 0;
         for (int ct=0; ct < (count-1); ct++) {
             t.x = -vtx[ct*2] / 100.f;
@@ -228,16 +227,15 @@
             t.ny /= len;
             t.y = -0.5f;
             t.t = 0;
-            //Log.e("xx", "vtx " + t.x + "  " + t.y + "  " + t.z);
-            t.addToRS(rs);
+            tm.add_XYZ_ST_NORM(t.x, t.y, t.z, t.s, t.t, t.nx, t.ny, t.nz);
+            //android.util.Log.e("rs", "vtx x="+t.x+" y="+t.y+" z="+t.z+" s="+t.s+" t="+t.t);
             t.y = .5f;
             t.t = 1;
-            t.addToRS(rs);
+            tm.add_XYZ_ST_NORM(t.x, t.y, t.z, t.s, t.t, t.nx, t.ny, t.nz);
+            //android.util.Log.e("rs", "vtx x="+t.x+" y="+t.y+" z="+t.z+" s="+t.s+" t="+t.t);
 
-            //LOGE(" %f", runningS);
             if((runningS*2) > mTriangleOffsetsCount) {
-                //LOGE("**** img %i  %i", gTriangleOffsetsCount, ct*2);
-                mTriangleOffsets[mTriangleOffsetsCount] = ct*2;
+                mTriangleOffsets[mTriangleOffsetsCount] = ct*2 * 3;
                 mTriangleOffsetsTex[mTriangleOffsetsCount] = t.s;
                 mTriangleOffsetsCount ++;
             }
@@ -245,9 +243,10 @@
 
         count = (count * 2 - 2);
         for (int ct=0; ct < (count-2); ct+= 2) {
-            rs.triangleMeshAddTriangle(ct, ct+1, ct+2);
-            rs.triangleMeshAddTriangle(ct+1, ct+3, ct+2);
+            tm.addTriangle(ct, ct+1, ct+2);
+            tm.addTriangle(ct+1, ct+3, ct+2);
         }
+        return tm.create();
     }
 
 

libs/rs/rs.spec

diff --git a/libs/rs/rs.spec b/libs/rs/rs.spec
index e275f27..cb4dd00 100644
--- a/libs/rs/rs.spec
+++ b/libs/rs/rs.spec
@@ -130,6 +130,9 @@
 AllocationData {
 	param RsAllocation va
 	param const void * data
+	param uint32_t bytes
+	handcodeApi
+	togglePlay
 	}
 
 Allocation1DSubData {
@@ -137,6 +140,9 @@
 	param uint32_t xoff
 	param uint32_t count
 	param const void *data
+	param uint32_t bytes
+	handcodeApi
+	togglePlay
 	}
 
 Allocation2DSubData {
@@ -146,6 +152,7 @@
 	param uint32_t w
 	param uint32_t h
 	param const void *data
+	param uint32_t bytes
 	}
 
 AllocationRead {

libs/rs/rsAdapter.cpp

diff --git a/libs/rs/rsAdapter.cpp b/libs/rs/rsAdapter.cpp
index 3242e11..d20e910 100644
--- a/libs/rs/rsAdapter.cpp
+++ b/libs/rs/rsAdapter.cpp
@@ -72,7 +72,7 @@
 RsAdapter1D rsi_Adapter1DCreate(Context *rsc)
 {
     Adapter1D *a = new Adapter1D();
-    a->incRef();
+    a->incUserRef();
     return a;
 }
 
@@ -185,7 +185,7 @@
 RsAdapter2D rsi_Adapter2DCreate(Context *rsc)
 {
     Adapter2D *a = new Adapter2D();
-    a->incRef();
+    a->incUserRef();
     return a;
 }
 

libs/rs/rsAllocation.cpp

diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index 3cb76bc..1f49ca1 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -115,9 +115,14 @@
 }
 
 
-void Allocation::data(const void *data)
+void Allocation::data(const void *data, uint32_t sizeBytes)
 {
-    memcpy(mPtr, data, mType->getSizeBytes());
+    uint32_t size = mType->getSizeBytes();
+    if (size != sizeBytes) {
+        LOGE("Allocation::data called with mismatched size expected %i, got %i", size, sizeBytes);
+        return;
+    }
+    memcpy(mPtr, data, size);
 }
 
 void Allocation::read(void *data)
@@ -125,16 +130,22 @@
     memcpy(data, mPtr, mType->getSizeBytes());
 }
 
-void Allocation::subData(uint32_t xoff, uint32_t count, const void *data)
+void Allocation::subData(uint32_t xoff, uint32_t count, const void *data, uint32_t sizeBytes)
 {
     uint32_t eSize = mType->getElementSizeBytes();
     uint8_t * ptr = static_cast<uint8_t *>(mPtr);
     ptr += eSize * xoff;
-    memcpy(ptr, data, count * eSize);
+    uint32_t size = count * eSize;
+
+    if (size != sizeBytes) {
+        LOGE("Allocation::subData called with mismatched size expected %i, got %i", size, sizeBytes);
+        return;
+    }
+    memcpy(ptr, data, size);
 }
 
 void Allocation::subData(uint32_t xoff, uint32_t yoff,
-             uint32_t w, uint32_t h, const void *data)
+             uint32_t w, uint32_t h, const void *data, uint32_t sizeBytes)
 {
     uint32_t eSize = mType->getElementSizeBytes();
     uint32_t lineSize = eSize * w;
@@ -143,6 +154,12 @@
     const uint8_t *src = static_cast<const uint8_t *>(data);
     uint8_t *dst = static_cast<uint8_t *>(mPtr);
     dst += eSize * (xoff + yoff * destW);
+
+    if ((lineSize * eSize * h) != sizeBytes) {
+        rsAssert(!"Allocation::subData called with mismatched size");
+        return;
+    }
+
     for (uint32_t line=yoff; line < (yoff+h); line++) {
         uint8_t * ptr = static_cast<uint8_t *>(mPtr);
         memcpy(dst, src, lineSize);
@@ -152,7 +169,7 @@
 }
 
 void Allocation::subData(uint32_t xoff, uint32_t yoff, uint32_t zoff,
-             uint32_t w, uint32_t h, uint32_t d, const void *data)
+             uint32_t w, uint32_t h, uint32_t d, const void *data, uint32_t sizeBytes)
 {
 }
 
@@ -170,7 +187,7 @@
     const Type * type = static_cast<const Type *>(vtype);
 
     Allocation * alloc = new Allocation(type);
-    alloc->incRef();
+    alloc->incUserRef();
     return alloc;
 }
 
@@ -340,7 +357,7 @@
         LOGE("Memory allocation failure");
         return NULL;
     }
-    texAlloc->incRef();
+    texAlloc->incUserRef();
 
     ElementConverter_t cvt = pickConverter(dstFmt, srcFmt);
     cvt(texAlloc->getPtr(), data, w * h);
@@ -451,7 +468,7 @@
 
     RsAllocation vTexAlloc = rsi_AllocationCreateTyped(rsc, type);
     Allocation *texAlloc = static_cast<Allocation *>(vTexAlloc);
-    texAlloc->incRef();
+    texAlloc->incUserRef();
     if (texAlloc == NULL) {
         LOGE("Memory allocation failure");
         fclose(f);
@@ -503,24 +520,24 @@
     return texAlloc;
 }
 
-void rsi_AllocationData(Context *rsc, RsAllocation va, const void *data)
+void rsi_AllocationData(Context *rsc, RsAllocation va, const void *data, uint32_t sizeBytes)
 {
     Allocation *a = static_cast<Allocation *>(va);
-    a->data(data);
+    a->data(data, sizeBytes);
     rsc->allocationCheck(a);
 }
 
-void rsi_Allocation1DSubData(Context *rsc, RsAllocation va, uint32_t xoff, uint32_t count, const void *data)
+void rsi_Allocation1DSubData(Context *rsc, RsAllocation va, uint32_t xoff, uint32_t count, const void *data, uint32_t sizeBytes)
 {
     Allocation *a = static_cast<Allocation *>(va);
-    a->subData(xoff, count, data);
+    a->subData(xoff, count, data, sizeBytes);
     rsc->allocationCheck(a);
 }
 
-void rsi_Allocation2DSubData(Context *rsc, RsAllocation va, uint32_t xoff, uint32_t yoff, uint32_t w, uint32_t h, const void *data)
+void rsi_Allocation2DSubData(Context *rsc, RsAllocation va, uint32_t xoff, uint32_t yoff, uint32_t w, uint32_t h, const void *data, uint32_t sizeBytes)
 {
     Allocation *a = static_cast<Allocation *>(va);
-    a->subData(xoff, yoff, w, h, data);
+    a->subData(xoff, yoff, w, h, data, sizeBytes);
     rsc->allocationCheck(a);
 }
 

libs/rs/rsAllocation.h

diff --git a/libs/rs/rsAllocation.h b/libs/rs/rsAllocation.h
index 00af9ed..1f58ec5 100644
--- a/libs/rs/rsAllocation.h
+++ b/libs/rs/rsAllocation.h
@@ -53,12 +53,12 @@
     uint32_t getBufferObjectID() const {return mBufferID;}
 
 
-    void data(const void *data);
-    void subData(uint32_t xoff, uint32_t count, const void *data);
+    void data(const void *data, uint32_t sizeBytes);
+    void subData(uint32_t xoff, uint32_t count, const void *data, uint32_t sizeBytes);
     void subData(uint32_t xoff, uint32_t yoff,
-                 uint32_t w, uint32_t h, const void *data);
+                 uint32_t w, uint32_t h, const void *data, uint32_t sizeBytes);
     void subData(uint32_t xoff, uint32_t yoff, uint32_t zoff,
-                 uint32_t w, uint32_t h, uint32_t d, const void *data);
+                 uint32_t w, uint32_t h, uint32_t d, const void *data, uint32_t sizeBytes);
 
     void read(void *data);
 

libs/rs/rsContext.cpp

diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 52c2b78..c28bd02 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -45,6 +45,7 @@
         configAttribsPtr[1] = 16;
         configAttribsPtr += 2;
     }
+
     configAttribsPtr[0] = EGL_NONE;
     rsAssert(configAttribsPtr < (configAttribs + (sizeof(configAttribs) / sizeof(EGLint))));
 
@@ -53,7 +54,7 @@
 
     status_t err = EGLUtils::selectConfigForNativeWindow(mEGL.mDisplay, configAttribs, mWndSurface, &mEGL.mConfig);
     if (err) {
-     LOGE("couldn't find an EGLConfig matching the screen format\n");
+       LOGE("couldn't find an EGLConfig matching the screen format\n");
     }
     //eglChooseConfig(mEGL.mDisplay, configAttribs, &mEGL.mConfig, 1, &mEGL.mNumConfigs);
 
@@ -76,11 +77,11 @@
     mGL.mRenderer = glGetString(GL_RENDERER);
     mGL.mExtensions = glGetString(GL_EXTENSIONS);
 
-    //LOGV("EGL Version %i %i", mEGL.mMajorVersion, mEGL.mMinorVersion);
-    //LOGV("GL Version %s", mGL.mVersion);
-    //LOGV("GL Vendor %s", mGL.mVendor);
-    //LOGV("GL Renderer %s", mGL.mRenderer);
-    //LOGV("GL Extensions %s", mGL.mExtensions);
+    LOGV("EGL Version %i %i", mEGL.mMajorVersion, mEGL.mMinorVersion);
+    LOGV("GL Version %s", mGL.mVersion);
+    LOGV("GL Vendor %s", mGL.mVendor);
+    LOGV("GL Renderer %s", mGL.mRenderer);
+    LOGV("GL Extensions %s", mGL.mExtensions);
 
     if ((strlen((const char *)mGL.mVersion) < 12) || memcmp(mGL.mVersion, "OpenGL ES-CM", 12)) {
         LOGE("Error, OpenGL ES Lite not supported");
@@ -432,7 +433,7 @@
         }
 
         for (size_t ct = 0; ct < mObjDestroy.mDestroyList.size(); ct++) {
-            mObjDestroy.mDestroyList[ct]->decRef();
+            mObjDestroy.mDestroyList[ct]->decUserRef();
         }
         mObjDestroy.mDestroyList.clear();
         mObjDestroy.mNeedToEmpty = false;
@@ -522,7 +523,7 @@
 {
     ObjectBase *ob = static_cast<ObjectBase *>(obj);
     rsc->removeName(ob);
-    ob->decRef();
+    ob->decUserRef();
 }
 
 void rsi_ContextSetDefineF(Context *rsc, const char* name, float value)

libs/rs/rsElement.cpp

diff --git a/libs/rs/rsElement.cpp b/libs/rs/rsElement.cpp
index 389b2c0..6794522 100644
--- a/libs/rs/rsElement.cpp
+++ b/libs/rs/rsElement.cpp
@@ -215,7 +215,7 @@
     rsAssert(!mComponents[idx].get());
     rsAssert(idx < mComponentCount);
     mComponents[idx].set(c);
-    c->incRef();
+    c->incUserRef();
 }
 
 
@@ -387,7 +387,7 @@
 
     rsAssert(sec->mPredefinedList[predef].mEnum == predef);
     Element * e = sec->mPredefinedList[predef].mElement;
-    e->incRef();
+    e->incUserRef();
     return e;
 }
 
@@ -412,7 +412,7 @@
     }
 
     rsc->mStateElement.mComponentBuildList.clear();
-    se->incRef();
+    se->incUserRef();
     return se;
 }
 

libs/rs/rsHandcode.h

diff --git a/libs/rs/rsHandcode.h b/libs/rs/rsHandcode.h
new file mode 100644
index 0000000..800eddd
--- /dev/null
+++ b/libs/rs/rsHandcode.h
@@ -0,0 +1,47 @@
+
+#define DATA_SYNC_SIZE 1024
+
+static inline void rsHCAPI_AllocationData (RsContext rsc, RsAllocation va, const void * data, uint32_t sizeBytes)
+{
+    ThreadIO *io = &((Context *)rsc)->mIO;
+    uint32_t size = sizeof(RS_CMD_AllocationData);
+    if (sizeBytes < DATA_SYNC_SIZE) {
+        size += (sizeBytes + 3) & ~3;
+    }
+    RS_CMD_AllocationData *cmd = static_cast<RS_CMD_AllocationData *>(io->mToCore.reserve(size));
+    cmd->va = va;
+    cmd->bytes = sizeBytes;
+    cmd->data = data;
+    if (sizeBytes < DATA_SYNC_SIZE) {
+        cmd->data = (void *)(cmd+1);
+        memcpy(cmd+1, data, sizeBytes);
+        io->mToCore.commit(RS_CMD_ID_AllocationData, size);
+    } else {
+        io->mToCore.commitSync(RS_CMD_ID_AllocationData, size);
+    }
+}
+
+
+static inline void rsHCAPI_Allocation1DSubData (RsContext rsc, RsAllocation va, uint32_t xoff, uint32_t count, const void * data, uint32_t sizeBytes)
+{
+    ThreadIO *io = &((Context *)rsc)->mIO;
+    uint32_t size = sizeof(RS_CMD_Allocation1DSubData);
+    if (sizeBytes < DATA_SYNC_SIZE) {
+        size += (sizeBytes + 3) & ~3;
+    }
+    RS_CMD_Allocation1DSubData *cmd = static_cast<RS_CMD_Allocation1DSubData *>(io->mToCore.reserve(size));
+    cmd->va = va;
+    cmd->xoff = xoff;
+    cmd->count = count;
+    cmd->data = data;
+    cmd->bytes = sizeBytes;
+    if (sizeBytes < DATA_SYNC_SIZE) {
+        cmd->data = (void *)(cmd+1);
+        memcpy(cmd+1, data, sizeBytes);
+        io->mToCore.commit(RS_CMD_ID_Allocation1DSubData, size);
+    } else {
+        io->mToCore.commitSync(RS_CMD_ID_Allocation1DSubData, size);
+    }
+
+}
+

libs/rs/rsLight.cpp

diff --git a/libs/rs/rsLight.cpp b/libs/rs/rsLight.cpp
index f780e52..ad06c1f 100644
--- a/libs/rs/rsLight.cpp
+++ b/libs/rs/rsLight.cpp
@@ -106,7 +106,7 @@
 {
     Light *l = new Light(rsc->mStateLight.mIsLocal,
                          rsc->mStateLight.mIsMono);
-    l->incRef();
+    l->incUserRef();
     return l;
 }
 

libs/rs/rsObjectBase.cpp

diff --git a/libs/rs/rsObjectBase.cpp b/libs/rs/rsObjectBase.cpp
index 07bbc1e..7e7afab 100644
--- a/libs/rs/rsObjectBase.cpp
+++ b/libs/rs/rsObjectBase.cpp
@@ -21,28 +21,51 @@
 
 ObjectBase::ObjectBase()
 {
-    mRefCount = 0;
+    mUserRefCount = 0;
+    mSysRefCount = 0;
     mName = NULL;
 }
 
 ObjectBase::~ObjectBase()
 {
     //LOGV("~ObjectBase %p  ref %i", this, mRefCount);
-    rsAssert(!mRefCount);
+    rsAssert(!mUserRefCount);
+    rsAssert(!mSysRefCount);
 }
 
-void ObjectBase::incRef() const
+void ObjectBase::incUserRef() const
 {
-    mRefCount ++;
+    mUserRefCount ++;
     //LOGV("ObjectBase %p inc ref %i", this, mRefCount);
 }
 
-void ObjectBase::decRef() const
+void ObjectBase::incSysRef() const
 {
-    rsAssert(mRefCount > 0);
-    mRefCount --;
+    mSysRefCount ++;
+    //LOGV("ObjectBase %p inc ref %i", this, mRefCount);
+}
+
+void ObjectBase::decUserRef() const
+{
+    rsAssert(mUserRefCount > 0);
+    mUserRefCount --;
     //LOGV("ObjectBase %p dec ref %i", this, mRefCount);
-    if (!mRefCount) {
+    if (!(mSysRefCount | mUserRefCount)) {
+        if (mName) {
+            LOGV("Deleting RS object %p, name %s", this, mName);
+        } else {
+            LOGV("Deleting RS object %p, no name", this);
+        }
+        delete this;
+    }
+}
+
+void ObjectBase::decSysRef() const
+{
+    rsAssert(mSysRefCount > 0);
+    mSysRefCount --;
+    //LOGV("ObjectBase %p dec ref %i", this, mRefCount);
+    if (!(mSysRefCount | mUserRefCount)) {
         if (mName) {
             LOGV("Deleting RS object %p, name %s", this, mName);
         } else {

libs/rs/rsObjectBase.h

diff --git a/libs/rs/rsObjectBase.h b/libs/rs/rsObjectBase.h
index b2c3338..d1e6baa 100644
--- a/libs/rs/rsObjectBase.h
+++ b/libs/rs/rsObjectBase.h
@@ -30,8 +30,11 @@
     ObjectBase();
     virtual ~ObjectBase();
 
-    void incRef() const;
-    void decRef() const;
+    void incSysRef() const;
+    void decSysRef() const;
+
+    void incUserRef() const;
+    void decUserRef() const;
 
     const char * getName() const {
         return mName;
@@ -41,13 +44,14 @@
 
 private:
     char * mName;
-    mutable int32_t mRefCount;
+    mutable int32_t mSysRefCount;
+    mutable int32_t mUserRefCount;
 
 
 };
 
-template<class T> 
-class ObjectBaseRef 
+template<class T>
+class ObjectBaseRef
 {
 public:
     ObjectBaseRef() {
@@ -57,14 +61,14 @@
     ObjectBaseRef(const ObjectBaseRef &ref) {
         mRef = ref.get();
         if (mRef) {
-            mRef->incRef();
+            mRef->incSysRef();
         }
     }
 
     ObjectBaseRef(T *ref) {
         mRef = ref;
         if (mRef) {
-            ref->incRef();
+            ref->incSysRef();
         }
     }
 
@@ -77,7 +81,7 @@
             clear();
             mRef = ref;
             if (mRef) {
-                ref->incRef();
+                ref->incSysRef();
             }
         }
     }
@@ -88,7 +92,7 @@
 
     void clear() {
         if (mRef) {
-            mRef->decRef();
+            mRef->decSysRef();
         }
         mRef = NULL;
     }
@@ -97,8 +101,8 @@
         return mRef;
     }
 
-    inline T * operator-> () const { 
-        return mRef;  
+    inline T * operator-> () const {
+        return mRef;
     }
 
 protected:

libs/rs/rsProgramFragment.cpp

diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp
index 654974f..0adce75 100644
--- a/libs/rs/rsProgramFragment.cpp
+++ b/libs/rs/rsProgramFragment.cpp
@@ -227,7 +227,7 @@
 RsProgramFragment rsi_ProgramFragmentCreate(Context *rsc)
 {
     ProgramFragment *pf = rsc->mStateFragment.mPF;
-    pf->incRef();
+    pf->incUserRef();
     rsc->mStateFragment.mPF = 0;
     return pf;
 }

libs/rs/rsProgramFragmentStore.cpp

diff --git a/libs/rs/rsProgramFragmentStore.cpp b/libs/rs/rsProgramFragmentStore.cpp
index 36ec615..3179484 100644
--- a/libs/rs/rsProgramFragmentStore.cpp
+++ b/libs/rs/rsProgramFragmentStore.cpp
@@ -251,7 +251,7 @@
 RsProgramFragmentStore rsi_ProgramFragmentStoreCreate(Context *rsc)
 {
     ProgramFragmentStore *pfs = rsc->mStateFragmentStore.mPFS;
-    pfs->incRef();
+    pfs->incUserRef();
     rsc->mStateFragmentStore.mPFS = 0;
     return pfs;
 }

libs/rs/rsProgramVertex.cpp

diff --git a/libs/rs/rsProgramVertex.cpp b/libs/rs/rsProgramVertex.cpp
index dc57d34..a07e166 100644
--- a/libs/rs/rsProgramVertex.cpp
+++ b/libs/rs/rsProgramVertex.cpp
@@ -143,10 +143,10 @@
 
     Matrix m;
     m.loadOrtho(0,w, h,0, -1,1);
-    alloc->subData(RS_PROGRAM_VERTEX_PROJECTION_OFFSET, 16, &m.m[0]);
+    alloc->subData(RS_PROGRAM_VERTEX_PROJECTION_OFFSET, 16, &m.m[0], 16*4);
 
     m.loadIdentity();
-    alloc->subData(RS_PROGRAM_VERTEX_MODELVIEW_OFFSET, 16, &m.m[0]);
+    alloc->subData(RS_PROGRAM_VERTEX_MODELVIEW_OFFSET, 16, &m.m[0], 16*4);
 }
 
 
@@ -162,7 +162,7 @@
 RsProgramVertex rsi_ProgramVertexCreate(Context *rsc)
 {
     ProgramVertex *pv = rsc->mStateVertex.mPV;
-    pv->incRef();
+    pv->incUserRef();
     rsc->mStateVertex.mPV = 0;
     return pv;
 }

libs/rs/rsSampler.cpp

diff --git a/libs/rs/rsSampler.cpp b/libs/rs/rsSampler.cpp
index 332d532..3f56faa 100644
--- a/libs/rs/rsSampler.cpp
+++ b/libs/rs/rsSampler.cpp
@@ -143,7 +143,7 @@
                               ss->mWrapS,
                               ss->mWrapT,
                               ss->mWrapR);
-    s->incRef();
+    s->incUserRef();
     return s;
 }
 

libs/rs/rsScriptC.cpp

diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp
index 9419829..0c7ac18 100644
--- a/libs/rs/rsScriptC.cpp
+++ b/libs/rs/rsScriptC.cpp
@@ -334,7 +334,7 @@
     ss->runCompiler(rsc);
 
     ScriptC *s = new ScriptC();
-    s->incRef();
+    s->incUserRef();
     s->mAccScript = ss->mAccScript;
     ss->mAccScript = NULL;
     s->mEnviroment = ss->mEnviroment;

libs/rs/rsSimpleMesh.cpp

diff --git a/libs/rs/rsSimpleMesh.cpp b/libs/rs/rsSimpleMesh.cpp
index 0b745eb..7c73eb9 100644
--- a/libs/rs/rsSimpleMesh.cpp
+++ b/libs/rs/rsSimpleMesh.cpp
@@ -67,7 +67,7 @@
 
     if (mIndexType.get()) {
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer->getBufferObjectID());
-        glDrawElements(mGLPrimitive, len, GL_UNSIGNED_SHORT, (GLvoid *)(start * 2));
+        glDrawElements(mGLPrimitive, len, GL_UNSIGNED_SHORT, (uint16_t *)(start * 2));
     } else {
         glDrawArrays(mGLPrimitive, start, len);
     }
@@ -91,7 +91,7 @@
 RsSimpleMesh rsi_SimpleMeshCreate(Context *rsc, RsType prim, RsType idx, RsType *vtx, uint32_t vtxCount, uint32_t primType)
 {
     SimpleMesh *sm = new SimpleMesh();
-    sm->incRef();
+    sm->incUserRef();
 
     sm->mIndexType.set((const Type *)idx);
     sm->mPrimitiveType.set((const Type *)prim);

libs/rs/rsTriangleMesh.cpp

diff --git a/libs/rs/rsTriangleMesh.cpp b/libs/rs/rsTriangleMesh.cpp
index 99f8adb..64bb71b 100644
--- a/libs/rs/rsTriangleMesh.cpp
+++ b/libs/rs/rsTriangleMesh.cpp
@@ -199,7 +199,7 @@
     memcpy(tm->mIndexData, tmc->mIndexData.array(), tm->mIndexDataSize);
     tm->analyzeElement();
 
-    tm->incRef();
+    tm->incUserRef();
     return tm;
 }
 

libs/rs/rsType.cpp

diff --git a/libs/rs/rsType.cpp b/libs/rs/rsType.cpp
index 5a9090e..1838fa6 100644
--- a/libs/rs/rsType.cpp
+++ b/libs/rs/rsType.cpp
@@ -252,6 +252,7 @@
 
     uint32_t stride = mElement->getSizeBytes();
     if (mGL.mVtx.size) {
+        //LOGE("va vtx %i %x, %i, %p", mGL.mVtx.size, mGL.mVtx.type, stride, (void *)mGL.mVtx.offset);
         glEnableClientState(GL_VERTEX_ARRAY);
         glVertexPointer(mGL.mVtx.size,
                         mGL.mVtx.type,
@@ -260,9 +261,10 @@
     }
 
     if (mGL.mNorm.size) {
+        //LOGE("va norm %i %x, %i, %p", mGL.mNorm.size, mGL.mNorm.type, stride, (void *)mGL.mNorm.offset);
         glEnableClientState(GL_NORMAL_ARRAY);
         rsAssert(mGL.mNorm.size == 3);
-        glNormalPointer(mGL.mNorm.size,
+        glNormalPointer(mGL.mNorm.type,
                         stride,
                         (void *)mGL.mNorm.offset);
     }
@@ -277,6 +279,7 @@
 
     for (uint32_t ct=0; ct < RS_MAX_TEXTURE; ct++) {
         if (mGL.mTex[ct].size) {
+            //LOGE("va tex%i %i %x, %i, %p", ct, mGL.mTex[ct].size, mGL.mTex[ct].type, stride, (void *)mGL.mTex[ct].offset);
             glClientActiveTexture(GL_TEXTURE0 + ct);
             glEnableClientState(GL_TEXTURE_COORD_ARRAY);
             glTexCoordPointer(mGL.mTex[ct].size,
@@ -361,7 +364,7 @@
     TypeState * stc = &rsc->mStateType;
 
     Type * st = new Type();
-    st->incRef();
+    st->incUserRef();
     st->setDimX(stc->mX);
     st->setDimY(stc->mY);
     st->setDimZ(stc->mZ);

libs/rs/rsg_generator.c

diff --git a/libs/rs/rsg_generator.c b/libs/rs/rsg_generator.c
index e3f816f..74ba248 100644
--- a/libs/rs/rsg_generator.c
+++ b/libs/rs/rsg_generator.c
@@ -141,6 +141,7 @@
     fprintf(f, "\n");
     fprintf(f, "using namespace android;\n");
     fprintf(f, "using namespace android::renderscript;\n");
+    fprintf(f, "#include \"rsHandcode.h\"\n");
     fprintf(f, "\n");
 
     for(ct=0; ct < apiCount; ct++) {
@@ -149,30 +150,39 @@
 
         printFuncDecl(f, api, "rs", 0);
         fprintf(f, "\n{\n");
-        fprintf(f, "    ThreadIO *io = &((Context *)rsc)->mIO;\n");
-        //fprintf(f, "    LOGE(\"add command %s\\n\");\n", api->name);
-        fprintf(f, "    RS_CMD_%s *cmd = static_cast<RS_CMD_%s *>(io->mToCore.reserve(sizeof(RS_CMD_%s)));\n", api->name, api->name, api->name);
-        fprintf(f, "    uint32_t size = sizeof(RS_CMD_%s);\n", api->name);
+        if (api->handcodeApi) {
+            fprintf(f, "    rsHCAPI_%s(rsc", api->name);
+            for(ct2=0; ct2 < api->paramCount; ct2++) {
+                const VarType *vt = &api->params[ct2];
+                fprintf(f, ", %s", vt->name);
+            }
+            fprintf(f, ");\n");
+        } else {
+            fprintf(f, "    ThreadIO *io = &((Context *)rsc)->mIO;\n");
+            //fprintf(f, "    LOGE(\"add command %s\\n\");\n", api->name);
+            fprintf(f, "    RS_CMD_%s *cmd = static_cast<RS_CMD_%s *>(io->mToCore.reserve(sizeof(RS_CMD_%s)));\n", api->name, api->name, api->name);
+            fprintf(f, "    uint32_t size = sizeof(RS_CMD_%s);\n", api->name);
 
-        for(ct2=0; ct2 < api->paramCount; ct2++) {
-            const VarType *vt = &api->params[ct2];
-            needFlush += vt->ptrLevel;
-            fprintf(f, "    cmd->%s = %s;\n", vt->name, vt->name);
-        }
-        if (api->ret.typeName[0]) {
-            needFlush = 1;
-        }
+            for(ct2=0; ct2 < api->paramCount; ct2++) {
+                const VarType *vt = &api->params[ct2];
+                needFlush += vt->ptrLevel;
+                fprintf(f, "    cmd->%s = %s;\n", vt->name, vt->name);
+            }
+            if (api->ret.typeName[0]) {
+                needFlush = 1;
+            }
 
-        fprintf(f, "    io->mToCore.commit");
-        if (needFlush) {
-            fprintf(f, "Sync");
-        }
-        fprintf(f, "(RS_CMD_ID_%s, size);\n", api->name);
+            fprintf(f, "    io->mToCore.commit");
+            if (needFlush) {
+                fprintf(f, "Sync");
+            }
+            fprintf(f, "(RS_CMD_ID_%s, size);\n", api->name);
 
-        if (api->ret.typeName[0]) {
-            fprintf(f, "    return reinterpret_cast<");
-            printVarType(f, &api->ret);
-            fprintf(f, ">(io->mToCoreRet);\n");
+            if (api->ret.typeName[0]) {
+                fprintf(f, "    return reinterpret_cast<");
+                printVarType(f, &api->ret);
+                fprintf(f, ">(io->mToCoreRet);\n");
+            }
         }
         fprintf(f, "};\n\n");
     }
@@ -191,6 +201,7 @@
     fprintf(f, "\n");
     fprintf(f, "namespace android {\n");
     fprintf(f, "namespace renderscript {\n");
+    fprintf(f, "#include \"rsHandcode.h\"\n");
     fprintf(f, "\n");
 
     for(ct=0; ct < apiCount; ct++) {
@@ -198,20 +209,22 @@
 
         fprintf(f, "void rsp_%s(Context *con, const void *vp)\n", api->name);
         fprintf(f, "{\n");
-        //fprintf(f, "    LOGE(\"play command %s\\n\");\n", api->name);
-        fprintf(f, "    const RS_CMD_%s *cmd = static_cast<const RS_CMD_%s *>(vp);\n", api->name, api->name);
-        fprintf(f, "    ");
-        if (api->ret.typeName[0]) {
-            fprintf(f, "con->mIO.mToCoreRet = (intptr_t)");
+        if (api->handcodePlay) {
+            fprintf(f, "    rsHCPLAY_%s(con, vp);\n", api->name);
+        } else {
+            //fprintf(f, "    LOGE(\"play command %s\\n\");\n", api->name);
+            fprintf(f, "    const RS_CMD_%s *cmd = static_cast<const RS_CMD_%s *>(vp);\n", api->name, api->name);
+            fprintf(f, "    ");
+            if (api->ret.typeName[0]) {
+                fprintf(f, "con->mIO.mToCoreRet = (intptr_t)");
+            }
+            fprintf(f, "rsi_%s(con", api->name);
+            for(ct2=0; ct2 < api->paramCount; ct2++) {
+                const VarType *vt = &api->params[ct2];
+                fprintf(f, ",\n           cmd->%s", vt->name);
+            }
+            fprintf(f, ");\n");
         }
-        fprintf(f, "rsi_%s(con", api->name);
-        for(ct2=0; ct2 < api->paramCount; ct2++) {
-            const VarType *vt = &api->params[ct2];
-            fprintf(f, ",");
-            fprintf(f, "\n           cmd->%s", vt->name);
-        }
-        fprintf(f, ");\n");
-
         fprintf(f, "};\n\n");
     }
 

libs/rs/spec.h

diff --git a/libs/rs/spec.h b/libs/rs/spec.h
index ba802f7..82650a7 100644
--- a/libs/rs/spec.h
+++ b/libs/rs/spec.h
@@ -24,6 +24,8 @@
 typedef struct {
   char name[256];
   int sync;
+  int handcodeApi;
+  int handcodePlay;
   int paramCount;
   VarType ret;
   VarType params[16];

libs/rs/spec.l

diff --git a/libs/rs/spec.l b/libs/rs/spec.l
index 62fcb63..d81d47e 100644
--- a/libs/rs/spec.l
+++ b/libs/rs/spec.l
@@ -47,6 +47,14 @@
     apis[apiCount].sync = 1;
     }
 
+<api_entry2>"handcodeApi" {
+    apis[apiCount].handcodeApi = 1;
+    }
+
+<api_entry2>"handcodePlay" {
+    apis[apiCount].handcodePlay = 1;
+    }
+
 <api_entry2>"ret" {
     currType = &apis[apiCount].ret;
     typeNextState = api_entry2;

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 91db766..eaad4fc 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1272,7 +1272,7 @@
 }
 
 void OMXCodec::drainInputBuffers() {
-    CHECK_EQ(mState, EXECUTING);
+    CHECK(mState == EXECUTING || mState == RECONFIGURING);
 
     Vector<BufferInfo> *buffers = &mPortBuffers[kPortIndexInput];
     for (size_t i = 0; i < buffers->size(); ++i) {
@@ -1716,15 +1716,20 @@
 
     Mutex::Autolock autoLock(mLock);
 
+    if (mState != EXECUTING && mState != RECONFIGURING) {
+        return UNKNOWN_ERROR;
+    }
+
     if (mInitialBufferSubmit) {
         mInitialBufferSubmit = false;
 
         drainInputBuffers();
-        fillOutputBuffers();
-    }
 
-    if (mState != EXECUTING && mState != RECONFIGURING) {
-        return UNKNOWN_ERROR;
+        if (mState == EXECUTING) {
+            // Otherwise mState == RECONFIGURING and this code will trigger
+            // after the output port is reenabled.
+            fillOutputBuffers();
+        }
     }
 
     int64_t seekTimeUs;

media/tests/MediaFrameworkTest/res/drawable-hdpi/icon.png

diff --git a/media/tests/MediaFrameworkTest/res/drawable-hdpi/icon.png b/media/tests/MediaFrameworkTest/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000..a02138e
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/res/drawable-hdpi/icon.png
Binary files differ

media/tests/MediaFrameworkTest/res/drawable-mdpi/icon.png

diff --git a/media/tests/MediaFrameworkTest/res/drawable/icon.png b/media/tests/MediaFrameworkTest/res/drawable-mdpi/icon.png
similarity index 100%
rename from media/tests/MediaFrameworkTest/res/drawable/icon.png
rename to media/tests/MediaFrameworkTest/res/drawable-mdpi/icon.png
Binary files differ

packages/TtsService/src/android/tts/TtsService.java

diff --git a/packages/TtsService/src/android/tts/TtsService.java b/packages/TtsService/src/android/tts/TtsService.java
index 5a72fcd..2e11698 100755
--- a/packages/TtsService/src/android/tts/TtsService.java
+++ b/packages/TtsService/src/android/tts/TtsService.java
@@ -148,7 +148,7 @@
     @Override
     public void onCreate() {
         super.onCreate();
-        Log.i("TtsService", "TtsService.onCreate()");
+        Log.v("TtsService", "TtsService.onCreate()");
 
         mResolver = getContentResolver();
 
@@ -279,7 +279,6 @@
 
 
     private int isLanguageAvailable(String lang, String country, String variant) {
-        //Log.v("TtsService", "TtsService.isLanguageAvailable(" + lang + ", " + country + ", " +variant+")");
         int res = TextToSpeech.LANG_NOT_SUPPORTED;
         try {
             res = sNativeSynth.isLanguageAvailable(lang, country, variant);
@@ -462,6 +461,9 @@
                     result = TextToSpeech.SUCCESS;
                 }
                 Log.i("TtsService", "Stopped");
+            } else {
+                Log.e("TtsService", "TTS stop(): queue locked longer than expected");
+                result = TextToSpeech.ERROR;
             }
         } catch (InterruptedException e) {
           Log.e("TtsService", "TTS stop: tryLock interrupted");
@@ -575,6 +577,9 @@
                     result = TextToSpeech.SUCCESS;
                 }
                 Log.i("TtsService", "Stopped all");
+            } else {
+                Log.e("TtsService", "TTS stopAll(): queue locked longer than expected");
+                result = TextToSpeech.ERROR;
             }
         } catch (InterruptedException e) {
           Log.e("TtsService", "TTS stopAll: tryLock interrupted");
@@ -725,7 +730,7 @@
             }
         }
         Thread synth = (new Thread(new SynthThread()));
-        //synth.setPriority(Thread.MIN_PRIORITY);
+        synth.setPriority(Thread.MAX_PRIORITY);
         synth.start();
     }
 
@@ -799,7 +804,7 @@
             }
         }
         Thread synth = (new Thread(new SynthThread()));
-        //synth.setPriority(Thread.MIN_PRIORITY);
+        synth.setPriority(Thread.MAX_PRIORITY);
         synth.start();
     }
 
@@ -827,7 +832,7 @@
         if (cb == null){
             return;
         }
-        Log.i("TtsService", "TTS callback: dispatch started");
+        Log.v("TtsService", "TTS callback: dispatch started");
         // Broadcast to all clients the new value.
         final int N = mCallbacks.beginBroadcast();
         try {
@@ -837,7 +842,7 @@
             // the dead object for us.
         }
         mCallbacks.finishBroadcast();
-        Log.i("TtsService", "TTS callback: dispatch completed to " + N);
+        Log.v("TtsService", "TTS callback: dispatch completed to " + N);
     }
 
     private SpeechItem splitCurrentTextIfNeeded(SpeechItem currentSpeechItem){
@@ -888,7 +893,7 @@
             SoundResource sr = getSoundResource(mCurrentSpeechItem);
             // Synth speech as needed - synthesizer should call
             // processSpeechQueue to continue running the queue
-            Log.i("TtsService", "TTS processing: " + mCurrentSpeechItem.mText);
+            Log.v("TtsService", "TTS processing: " + mCurrentSpeechItem.mText);
             if (sr == null) {
                 if (mCurrentSpeechItem.mType == SpeechItem.TEXT) {
                     mCurrentSpeechItem = splitCurrentTextIfNeeded(mCurrentSpeechItem);

packages/VpnServices/res/values/strings.xml

diff --git a/packages/VpnServices/res/values/strings.xml b/packages/VpnServices/res/values/strings.xml
index 074655e..d82f52a 100755
--- a/packages/VpnServices/res/values/strings.xml
+++ b/packages/VpnServices/res/values/strings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Title for the VPN Services activity. -->
     <string name="app_label">VPN Services</string>
 
-    <string name="vpn_notification_title_connected">%s VPN connected</string>
-    <string name="vpn_notification_title_disconnected">%s VPN disconnected</string>
+    <string name="vpn_notification_title_connected"><xliff:g id="profilename">%s</xliff:g> VPN connected</string>
+    <string name="vpn_notification_title_disconnected"><xliff:g id="profilename">%s</xliff:g> VPN disconnected</string>
     <string name="vpn_notification_hint_disconnected">Touch to reconnect to a VPN.</string>
 </resources>
 

telephony/java/com/android/internal/telephony/Phone.java

diff --git a/telephony/java/com/android/internal/telephony/Phone.java b/telephony/java/com/android/internal/telephony/Phone.java
index 3f9744f..e818175 100644
--- a/telephony/java/com/android/internal/telephony/Phone.java
+++ b/telephony/java/com/android/internal/telephony/Phone.java
@@ -1388,7 +1388,7 @@
      */
     String getIccSerialNumber();
 
-    //***** CDMA support methods
+    /* CDMA support methods */
 
     /*
      * TODO(Moto) TODO(Teleca): can getCdmaMin, getEsn, getMeid use more generic calls

telephony/java/com/android/internal/telephony/PhoneBase.java

diff --git a/telephony/java/com/android/internal/telephony/PhoneBase.java b/telephony/java/com/android/internal/telephony/PhoneBase.java
index 9edb4c2..e340f85 100644
--- a/telephony/java/com/android/internal/telephony/PhoneBase.java
+++ b/telephony/java/com/android/internal/telephony/PhoneBase.java
@@ -31,7 +31,6 @@
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.telephony.ServiceState;
-import android.telephony.SignalStrength;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -55,7 +54,7 @@
  *
  */
 
-public abstract class PhoneBase implements Phone {
+public abstract class PhoneBase extends Handler implements Phone {
     private static final String LOG_TAG = "PHONE";
     private static final boolean LOCAL_DEBUG = true;
 
@@ -68,7 +67,7 @@
     // Key used to read/write "disable data connection on boot" pref (used for testing)
     public static final String DATA_DISABLED_ON_BOOT_KEY = "disabled_on_boot_key";
 
-    //***** Event Constants
+    /* Event Constants */
     protected static final int EVENT_RADIO_AVAILABLE             = 1;
     /** Supplementary Service Notification received. */
     protected static final int EVENT_SSN                         = 2;
@@ -84,20 +83,22 @@
     protected static final int EVENT_SET_CALL_FORWARD_DONE       = 12;
     protected static final int EVENT_GET_CALL_FORWARD_DONE       = 13;
     protected static final int EVENT_CALL_RING                   = 14;
+    protected static final int EVENT_CALL_RING_CONTINUE          = 15;
+
     // Used to intercept the carrier selection calls so that
     // we can save the values.
-    protected static final int EVENT_SET_NETWORK_MANUAL_COMPLETE    = 15;
-    protected static final int EVENT_SET_NETWORK_AUTOMATIC_COMPLETE = 16;
-    protected static final int EVENT_SET_CLIR_COMPLETE              = 17;
-    protected static final int EVENT_REGISTERED_TO_NETWORK          = 18;
-    protected static final int EVENT_SET_VM_NUMBER_DONE             = 19;
+    protected static final int EVENT_SET_NETWORK_MANUAL_COMPLETE    = 16;
+    protected static final int EVENT_SET_NETWORK_AUTOMATIC_COMPLETE = 17;
+    protected static final int EVENT_SET_CLIR_COMPLETE              = 18;
+    protected static final int EVENT_REGISTERED_TO_NETWORK          = 19;
+    protected static final int EVENT_SET_VM_NUMBER_DONE             = 20;
     // Events for CDMA support
-    protected static final int EVENT_GET_DEVICE_IDENTITY_DONE       = 20;
-    protected static final int EVENT_RUIM_RECORDS_LOADED            = 21;
-    protected static final int EVENT_NV_READY                       = 22;
-    protected static final int EVENT_SET_ENHANCED_VP                = 23;
-    protected static final int EVENT_EMERGENCY_CALLBACK_MODE_ENTER  = 24;
-    protected static final int EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE = 25;
+    protected static final int EVENT_GET_DEVICE_IDENTITY_DONE       = 21;
+    protected static final int EVENT_RUIM_RECORDS_LOADED            = 22;
+    protected static final int EVENT_NV_READY                       = 23;
+    protected static final int EVENT_SET_ENHANCED_VP                = 24;
+    protected static final int EVENT_EMERGENCY_CALLBACK_MODE_ENTER  = 25;
+    protected static final int EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE = 26;
 
     // Key used to read/write current CLIR setting
     public static final String CLIR_KEY = "clir_key";
@@ -105,11 +106,14 @@
     // Key used to read/write "disable DNS server check" pref (used for testing)
     public static final String DNS_SERVER_CHECK_DISABLED_KEY = "dns_server_check_disabled_key";
 
-    //***** Instance Variables
+    /* Instance Variables */
     public CommandsInterface mCM;
     protected IccFileHandler mIccFileHandler;
     boolean mDnsCheckDisabled = false;
     public DataConnectionTracker mDataConnection;
+    boolean mDoesRilSendMultipleCallRing;
+    int mCallRingContinueToken = 0;
+    int mCallRingDelay;
 
     /**
      * Set a system property, unless we're in unit test mode
@@ -172,8 +176,8 @@
      * @param notifier An instance of DefaultPhoneNotifier,
      * unless unit testing.
      */
-    protected PhoneBase(PhoneNotifier notifier, Context context) {
-        this(notifier, context, false);
+    protected PhoneBase(PhoneNotifier notifier, Context context, CommandsInterface ci) {
+        this(notifier, context, ci, false);
     }
 
     /**
@@ -185,11 +189,12 @@
      * @param unitTestMode when true, prevents notifications
      * of state change events
      */
-    protected PhoneBase(PhoneNotifier notifier, Context context,
+    protected PhoneBase(PhoneNotifier notifier, Context context, CommandsInterface ci,
             boolean unitTestMode) {
         this.mNotifier = notifier;
         this.mContext = context;
         mLooper = Looper.myLooper();
+        mCM = ci;
 
         setPropertiesByCarrier();
 
@@ -197,6 +202,70 @@
 
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
         mDnsCheckDisabled = sp.getBoolean(DNS_SERVER_CHECK_DISABLED_KEY, false);
+        mCM.setOnCallRing(this, EVENT_CALL_RING, null);
+
+        /**
+         *  Some RIL's don't always send RIL_UNSOL_CALL_RING so it needs
+         *  to be generated locally. Ideally all ring tones should be loops
+         * and this wouldn't be necessary. But to minimize changes to upper
+         * layers it is requested that it be generated by lower layers.
+         *
+         * By default old phones won't have the property set but do generate
+         * the RIL_UNSOL_CALL_RING so the default if there is no property is
+         * true.
+         */
+        mDoesRilSendMultipleCallRing = SystemProperties.getBoolean(
+                TelephonyProperties.PROPERTY_RIL_SENDS_MULTIPLE_CALL_RING, true);
+        Log.d(LOG_TAG, "mDoesRilSendMultipleCallRing=" + mDoesRilSendMultipleCallRing);
+
+        mCallRingDelay = SystemProperties.getInt(
+                TelephonyProperties.PROPERTY_CALL_RING_DELAY, 3000);
+        Log.d(LOG_TAG, "mCallRingDelay=" + mCallRingDelay);
+    }
+
+    public void dispose() {
+        synchronized(PhoneProxy.lockForRadioTechnologyChange) {
+            mCM.unSetOnCallRing(this);
+        }
+    }
+
+    /**
+     * When overridden the derived class needs to call
+     * super.handleMessage(msg) so this method has a
+     * a chance to process the message.
+     *
+     * @param msg
+     */
+    @Override
+    public void handleMessage(Message msg) {
+        AsyncResult ar;
+
+        switch(msg.what) {
+            case EVENT_CALL_RING:
+                Log.d(LOG_TAG, "Event EVENT_CALL_RING Received state=" + getState());
+                ar = (AsyncResult)msg.obj;
+                if (ar.exception == null) {
+                    Phone.State state = getState();
+                    if ((!mDoesRilSendMultipleCallRing)
+                            && ((state == Phone.State.RINGING) || (state == Phone.State.IDLE))) {
+                        mCallRingContinueToken += 1;
+                        sendIncomingCallRingNotification(mCallRingContinueToken);
+                    } else {
+                        notifyIncomingRing();
+                    }
+                }
+                break;
+
+            case EVENT_CALL_RING_CONTINUE:
+                Log.d(LOG_TAG, "Event EVENT_CALL_RING_CONTINUE Received stat=" + getState());
+                if (getState() == Phone.State.RINGING) {
+                    sendIncomingCallRingNotification(msg.arg1);
+                }
+                break;
+
+            default:
+                throw new RuntimeException("unexpected event not handled");
+        }
     }
 
     // Inherited documentation suffices.
@@ -290,16 +359,6 @@
         mCM.unregisterForInCallVoicePrivacyOff(h);
     }
 
-    /**
-     * Notifiy registrants of a new ringing Connection.
-     * Subclasses of Phone probably want to replace this with a
-     * version scoped to their packages
-     */
-    protected void notifyNewRingingConnectionP(Connection cn) {
-        AsyncResult ar = new AsyncResult(null, cn, null);
-        mNewRingingConnectionRegistrants.notifyRegistrants(ar);
-    }
-
     // Inherited documentation suffices.
     public void registerForIncomingRing(
             Handler h, int what, Object obj) {
@@ -553,16 +612,22 @@
         }
     }
 
-    /*
-     * Retrieves the Handler of the Phone instance
+    /**
+     * Get state
      */
-    public abstract Handler getHandler();
+    public abstract Phone.State getState();
 
     /**
      * Retrieves the IccFileHandler of the Phone instance
      */
     public abstract IccFileHandler getIccFileHandler();
 
+    /*
+     * Retrieves the Handler of the Phone instance
+     */
+    public Handler getHandler() {
+        return this;
+    }
 
     /**
      *  Query the status of the CDMA roaming preference
@@ -902,4 +967,39 @@
         mDataConnection.setState(dcState);
         notifyDataConnection(null);
     }
+
+    /**
+     * Notifiy registrants of a new ringing Connection.
+     * Subclasses of Phone probably want to replace this with a
+     * version scoped to their packages
+     */
+    protected void notifyNewRingingConnectionP(Connection cn) {
+        AsyncResult ar = new AsyncResult(null, cn, null);
+        mNewRingingConnectionRegistrants.notifyRegistrants(ar);
+    }
+
+    /**
+     * Notify registrants of a RING event.
+     */
+    private void notifyIncomingRing() {
+        AsyncResult ar = new AsyncResult(null, this, null);
+        mIncomingRingRegistrants.notifyRegistrants(ar);
+    }
+
+    /**
+     * Send the incoming call Ring notification if conditions are right.
+     */
+    private void sendIncomingCallRingNotification(int token) {
+        if (!mDoesRilSendMultipleCallRing && (token == mCallRingContinueToken)) {
+            Log.d(LOG_TAG, "Sending notifyIncomingRing");
+            notifyIncomingRing();
+            sendMessageDelayed(
+                    obtainMessage(EVENT_CALL_RING_CONTINUE, token, 0), mCallRingDelay);
+        } else {
+            Log.d(LOG_TAG, "Ignoring ring notification request,"
+                    + " mDoesRilSendMultipleCallRing=" + mDoesRilSendMultipleCallRing
+                    + " token=" + token
+                    + " mCallRingContinueToken=" + mCallRingContinueToken);
+        }
+    }
 }

telephony/java/com/android/internal/telephony/TelephonyProperties.java

diff --git a/telephony/java/com/android/internal/telephony/TelephonyProperties.java b/telephony/java/com/android/internal/telephony/TelephonyProperties.java
index 60e0a44..de5bbc1 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyProperties.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyProperties.java
@@ -120,4 +120,14 @@
      */
     static final String PROPERTY_DISABLE_CALL = "ro.telephony.disable-call";
 
+    /**
+     * Set to true for vendor RIL's that send multiple UNSOL_CALL_RING notifications.
+     */
+    static final String PROPERTY_RIL_SENDS_MULTIPLE_CALL_RING =
+        "ro.telephony.call_ring.multiple";
+
+    /**
+     * The number of milli-seconds between CALL_RING notifications.
+     */
+    static final String PROPERTY_CALL_RING_DELAY = "ro.telephony.call_ring.delay";
 }

telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java

diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
index 66eb789..ebe3e096 100755
--- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -26,7 +26,6 @@
 import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Handler;
-import android.os.Looper;
 import android.os.Message;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
@@ -35,7 +34,6 @@
 import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.preference.PreferenceManager;
-import android.provider.Settings;
 import android.provider.Telephony;
 import android.telephony.CellLocation;
 import android.telephony.PhoneNumberUtils;
@@ -96,20 +94,20 @@
     static final int RESTART_ECM_TIMER = 0; // restart Ecm timer
     static final int CANCEL_ECM_TIMER = 1; // cancel Ecm timer
 
-    //***** Instance Variables
+    // Instance Variables
     CdmaCallTracker mCT;
     CdmaSMSDispatcher mSMS;
     CdmaServiceStateTracker mSST;
     RuimFileHandler mRuimFileHandler;
     RuimRecords mRuimRecords;
     RuimCard mRuimCard;
-    MyHandler h;
     RuimPhoneBookInterfaceManager mRuimPhoneBookInterfaceManager;
     RuimSmsInterfaceManager mRuimSmsInterfaceManager;
     PhoneSubInfo mSubInfo;
     EriManager mEriManager;
     WakeLock mWakeLock;
 
+
     // mNvLoadedRegistrants are informed after the EVENT_NV_READY
     private RegistrantList mNvLoadedRegistrants = new RegistrantList();
 
@@ -139,17 +137,14 @@
     Registrant mPostDialHandler;
 
 
-    //***** Constructors
+    // Constructors
     public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier) {
         this(context,ci,notifier, false);
     }
 
     public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier,
             boolean unitTestMode) {
-        super(notifier, context, unitTestMode);
-
-        h = new MyHandler();
-        mCM = ci;
+        super(notifier, context, ci, unitTestMode);
 
         mCM.setPhoneType(RILConstants.CDMA_PHONE);
         mCT = new CdmaCallTracker(this);
@@ -164,15 +159,14 @@
         mSubInfo = new PhoneSubInfo(this);
         mEriManager = new EriManager(this, context, EriManager.ERI_FROM_XML);
 
-        mCM.registerForAvailable(h, EVENT_RADIO_AVAILABLE, null);
-        mRuimRecords.registerForRecordsLoaded(h, EVENT_RUIM_RECORDS_LOADED, null);
-        mCM.registerForOffOrNotAvailable(h, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
-        mCM.registerForOn(h, EVENT_RADIO_ON, null);
-        mCM.setOnSuppServiceNotification(h, EVENT_SSN, null);
-        mCM.setOnCallRing(h, EVENT_CALL_RING, null);
-        mSST.registerForNetworkAttach(h, EVENT_REGISTERED_TO_NETWORK, null);
-        mCM.registerForNVReady(h, EVENT_NV_READY, null);
-        mCM.setEmergencyCallbackMode(h, EVENT_EMERGENCY_CALLBACK_MODE_ENTER, null);
+        mCM.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
+        mRuimRecords.registerForRecordsLoaded(this, EVENT_RUIM_RECORDS_LOADED, null);
+        mCM.registerForOffOrNotAvailable(this, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
+        mCM.registerForOn(this, EVENT_RADIO_ON, null);
+        mCM.setOnSuppServiceNotification(this, EVENT_SSN, null);
+        mSST.registerForNetworkAttach(this, EVENT_REGISTERED_TO_NETWORK, null);
+        mCM.registerForNVReady(this, EVENT_NV_READY, null);
+        mCM.setEmergencyCallbackMode(this, EVENT_EMERGENCY_CALLBACK_MODE_ENTER, null);
 
         PowerManager pm
             = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
@@ -207,23 +201,23 @@
         // Updates MCC MNC device configuration information
         updateMccMncConfiguration(operatorNumeric);
 
+
         // Notify voicemails.
         notifier.notifyMessageWaitingChanged(this);
     }
 
     public void dispose() {
         synchronized(PhoneProxy.lockForRadioTechnologyChange) {
+            super.dispose();
 
             //Unregister from all former registered events
-            mRuimRecords.unregisterForRecordsLoaded(h); //EVENT_RUIM_RECORDS_LOADED
-            mCM.unregisterForAvailable(h); //EVENT_RADIO_AVAILABLE
-            mCM.unregisterForOffOrNotAvailable(h); //EVENT_RADIO_OFF_OR_NOT_AVAILABLE
-            mCM.unregisterForOn(h); //EVENT_RADIO_ON
-            mCM.unregisterForNVReady(h); //EVENT_NV_READY
-            mSST.unregisterForNetworkAttach(h); //EVENT_REGISTERED_TO_NETWORK
-            mCM.unSetOnSuppServiceNotification(h);
-            mCM.unSetOnCallRing(h);
-
+            mRuimRecords.unregisterForRecordsLoaded(this); //EVENT_RUIM_RECORDS_LOADED
+            mCM.unregisterForAvailable(this); //EVENT_RADIO_AVAILABLE
+            mCM.unregisterForOffOrNotAvailable(this); //EVENT_RADIO_OFF_OR_NOT_AVAILABLE
+            mCM.unregisterForOn(this); //EVENT_RADIO_ON
+            mCM.unregisterForNVReady(this); //EVENT_NV_READY
+            mSST.unregisterForNetworkAttach(this); //EVENT_REGISTERED_TO_NETWORK
+            mCM.unSetOnSuppServiceNotification(this);
 
             //Force all referenced classes to unregister their former registered events
             mCT.dispose();
@@ -262,8 +256,6 @@
         }
     }
 
-
-    //***** Overridden from Phone
     public ServiceState getServiceState() {
         return mSST.ss;
     }
@@ -701,7 +693,7 @@
                                    Message onComplete) {
         Message resp;
         mVmNumber = voiceMailNumber;
-        resp = h.obtainMessage(EVENT_SET_VM_NUMBER_DONE, 0, 0, onComplete);
+        resp = obtainMessage(EVENT_SET_VM_NUMBER_DONE, 0, 0, onComplete);
         mRuimRecords.setVoiceMailNumber(alphaTag, mVmNumber, resp);
     }
 
@@ -826,14 +818,6 @@
         super.notifyNewRingingConnectionP(c);
     }
 
-    /**
-     * Notifiy registrants of a RING event.
-     */
-    void notifyIncomingRing() {
-        AsyncResult ar = new AsyncResult(null, this, null);
-        mIncomingRingRegistrants.notifyRegistrants(ar);
-    }
-
     /*package*/ void notifyDisconnect(Connection cn) {
         mDisconnectRegistrants.notifyResult(cn);
     }
@@ -883,7 +867,7 @@
             mWakeLock.release();
         }
         // Send a message which will invoke handleExitEmergencyCallbackMode
-        mCM.exitEmergencyCallbackMode(h.obtainMessage(EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE));
+        mCM.exitEmergencyCallbackMode(obtainMessage(EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE));
     }
 
     private void handleEnterEmergencyCallbackMode(Message msg) {
@@ -902,7 +886,7 @@
             // if no one invokes exitEmergencyCallbackMode() directly.
             long delayInMillis = SystemProperties.getLong(
                     TelephonyProperties.PROPERTY_ECM_EXIT_TIMER, DEFAULT_ECM_EXIT_TIMER_VALUE);
-            h.postDelayed(mExitEcmRunnable, delayInMillis);
+            postDelayed(mExitEcmRunnable, delayInMillis);
             // We don't want to go to sleep while in Ecm
             mWakeLock.acquire();
         }
@@ -915,7 +899,7 @@
                     + ar.exception + mIsPhoneInEcmState);
         }
         // Remove pending exit Ecm runnable, if any
-        h.removeCallbacks(mExitEcmRunnable);
+        removeCallbacks(mExitEcmRunnable);
 
         if (mEcmExitRespRegistrant != null) {
             mEcmExitRespRegistrant.notifyRegistrant(ar);
@@ -941,13 +925,13 @@
     void handleTimerInEmergencyCallbackMode(int action) {
         switch(action) {
         case CANCEL_ECM_TIMER:
-            h.removeCallbacks(mExitEcmRunnable);
+            removeCallbacks(mExitEcmRunnable);
             mEcmTimerResetRegistrants.notifyResult(new Boolean(true));
             break;
         case RESTART_ECM_TIMER:
             long delayInMillis = SystemProperties.getLong(
                     TelephonyProperties.PROPERTY_ECM_EXIT_TIMER, DEFAULT_ECM_EXIT_TIMER_VALUE);
-            h.postDelayed(mExitEcmRunnable, delayInMillis);
+            postDelayed(mExitEcmRunnable, delayInMillis);
             mEcmTimerResetRegistrants.notifyResult(new Boolean(false));
             break;
         default:
@@ -969,123 +953,108 @@
         mEcmTimerResetRegistrants.remove(h);
     }
 
-    //***** Inner Classes
-    class MyHandler extends Handler {
-        MyHandler() {
-        }
+    @Override
+    public void handleMessage(Message msg) {
+        AsyncResult ar;
+        Message     onComplete;
 
-        MyHandler(Looper l) {
-            super(l);
-        }
+        switch(msg.what) {
+            case EVENT_RADIO_AVAILABLE: {
+                mCM.getBasebandVersion(obtainMessage(EVENT_GET_BASEBAND_VERSION_DONE));
 
-        @Override
-        public void handleMessage(Message msg) {
-            AsyncResult ar;
-            Message     onComplete;
+                mCM.getDeviceIdentity(obtainMessage(EVENT_GET_DEVICE_IDENTITY_DONE));
+            }
+            break;
 
-            switch(msg.what) {
-                case EVENT_RADIO_AVAILABLE: {
-                    mCM.getBasebandVersion(obtainMessage(EVENT_GET_BASEBAND_VERSION_DONE));
+            case EVENT_GET_BASEBAND_VERSION_DONE:{
+                ar = (AsyncResult)msg.obj;
 
-                    mCM.getDeviceIdentity(obtainMessage(EVENT_GET_DEVICE_IDENTITY_DONE));
+                if (ar.exception != null) {
+                    break;
                 }
-                break;
 
-                case EVENT_GET_BASEBAND_VERSION_DONE:{
-                    ar = (AsyncResult)msg.obj;
+                if (DBG) Log.d(LOG_TAG, "Baseband version: " + ar.result);
+                setSystemProperty(TelephonyProperties.PROPERTY_BASEBAND_VERSION, (String)ar.result);
+            }
+            break;
 
-                    if (ar.exception != null) {
-                        break;
-                    }
+            case EVENT_GET_DEVICE_IDENTITY_DONE:{
+                ar = (AsyncResult)msg.obj;
 
-                    if (DBG) Log.d(LOG_TAG, "Baseband version: " + ar.result);
-                    setSystemProperty(TelephonyProperties.PROPERTY_BASEBAND_VERSION, (String)ar.result);
+                if (ar.exception != null) {
+                    break;
                 }
-                break;
+                String[] respId = (String[])ar.result;
+                mEsn  =  respId[2];
+                mMeid =  respId[3];
+            }
+            break;
 
-                case EVENT_GET_DEVICE_IDENTITY_DONE:{
-                    ar = (AsyncResult)msg.obj;
+            case EVENT_EMERGENCY_CALLBACK_MODE_ENTER:{
+                handleEnterEmergencyCallbackMode(msg);
+            }
+            break;
 
-                    if (ar.exception != null) {
-                        break;
-                    }
-                    String[] respId = (String[])ar.result;
-                    mEsn  =  respId[2];
-                    mMeid =  respId[3];
+            case  EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE:{
+                handleExitEmergencyCallbackMode(msg);
+            }
+            break;
+
+            case EVENT_RUIM_RECORDS_LOADED:{
+                Log.d(LOG_TAG, "Event EVENT_RUIM_RECORDS_LOADED Received");
+            }
+            break;
+
+            case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:{
+                Log.d(LOG_TAG, "Event EVENT_RADIO_OFF_OR_NOT_AVAILABLE Received");
+            }
+            break;
+
+            case EVENT_RADIO_ON:{
+                Log.d(LOG_TAG, "Event EVENT_RADIO_ON Received");
+            }
+            break;
+
+            case EVENT_SSN:{
+                Log.d(LOG_TAG, "Event EVENT_SSN Received");
+            }
+            break;
+
+            case EVENT_REGISTERED_TO_NETWORK:{
+                Log.d(LOG_TAG, "Event EVENT_REGISTERED_TO_NETWORK Received");
+            }
+            break;
+
+            case EVENT_NV_READY:{
+                Log.d(LOG_TAG, "Event EVENT_NV_READY Received");
+                //Inform the Service State Tracker
+                mEriManager.loadEriFile();
+                mNvLoadedRegistrants.notifyRegistrants();
+                if(mEriManager.isEriFileLoaded()) {
+                    // when the ERI file is loaded
+                    Log.d(LOG_TAG, "ERI read, notify registrants");
+                    mEriFileLoadedRegistrants.notifyRegistrants();
                 }
-                break;
+                setSystemProperty(TelephonyProperties.PROPERTY_INECM_MODE,"false");
+            }
+            break;
 
-                case EVENT_EMERGENCY_CALLBACK_MODE_ENTER:{
-                    handleEnterEmergencyCallbackMode(msg);
+            case EVENT_SET_VM_NUMBER_DONE:{
+                ar = (AsyncResult)msg.obj;
+                if (IccException.class.isInstance(ar.exception)) {
+                    storeVoiceMailNumber(mVmNumber);
+                    ar.exception = null;
                 }
-                break;
+                onComplete = (Message) ar.userObj;
+                if (onComplete != null) {
+                    AsyncResult.forMessage(onComplete, ar.result, ar.exception);
+                    onComplete.sendToTarget();
+                }
+            }
+            break;
 
-                case  EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE:{
-                    handleExitEmergencyCallbackMode(msg);
-                }
-                break;
-
-                case EVENT_RUIM_RECORDS_LOADED:{
-                    Log.d(LOG_TAG, "Event EVENT_RUIM_RECORDS_LOADED Received");
-                }
-                break;
-
-                case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:{
-                    Log.d(LOG_TAG, "Event EVENT_RADIO_OFF_OR_NOT_AVAILABLE Received");
-                }
-                break;
-
-                case EVENT_RADIO_ON:{
-                    Log.d(LOG_TAG, "Event EVENT_RADIO_ON Received");
-                }
-                break;
-
-                case EVENT_SSN:{
-                    Log.d(LOG_TAG, "Event EVENT_SSN Received");
-                }
-                break;
-
-                case EVENT_CALL_RING:{
-                    Log.d(LOG_TAG, "Event EVENT_CALL_RING Received");
-                }
-                break;
-
-                case EVENT_REGISTERED_TO_NETWORK:{
-                    Log.d(LOG_TAG, "Event EVENT_REGISTERED_TO_NETWORK Received");
-                }
-                break;
-
-                case EVENT_NV_READY:{
-                    Log.d(LOG_TAG, "Event EVENT_NV_READY Received");
-                    //Inform the Service State Tracker
-                    mEriManager.loadEriFile();
-                    mNvLoadedRegistrants.notifyRegistrants();
-                    if(mEriManager.isEriFileLoaded()) {
-                        // when the ERI file is loaded
-                        Log.d(LOG_TAG, "ERI read, notify registrants");
-                        mEriFileLoadedRegistrants.notifyRegistrants();
-                    }
-                    setSystemProperty(TelephonyProperties.PROPERTY_INECM_MODE,"false");
-                }
-                break;
-
-                case EVENT_SET_VM_NUMBER_DONE:{
-                    ar = (AsyncResult)msg.obj;
-                    if (IccException.class.isInstance(ar.exception)) {
-                        storeVoiceMailNumber(mVmNumber);
-                        ar.exception = null;
-                    }
-                    onComplete = (Message) ar.userObj;
-                    if (onComplete != null) {
-                        AsyncResult.forMessage(onComplete, ar.result, ar.exception);
-                        onComplete.sendToTarget();
-                    }
-                }
-                break;
-
-                default:{
-                    throw new RuntimeException("unexpected event not handled");
-                }
+            default:{
+                super.handleMessage(msg);
             }
         }
     }
@@ -1140,13 +1109,6 @@
     /**
      * {@inheritDoc}
      */
-    public Handler getHandler() {
-        return h;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public IccFileHandler getIccFileHandler() {
         return this.mIccFileHandler;
     }

telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java

diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
index caf5a80..3cabd2d 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
@@ -146,7 +146,7 @@
     };
 
 
-    //***** Constructor
+    /* Constructor */
 
     CdmaDataConnectionTracker(CDMAPhone p) {
         super(p);
@@ -174,7 +174,9 @@
         filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
         filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
 
-        p.getContext().registerReceiver(mIntentReceiver, filter, null, p.h);
+        // TODO: Why is this registering the phone as the receiver of the intent
+        //       and not its own handler?
+        p.getContext().registerReceiver(mIntentReceiver, filter, null, p);
 
         mDataConnectionTracker = this;
 

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
index 3c1308b..ac7331e 100755
--- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -23,13 +23,11 @@
 import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Handler;
-import android.os.Looper;
 import android.os.Message;
 import android.os.Registrant;
 import android.os.RegistrantList;
 import android.os.SystemProperties;
 import android.preference.PreferenceManager;
-import android.provider.Settings;
 import android.provider.Telephony;
 import android.telephony.CellLocation;
 import android.telephony.PhoneNumberUtils;
@@ -98,14 +96,13 @@
     // Key used to read/write the SIM IMSI used for storing the voice mail
     public static final String VM_SIM_IMSI = "vm_sim_imsi_key";
 
-    //***** Instance Variables
+    // Instance Variables
     GsmCallTracker mCT;
     GsmServiceStateTracker mSST;
     GsmSMSDispatcher mSMS;
     SIMRecords mSIMRecords;
     SimCard mSimCard;
     StkService mStkService;
-    MyHandler h;
     ArrayList <GsmMmiCode> mPendingMMIs = new ArrayList<GsmMmiCode>();
     SimPhoneBookInterfaceManager mSimPhoneBookIntManager;
     SimSmsInterfaceManager mSimSmsIntManager;
@@ -129,7 +126,7 @@
     private String mVmNumber;
 
 
-    //***** Constructors
+    // Constructors
 
     public
     GSMPhone (Context context, CommandsInterface ci, PhoneNotifier notifier) {
@@ -138,9 +135,7 @@
 
     public
     GSMPhone (Context context, CommandsInterface ci, PhoneNotifier notifier, boolean unitTestMode) {
-        super(notifier, context, unitTestMode);
-        h = new MyHandler();
-        mCM = ci;
+        super(notifier, context, ci, unitTestMode);
 
         if (ci instanceof SimulatedRadioControl) {
             mSimulatedRadioControl = (SimulatedRadioControl) ci;
@@ -162,14 +157,13 @@
         mStkService = StkService.getInstance(mCM, mSIMRecords, mContext,
                 (SIMFileHandler)mIccFileHandler, mSimCard);
 
-        mCM.registerForAvailable(h, EVENT_RADIO_AVAILABLE, null);
-        mSIMRecords.registerForRecordsLoaded(h, EVENT_SIM_RECORDS_LOADED, null);
-        mCM.registerForOffOrNotAvailable(h, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
-        mCM.registerForOn(h, EVENT_RADIO_ON, null);
-        mCM.setOnUSSD(h, EVENT_USSD, null);
-        mCM.setOnSuppServiceNotification(h, EVENT_SSN, null);
-        mCM.setOnCallRing(h, EVENT_CALL_RING, null);
-        mSST.registerForNetworkAttach(h, EVENT_REGISTERED_TO_NETWORK, null);
+        mCM.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
+        mSIMRecords.registerForRecordsLoaded(this, EVENT_SIM_RECORDS_LOADED, null);
+        mCM.registerForOffOrNotAvailable(this, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
+        mCM.registerForOn(this, EVENT_RADIO_ON, null);
+        mCM.setOnUSSD(this, EVENT_USSD, null);
+        mCM.setOnSuppServiceNotification(this, EVENT_SSN, null);
+        mSST.registerForNetworkAttach(this, EVENT_REGISTERED_TO_NETWORK, null);
 
         if (false) {
             try {
@@ -212,15 +206,16 @@
 
     public void dispose() {
         synchronized(PhoneProxy.lockForRadioTechnologyChange) {
+            super.dispose();
+
             //Unregister from all former registered events
-            mCM.unregisterForAvailable(h); //EVENT_RADIO_AVAILABLE
-            mSIMRecords.unregisterForRecordsLoaded(h); //EVENT_SIM_RECORDS_LOADED
-            mCM.unregisterForOffOrNotAvailable(h); //EVENT_RADIO_OFF_OR_NOT_AVAILABLE
-            mCM.unregisterForOn(h); //EVENT_RADIO_ON
-            mSST.unregisterForNetworkAttach(h); //EVENT_REGISTERED_TO_NETWORK
-            mCM.unSetOnUSSD(h);
-            mCM.unSetOnSuppServiceNotification(h);
-            mCM.unSetOnCallRing(h);
+            mCM.unregisterForAvailable(this); //EVENT_RADIO_AVAILABLE
+            mSIMRecords.unregisterForRecordsLoaded(this); //EVENT_SIM_RECORDS_LOADED
+            mCM.unregisterForOffOrNotAvailable(this); //EVENT_RADIO_OFF_OR_NOT_AVAILABLE
+            mCM.unregisterForOn(this); //EVENT_RADIO_ON
+            mSST.unregisterForNetworkAttach(this); //EVENT_REGISTERED_TO_NETWORK
+            mCM.unSetOnUSSD(this);
+            mCM.unSetOnSuppServiceNotification(this);
 
             mPendingMMIs.clear();
 
@@ -258,8 +253,6 @@
     }
 
 
-    //***** Overridden from Phone
-
     public ServiceState
     getServiceState() {
         return mSST.ss;
@@ -391,14 +384,6 @@
         super.notifyNewRingingConnectionP(c);
     }
 
-    /**
-     * Notifiy registrants of a RING event.
-     */
-    void notifyIncomingRing() {
-        AsyncResult ar = new AsyncResult(null, this, null);
-        mIncomingRingRegistrants.notifyRegistrants(ar);
-    }
-
     /*package*/ void
     notifyDisconnect(Connection cn) {
         mDisconnectRegistrants.notifyResult(cn);
@@ -917,7 +902,7 @@
 
         Message resp;
         mVmNumber = voiceMailNumber;
-        resp = h.obtainMessage(EVENT_SET_VM_NUMBER_DONE, 0, 0, onComplete);
+        resp = obtainMessage(EVENT_SET_VM_NUMBER_DONE, 0, 0, onComplete);
         mSIMRecords.setVoiceMailNumber(alphaTag, mVmNumber, resp);
     }
 
@@ -956,7 +941,7 @@
             if (LOCAL_DEBUG) Log.d(LOG_TAG, "requesting call forwarding query.");
             Message resp;
             if (commandInterfaceCFReason == CF_REASON_UNCONDITIONAL) {
-                resp = h.obtainMessage(EVENT_GET_CALL_FORWARD_DONE, onComplete);
+                resp = obtainMessage(EVENT_GET_CALL_FORWARD_DONE, onComplete);
             } else {
                 resp = onComplete;
             }
@@ -974,7 +959,7 @@
 
             Message resp;
             if (commandInterfaceCFReason == CF_REASON_UNCONDITIONAL) {
-                resp = h.obtainMessage(EVENT_SET_CALL_FORWARD_DONE,
+                resp = obtainMessage(EVENT_SET_CALL_FORWARD_DONE,
                         isCfEnable(commandInterfaceCFAction) ? 1 : 0, 0, onComplete);
             } else {
                 resp = onComplete;
@@ -995,7 +980,7 @@
     public void setOutgoingCallerIdDisplay(int commandInterfaceCLIRMode,
                                            Message onComplete) {
         mCM.setCLIR(commandInterfaceCLIRMode,
-                h.obtainMessage(EVENT_SET_CLIR_COMPLETE, commandInterfaceCLIRMode, 0, onComplete));
+                obtainMessage(EVENT_SET_CLIR_COMPLETE, commandInterfaceCLIRMode, 0, onComplete));
     }
 
     public void getCallWaiting(Message onComplete) {
@@ -1043,7 +1028,7 @@
         nsm.operatorAlphaLong = "";
 
         // get the message
-        Message msg = h.obtainMessage(EVENT_SET_NETWORK_AUTOMATIC_COMPLETE, nsm);
+        Message msg = obtainMessage(EVENT_SET_NETWORK_AUTOMATIC_COMPLETE, nsm);
         if (LOCAL_DEBUG)
             Log.d(LOG_TAG, "wrapping and sending message to connect automatically");
 
@@ -1061,7 +1046,7 @@
         nsm.operatorAlphaLong = network.operatorAlphaLong;
 
         // get the message
-        Message msg = h.obtainMessage(EVENT_SET_NETWORK_MANUAL_COMPLETE, nsm);
+        Message msg = obtainMessage(EVENT_SET_NETWORK_MANUAL_COMPLETE, nsm);
 
         mCM.setNetworkSelectionModeManual(network.operatorNumeric, msg);
     }
@@ -1247,178 +1232,163 @@
         }
     }
 
-    //***** Inner Classes
+    @Override
+    public void handleMessage (Message msg) {
+        AsyncResult ar;
+        Message onComplete;
 
-    class MyHandler extends Handler {
-        MyHandler() {
-        }
+        switch (msg.what) {
+            case EVENT_RADIO_AVAILABLE: {
+                mCM.getBasebandVersion(
+                        obtainMessage(EVENT_GET_BASEBAND_VERSION_DONE));
 
-        MyHandler(Looper l) {
-            super(l);
-        }
+                mCM.getIMEI(obtainMessage(EVENT_GET_IMEI_DONE));
+                mCM.getIMEISV(obtainMessage(EVENT_GET_IMEISV_DONE));
+            }
+            break;
 
-        public void
-        handleMessage (Message msg) {
-            AsyncResult ar;
-            Message onComplete;
+            case EVENT_RADIO_ON:
+            break;
 
-            switch (msg.what) {
-                case EVENT_RADIO_AVAILABLE: {
-                    mCM.getBasebandVersion(
-                            obtainMessage(EVENT_GET_BASEBAND_VERSION_DONE));
+            case EVENT_REGISTERED_TO_NETWORK:
+                syncClirSetting();
+                break;
 
-                    mCM.getIMEI(obtainMessage(EVENT_GET_IMEI_DONE));
-                    mCM.getIMEISV(obtainMessage(EVENT_GET_IMEISV_DONE));
+            case EVENT_SIM_RECORDS_LOADED:
+                updateCurrentCarrierInProvider();
+
+                // Check if this is a different SIM than the previous one. If so unset the
+                // voice mail number.
+                String imsi = getVmSimImsi();
+                if (imsi != null && !getSubscriberId().equals(imsi)) {
+                    storeVoiceMailNumber(null);
+                    setVmSimImsi(null);
+                }
+
+            break;
+
+            case EVENT_GET_BASEBAND_VERSION_DONE:
+                ar = (AsyncResult)msg.obj;
+
+                if (ar.exception != null) {
+                    break;
+                }
+
+                if (LOCAL_DEBUG) Log.d(LOG_TAG, "Baseband version: " + ar.result);
+                setSystemProperty(PROPERTY_BASEBAND_VERSION, (String)ar.result);
+            break;
+
+            case EVENT_GET_IMEI_DONE:
+                ar = (AsyncResult)msg.obj;
+
+                if (ar.exception != null) {
+                    break;
+                }
+
+                mImei = (String)ar.result;
+            break;
+
+            case EVENT_GET_IMEISV_DONE:
+                ar = (AsyncResult)msg.obj;
+
+                if (ar.exception != null) {
+                    break;
+                }
+
+                mImeiSv = (String)ar.result;
+            break;
+
+            case EVENT_USSD:
+                ar = (AsyncResult)msg.obj;
+
+                String[] ussdResult = (String[]) ar.result;
+
+                if (ussdResult.length > 1) {
+                    try {
+                        onIncomingUSSD(Integer.parseInt(ussdResult[0]), ussdResult[1]);
+                    } catch (NumberFormatException e) {
+                        Log.w(LOG_TAG, "error parsing USSD");
+                    }
+                }
+            break;
+
+            case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:
+                // Some MMI requests (eg USSD) are not completed
+                // within the course of a CommandsInterface request
+                // If the radio shuts off or resets while one of these
+                // is pending, we need to clean up.
+
+                for (int i = 0, s = mPendingMMIs.size() ; i < s; i++) {
+                    if (mPendingMMIs.get(i).isPendingUSSD()) {
+                        mPendingMMIs.get(i).onUssdFinishedError();
+                    }
+                }
+            break;
+
+            case EVENT_SSN:
+                ar = (AsyncResult)msg.obj;
+                SuppServiceNotification not = (SuppServiceNotification) ar.result;
+                mSsnRegistrants.notifyRegistrants(ar);
+            break;
+
+            case EVENT_SET_CALL_FORWARD_DONE:
+                ar = (AsyncResult)msg.obj;
+                if (ar.exception == null) {
+                    mSIMRecords.setVoiceCallForwardingFlag(1, msg.arg1 == 1);
+                }
+                onComplete = (Message) ar.userObj;
+                if (onComplete != null) {
+                    AsyncResult.forMessage(onComplete, ar.result, ar.exception);
+                    onComplete.sendToTarget();
                 }
                 break;
 
-                case EVENT_RADIO_ON:
+            case EVENT_SET_VM_NUMBER_DONE:
+                ar = (AsyncResult)msg.obj;
+                if (IccVmNotSupportedException.class.isInstance(ar.exception)) {
+                    storeVoiceMailNumber(mVmNumber);
+                    ar.exception = null;
+                }
+                onComplete = (Message) ar.userObj;
+                if (onComplete != null) {
+                    AsyncResult.forMessage(onComplete, ar.result, ar.exception);
+                    onComplete.sendToTarget();
+                }
                 break;
 
-                case EVENT_REGISTERED_TO_NETWORK:
-                    syncClirSetting();
-                    break;
 
-                case EVENT_SIM_RECORDS_LOADED:
-                    updateCurrentCarrierInProvider();
-
-                    // Check if this is a different SIM than the previous one. If so unset the
-                    // voice mail number.
-                    String imsi = getVmSimImsi();
-                    if (imsi != null && !getSubscriberId().equals(imsi)) {
-                        storeVoiceMailNumber(null);
-                        setVmSimImsi(null);
-                    }
-
+            case EVENT_GET_CALL_FORWARD_DONE:
+                ar = (AsyncResult)msg.obj;
+                if (ar.exception == null) {
+                    handleCfuQueryResult((CallForwardInfo[])ar.result);
+                }
+                onComplete = (Message) ar.userObj;
+                if (onComplete != null) {
+                    AsyncResult.forMessage(onComplete, ar.result, ar.exception);
+                    onComplete.sendToTarget();
+                }
                 break;
 
-                case EVENT_GET_BASEBAND_VERSION_DONE:
-                    ar = (AsyncResult)msg.obj;
-
-                    if (ar.exception != null) {
-                        break;
-                    }
-
-                    if (LOCAL_DEBUG) Log.d(LOG_TAG, "Baseband version: " + ar.result);
-                    setSystemProperty(PROPERTY_BASEBAND_VERSION, (String)ar.result);
+            // handle the select network completion callbacks.
+            case EVENT_SET_NETWORK_MANUAL_COMPLETE:
+            case EVENT_SET_NETWORK_AUTOMATIC_COMPLETE:
+                handleSetSelectNetwork((AsyncResult) msg.obj);
                 break;
 
-                case EVENT_GET_IMEI_DONE:
-                    ar = (AsyncResult)msg.obj;
-
-                    if (ar.exception != null) {
-                        break;
-                    }
-
-                    mImei = (String)ar.result;
+            case EVENT_SET_CLIR_COMPLETE:
+                ar = (AsyncResult)msg.obj;
+                if (ar.exception == null) {
+                    saveClirSetting(msg.arg1);
+                }
+                onComplete = (Message) ar.userObj;
+                if (onComplete != null) {
+                    AsyncResult.forMessage(onComplete, ar.result, ar.exception);
+                    onComplete.sendToTarget();
+                }
                 break;
 
-                case EVENT_GET_IMEISV_DONE:
-                    ar = (AsyncResult)msg.obj;
-
-                    if (ar.exception != null) {
-                        break;
-                    }
-
-                    mImeiSv = (String)ar.result;
-                break;
-
-                case EVENT_USSD:
-                    ar = (AsyncResult)msg.obj;
-
-                    String[] ussdResult = (String[]) ar.result;
-
-                    if (ussdResult.length > 1) {
-                        try {
-                            onIncomingUSSD(Integer.parseInt(ussdResult[0]), ussdResult[1]);
-                        } catch (NumberFormatException e) {
-                            Log.w(LOG_TAG, "error parsing USSD");
-                        }
-                    }
-                break;
-
-                case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:
-                    // Some MMI requests (eg USSD) are not completed
-                    // within the course of a CommandsInterface request
-                    // If the radio shuts off or resets while one of these
-                    // is pending, we need to clean up.
-
-                    for (int i = 0, s = mPendingMMIs.size() ; i < s; i++) {
-                        if (mPendingMMIs.get(i).isPendingUSSD()) {
-                            mPendingMMIs.get(i).onUssdFinishedError();
-                        }
-                    }
-                break;
-
-                case EVENT_SSN:
-                    ar = (AsyncResult)msg.obj;
-                    SuppServiceNotification not = (SuppServiceNotification) ar.result;
-                    mSsnRegistrants.notifyRegistrants(ar);
-                break;
-
-                case EVENT_SET_CALL_FORWARD_DONE:
-                    ar = (AsyncResult)msg.obj;
-                    if (ar.exception == null) {
-                        mSIMRecords.setVoiceCallForwardingFlag(1, msg.arg1 == 1);
-                    }
-                    onComplete = (Message) ar.userObj;
-                    if (onComplete != null) {
-                        AsyncResult.forMessage(onComplete, ar.result, ar.exception);
-                        onComplete.sendToTarget();
-                    }
-                    break;
-
-                case EVENT_SET_VM_NUMBER_DONE:
-                    ar = (AsyncResult)msg.obj;
-                    if (IccVmNotSupportedException.class.isInstance(ar.exception)) {
-                        storeVoiceMailNumber(mVmNumber);
-                        ar.exception = null;
-                    }
-                    onComplete = (Message) ar.userObj;
-                    if (onComplete != null) {
-                        AsyncResult.forMessage(onComplete, ar.result, ar.exception);
-                        onComplete.sendToTarget();
-                    }
-                    break;
-
-
-                case EVENT_GET_CALL_FORWARD_DONE:
-                    ar = (AsyncResult)msg.obj;
-                    if (ar.exception == null) {
-                        handleCfuQueryResult((CallForwardInfo[])ar.result);
-                    }
-                    onComplete = (Message) ar.userObj;
-                    if (onComplete != null) {
-                        AsyncResult.forMessage(onComplete, ar.result, ar.exception);
-                        onComplete.sendToTarget();
-                    }
-                    break;
-
-                case EVENT_CALL_RING:
-                    ar = (AsyncResult)msg.obj;
-                    if (ar.exception == null) {
-                        notifyIncomingRing();
-                    }
-                    break;
-
-                // handle the select network completion callbacks.
-                case EVENT_SET_NETWORK_MANUAL_COMPLETE:
-                case EVENT_SET_NETWORK_AUTOMATIC_COMPLETE:
-                    handleSetSelectNetwork((AsyncResult) msg.obj);
-                    break;
-
-                case EVENT_SET_CLIR_COMPLETE:
-                    ar = (AsyncResult)msg.obj;
-                    if (ar.exception == null) {
-                        saveClirSetting(msg.arg1);
-                    }
-                    onComplete = (Message) ar.userObj;
-                    if (onComplete != null) {
-                        AsyncResult.forMessage(onComplete, ar.result, ar.exception);
-                        onComplete.sendToTarget();
-                    }
-                    break;
-            }
+             default:
+                 super.handleMessage(msg);
         }
     }
 
@@ -1533,13 +1503,6 @@
     /**
      * {@inheritDoc}
      */
-    public Handler getHandler(){
-        return h;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public IccFileHandler getIccFileHandler(){
         return this.mIccFileHandler;
     }

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index a9c6fad..d057dfe 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -222,7 +222,9 @@
         filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
         filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
 
-        p.getContext().registerReceiver(mIntentReceiver, filter, null, p.h);
+        // TODO: Why is this registering the phone as the receiver of the intent
+        //       and not its own handler?
+        p.getContext().registerReceiver(mIntentReceiver, filter, null, p);
 
 
         mDataConnectionTracker = this;

telephony/java/com/android/internal/telephony/gsm/MccTable.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/MccTable.java b/telephony/java/com/android/internal/telephony/gsm/MccTable.java
index 22b1f4f..9343f44 100644
--- a/telephony/java/com/android/internal/telephony/gsm/MccTable.java
+++ b/telephony/java/com/android/internal/telephony/gsm/MccTable.java
@@ -16,8 +16,342 @@
 
 package com.android.internal.telephony.gsm;
 
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
+
+/**
+ * The table below is built from two resources:
+ *
+ * 1) ITU "Mobile Network Code (MNC) for the international
+ *   identification plan for mobile terminals and mobile users"
+ *   which is available as an annex to the ITU operational bulletin
+ *   available here: http://www.itu.int/itu-t/bulletin/annex.html
+ *
+ * 2) The ISO 3166 country codes list, available here:
+ *    http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/index.html
+ *
+ * This table was verified (28 Aug 2009) against
+ * http://en.wikipedia.org/wiki/List_of_mobile_country_codes with the
+ * only unresolved discrepancy being that this list has an extra entry
+ * (461) for China.
+ *
+ * TODO: Complete the mappings for timezones and language/locale codes.
+ *
+ * The actual table data used in the Java code is generated from the
+ * below Python code for efficiency.  The information is expected to
+ * be static, but if changes are required, the table in the python
+ * code can be modified and the trailing code run to re-generate the
+ * tables that are to be used by Java.
+
+mcc_table = [
+  (202, 'gr', 2, 'Greece'),
+  (204, 'nl', 2, 'Europe/Amsterdam', 'nl', 13, 'Netherlands (Kingdom of the)'),
+  (206, 'be', 2, 'Belgium'),
+  (208, 'fr', 2, 'Europe/Paris', 'fr', 'France'),
+  (212, 'mc', 2, 'Monaco (Principality of)'),
+  (213, 'ad', 2, 'Andorra (Principality of)'),
+  (214, 'es', 2, 'Europe/Madrid', 'es', 'Spain'),
+  (216, 'hu', 2, 'Hungary (Republic of)'),
+  (218, 'ba', 2, 'Bosnia and Herzegovina'),
+  (219, 'hr', 2, 'Croatia (Republic of)'),
+  (220, 'rs', 2, 'Serbia and Montenegro'),
+  (222, 'it', 2, 'Europe/Rome', 'it', 'Italy'),
+  (225, 'va', 2, 'Europe/Rome', 'it', 'Vatican City State'),
+  (226, 'ro', 2, 'Romania'),
+  (228, 'ch', 2, 'Europe/Zurich', 'de', 'Switzerland (Confederation of)'),
+  (230, 'cz', 2, 'Europe/Prague', 'cs', 13, 'Czech Republic'),
+  (231, 'sk', 2, 'Slovak Republic'),
+  (232, 'at', 2, 'Europe/Vienna', 'de', 13, 'Austria'),
+  (234, 'gb', 2, 'Europe/London', 'en', 13, 'United Kingdom of Great Britain and Northern Ireland'),
+  (235, 'gb', 2, 'Europe/London', 'en', 13, 'United Kingdom of Great Britain and Northern Ireland'),
+  (238, 'dk', 2, 'Denmark'),
+  (240, 'se', 2, 'Sweden'),
+  (242, 'no', 2, 'Norway'),
+  (244, 'fi', 2, 'Finland'),
+  (246, 'lt', 2, 'Lithuania (Republic of)'),
+  (247, 'lv', 2, 'Latvia (Republic of)'),
+  (248, 'ee', 2, 'Estonia (Republic of)'),
+  (250, 'ru', 2, 'Russian Federation'),
+  (255, 'ua', 2, 'Ukraine'),
+  (257, 'by', 2, 'Belarus (Republic of)'),
+  (259, 'md', 2, 'Moldova (Republic of)'),
+  (260, 'pl', 2, 'Europe/Warsaw', 'Poland (Republic of)'),
+  (262, 'de', 2, 'Europe/Berlin', 'de', 13, 'Germany (Federal Republic of)'),
+  (266, 'gi', 2, 'Gibraltar'),
+  (268, 'pt', 2, 'Portugal'),
+  (270, 'lu', 2, 'Luxembourg'),
+  (272, 'ie', 2, 'Europe/Dublin', 'en', 'Ireland'),
+  (274, 'is', 2, 'Iceland'),
+  (276, 'al', 2, 'Albania (Republic of)'),
+  (278, 'mt', 2, 'Malta'),
+  (280, 'cy', 2, 'Cyprus (Republic of)'),
+  (282, 'ge', 2, 'Georgia'),
+  (283, 'am', 2, 'Armenia (Republic of)'),
+  (284, 'bg', 2, 'Bulgaria (Republic of)'),
+  (286, 'tr', 2, 'Turkey'),
+  (288, 'fo', 2, 'Faroe Islands'),
+  (289, 'ge', 2, 'Abkhazia (Georgia)'),
+  (290, 'gl', 2, 'Greenland (Denmark)'),
+  (292, 'sm', 2, 'San Marino (Republic of)'),
+  (293, 'sl', 2, 'Slovenia (Republic of)'),
+  (294, 'mk', 2, 'The Former Yugoslav Republic of Macedonia'),
+  (295, 'li', 2, 'Liechtenstein (Principality of)'),
+  (297, 'me', 2, 'Montenegro (Republic of)'),
+  (302, 'ca', 2, '', '', 11, 'Canada'),
+  (308, 'pm', 2, 'Saint Pierre and Miquelon (Collectivit territoriale de la Rpublique franaise)'),
+  (310, 'us', 3, '', 'en', 11, 'United States of America'),
+  (311, 'us', 3, '', 'en', 11, 'United States of America'),
+  (312, 'us', 3, '', 'en', 11, 'United States of America'),
+  (313, 'us', 3, '', 'en', 11, 'United States of America'),
+  (314, 'us', 3, '', 'en', 11, 'United States of America'),
+  (315, 'us', 3, '', 'en', 11, 'United States of America'),
+  (316, 'us', 3, '', 'en', 11, 'United States of America'),
+  (330, 'pr', 2, 'Puerto Rico'),
+  (332, 'vi', 2, 'United States Virgin Islands'),
+  (334, 'mx', 3, 'Mexico'),
+  (338, 'jm', 3, 'Jamaica'),
+  (340, 'gp', 2, 'Guadeloupe (French Department of)'),
+  (342, 'bb', 3, 'Barbados'),
+  (344, 'ag', 3, 'Antigua and Barbuda'),
+  (346, 'ky', 3, 'Cayman Islands'),
+  (348, 'vg', 3, 'British Virgin Islands'),
+  (350, 'bm', 2, 'Bermuda'),
+  (352, 'gd', 2, 'Grenada'),
+  (354, 'ms', 2, 'Montserrat'),
+  (356, 'kn', 2, 'Saint Kitts and Nevis'),
+  (358, 'lc', 2, 'Saint Lucia'),
+  (360, 'vc', 2, 'Saint Vincent and the Grenadines'),
+  (362, 'nl', 2, 'Netherlands Antilles'),
+  (363, 'aw', 2, 'Aruba'),
+  (364, 'bs', 2, 'Bahamas (Commonwealth of the)'),
+  (365, 'ai', 3, 'Anguilla'),
+  (366, 'dm', 2, 'Dominica (Commonwealth of)'),
+  (368, 'cu', 2, 'Cuba'),
+  (370, 'do', 2, 'Dominican Republic'),
+  (372, 'ht', 2, 'Haiti (Republic of)'),
+  (374, 'tt', 2, 'Trinidad and Tobago'),
+  (376, 'tc', 2, 'Turks and Caicos Islands'),
+  (400, 'az', 2, 'Azerbaijani Republic'),
+  (401, 'kz', 2, 'Kazakhstan (Republic of)'),
+  (402, 'bt', 2, 'Bhutan (Kingdom of)'),
+  (404, 'in', 2, 'India (Republic of)'),
+  (405, 'in', 2, 'India (Republic of)'),
+  (410, 'pk', 2, 'Pakistan (Islamic Republic of)'),
+  (412, 'af', 2, 'Afghanistan'),
+  (413, 'lk', 2, 'Sri Lanka (Democratic Socialist Republic of)'),
+  (414, 'mm', 2, 'Myanmar (Union of)'),
+  (415, 'lb', 2, 'Lebanon'),
+  (416, 'jo', 2, 'Jordan (Hashemite Kingdom of)'),
+  (417, 'sy', 2, 'Syrian Arab Republic'),
+  (418, 'iq', 2, 'Iraq (Republic of)'),
+  (419, 'kw', 2, 'Kuwait (State of)'),
+  (420, 'sa', 2, 'Saudi Arabia (Kingdom of)'),
+  (421, 'ye', 2, 'Yemen (Republic of)'),
+  (422, 'om', 2, 'Oman (Sultanate of)'),
+  (423, 'ps', 2, 'Palestine'),
+  (424, 'ae', 2, 'United Arab Emirates'),
+  (425, 'il', 2, 'Israel (State of)'),
+  (426, 'bh', 2, 'Bahrain (Kingdom of)'),
+  (427, 'qa', 2, 'Qatar (State of)'),
+  (428, 'mn', 2, 'Mongolia'),
+  (429, 'np', 2, 'Nepal'),
+  (430, 'ae', 2, 'United Arab Emirates'),
+  (431, 'ae', 2, 'United Arab Emirates'),
+  (432, 'ir', 2, 'Iran (Islamic Republic of)'),
+  (434, 'uz', 2, 'Uzbekistan (Republic of)'),
+  (436, 'tj', 2, 'Tajikistan (Republic of)'),
+  (437, 'kg', 2, 'Kyrgyz Republic'),
+  (438, 'tm', 2, 'Turkmenistan'),
+  (440, 'jp', 2, 'Asia/Tokyo', 'ja', 14, 'Japan'),
+  (441, 'jp', 2, 'Asia/Tokyo', 'ja', 14, 'Japan'),
+  (450, 'kr', 2, 'Korea (Republic of)'),
+  (452, 'vn', 2, 'Viet Nam (Socialist Republic of)'),
+  (454, 'hk', 2, '"Hong Kong, China"'),
+  (455, 'mo', 2, '"Macao, China"'),
+  (456, 'kh', 2, 'Cambodia (Kingdom of)'),
+  (457, 'la', 2, "Lao People's Democratic Republic"),
+  (460, 'cn', 2, "China (People's Republic of)"),
+  (461, 'cn', 2, "China (People's Republic of)"),
+  (466, 'tw', 2, "Taiwan (Republic of China)"),
+  (467, 'kp', 2, "Democratic People's Republic of Korea"),
+  (470, 'bd', 2, "Bangladesh (People's Republic of)"),
+  (472, 'mv', 2, 'Maldives (Republic of)'),
+  (502, 'my', 2, 'Malaysia'),
+  (505, 'au', 2, 'Australia/Sydney', 'en', 11, 'Australia'),
+  (510, 'id', 2, 'Indonesia (Republic of)'),
+  (514, 'tl', 2, 'Democratic Republic of Timor-Leste'),
+  (515, 'ph', 2, 'Philippines (Republic of the)'),
+  (520, 'th', 2, 'Thailand'),
+  (525, 'sg', 2, 'Singapore', 'en', 11, 'Singapore (Republic of)'),
+  (528, 'bn', 2, 'Brunei Darussalam'),
+  (530, 'nz', 2, 'Pacific/Auckland', 'en', 'New Zealand'),
+  (534, 'mp', 2, 'Northern Mariana Islands (Commonwealth of the)'),
+  (535, 'gu', 2, 'Guam'),
+  (536, 'nr', 2, 'Nauru (Republic of)'),
+  (537, 'pg', 2, 'Papua New Guinea'),
+  (539, 'to', 2, 'Tonga (Kingdom of)'),
+  (540, 'sb', 2, 'Solomon Islands'),
+  (541, 'vu', 2, 'Vanuatu (Republic of)'),
+  (542, 'fj', 2, 'Fiji (Republic of)'),
+  (543, 'wf', 2, "Wallis and Futuna (Territoire franais d'outre-mer)"),
+  (544, 'as', 2, 'American Samoa'),
+  (545, 'ki', 2, 'Kiribati (Republic of)'),
+  (546, 'nc', 2, "New Caledonia (Territoire franais d'outre-mer)"),
+  (547, 'pf', 2, "French Polynesia (Territoire franais d'outre-mer)"),
+  (548, 'ck', 2, 'Cook Islands'),
+  (549, 'ws', 2, 'Samoa (Independent State of)'),
+  (550, 'fm', 2, 'Micronesia (Federated States of)'),
+  (551, 'mh', 2, 'Marshall Islands (Republic of the)'),
+  (552, 'pw', 2, 'Palau (Republic of)'),
+  (602, 'eg', 2, 'Egypt (Arab Republic of)'),
+  (603, 'dz', 2, "Algeria (People's Democratic Republic of)"),
+  (604, 'ma', 2, 'Morocco (Kingdom of)'),
+  (605, 'tn', 2, 'Tunisia'),
+  (606, 'ly', 2, "Libya (Socialist People's Libyan Arab Jamahiriya)"),
+  (607, 'gm', 2, 'Gambia (Republic of the)'),
+  (608, 'sn', 2, 'Senegal (Republic of)'),
+  (609, 'mr', 2, 'Mauritania (Islamic Republic of)'),
+  (610, 'ml', 2, 'Mali (Republic of)'),
+  (611, 'gn', 2, 'Guinea (Republic of)'),
+  (612, 'ci', 2, "Cte d'Ivoire (Republic of)"),
+  (613, 'bf', 2, 'Burkina Faso'),
+  (614, 'ne', 2, 'Niger (Republic of the)'),
+  (615, 'tg', 2, 'Togolese Republic'),
+  (616, 'bj', 2, 'Benin (Republic of)'),
+  (617, 'mu', 2, 'Mauritius (Republic of)'),
+  (618, 'lr', 2, 'Liberia (Republic of)'),
+  (619, 'sl', 2, 'Sierra Leone'),
+  (620, 'gh', 2, 'Ghana'),
+  (621, 'ng', 2, 'Nigeria (Federal Republic of)'),
+  (622, 'td', 2, 'Chad (Republic of)'),
+  (623, 'cf', 2, 'Central African Republic'),
+  (624, 'cm', 2, 'Cameroon (Republic of)'),
+  (625, 'cv', 2, 'Cape Verde (Republic of)'),
+  (626, 'st', 2, 'Sao Tome and Principe (Democratic Republic of)'),
+  (627, 'gq', 2, 'Equatorial Guinea (Republic of)'),
+  (628, 'ga', 2, 'Gabonese Republic'),
+  (629, 'cg', 2, 'Congo (Republic of the)'),
+  (630, 'cg', 2, 'Democratic Republic of the Congo'),
+  (631, 'ao', 2, 'Angola (Republic of)'),
+  (632, 'gw', 2, 'Guinea-Bissau (Republic of)'),
+  (633, 'sc', 2, 'Seychelles (Republic of)'),
+  (634, 'sd', 2, 'Sudan (Republic of the)'),
+  (635, 'rw', 2, 'Rwanda (Republic of)'),
+  (636, 'et', 2, 'Ethiopia (Federal Democratic Republic of)'),
+  (637, 'so', 2, 'Somali Democratic Republic'),
+  (638, 'dj', 2, 'Djibouti (Republic of)'),
+  (639, 'ke', 2, 'Kenya (Republic of)'),
+  (640, 'tz', 2, 'Tanzania (United Republic of)'),
+  (641, 'ug', 2, 'Uganda (Republic of)'),
+  (642, 'bi', 2, 'Burundi (Republic of)'),
+  (643, 'mz', 2, 'Mozambique (Republic of)'),
+  (645, 'zm', 2, 'Zambia (Republic of)'),
+  (646, 'mg', 2, 'Madagascar (Republic of)'),
+  (647, 're', 2, 'Reunion (French Department of)'),
+  (648, 'zw', 2, 'Zimbabwe (Republic of)'),
+  (649, 'na', 2, 'Namibia (Republic of)'),
+  (650, 'mw', 2, 'Malawi'),
+  (651, 'ls', 2, 'Lesotho (Kingdom of)'),
+  (652, 'bw', 2, 'Botswana (Republic of)'),
+  (653, 'sz', 2, 'Swaziland (Kingdom of)'),
+  (654, 'km', 2, 'Comoros (Union of the)'),
+  (655, 'za', 2, 'Africa/Johannesburg', 'en', 'South Africa (Republic of)'),
+  (657, 'er', 2, 'Eritrea'),
+  (702, 'bz', 2, 'Belize'),
+  (704, 'gt', 2, 'Guatemala (Republic of)'),
+  (706, 'sv', 2, 'El Salvador (Republic of)'),
+  (708, 'hn', 3, 'Honduras (Republic of)'),
+  (710, 'ni', 2, 'Nicaragua'),
+  (712, 'cr', 2, 'Costa Rica'),
+  (714, 'pa', 2, 'Panama (Republic of)'),
+  (716, 'pe', 2, 'Peru'),
+  (722, 'ar', 3, 'Argentine Republic'),
+  (724, 'br', 2, 'Brazil (Federative Republic of)'),
+  (730, 'cl', 2, 'Chile'),
+  (732, 'co', 3, 'Colombia (Republic of)'),
+  (734, 've', 2, 'Venezuela (Bolivarian Republic of)'),
+  (736, 'bo', 2, 'Bolivia (Republic of)'),
+  (738, 'gy', 2, 'Guyana'),
+  (740, 'ec', 2, 'Ecuador'),
+  (742, 'gf', 2, 'French Guiana (French Department of)'),
+  (744, 'py', 2, 'Paraguay (Republic of)'),
+  (746, 'sr', 2, 'Suriname (Republic of)'),
+  (748, 'uy', 2, 'Uruguay (Eastern Republic of)'),
+  (750, 'fk', 2, 'Falkland Islands (Malvinas)')]
+
+get_mcc = lambda elt: elt[0]
+get_iso = lambda elt: elt[1]
+get_sd = lambda elt: elt[2]
+get_tz = lambda elt: len(elt) > 4 and elt[3] or ''
+get_lang = lambda elt: len(elt) > 5 and elt[4] or ''
+get_wifi = lambda elt: len(elt) > 6 and elt[5] or 0
+
+mcc_codes = ['0x%04x' % get_mcc(elt) for elt in mcc_table]
+tz_set = sorted(x for x in set(get_tz(elt) for elt in mcc_table))
+lang_set = sorted(x for x in set(get_lang(elt) for elt in mcc_table))
+
+def mk_ind_code(elt):
+  iso = get_iso(elt)
+  iso_code = ((ord(iso[0]) << 8) | ord(iso[1])) & 0xFFFF # 16 bits
+  wifi = get_wifi(elt) & 0x000F                          #  4 bits
+  sd = get_sd(elt) & 0x0003                              #  2 bits
+  tz_ind = tz_set.index(get_tz(elt)) & 0x001F            #  5 bits
+  lang_ind = lang_set.index(get_lang(elt)) & 0x000F      #  4 bits
+  return (iso_code << 16) | (wifi << 11) | (sd << 9) | (tz_ind << 4) | lang_ind
+
+ind_codes = ['0x%08x' % mk_ind_code(elt) for elt in mcc_table]
+
+def fmt_list(title, l, batch_sz):
+  sl = []
+  for i in range(len(l) / batch_sz + (len(l) % batch_sz and 1 or 0)):
+    j = i * batch_sz
+    sl.append((' ' * 8) + ', '.join(l[j:j + batch_sz]))
+  return '    private static final %s = {\n' % title + ',\n'.join(sl) + '\n    };\n'
+
+def do_autogen_comment(extra_desc=[]):
+  print '    /' + '**\n    * AUTO GENERATED (by the Python code above)'
+  for line in extra_desc:
+    print '    * %s' % line
+  print '    *' + '/'
+
+do_autogen_comment()
+print fmt_list('String[] TZ_STRINGS', ['"%s"' % x for x in tz_set], 1)
+do_autogen_comment()
+print fmt_list('String[] LANG_STRINGS', ['"%s"' % x for x in lang_set], 10)
+do_autogen_comment(['This table is a list of MCC codes.  The index in this table',
+                    'of a given MCC code is the index of extra information about',
+                    'that MCC in the IND_CODES table.'])
+print fmt_list('short[] MCC_CODES', mcc_codes, 10)
+do_autogen_comment(['The values in this table are broken down as follows (msb to lsb):',
+                    '    iso country code 16 bits',
+                    '    (unused)          1 bit',
+                    '    wifi channel      4 bits',
+                    '    smalled digit     2 bits',
+                    '    default timezone  5 bits',
+                    '    default language  4 bits'])
+print fmt_list('int[] IND_CODES', ind_codes, 6)
+
+def parse_ind_code(ind):
+  mcc = eval(mcc_codes[ind])
+  code = eval(ind_codes[ind])
+  iso_lsb = int((code >> 16) & 0x00FF)
+  iso_msb = int((code >> 24) & 0x00FF)
+  iso = '%s%s' % (chr(iso_msb), chr(iso_lsb))
+  wifi = int((code >> 11) & 0x000F)
+  sd = int((code >> 9) & 0x0003)
+  tz_ind = (code >> 4) & 0x001F
+  lang_ind = (code >> 0) & 0x000F
+  return (mcc, iso, sd, tz_set[tz_ind], lang_set[lang_ind], wifi)
+
+fmt_str = 'mcc = %s, iso = %s, sd = %s, tz = %s, lang = %s, wifi = %s'
+orig_table = [fmt_str % (get_mcc(elt), get_iso(elt), get_sd(elt),
+                         get_tz(elt), get_lang(elt), get_wifi(elt))
+              for elt in mcc_table]
+derived_table = [fmt_str % parse_ind_code(i) for i in range(len(ind_codes))]
+for i in range(len(orig_table)):
+  if orig_table[i] == derived_table[i]: continue
+  print 'MISMATCH ERROR : ', orig_table[i], " != ", derived_table[i]
+
+*/
 
 /**
  * Mobile Country Code
@@ -26,404 +360,197 @@
  */
 public final class MccTable
 {
-    static ArrayList<MccEntry> table;
+    /**
+    * AUTO GENERATED (by the Python code above)
+    */
+    private static final String[] TZ_STRINGS = {
+        "",
+        "Africa/Johannesburg",
+        "Asia/Tokyo",
+        "Australia/Sydney",
+        "Europe/Amsterdam",
+        "Europe/Berlin",
+        "Europe/Dublin",
+        "Europe/London",
+        "Europe/Madrid",
+        "Europe/Paris",
+        "Europe/Prague",
+        "Europe/Rome",
+        "Europe/Vienna",
+        "Europe/Warsaw",
+        "Europe/Zurich",
+        "Pacific/Auckland",
+        "Singapore"
+    };
 
-    static class MccEntry implements Comparable<MccEntry>
-    {
-        int mcc;
-        String iso;
-        int smallestDigitsMnc;
-        String timezone;
-        String language;
-        int wifiChannelsAllowed;
+    /**
+    * AUTO GENERATED (by the Python code above)
+    */
+    private static final String[] LANG_STRINGS = {
+        "", "cs", "de", "en", "es", "fr", "it", "ja", "nl"
+    };
 
-        MccEntry(int mnc, String iso, int smallestDigitsMCC) {
-            this(mnc, iso, smallestDigitsMCC, null);
-        }
+    /**
+    * AUTO GENERATED (by the Python code above)
+    * This table is a list of MCC codes.  The index in this table
+    * of a given MCC code is the index of extra information about
+    * that MCC in the IND_CODES table.
+    */
+    private static final short[] MCC_CODES = {
+        0x00ca, 0x00cc, 0x00ce, 0x00d0, 0x00d4, 0x00d5, 0x00d6, 0x00d8, 0x00da, 0x00db,
+        0x00dc, 0x00de, 0x00e1, 0x00e2, 0x00e4, 0x00e6, 0x00e7, 0x00e8, 0x00ea, 0x00eb,
+        0x00ee, 0x00f0, 0x00f2, 0x00f4, 0x00f6, 0x00f7, 0x00f8, 0x00fa, 0x00ff, 0x0101,
+        0x0103, 0x0104, 0x0106, 0x010a, 0x010c, 0x010e, 0x0110, 0x0112, 0x0114, 0x0116,
+        0x0118, 0x011a, 0x011b, 0x011c, 0x011e, 0x0120, 0x0121, 0x0122, 0x0124, 0x0125,
+        0x0126, 0x0127, 0x0129, 0x012e, 0x0134, 0x0136, 0x0137, 0x0138, 0x0139, 0x013a,
+        0x013b, 0x013c, 0x014a, 0x014c, 0x014e, 0x0152, 0x0154, 0x0156, 0x0158, 0x015a,
+        0x015c, 0x015e, 0x0160, 0x0162, 0x0164, 0x0166, 0x0168, 0x016a, 0x016b, 0x016c,
+        0x016d, 0x016e, 0x0170, 0x0172, 0x0174, 0x0176, 0x0178, 0x0190, 0x0191, 0x0192,
+        0x0194, 0x0195, 0x019a, 0x019c, 0x019d, 0x019e, 0x019f, 0x01a0, 0x01a1, 0x01a2,
+        0x01a3, 0x01a4, 0x01a5, 0x01a6, 0x01a7, 0x01a8, 0x01a9, 0x01aa, 0x01ab, 0x01ac,
+        0x01ad, 0x01ae, 0x01af, 0x01b0, 0x01b2, 0x01b4, 0x01b5, 0x01b6, 0x01b8, 0x01b9,
+        0x01c2, 0x01c4, 0x01c6, 0x01c7, 0x01c8, 0x01c9, 0x01cc, 0x01cd, 0x01d2, 0x01d3,
+        0x01d6, 0x01d8, 0x01f6, 0x01f9, 0x01fe, 0x0202, 0x0203, 0x0208, 0x020d, 0x0210,
+        0x0212, 0x0216, 0x0217, 0x0218, 0x0219, 0x021b, 0x021c, 0x021d, 0x021e, 0x021f,
+        0x0220, 0x0221, 0x0222, 0x0223, 0x0224, 0x0225, 0x0226, 0x0227, 0x0228, 0x025a,
+        0x025b, 0x025c, 0x025d, 0x025e, 0x025f, 0x0260, 0x0261, 0x0262, 0x0263, 0x0264,
+        0x0265, 0x0266, 0x0267, 0x0268, 0x0269, 0x026a, 0x026b, 0x026c, 0x026d, 0x026e,
+        0x026f, 0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0275, 0x0276, 0x0277, 0x0278,
+        0x0279, 0x027a, 0x027b, 0x027c, 0x027d, 0x027e, 0x027f, 0x0280, 0x0281, 0x0282,
+        0x0283, 0x0285, 0x0286, 0x0287, 0x0288, 0x0289, 0x028a, 0x028b, 0x028c, 0x028d,
+        0x028e, 0x028f, 0x0291, 0x02be, 0x02c0, 0x02c2, 0x02c4, 0x02c6, 0x02c8, 0x02ca,
+        0x02cc, 0x02d2, 0x02d4, 0x02da, 0x02dc, 0x02de, 0x02e0, 0x02e2, 0x02e4, 0x02e6,
+        0x02e8, 0x02ea, 0x02ec, 0x02ee
+    };
 
-        MccEntry(int mnc, String iso, int smallestDigitsMCC, String timezone) {
-            this(mnc, iso, smallestDigitsMCC, timezone, null);
-        }
+    /**
+    * AUTO GENERATED (by the Python code above)
+    * The values in this table are broken down as follows (msb to lsb):
+    *     iso country code 16 bits
+    *     (unused)          1 bit
+    *     wifi channel      4 bits
+    *     smalled digit     2 bits
+    *     default timezone  5 bits
+    *     default language  4 bits
+    */
+    private static final int[] IND_CODES = {
+        0x67720400, 0x6e6c6c48, 0x62650400, 0x66720495, 0x6d630400, 0x61640400,
+        0x65730484, 0x68750400, 0x62610400, 0x68720400, 0x72730400, 0x697404b6,
+        0x766104b6, 0x726f0400, 0x636804e2, 0x637a6ca1, 0x736b0400, 0x61746cc2,
+        0x67626c73, 0x67626c73, 0x646b0400, 0x73650400, 0x6e6f0400, 0x66690400,
+        0x6c740400, 0x6c760400, 0x65650400, 0x72750400, 0x75610400, 0x62790400,
+        0x6d640400, 0x706c04d0, 0x64656c52, 0x67690400, 0x70740400, 0x6c750400,
+        0x69650463, 0x69730400, 0x616c0400, 0x6d740400, 0x63790400, 0x67650400,
+        0x616d0400, 0x62670400, 0x74720400, 0x666f0400, 0x67650400, 0x676c0400,
+        0x736d0400, 0x736c0400, 0x6d6b0400, 0x6c690400, 0x6d650400, 0x63615c00,
+        0x706d0400, 0x75735e03, 0x75735e03, 0x75735e03, 0x75735e03, 0x75735e03,
+        0x75735e03, 0x75735e03, 0x70720400, 0x76690400, 0x6d780600, 0x6a6d0600,
+        0x67700400, 0x62620600, 0x61670600, 0x6b790600, 0x76670600, 0x626d0400,
+        0x67640400, 0x6d730400, 0x6b6e0400, 0x6c630400, 0x76630400, 0x6e6c0400,
+        0x61770400, 0x62730400, 0x61690600, 0x646d0400, 0x63750400, 0x646f0400,
+        0x68740400, 0x74740400, 0x74630400, 0x617a0400, 0x6b7a0400, 0x62740400,
+        0x696e0400, 0x696e0400, 0x706b0400, 0x61660400, 0x6c6b0400, 0x6d6d0400,
+        0x6c620400, 0x6a6f0400, 0x73790400, 0x69710400, 0x6b770400, 0x73610400,
+        0x79650400, 0x6f6d0400, 0x70730400, 0x61650400, 0x696c0400, 0x62680400,
+        0x71610400, 0x6d6e0400, 0x6e700400, 0x61650400, 0x61650400, 0x69720400,
+        0x757a0400, 0x746a0400, 0x6b670400, 0x746d0400, 0x6a707427, 0x6a707427,
+        0x6b720400, 0x766e0400, 0x686b0400, 0x6d6f0400, 0x6b680400, 0x6c610400,
+        0x636e0400, 0x636e0400, 0x74770400, 0x6b700400, 0x62640400, 0x6d760400,
+        0x6d790400, 0x61755c33, 0x69640400, 0x746c0400, 0x70680400, 0x74680400,
+        0x73675d03, 0x626e0400, 0x6e7a04f3, 0x6d700400, 0x67750400, 0x6e720400,
+        0x70670400, 0x746f0400, 0x73620400, 0x76750400, 0x666a0400, 0x77660400,
+        0x61730400, 0x6b690400, 0x6e630400, 0x70660400, 0x636b0400, 0x77730400,
+        0x666d0400, 0x6d680400, 0x70770400, 0x65670400, 0x647a0400, 0x6d610400,
+        0x746e0400, 0x6c790400, 0x676d0400, 0x736e0400, 0x6d720400, 0x6d6c0400,
+        0x676e0400, 0x63690400, 0x62660400, 0x6e650400, 0x74670400, 0x626a0400,
+        0x6d750400, 0x6c720400, 0x736c0400, 0x67680400, 0x6e670400, 0x74640400,
+        0x63660400, 0x636d0400, 0x63760400, 0x73740400, 0x67710400, 0x67610400,
+        0x63670400, 0x63670400, 0x616f0400, 0x67770400, 0x73630400, 0x73640400,
+        0x72770400, 0x65740400, 0x736f0400, 0x646a0400, 0x6b650400, 0x747a0400,
+        0x75670400, 0x62690400, 0x6d7a0400, 0x7a6d0400, 0x6d670400, 0x72650400,
+        0x7a770400, 0x6e610400, 0x6d770400, 0x6c730400, 0x62770400, 0x737a0400,
+        0x6b6d0400, 0x7a610413, 0x65720400, 0x627a0400, 0x67740400, 0x73760400,
+        0x686e0600, 0x6e690400, 0x63720400, 0x70610400, 0x70650400, 0x61720600,
+        0x62720400, 0x636c0400, 0x636f0600, 0x76650400, 0x626f0400, 0x67790400,
+        0x65630400, 0x67660400, 0x70790400, 0x73720400, 0x75790400, 0x666b0400
+    };
 
-        MccEntry(int mnc, String iso, int smallestDigitsMCC, String timezone, String language) {
-            this(mnc, iso, smallestDigitsMCC, timezone, language, 0);
-        }
-
-        MccEntry(int mnc, String iso, int smallestDigitsMCC, String timezone, String language, int wifiChannels) {
-            this.mcc = mnc;
-            this.iso = iso;
-            this.smallestDigitsMnc = smallestDigitsMCC;
-            this.timezone = timezone;
-            this.language = language;
-            this.wifiChannelsAllowed = wifiChannels;
-        }
-
-        public int compareTo(MccEntry o)
-        {
-            return mcc - o.mcc;
-        }
-    }
-
-    private static MccEntry
-    entryForMcc(int mcc)
-    {
-        int index;
-
-        MccEntry m;
-
-        m = new MccEntry(mcc, null, 0);
-
-        index = Collections.binarySearch(table, m);
-
+    /**
+     * Given a GSM Mobile Country Code, returns a default time zone ID
+     * if available.  Returns null if unavailable.
+     */
+    public static String defaultTimeZoneForMcc(int mcc) {
+        int index = Arrays.binarySearch(MCC_CODES, (short)mcc);
         if (index < 0) {
             return null;
-        } else {
-            return table.get(index);
         }
-    }
-
-    /**
-     * Returns a default time zone ID for the given MCC.
-     * @param mcc Mobile Country Code
-     * @return default TimeZone ID, or null if not specified
-     */
-    /* package */ static String defaultTimeZoneForMcc(int mcc) {
-        MccEntry entry;
-
-        entry = entryForMcc(mcc);
-
-        if (entry == null) {
+        int indCode = IND_CODES[index];
+        int tzInd = (indCode >>> 4) & 0x001F;
+        String tz = TZ_STRINGS[tzInd];
+        if (tz == "") {
             return null;
-        } else {
-            return entry.timezone;
         }
+        return tz;
     }
 
     /**
-     * Given a GSM Mobile Country Code, returns
-     * an ISO two-character country code if available.
-     * Returns "" if unavailable.
+     * Given a GSM Mobile Country Code, returns an ISO two-character
+     * country code if available.  Returns "" if unavailable.
      */
-    public static String
-    countryCodeForMcc(int mcc)
-    {
-        MccEntry entry;
-
-        entry = entryForMcc(mcc);
-
-        if (entry == null) {
+    public static String countryCodeForMcc(int mcc) {
+        int index = Arrays.binarySearch(MCC_CODES, (short)mcc);
+        if (index < 0) {
             return "";
-        } else {
-            return entry.iso;
         }
+        int indCode = IND_CODES[index];
+        byte[] iso = {(byte)((indCode >>> 24) & 0x00FF), (byte)((indCode >>> 16) & 0x00FF)};
+        return new String(iso);
     }
 
     /**
-     * Given a GSM Mobile Country Code, returns
-     * an ISO 2-3 character language code if available.
-     * Returns null if unavailable.
+     * Given a GSM Mobile Country Code, returns an ISO 2-3 character
+     * language code if available.  Returns null if unavailable.
      */
-    /* package */ static String defaultLanguageForMcc(int mcc) {
-        MccEntry entry;
-
-        entry = entryForMcc(mcc);
-
-        if (entry == null) {
+    public static String defaultLanguageForMcc(int mcc) {
+        int index = Arrays.binarySearch(MCC_CODES, (short)mcc);
+        if (index < 0) {
             return null;
-        } else {
-            return entry.language;
         }
+        int indCode = IND_CODES[index];
+        int langInd = indCode & 0x000F;
+        String lang = LANG_STRINGS[langInd];
+        if (lang == "") {
+            return null;
+        }
+        return lang;
     }
 
     /**
-     * Given a GSM Mobile Country Code, returns
-     * the smallest number of digits that M if available.
-     * Returns "" if unavailable.
+     * Given a GSM Mobile Country Code, returns the corresponding
+     * smallest number of digits field.  Returns 2 if unavailable.
      */
-    public static int
-    smallestDigitsMccForMnc(int mcc)
-    {
-        MccEntry entry;
-
-        entry = entryForMcc(mcc);
-
-        if (entry == null) {
+    public static int smallestDigitsMccForMnc(int mcc) {
+        int index = Arrays.binarySearch(MCC_CODES, (short)mcc);
+        if (index < 0) {
             return 2;
-        } else {
-            return entry.smallestDigitsMnc;
         }
+        int indCode = IND_CODES[index];
+        int smDig = (indCode >>> 9) & 0x0003;
+        return smDig;
     }
 
     /**
-     * Given a GSM Mobile Country Code, returns
-     * the number of wifi channels allowed in that country.
-     * Returns 0 if unavailable
+     * Given a GSM Mobile Country Code, returns the number of wifi
+     * channels allowed in that country.  Returns 0 if unavailable.
      */
     public static int wifiChannelsForMcc(int mcc) {
-        MccEntry entry;
-
-        entry = entryForMcc(mcc);
-
-        if (entry == null) {
+        int index = Arrays.binarySearch(MCC_CODES, (short)mcc);
+        if (index < 0) {
             return 0;
-        } else {
-            return entry.wifiChannelsAllowed;
         }
+        int indCode = IND_CODES[index];
+        int wifi = (indCode >>> 11) & 0x000F;
+        return wifi;
     }
 
-    static {
-        table = new ArrayList<MccEntry>(240);
-
-
-        /*
-         * The table below is built from two resources:
-         *
-         * 1) ITU "Mobile Network Code (MNC) for the international
-         *   identification plan for mobile terminals and mobile users"
-         *   which is available as an annex to the ITU operational bulletin
-         *   available here: http://www.itu.int/itu-t/bulletin/annex.html
-         *
-         * 2) The ISO 3166 country codes list, available here:
-         *    http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/index.html
-         *
-         * This table has not been verified.
-         *
-         * FIXME(mkf) this should be stored in a more efficient representation
-         */
-
-		table.add(new MccEntry(202,"gr",2));	//Greece
-		table.add(new MccEntry(204,"nl",2,"Europe/Amsterdam","nl",13)); //Netherlands (Kingdom of the)
-		table.add(new MccEntry(206,"be",2));	//Belgium
-		table.add(new MccEntry(208,"fr",2,"Europe/Paris","fr"));	//France
-		table.add(new MccEntry(212,"mc",2));	//Monaco (Principality of)
-		table.add(new MccEntry(213,"ad",2));	//Andorra (Principality of)
-		table.add(new MccEntry(214,"es",2,"Europe/Madrid","es"));	//Spain
-		table.add(new MccEntry(216,"hu",2));	//Hungary (Republic of)
-		table.add(new MccEntry(218,"ba",2));	//Bosnia and Herzegovina
-		table.add(new MccEntry(219,"hr",2));	//Croatia (Republic of)
-		table.add(new MccEntry(220,"rs",2));	//Serbia and Montenegro
-		table.add(new MccEntry(222,"it",2,"Europe/Rome","it"));	//Italy
-		table.add(new MccEntry(225,"va",2,"Europe/Rome","it"));	//Vatican City State
-		table.add(new MccEntry(226,"ro",2));	//Romania
-		table.add(new MccEntry(228,"ch",2,"Europe/Zurich","de"));	//Switzerland (Confederation of)
-		table.add(new MccEntry(230,"cz",2,"Europe/Prague","cs", 13));	//Czech Republic
-		table.add(new MccEntry(231,"sk",2));	//Slovak Republic
-		table.add(new MccEntry(232,"at",2,"Europe/Vienna","de", 13));   //Austria
-		table.add(new MccEntry(234,"gb",2,"Europe/London","en", 13));   //United Kingdom of Great Britain and Northern Ireland
-		table.add(new MccEntry(235,"gb",2,"Europe/London","en", 13));   //United Kingdom of Great Britain and Northern Ireland
-		table.add(new MccEntry(238,"dk",2));	//Denmark
-		table.add(new MccEntry(240,"se",2));	//Sweden
-		table.add(new MccEntry(242,"no",2));	//Norway
-		table.add(new MccEntry(244,"fi",2));	//Finland
-		table.add(new MccEntry(246,"lt",2));	//Lithuania (Republic of)
-		table.add(new MccEntry(247,"lv",2));	//Latvia (Republic of)
-		table.add(new MccEntry(248,"ee",2));	//Estonia (Republic of)
-		table.add(new MccEntry(250,"ru",2));	//Russian Federation
-		table.add(new MccEntry(255,"ua",2));	//Ukraine
-		table.add(new MccEntry(257,"by",2));	//Belarus (Republic of)
-		table.add(new MccEntry(259,"md",2));	//Moldova (Republic of)
-		table.add(new MccEntry(260,"pl",2,"Europe/Warsaw"));	//Poland (Republic of)
-		table.add(new MccEntry(262,"de",2,"Europe/Berlin","de", 13));   //Germany (Federal Republic of)
-		table.add(new MccEntry(266,"gi",2));	//Gibraltar
-		table.add(new MccEntry(268,"pt",2));	//Portugal
-		table.add(new MccEntry(270,"lu",2));	//Luxembourg
-		table.add(new MccEntry(272,"ie",2,"Europe/Dublin","en"));	//Ireland
-		table.add(new MccEntry(274,"is",2));	//Iceland
-		table.add(new MccEntry(276,"al",2));	//Albania (Republic of)
-		table.add(new MccEntry(278,"mt",2));	//Malta
-		table.add(new MccEntry(280,"cy",2));	//Cyprus (Republic of)
-		table.add(new MccEntry(282,"ge",2));	//Georgia
-		table.add(new MccEntry(283,"am",2));	//Armenia (Republic of)
-		table.add(new MccEntry(284,"bg",2));	//Bulgaria (Republic of)
-		table.add(new MccEntry(286,"tr",2));	//Turkey
-		table.add(new MccEntry(288,"fo",2));	//Faroe Islands
-		table.add(new MccEntry(290,"gl",2));	//Greenland (Denmark)
-		table.add(new MccEntry(292,"sm",2));	//San Marino (Republic of)
-		table.add(new MccEntry(293,"sl",2));	//Slovenia (Republic of)
-                table.add(new MccEntry(294,"mk",2));   //The Former Yugoslav Republic of Macedonia
-		table.add(new MccEntry(295,"li",2));	//Liechtenstein (Principality of)
-		table.add(new MccEntry(302,"ca",2, "", "", 11));        //Canada
-		table.add(new MccEntry(308,"pm",2));	//Saint Pierre and Miquelon (Collectivit territoriale de la Rpublique franaise)
-		table.add(new MccEntry(310,"us",3,"","en", 11));        //United States of America
-		table.add(new MccEntry(311,"us",3,"","en", 11));        //United States of America
-		table.add(new MccEntry(312,"us",3,"","en", 11));        //United States of America
-		table.add(new MccEntry(313,"us",3,"","en", 11));        //United States of America
-		table.add(new MccEntry(314,"us",3,"","en", 11));        //United States of America
-		table.add(new MccEntry(315,"us",3,"","en", 11));        //United States of America
-		table.add(new MccEntry(316,"us",3,"","en", 11));        //United States of America
-		table.add(new MccEntry(330,"pr",2));	//Puerto Rico
-		table.add(new MccEntry(332,"vi",2));	//United States Virgin Islands
-		table.add(new MccEntry(334,"mx",3));	//Mexico
-		table.add(new MccEntry(338,"jm",3));	//Jamaica
-		table.add(new MccEntry(340,"gp",2));	//Guadeloupe (French Department of)
-		table.add(new MccEntry(342,"bb",3));	//Barbados
-		table.add(new MccEntry(344,"ag",3));	//Antigua and Barbuda
-		table.add(new MccEntry(346,"ky",3));	//Cayman Islands
-		table.add(new MccEntry(348,"vg",3));	//British Virgin Islands
-		table.add(new MccEntry(350,"bm",2));	//Bermuda
-		table.add(new MccEntry(352,"gd",2));	//Grenada
-		table.add(new MccEntry(354,"ms",2));	//Montserrat
-		table.add(new MccEntry(356,"kn",2));	//Saint Kitts and Nevis
-		table.add(new MccEntry(358,"lc",2));	//Saint Lucia
-		table.add(new MccEntry(360,"vc",2));	//Saint Vincent and the Grenadines
-		table.add(new MccEntry(362,"nl",2));	//Netherlands Antilles
-		table.add(new MccEntry(363,"aw",2));	//Aruba
-		table.add(new MccEntry(364,"bs",2));	//Bahamas (Commonwealth of the)
-		table.add(new MccEntry(365,"ai",3));	//Anguilla
-		table.add(new MccEntry(366,"dm",2));	//Dominica (Commonwealth of)
-		table.add(new MccEntry(368,"cu",2));	//Cuba
-		table.add(new MccEntry(370,"do",2));	//Dominican Republic
-		table.add(new MccEntry(372,"ht",2));	//Haiti (Republic of)
-		table.add(new MccEntry(374,"tt",2));	//Trinidad and Tobago
-		table.add(new MccEntry(376,"tc",2));	//Turks and Caicos Islands
-		table.add(new MccEntry(400,"az",2));	//Azerbaijani Republic
-		table.add(new MccEntry(401,"kz",2));	//Kazakhstan (Republic of)
-		table.add(new MccEntry(402,"bt",2));	//Bhutan (Kingdom of)
-		table.add(new MccEntry(404,"in",2));	//India (Republic of)
-		table.add(new MccEntry(405,"in",2));	//India (Republic of)
-		table.add(new MccEntry(410,"pk",2));	//Pakistan (Islamic Republic of)
-		table.add(new MccEntry(412,"af",2));	//Afghanistan
-		table.add(new MccEntry(413,"lk",2));	//Sri Lanka (Democratic Socialist Republic of)
-		table.add(new MccEntry(414,"mm",2));	//Myanmar (Union of)
-		table.add(new MccEntry(415,"lb",2));	//Lebanon
-		table.add(new MccEntry(416,"jo",2));	//Jordan (Hashemite Kingdom of)
-		table.add(new MccEntry(417,"sy",2));	//Syrian Arab Republic
-		table.add(new MccEntry(418,"iq",2));	//Iraq (Republic of)
-		table.add(new MccEntry(419,"kw",2));	//Kuwait (State of)
-		table.add(new MccEntry(420,"sa",2));	//Saudi Arabia (Kingdom of)
-		table.add(new MccEntry(421,"ye",2));	//Yemen (Republic of)
-		table.add(new MccEntry(422,"om",2));	//Oman (Sultanate of)
-		table.add(new MccEntry(424,"ae",2));	//United Arab Emirates
-		table.add(new MccEntry(425,"il",2));	//Israel (State of)
-		table.add(new MccEntry(426,"bh",2));	//Bahrain (Kingdom of)
-		table.add(new MccEntry(427,"qa",2));	//Qatar (State of)
-		table.add(new MccEntry(428,"mn",2));	//Mongolia
-		table.add(new MccEntry(429,"np",2));	//Nepal
-		table.add(new MccEntry(430,"ae",2));	//United Arab Emirates
-		table.add(new MccEntry(431,"ae",2));	//United Arab Emirates
-		table.add(new MccEntry(432,"ir",2));	//Iran (Islamic Republic of)
-		table.add(new MccEntry(434,"uz",2));	//Uzbekistan (Republic of)
-		table.add(new MccEntry(436,"tj",2));	//Tajikistan (Republic of)
-		table.add(new MccEntry(437,"kg",2));	//Kyrgyz Republic
-		table.add(new MccEntry(438,"tm",2));	//Turkmenistan
-		table.add(new MccEntry(440,"jp",2,"Asia/Tokyo","ja", 14));              //Japan
-		table.add(new MccEntry(441,"jp",2,"Asia/Tokyo","ja", 14));              //Japan
-		table.add(new MccEntry(450,"kr",2));	//Korea (Republic of)
-		table.add(new MccEntry(452,"vn",2));	//Viet Nam (Socialist Republic of)
-		table.add(new MccEntry(454,"hk",2));	//"Hong Kong, China"
-		table.add(new MccEntry(455,"mo",2));	//"Macao, China"
-		table.add(new MccEntry(456,"kh",2));	//Cambodia (Kingdom of)
-		table.add(new MccEntry(457,"la",2));	//Lao People's Democratic Republic
-		table.add(new MccEntry(460,"cn",2));	//China (People's Republic of)
-		table.add(new MccEntry(461,"cn",2));	//China (People's Republic of)
-		table.add(new MccEntry(466,"tw",2));	//"Taiwan, China"
-		table.add(new MccEntry(467,"kp",2));	//Democratic People's Republic of Korea
-		table.add(new MccEntry(470,"bd",2));	//Bangladesh (People's Republic of)
-		table.add(new MccEntry(472,"mv",2));	//Maldives (Republic of)
-		table.add(new MccEntry(502,"my",2));	//Malaysia
-		table.add(new MccEntry(505,"au",2,"Australia/Sydney","en", 11));        //Australia
-		table.add(new MccEntry(510,"id",2));	//Indonesia (Republic of)
-		table.add(new MccEntry(514,"tl",2));	//Democratic Republic of Timor-Leste
-		table.add(new MccEntry(515,"ph",2));	//Philippines (Republic of the)
-		table.add(new MccEntry(520,"th",2));	//Thailand
-		table.add(new MccEntry(525,"sg",2,"Singapore","en", 11));               //Singapore (Republic of)
-		table.add(new MccEntry(528,"bn",2));	//Brunei Darussalam
-		table.add(new MccEntry(530,"nz",2,"Pacific/Auckland", "en"));	//New Zealand
-		table.add(new MccEntry(534,"mp",2));	//Northern Mariana Islands (Commonwealth of the)
-		table.add(new MccEntry(535,"gu",2));	//Guam
-		table.add(new MccEntry(536,"nr",2));	//Nauru (Republic of)
-		table.add(new MccEntry(537,"pg",2));	//Papua New Guinea
-		table.add(new MccEntry(539,"to",2));	//Tonga (Kingdom of)
-		table.add(new MccEntry(540,"sb",2));	//Solomon Islands
-		table.add(new MccEntry(541,"vu",2));	//Vanuatu (Republic of)
-		table.add(new MccEntry(542,"fj",2));	//Fiji (Republic of)
-		table.add(new MccEntry(543,"wf",2));	//Wallis and Futuna (Territoire franais d'outre-mer)
-		table.add(new MccEntry(544,"as",2));	//American Samoa
-		table.add(new MccEntry(545,"ki",2));	//Kiribati (Republic of)
-		table.add(new MccEntry(546,"nc",2));	//New Caledonia (Territoire franais d'outre-mer)
-		table.add(new MccEntry(547,"pf",2));	//French Polynesia (Territoire franais d'outre-mer)
-		table.add(new MccEntry(548,"ck",2));	//Cook Islands
-		table.add(new MccEntry(549,"ws",2));	//Samoa (Independent State of)
-		table.add(new MccEntry(550,"fm",2));	//Micronesia (Federated States of)
-		table.add(new MccEntry(551,"mh",2));	//Marshall Islands (Republic of the)
-		table.add(new MccEntry(552,"pw",2));	//Palau (Republic of)
-		table.add(new MccEntry(602,"eg",2));	//Egypt (Arab Republic of)
-		table.add(new MccEntry(603,"dz",2));	//Algeria (People's Democratic Republic of)
-		table.add(new MccEntry(604,"ma",2));	//Morocco (Kingdom of)
-		table.add(new MccEntry(605,"tn",2));	//Tunisia
-		table.add(new MccEntry(606,"ly",2));	//Libya (Socialist People's Libyan Arab Jamahiriya)
-		table.add(new MccEntry(607,"gm",2));	//Gambia (Republic of the)
-		table.add(new MccEntry(608,"sn",2));	//Senegal (Republic of)
-		table.add(new MccEntry(609,"mr",2));	//Mauritania (Islamic Republic of)
-		table.add(new MccEntry(610,"ml",2));	//Mali (Republic of)
-		table.add(new MccEntry(611,"gn",2));	//Guinea (Republic of)
-		table.add(new MccEntry(612,"ci",2));	//Cte d'Ivoire (Republic of)
-		table.add(new MccEntry(613,"bf",2));	//Burkina Faso
-		table.add(new MccEntry(614,"ne",2));	//Niger (Republic of the)
-		table.add(new MccEntry(615,"tg",2));	//Togolese Republic
-		table.add(new MccEntry(616,"bj",2));	//Benin (Republic of)
-		table.add(new MccEntry(617,"mu",2));	//Mauritius (Republic of)
-		table.add(new MccEntry(618,"lr",2));	//Liberia (Republic of)
-		table.add(new MccEntry(619,"sl",2));	//Sierra Leone
-		table.add(new MccEntry(620,"gh",2));	//Ghana
-		table.add(new MccEntry(621,"ng",2));	//Nigeria (Federal Republic of)
-		table.add(new MccEntry(622,"td",2));	//Chad (Republic of)
-		table.add(new MccEntry(623,"cf",2));	//Central African Republic
-		table.add(new MccEntry(624,"cm",2));	//Cameroon (Republic of)
-		table.add(new MccEntry(625,"cv",2));	//Cape Verde (Republic of)
-		table.add(new MccEntry(626,"st",2));	//Sao Tome and Principe (Democratic Republic of)
-		table.add(new MccEntry(627,"gq",2));	//Equatorial Guinea (Republic of)
-		table.add(new MccEntry(628,"ga",2));	//Gabonese Republic
-		table.add(new MccEntry(629,"cg",2));	//Congo (Republic of the)
-		table.add(new MccEntry(630,"cg",2));	//Democratic Republic of the Congo
-		table.add(new MccEntry(631,"ao",2));	//Angola (Republic of)
-		table.add(new MccEntry(632,"gw",2));	//Guinea-Bissau (Republic of)
-		table.add(new MccEntry(633,"sc",2));	//Seychelles (Republic of)
-		table.add(new MccEntry(634,"sd",2));	//Sudan (Republic of the)
-		table.add(new MccEntry(635,"rw",2));	//Rwanda (Republic of)
-		table.add(new MccEntry(636,"et",2));	//Ethiopia (Federal Democratic Republic of)
-		table.add(new MccEntry(637,"so",2));	//Somali Democratic Republic
-		table.add(new MccEntry(638,"dj",2));	//Djibouti (Republic of)
-		table.add(new MccEntry(639,"ke",2));	//Kenya (Republic of)
-		table.add(new MccEntry(640,"tz",2));	//Tanzania (United Republic of)
-		table.add(new MccEntry(641,"ug",2));	//Uganda (Republic of)
-		table.add(new MccEntry(642,"bi",2));	//Burundi (Republic of)
-		table.add(new MccEntry(643,"mz",2));	//Mozambique (Republic of)
-		table.add(new MccEntry(645,"zm",2));	//Zambia (Republic of)
-		table.add(new MccEntry(646,"mg",2));	//Madagascar (Republic of)
-		table.add(new MccEntry(647,"re",2));	//Reunion (French Department of)
-		table.add(new MccEntry(648,"zw",2));	//Zimbabwe (Republic of)
-		table.add(new MccEntry(649,"na",2));	//Namibia (Republic of)
-		table.add(new MccEntry(650,"mw",2));	//Malawi
-		table.add(new MccEntry(651,"ls",2));	//Lesotho (Kingdom of)
-		table.add(new MccEntry(652,"bw",2));	//Botswana (Republic of)
-		table.add(new MccEntry(653,"sz",2));	//Swaziland (Kingdom of)
-		table.add(new MccEntry(654,"km",2));	//Comoros (Union of the)
-		table.add(new MccEntry(655,"za",2,"Africa/Johannesburg","en"));	//South Africa (Republic of)
-		table.add(new MccEntry(657,"er",2));	//Eritrea
-		table.add(new MccEntry(702,"bz",2));	//Belize
-		table.add(new MccEntry(704,"gt",2));	//Guatemala (Republic of)
-		table.add(new MccEntry(706,"sv",2));	//El Salvador (Republic of)
-		table.add(new MccEntry(708,"hn",3));	//Honduras (Republic of)
-		table.add(new MccEntry(710,"ni",2));	//Nicaragua
-		table.add(new MccEntry(712,"cr",2));	//Costa Rica
-		table.add(new MccEntry(714,"pa",2));	//Panama (Republic of)
-		table.add(new MccEntry(716,"pe",2));	//Peru
-		table.add(new MccEntry(722,"ar",3));	//Argentine Republic
-		table.add(new MccEntry(724,"br",2));	//Brazil (Federative Republic of)
-		table.add(new MccEntry(730,"cl",2));	//Chile
-		table.add(new MccEntry(732,"co",3));	//Colombia (Republic of)
-		table.add(new MccEntry(734,"ve",2));	//Venezuela (Bolivarian Republic of)
-		table.add(new MccEntry(736,"bo",2));	//Bolivia (Republic of)
-		table.add(new MccEntry(738,"gy",2));	//Guyana
-		table.add(new MccEntry(740,"ec",2));	//Ecuador
-		table.add(new MccEntry(742,"gf",2));	//French Guiana (French Department of)
-		table.add(new MccEntry(744,"py",2));	//Paraguay (Republic of)
-		table.add(new MccEntry(746,"sr",2));	//Suriname (Republic of)
-		table.add(new MccEntry(748,"uy",2));	//Uruguay (Eastern Republic of)
-		table.add(new MccEntry(750,"fk",2));	//Falkland Islands (Malvinas)
-        //table.add(new MccEntry(901,"",2));	//"International Mobile, shared code"
-
-        Collections.sort(table);
-    }
 }

tests/AndroidTests/src/com/android/unit_tests/MccTableTest.java

diff --git a/tests/AndroidTests/src/com/android/unit_tests/MccTableTest.java b/tests/AndroidTests/src/com/android/unit_tests/MccTableTest.java
new file mode 100644
index 0000000..875376a
--- /dev/null
+++ b/tests/AndroidTests/src/com/android/unit_tests/MccTableTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2006 The Android 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.unit_tests;
+
+import com.android.internal.telephony.gsm.MccTable;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import android.util.Log;
+
+public class MccTableTest extends AndroidTestCase {
+    private final static String LOG_TAG = "GSM";
+
+    @SmallTest
+    public void testTimeZone() throws Exception {
+        assertEquals(MccTable.defaultTimeZoneForMcc(208), "Europe/Paris");
+        assertEquals(MccTable.defaultTimeZoneForMcc(232), "Europe/Vienna");
+        assertEquals(MccTable.defaultTimeZoneForMcc(655), "Africa/Johannesburg");
+        assertEquals(MccTable.defaultTimeZoneForMcc(440), "Asia/Tokyo");
+        assertEquals(MccTable.defaultTimeZoneForMcc(441), "Asia/Tokyo");
+        assertEquals(MccTable.defaultTimeZoneForMcc(525), "Singapore");
+        assertEquals(MccTable.defaultTimeZoneForMcc(240), null);  // tz not defined, hence default
+        assertEquals(MccTable.defaultTimeZoneForMcc(0), null);    // mcc not defined, hence default
+        assertEquals(MccTable.defaultTimeZoneForMcc(2000), null); // mcc not defined, hence default
+    }
+
+    @SmallTest
+    public void testCountryCode() throws Exception {
+        assertEquals(MccTable.countryCodeForMcc(270), "lu");
+        assertEquals(MccTable.countryCodeForMcc(202), "gr");
+        assertEquals(MccTable.countryCodeForMcc(750), "fk");
+        assertEquals(MccTable.countryCodeForMcc(646), "mg");
+        assertEquals(MccTable.countryCodeForMcc(314), "us");
+        assertEquals(MccTable.countryCodeForMcc(300), "");  // mcc not defined, hence default
+        assertEquals(MccTable.countryCodeForMcc(0), "");    // mcc not defined, hence default
+        assertEquals(MccTable.countryCodeForMcc(2000), ""); // mcc not defined, hence default
+    }
+
+    @SmallTest
+    public void testLang() throws Exception {
+        assertEquals(MccTable.defaultLanguageForMcc(311), "en");
+        assertEquals(MccTable.defaultLanguageForMcc(232), "de");
+        assertEquals(MccTable.defaultLanguageForMcc(230), "cs");
+        assertEquals(MccTable.defaultLanguageForMcc(204), "nl");
+        assertEquals(MccTable.defaultLanguageForMcc(274), null);  // lang not defined, hence default
+        assertEquals(MccTable.defaultLanguageForMcc(0), null);    // mcc not defined, hence default
+        assertEquals(MccTable.defaultLanguageForMcc(2000), null); // mcc not defined, hence default
+    }
+
+    @SmallTest
+    public void testSmDigits() throws Exception {
+        assertEquals(MccTable.smallestDigitsMccForMnc(312), 3);
+        assertEquals(MccTable.smallestDigitsMccForMnc(430), 2);
+        assertEquals(MccTable.smallestDigitsMccForMnc(365), 3);
+        assertEquals(MccTable.smallestDigitsMccForMnc(536), 2);
+        assertEquals(MccTable.smallestDigitsMccForMnc(352), 2);  // sd not defined, hence default
+        assertEquals(MccTable.smallestDigitsMccForMnc(0), 2);    // mcc not defined, hence default
+        assertEquals(MccTable.smallestDigitsMccForMnc(2000), 2); // mcc not defined, hence default
+    }
+
+    @SmallTest
+    public void testWifi() throws Exception {
+        assertEquals(MccTable.wifiChannelsForMcc(262), 13);
+        assertEquals(MccTable.wifiChannelsForMcc(234), 13);
+        assertEquals(MccTable.wifiChannelsForMcc(505), 11);
+        assertEquals(MccTable.wifiChannelsForMcc(313), 11);
+        assertEquals(MccTable.wifiChannelsForMcc(330), 0);  // wifi not defined, hence default
+        assertEquals(MccTable.wifiChannelsForMcc(0), 0);    // mcc not defined, hence default
+        assertEquals(MccTable.wifiChannelsForMcc(2000), 0); // mcc not defined, hence default
+
+    }
+}

tests/FrameworkTest/res/drawable-hdpi/big_drawable_background.9.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/big_drawable_background.9.png b/tests/FrameworkTest/res/drawable-hdpi/big_drawable_background.9.png
new file mode 100644
index 0000000..53470b8
--- /dev/null
+++ b/tests/FrameworkTest/res/drawable-hdpi/big_drawable_background.9.png
Binary files differ

tests/FrameworkTest/res/drawable-hdpi/black_square.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/black_square.png b/tests/FrameworkTest/res/drawable-hdpi/black_square.png
new file mode 100644
index 0000000..77521031
--- /dev/null
+++ b/tests/FrameworkTest/res/drawable-hdpi/black_square.png
Binary files differ

tests/FrameworkTest/res/drawable-hdpi/black_square_stretchable.9.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/black_square_stretchable.9.png b/tests/FrameworkTest/res/drawable-hdpi/black_square_stretchable.9.png
new file mode 100644
index 0000000..4988163
--- /dev/null
+++ b/tests/FrameworkTest/res/drawable-hdpi/black_square_stretchable.9.png
Binary files differ

tests/FrameworkTest/res/drawable-hdpi/drawable_background.9.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/drawable_background.9.png b/tests/FrameworkTest/res/drawable-hdpi/drawable_background.9.png
new file mode 100644
index 0000000..f692d38
--- /dev/null
+++ b/tests/FrameworkTest/res/drawable-hdpi/drawable_background.9.png
Binary files differ

tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_pause_1.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_pause_1.png b/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_pause_1.png
new file mode 100644
index 0000000..9edb064
--- /dev/null
+++ b/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_pause_1.png
Binary files differ

tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_backward_1.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_backward_1.png b/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_backward_1.png
new file mode 100644
index 0000000..c4b6b92
--- /dev/null
+++ b/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_backward_1.png
Binary files differ

tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_forward_1.png

diff --git a/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_forward_1.png b/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_forward_1.png
new file mode 100644
index 0000000..03140f5
--- /dev/null
+++ b/tests/FrameworkTest/res/drawable-hdpi/sym_now_playing_skip_forward_1.png
Binary files differ

tests/FrameworkTest/res/drawable-mdpi/big_drawable_background.9.png

diff --git a/tests/FrameworkTest/res/drawable/big_drawable_background.9.png b/tests/FrameworkTest/res/drawable-mdpi/big_drawable_background.9.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable/big_drawable_background.9.png
rename to tests/FrameworkTest/res/drawable-mdpi/big_drawable_background.9.png
Binary files differ

tests/FrameworkTest/res/drawable-mdpi/black_square.png

diff --git a/tests/FrameworkTest/res/drawable/black_square.png b/tests/FrameworkTest/res/drawable-mdpi/black_square.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable/black_square.png
rename to tests/FrameworkTest/res/drawable-mdpi/black_square.png
Binary files differ

tests/FrameworkTest/res/drawable-mdpi/black_square_stretchable.9.png

diff --git a/tests/FrameworkTest/res/drawable/black_square_stretchable.9.png b/tests/FrameworkTest/res/drawable-mdpi/black_square_stretchable.9.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable/black_square_stretchable.9.png
rename to tests/FrameworkTest/res/drawable-mdpi/black_square_stretchable.9.png
Binary files differ

tests/FrameworkTest/res/drawable-mdpi/drawable_background.9.png

diff --git a/tests/FrameworkTest/res/drawable/drawable_background.9.png b/tests/FrameworkTest/res/drawable-mdpi/drawable_background.9.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable/drawable_background.9.png
rename to tests/FrameworkTest/res/drawable-mdpi/drawable_background.9.png
Binary files differ

tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_pause_1.png

diff --git a/tests/FrameworkTest/res/drawable/sym_now_playing_pause_1.png b/tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_pause_1.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable/sym_now_playing_pause_1.png
rename to tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_pause_1.png
Binary files differ

tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_backward_1.png

diff --git a/tests/FrameworkTest/res/drawable/sym_now_playing_skip_backward_1.png b/tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_backward_1.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable/sym_now_playing_skip_backward_1.png
rename to tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_backward_1.png
Binary files differ

tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_forward_1.png

diff --git a/tests/FrameworkTest/res/drawable/sym_now_playing_skip_forward_1.png b/tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_forward_1.png
similarity index 100%
rename from tests/FrameworkTest/res/drawable/sym_now_playing_skip_forward_1.png
rename to tests/FrameworkTest/res/drawable-mdpi/sym_now_playing_skip_forward_1.png
Binary files differ

tests/appwidgets/AppWidgetHostTest/res/drawable-hdpi/oh_hai_icon.png

diff --git a/tests/appwidgets/AppWidgetHostTest/res/drawable-hdpi/oh_hai_icon.png b/tests/appwidgets/AppWidgetHostTest/res/drawable-hdpi/oh_hai_icon.png
new file mode 100644
index 0000000..2ddde94
--- /dev/null
+++ b/tests/appwidgets/AppWidgetHostTest/res/drawable-hdpi/oh_hai_icon.png
Binary files differ

tests/appwidgets/AppWidgetHostTest/res/drawable-mdpi/oh_hai_icon.png

diff --git a/tests/appwidgets/AppWidgetHostTest/res/drawable/oh_hai_icon.png b/tests/appwidgets/AppWidgetHostTest/res/drawable-mdpi/oh_hai_icon.png
similarity index 100%
rename from tests/appwidgets/AppWidgetHostTest/res/drawable/oh_hai_icon.png
rename to tests/appwidgets/AppWidgetHostTest/res/drawable-mdpi/oh_hai_icon.png
Binary files differ