From 91eee205f3171c080b6787efae734ffcbe8e2493 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Mon, 14 Dec 2015 15:17:36 +0000 Subject: [PATCH] Make the SupportDemo apps work the AppCompat + VDC Change-Id: Ib13152d2256081e4534b4b03bb1e376b8cc18f79 --- samples/Support7Demos/Android.mk | 4 ++-- samples/SupportDesignDemos/Android.mk | 3 ++- .../res/drawable-xxhdpi/ic_add.png | Bin 0 -> 114 bytes ...esign_appbar_toolbar_collapse_pin_with_fab.xml | 2 +- .../SupportDesignDemos/res/layout/design_fab.xml | 4 ++-- .../res/layout/design_snackbar_with_fab.xml | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 samples/SupportDesignDemos/res/drawable-xxhdpi/ic_add.png diff --git a/samples/Support7Demos/Android.mk b/samples/Support7Demos/Android.mk index 371c737a1..21d34a946 100644 --- a/samples/Support7Demos/Android.mk +++ b/samples/Support7Demos/Android.mk @@ -38,7 +38,6 @@ LOCAL_RESOURCE_DIR = \ frameworks/support/v7/cardview/res \ frameworks/support/design/res \ frameworks/support/v7/recyclerview/res - LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ --extra-packages android.support.v7.appcompat \ @@ -46,5 +45,6 @@ LOCAL_AAPT_FLAGS := \ --extra-packages android.support.v7.gridlayout \ --extra-packages android.support.v7.mediarouter \ --extra-packages android.support.design \ - --extra-packages android.support.v7.recyclerview + --extra-packages android.support.v7.recyclerview \ + --no-version-vectors include $(BUILD_PACKAGE) diff --git a/samples/SupportDesignDemos/Android.mk b/samples/SupportDesignDemos/Android.mk index 96068ee6f..9dc4538bd 100644 --- a/samples/SupportDesignDemos/Android.mk +++ b/samples/SupportDesignDemos/Android.mk @@ -36,6 +36,7 @@ LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ --extra-packages android.support.v7.appcompat \ --extra-packages android.support.v7.recyclerview \ - --extra-packages android.support.design + --extra-packages android.support.design \ + --no-version-vectors LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) diff --git a/samples/SupportDesignDemos/res/drawable-xxhdpi/ic_add.png b/samples/SupportDesignDemos/res/drawable-xxhdpi/ic_add.png new file mode 100644 index 0000000000000000000000000000000000000000..a84106b01fd4402e5d15b08c496a75b76e811999 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xf3?%cF6p=fS?83{ F1OO~S9V-9; literal 0 HcmV?d00001 diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml index adf7900de..a960ddb65 100644 --- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml @@ -51,7 +51,7 @@ android:layout_width="wrap_content" app:layout_anchor="@id/appbar" app:layout_anchorGravity="bottom|right|end" - android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha" + android:src="@drawable/ic_add" android:layout_marginRight="16dp" android:clickable="true" app:fabSize="mini"/> diff --git a/samples/SupportDesignDemos/res/layout/design_fab.xml b/samples/SupportDesignDemos/res/layout/design_fab.xml index 26a128a54..0eedea313 100644 --- a/samples/SupportDesignDemos/res/layout/design_fab.xml +++ b/samples/SupportDesignDemos/res/layout/design_fab.xml @@ -47,7 +47,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_margin="16dp" - android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha" + android:src="@drawable/ic_add" android:clickable="true" /> diff --git a/samples/SupportDesignDemos/res/layout/design_snackbar_with_fab.xml b/samples/SupportDesignDemos/res/layout/design_snackbar_with_fab.xml index e3bcd7cde..2f64d7b64 100644 --- a/samples/SupportDesignDemos/res/layout/design_snackbar_with_fab.xml +++ b/samples/SupportDesignDemos/res/layout/design_snackbar_with_fab.xml @@ -63,7 +63,7 @@ android:layout_width="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="16dp" - android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha" + android:src="@drawable/ic_add" android:clickable="true"/> \ No newline at end of file