LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Make the SupportDemo apps work the AppCompat + VDC" into mnc-ub-dev

Browse Source 
am: 87d5e9b38c

* commit '87d5e9b38ca04823f49ba708c7d7531dc624fa70':
  Make the SupportDemo apps work the AppCompat + VDC
This commit is contained in:
Chris Banes
2015-12-21 03:07:59 -08:00
committed by android-build-merger
parent c1cc994f85 87d5e9b38c
commit a42ded1564
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/Support7Demos/Android.mk
View File

@@ -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)

3
samples/SupportDesignDemos/Android.mk
View File

@@ -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)

BIN
samples/SupportDesignDemos/res/drawable-xxhdpi/ic_add.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 114 B

2
samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml
View File

@@ -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"/>

4
samples/SupportDesignDemos/res/layout/design_fab.xml
View File

@@ -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" />
<TextView
@@ -61,7 +61,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"
app:fabSize="mini" />

2
samples/SupportDesignDemos/res/layout/design_snackbar_with_fab.xml
View File

@@ -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"/>
</android.support.design.widget.CoordinatorLayout>