diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle index d20b813fee..0deaef3eea 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 4d6cc70318..04c58f03db 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'com.android.application' // Less important android { - compileSdkVersion 21 + compileSdkVersion 23 buildToolsVersion "23.0.1" signingConfigs { @@ -41,6 +41,7 @@ android { minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14 targetSdkVersion 23 versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode + multiDexEnabled true //versionName already assigned in code //versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName } @@ -59,6 +60,8 @@ android { dexOptions { jumboMode = true + incremental true + javaMaxHeapSize "4g" } sourceSets { @@ -184,17 +187,17 @@ task updateNoTranslate(type: Copy) { } task validateTranslate { - println "Validating translations" + println "Validating translations" new java.io.File("OsmAnd/res").eachFileRecurse groovy.io.FileType.FILES, { - if(it.name == "strings.xml" || it.name == "phrases.xml") { + if (it.name == "strings.xml" || it.name == "phrases.xml") { it.eachLine { line -> - if( line.contains("\$ s") || line.contains("\$ d") || line.contains("\$ f") || - line.contains(" \$s") || line.contains(" \$d") || line.contains(" \$f") || - line.contains("1\$ ") || line.contains("2\$ ") || line.contains("3\$ ") || - (line.contains("% \$") || line.contains("% 1") || - line.contains("% 2") || line.contains("% 3") )) { - throw new GradleException("Incorrect translation " + it.getAbsolutePath() + " " + line); + if (line.contains("\$ s") || line.contains("\$ d") || line.contains("\$ f") || + line.contains(" \$s") || line.contains(" \$d") || line.contains(" \$f") || + line.contains("1\$ ") || line.contains("2\$ ") || line.contains("3\$ ") || + (line.contains("% \$") || line.contains("% 1") || + line.contains("% 2") || line.contains("% 3"))) { + throw new GradleException("Incorrect translation " + it.getAbsolutePath() + " " + line); } } } @@ -231,7 +234,7 @@ task collectHelpContentsAssets(type: Copy) { include "technical-articles.html" include "map-legend.html" } - from("../../help/website/feature_articles"){ + from("../../help/website/feature_articles") { include "*.html" } @@ -350,7 +353,8 @@ dependencies { "QtAndroid-bundled.jar", "QtAndroidAccessibility-bundled.jar", "OsmAndCore_android.jar", - "OsmAndCore_wrapper.jar"]) + "OsmAndCore_wrapper.jar", + "android-support-multidex.jar"]) // compile "com.github.ksoichiro:android-observablescrollview:1.5.0" // compile "com.android.support:appcompat-v7:22.2.1" // compile "com.github.shell-software:fab:1.0.5" @@ -360,5 +364,4 @@ 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 files('libs/android-support-multidex.jar') } diff --git a/OsmAnd/libs/simple-logging.jar b/OsmAnd/libs/simple-logging.jar new file mode 100644 index 0000000000..89d3a05766 Binary files /dev/null and b/OsmAnd/libs/simple-logging.jar differ diff --git a/OsmAnd/src/net/osmand/PlatformUtil.java b/OsmAnd/src/net/osmand/PlatformUtil.java index 385ea068a1..11202adf74 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,30 +110,11 @@ 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 88295a14a3..f13bad53b9 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -2,7 +2,6 @@ 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; @@ -14,6 +13,7 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Handler; import android.os.Message; +import android.support.multidex.MultiDex; import android.support.multidex.MultiDexApplication; import android.support.v7.app.AlertDialog; import android.text.format.DateFormat; @@ -63,7 +63,6 @@ import java.util.Locale; import btools.routingapp.BRouterServiceConnection; import btools.routingapp.IBRouterService; - public class OsmandApplication extends MultiDexApplication { public static final String EXCEPTION_PATH = "exception.log"; //$NON-NLS-1$ private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(OsmandApplication.class); @@ -139,7 +138,13 @@ public class OsmandApplication extends MultiDexApplication { OsmandPlugin.initPlugins(this); System.out.println("Time to init plugins " + (System.currentTimeMillis() - timeToStart) + " ms. Should be less < 800 ms"); } - + + @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + MultiDex.install(this); + } + public AppInitializer getAppInitializer() { return appInitializer; } diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java index bab6c2ab42..75933e9d90 100644 --- a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java @@ -1,8 +1,5 @@ package net.osmand.plus.activities; - -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.R; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.support.v7.app.ActionBar; @@ -10,6 +7,9 @@ import android.support.v7.app.AppCompatActivity; import android.view.View; import android.view.ViewGroup; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.R; + public class OsmandActionBarActivity extends AppCompatActivity { protected boolean haveHomeButton = true; diff --git a/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java index bff6204045..d45f65083e 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.internal.view.ContextThemeWrapper; +import android.support.v7.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 f3648e4ab2..4a08f1d5f7 100644 --- a/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java +++ b/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java @@ -6,16 +6,13 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Typeface; import android.os.Build; -import android.support.v7.internal.text.AllCapsTransformationMethod; +import android.support.v7.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 34e8ec28cf..07e8c6a83c 100644 --- a/eclipse-compile/appcompat/build.gradle +++ b/eclipse-compile/appcompat/build.gradle @@ -5,12 +5,12 @@ dependencies { } android { - compileSdkVersion 21 + compileSdkVersion 23 buildToolsVersion "23.0.1" defaultConfig { minSdkVersion 9 - targetSdkVersion 21 + targetSdkVersion 23 } sourceSets { main { diff --git a/eclipse-compile/appcompat/libs/android-support-v4.jar b/eclipse-compile/appcompat/libs/android-support-v4.jar index 7b78bb8ee8..aa0b1a5cc5 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 830a4936a6..f9ad396f6c 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 new file mode 100644 index 0000000000..8d53611890 --- /dev/null +++ b/eclipse-compile/appcompat/res/color-v23/abc_color_highlight_material.xml @@ -0,0 +1,23 @@ + + + + + + + \ 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 new file mode 100644 index 0000000000..4efe298e28 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_off_mtrl_alpha.png 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 new file mode 100644 index 0000000000..543dec3376 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_to_pressed_mtrl_000.png 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 new file mode 100644 index 0000000000..9930b3ad1b Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_control_to_pressed_mtrl_005.png 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 new file mode 100644 index 0000000000..4cfb1a7c7e Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_primary_mtrl_alpha.9.png 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 new file mode 100644 index 0000000000..32ddf7a9e0 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-hdpi/abc_scrubber_track_mtrl_alpha.9.png 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 56436a1ccc..6ad9b1d245 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 deleted file mode 100644 index 5e0bf843ec..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-hdpi/abc_text_cursor_mtrl_alpha.9.png and /dev/null 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 new file mode 100644 index 0000000000..10df639062 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_off_mtrl_alpha.png 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 new file mode 100644 index 0000000000..f83b1ef163 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_to_pressed_mtrl_000.png 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 new file mode 100644 index 0000000000..e9efb20fb7 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_control_to_pressed_mtrl_005.png 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 new file mode 100644 index 0000000000..a4ab0a1e39 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_primary_mtrl_alpha.9.png 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 new file mode 100644 index 0000000000..db9e172d3b Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-mdpi/abc_scrubber_track_mtrl_alpha.9.png 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 fcd81de0c2..00c81fcada 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 deleted file mode 100644 index 36348a8b9a..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-mdpi/abc_text_cursor_mtrl_alpha.9.png and /dev/null 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 new file mode 100644 index 0000000000..595c56c6a9 --- /dev/null +++ b/eclipse-compile/appcompat/res/drawable-v21/abc_action_bar_item_background_material.xml @@ -0,0 +1,18 @@ + + + + \ 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 new file mode 100644 index 0000000000..10251aadc7 --- /dev/null +++ b/eclipse-compile/appcompat/res/drawable-v21/abc_btn_colored_material.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000000..0b540390a2 --- /dev/null +++ b/eclipse-compile/appcompat/res/drawable-v23/abc_control_background_material.xml @@ -0,0 +1,19 @@ + + + + \ 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 new file mode 100644 index 0000000000..138f643fa9 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_off_mtrl_alpha.png 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 new file mode 100644 index 0000000000..cd41d74c96 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_to_pressed_mtrl_000.png 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 new file mode 100644 index 0000000000..8d67525e0c Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_control_to_pressed_mtrl_005.png 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 new file mode 100644 index 0000000000..2b4734d25e Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_primary_mtrl_alpha.9.png 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 new file mode 100644 index 0000000000..805cb291f5 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xhdpi/abc_scrubber_track_mtrl_alpha.9.png 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 cd1396bca9..f0752d2bfb 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 deleted file mode 100644 index 666b10a2f2..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xhdpi/abc_text_cursor_mtrl_alpha.9.png and /dev/null 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 new file mode 100644 index 0000000000..52687451a8 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_off_mtrl_alpha.png 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 new file mode 100644 index 0000000000..adffc1472e Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_to_pressed_mtrl_000.png 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 new file mode 100644 index 0000000000..f3d16d5759 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_control_to_pressed_mtrl_005.png 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 new file mode 100644 index 0000000000..6a82af5081 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_primary_mtrl_alpha.9.png 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 new file mode 100644 index 0000000000..c3791fc661 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_scrubber_track_mtrl_alpha.9.png 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 96bec46c2e..c74b3fcf8d 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 deleted file mode 100644 index 08ee2b4779..0000000000 Binary files a/eclipse-compile/appcompat/res/drawable-xxhdpi/abc_text_cursor_mtrl_alpha.9.png and /dev/null 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 new file mode 100644 index 0000000000..e5a43bbe87 Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_scrubber_control_to_pressed_mtrl_000.png 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 new file mode 100644 index 0000000000..eeb37c1dae Binary files /dev/null and b/eclipse-compile/appcompat/res/drawable-xxxhdpi/abc_scrubber_control_to_pressed_mtrl_005.png 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 c2393abe68..85c81c1dbc 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/cardview/src/main/AndroidManifest.xml b/eclipse-compile/appcompat/res/drawable/abc_btn_colored_material.xml old mode 100755 new mode 100644 similarity index 76% rename from eclipse-compile/cardview/src/main/AndroidManifest.xml rename to eclipse-compile/appcompat/res/drawable/abc_btn_colored_material.xml index 3ef02dc9d6..ec93b8b6bc --- a/eclipse-compile/cardview/src/main/AndroidManifest.xml +++ b/eclipse-compile/appcompat/res/drawable/abc_btn_colored_material.xml @@ -13,8 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - + + + + + + diff --git a/eclipse-compile/appcompat/res/drawable/abc_seekbar_thumb_material.xml b/eclipse-compile/appcompat/res/drawable/abc_seekbar_thumb_material.xml new file mode 100644 index 0000000000..7fea83bc86 --- /dev/null +++ b/eclipse-compile/appcompat/res/drawable/abc_seekbar_thumb_material.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000000..e68ac03e90 --- /dev/null +++ b/eclipse-compile/appcompat/res/drawable/abc_seekbar_track_material.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eclipse-compile/design/src/main/res/drawable/snackbar_background.xml b/eclipse-compile/appcompat/res/drawable/abc_text_cursor_material.xml similarity index 84% rename from eclipse-compile/design/src/main/res/drawable/snackbar_background.xml rename to eclipse-compile/appcompat/res/drawable/abc_text_cursor_material.xml index 739b516713..885670c999 100644 --- a/eclipse-compile/design/src/main/res/drawable/snackbar_background.xml +++ b/eclipse-compile/appcompat/res/drawable/abc_text_cursor_material.xml @@ -13,10 +13,11 @@ ~ 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. - --> +--> - - + + \ 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 150ea50dc3..283358a5dc 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 85fd94e37f..2522f1a13e 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 @@ */ --> + + + + +