diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle index 0deaef3eea..d20b813fee 100644 --- a/OsmAnd-java/build.gradle +++ b/OsmAnd-java/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'java' -apply plugin: 'application' +apply plugin:'application' mainClassName = "net.osmand.util.GeoPointParserUtil" sourceSets { diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index d668110373..fcf5a8548e 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'com.android.application' // Less important android { - compileSdkVersion 23 + compileSdkVersion 21 buildToolsVersion "23.0.1" signingConfigs { @@ -39,8 +39,8 @@ android { defaultConfig { minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14 - targetSdkVersion 23 - multiDexEnabled true + targetSdkVersion 21 + versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode //versionName already assigned in code //versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName @@ -60,8 +60,6 @@ android { dexOptions { jumboMode = true - incremental true - javaMaxHeapSize "4g" } sourceSets { @@ -344,5 +342,5 @@ dependencies { qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" - compile 'com.android.support:multidex:1.0.0' + } diff --git a/OsmAnd/libs/simple-logging.jar b/OsmAnd/libs/simple-logging.jar deleted file mode 100644 index 89d3a05766..0000000000 Binary files a/OsmAnd/libs/simple-logging.jar and /dev/null differ diff --git a/OsmAnd/src/net/osmand/PlatformUtil.java b/OsmAnd/src/net/osmand/PlatformUtil.java index 11202adf74..385ea068a1 100644 --- a/OsmAnd/src/net/osmand/PlatformUtil.java +++ b/OsmAnd/src/net/osmand/PlatformUtil.java @@ -1,12 +1,12 @@ package net.osmand; -import android.util.Xml; - import org.apache.commons.logging.Log; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; +import android.util.Xml; + /** * That class is replacing of standard LogFactory due to * problems with Android implementation of LogFactory. @@ -110,11 +110,30 @@ public class PlatformUtil { return android.util.Log.isLoggable(TAG, android.util.Log.INFO); } + @Override + public boolean isTraceEnabled() { + return android.util.Log.isLoggable(TAG, android.util.Log.DEBUG); + } + @Override public boolean isWarnEnabled() { return android.util.Log.isLoggable(TAG, android.util.Log.WARN); } + @Override + public void trace(Object message) { + if(isTraceEnabled()){ + android.util.Log.d(TAG, name + " " + message); //$NON-NLS-1$ + } + } + + @Override + public void trace(Object message, Throwable t) { + if(isTraceEnabled()){ + android.util.Log.d(TAG, name + " " + message, t); //$NON-NLS-1$ + } + } + @Override public void warn(Object message) { if(isWarnEnabled()){ diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index 5064fd62ee..3db5b010e0 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -2,6 +2,7 @@ package net.osmand.plus; import android.app.Activity; import android.app.AlarmManager; +import android.app.Application; import android.app.PendingIntent; import android.content.Context; import android.content.DialogInterface; @@ -13,7 +14,6 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Handler; import android.os.Message; -import android.support.multidex.MultiDexApplication; import android.support.v7.app.AlertDialog; import android.text.format.DateFormat; import android.util.TypedValue; @@ -65,7 +65,7 @@ import btools.routingapp.IBRouterService; -public class OsmandApplication extends MultiDexApplication { +public class OsmandApplication extends Application { public static final String EXCEPTION_PATH = "exception.log"; //$NON-NLS-1$ private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(OsmandApplication.class); diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java index 3e1047a173..7765a960f3 100644 --- a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java @@ -1,14 +1,12 @@ package net.osmand.plus.activities; -import android.graphics.PorterDuff; -import android.graphics.drawable.Drawable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.view.View; -import android.view.ViewGroup; - import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.view.ViewGroup; /** * Created by Denis @@ -22,12 +20,9 @@ public class OsmandActionBarActivity extends AppCompatActivity { protected void setupHomeButton(){ Drawable back = ((OsmandApplication)getApplication()).getIconsCache().getIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha); back.setColorFilter(getResources().getColor(R.color.color_white), PorterDuff.Mode.MULTIPLY); - final ActionBar supportActionBar = getSupportActionBar(); - if (supportActionBar != null) { - supportActionBar.setHomeButtonEnabled(true); - supportActionBar.setDisplayHomeAsUpEnabled(true); - supportActionBar.setHomeAsUpIndicator(back); - } + getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setHomeAsUpIndicator(back); } @Override diff --git a/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java index d45f65083e..bff6204045 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java @@ -3,7 +3,7 @@ package net.osmand.plus.download.ui; import android.content.res.TypedArray; import android.os.Bundle; import android.support.v4.app.DialogFragment; -import android.support.v7.view.ContextThemeWrapper; +import android.support.v7.internal.view.ContextThemeWrapper; import android.support.v7.widget.Toolbar; import android.util.TypedValue; import android.view.LayoutInflater; diff --git a/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java b/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java index 4a08f1d5f7..f3648e4ab2 100644 --- a/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java +++ b/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java @@ -6,13 +6,16 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Typeface; import android.os.Build; -import android.support.v7.text.AllCapsTransformationMethod; +import android.support.v7.internal.text.AllCapsTransformationMethod; import android.util.AttributeSet; import android.widget.TextView; import net.osmand.plus.R; import net.osmand.plus.helpers.FontCache; +/** + * Created by Alexey Pelykh on 30.01.2015. + */ public class TextViewEx extends TextView { public TextViewEx(Context context) { super(context); diff --git a/eclipse-compile/appcompat/build.gradle b/eclipse-compile/appcompat/build.gradle index 07e8c6a83c..34e8ec28cf 100644 --- a/eclipse-compile/appcompat/build.gradle +++ b/eclipse-compile/appcompat/build.gradle @@ -5,12 +5,12 @@ dependencies { } android { - compileSdkVersion 23 + compileSdkVersion 21 buildToolsVersion "23.0.1" defaultConfig { minSdkVersion 9 - targetSdkVersion 23 + targetSdkVersion 21 } sourceSets { main { diff --git a/eclipse-compile/appcompat/libs/android-support-v4.jar b/eclipse-compile/appcompat/libs/android-support-v4.jar index aa0b1a5cc5..7b78bb8ee8 100644 Binary files a/eclipse-compile/appcompat/libs/android-support-v4.jar and b/eclipse-compile/appcompat/libs/android-support-v4.jar differ diff --git a/eclipse-compile/appcompat/libs/android-support-v7-appcompat.jar b/eclipse-compile/appcompat/libs/android-support-v7-appcompat.jar index f9ad396f6c..830a4936a6 100644 Binary files a/eclipse-compile/appcompat/libs/android-support-v7-appcompat.jar and b/eclipse-compile/appcompat/libs/android-support-v7-appcompat.jar differ diff --git a/eclipse-compile/appcompat/res/color-v23/abc_color_highlight_material.xml b/eclipse-compile/appcompat/res/color-v23/abc_color_highlight_material.xml deleted file mode 100644 index 8d53611890..0000000000 --- a/eclipse-compile/appcompat/res/color-v23/abc_color_highlight_material.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_off_mtrl_alpha.png b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_off_mtrl_alpha.png deleted file mode 100644 index 4efe298e28..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_off_mtrl_alpha.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_to_pressed_mtrl_000.png b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_to_pressed_mtrl_000.png deleted file mode 100644 index 543dec3376..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_to_pressed_mtrl_000.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_to_pressed_mtrl_005.png b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_to_pressed_mtrl_005.png deleted file mode 100644 index 9930b3ad1b..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_to_pressed_mtrl_005.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_primary_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_primary_mtrl_alpha.9.png deleted file mode 100644 index 4cfb1a7c7e..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_primary_mtrl_alpha.9.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_track_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_track_mtrl_alpha.9.png deleted file mode 100644 index 32ddf7a9e0..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_track_mtrl_alpha.9.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png index 6ad9b1d245..56436a1ccc 100644 Binary files a/eclipse-compile/appcompat/res/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png and b/eclipse-compile/appcompat/res/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/eclipse-compile/appcompat/res/drawable-hdpi/abc_text_cursor_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-hdpi/abc_text_cursor_mtrl_alpha.9.png new file mode 100644 index 0000000000..5e0bf843ec Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-hdpi/abc_text_cursor_mtrl_alpha.9.png differ diff --git a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_off_mtrl_alpha.png b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_off_mtrl_alpha.png deleted file mode 100644 index 10df639062..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_off_mtrl_alpha.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_to_pressed_mtrl_000.png b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_to_pressed_mtrl_000.png deleted file mode 100644 index f83b1ef163..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_to_pressed_mtrl_000.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_to_pressed_mtrl_005.png b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_to_pressed_mtrl_005.png deleted file mode 100644 index e9efb20fb7..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_to_pressed_mtrl_005.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_primary_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_primary_mtrl_alpha.9.png deleted file mode 100644 index a4ab0a1e39..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_primary_mtrl_alpha.9.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_track_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_track_mtrl_alpha.9.png deleted file mode 100644 index db9e172d3b..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_track_mtrl_alpha.9.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png index 00c81fcada..fcd81de0c2 100644 Binary files a/eclipse-compile/appcompat/res/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png and b/eclipse-compile/appcompat/res/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/eclipse-compile/appcompat/res/drawable-mdpi/abc_text_cursor_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-mdpi/abc_text_cursor_mtrl_alpha.9.png new file mode 100644 index 0000000000..36348a8b9a Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-mdpi/abc_text_cursor_mtrl_alpha.9.png differ diff --git a/eclipse-compile/appcompat/res/drawable-v21/abc_action_bar_item_background_material.xml b/eclipse-compile/appcompat/res/drawable-v21/abc_action_bar_item_background_material.xml deleted file mode 100644 index 595c56c6a9..0000000000 --- a/eclipse-compile/appcompat/res/drawable-v21/abc_action_bar_item_background_material.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - \ No newline at end of file diff --git a/eclipse-compile/appcompat/res/drawable-v21/abc_btn_colored_material.xml b/eclipse-compile/appcompat/res/drawable-v21/abc_btn_colored_material.xml deleted file mode 100644 index 10251aadc7..0000000000 --- a/eclipse-compile/appcompat/res/drawable-v21/abc_btn_colored_material.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eclipse-compile/appcompat/res/drawable-v23/abc_control_background_material.xml b/eclipse-compile/appcompat/res/drawable-v23/abc_control_background_material.xml deleted file mode 100644 index 0b540390a2..0000000000 --- a/eclipse-compile/appcompat/res/drawable-v23/abc_control_background_material.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - \ No newline at end of file diff --git a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_off_mtrl_alpha.png b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_off_mtrl_alpha.png deleted file mode 100644 index 138f643fa9..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_off_mtrl_alpha.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_to_pressed_mtrl_000.png b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_to_pressed_mtrl_000.png deleted file mode 100644 index cd41d74c96..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_to_pressed_mtrl_000.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_to_pressed_mtrl_005.png b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_to_pressed_mtrl_005.png deleted file mode 100644 index 8d67525e0c..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_to_pressed_mtrl_005.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_primary_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_primary_mtrl_alpha.9.png deleted file mode 100644 index 2b4734d25e..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_primary_mtrl_alpha.9.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_track_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_track_mtrl_alpha.9.png deleted file mode 100644 index 805cb291f5..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_track_mtrl_alpha.9.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png index f0752d2bfb..cd1396bca9 100644 Binary files a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png and b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_text_cursor_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_text_cursor_mtrl_alpha.9.png new file mode 100644 index 0000000000..666b10a2f2 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_text_cursor_mtrl_alpha.9.png differ diff --git a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_off_mtrl_alpha.png b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_off_mtrl_alpha.png deleted file mode 100644 index 52687451a8..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_off_mtrl_alpha.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_to_pressed_mtrl_000.png b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_to_pressed_mtrl_000.png deleted file mode 100644 index adffc1472e..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_to_pressed_mtrl_000.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_to_pressed_mtrl_005.png b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_to_pressed_mtrl_005.png deleted file mode 100644 index f3d16d5759..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_to_pressed_mtrl_005.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_primary_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_primary_mtrl_alpha.9.png deleted file mode 100644 index 6a82af5081..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_primary_mtrl_alpha.9.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_track_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_track_mtrl_alpha.9.png deleted file mode 100644 index c3791fc661..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_track_mtrl_alpha.9.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png index c74b3fcf8d..96bec46c2e 100644 Binary files a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png and b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_text_cursor_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_text_cursor_mtrl_alpha.9.png new file mode 100644 index 0000000000..08ee2b4779 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_text_cursor_mtrl_alpha.9.png differ diff --git a/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_scrubber_control_to_pressed_mtrl_000.png b/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_scrubber_control_to_pressed_mtrl_000.png deleted file mode 100644 index e5a43bbe87..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_scrubber_control_to_pressed_mtrl_000.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_scrubber_control_to_pressed_mtrl_005.png b/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_scrubber_control_to_pressed_mtrl_005.png deleted file mode 100644 index eeb37c1dae..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_scrubber_control_to_pressed_mtrl_005.png and /dev/null differ diff --git a/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png b/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png index 85c81c1dbc..c2393abe68 100644 Binary files a/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png and b/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/eclipse-compile/appcompat/res/drawable/abc_seekbar_thumb_material.xml b/eclipse-compile/appcompat/res/drawable/abc_seekbar_thumb_material.xml deleted file mode 100644 index 7fea83bc86..0000000000 --- a/eclipse-compile/appcompat/res/drawable/abc_seekbar_thumb_material.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eclipse-compile/appcompat/res/drawable/abc_seekbar_track_material.xml b/eclipse-compile/appcompat/res/drawable/abc_seekbar_track_material.xml deleted file mode 100644 index e68ac03e90..0000000000 --- a/eclipse-compile/appcompat/res/drawable/abc_seekbar_track_material.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eclipse-compile/appcompat/res/layout/abc_action_menu_item_layout.xml b/eclipse-compile/appcompat/res/layout/abc_action_menu_item_layout.xml index 283358a5dc..150ea50dc3 100644 --- a/eclipse-compile/appcompat/res/layout/abc_action_menu_item_layout.xml +++ b/eclipse-compile/appcompat/res/layout/abc_action_menu_item_layout.xml @@ -14,7 +14,7 @@ limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/eclipse-compile/appcompat/res/layout/abc_activity_chooser_view.xml b/eclipse-compile/appcompat/res/layout/abc_activity_chooser_view.xml index 2522f1a13e..85fd94e37f 100644 --- a/eclipse-compile/appcompat/res/layout/abc_activity_chooser_view.xml +++ b/eclipse-compile/appcompat/res/layout/abc_activity_chooser_view.xml @@ -17,7 +17,7 @@ */ --> - - - - -