Chris Banes 6dad4607e8 resolve merge conflicts of c16e4c6eec to nyc-dev ...

Change-Id: Ic309b7bbeb3c89e4e73f09b5806b566d004e0250

GitOrigin-RevId=84549395ed3e2ec0453f7349716a12eab9901703

PiperOrigin-RevId: 140560055

2016-12-12 15:50:18 -08:00

api

Merge "Revert "Add add/remove methods for TabLayout's selection listener"" into nyc-dev

2016-12-12 15:50:14 -08:00

base/android/support/design/widget

Fix some rough edges in AppCompat + VDC

2016-12-12 15:49:15 -08:00

eclair-mr1/android/support/design/widget

Fix FAB and background attrs again

2016-12-12 15:49:58 -08:00

honeycomb/android/support/design/widget

resolved conflicts for merge of 73a0c3c7 to master

2016-12-09 18:13:19 -08:00

honeycomb-mr1/android/support/design/widget

am 5a3a72a9: am 9ec922c2: Fix FAB using ICS APIs on Honeycomb

2016-12-12 15:41:15 -08:00

ics/android/support/design/widget

Respect a FloatingActionButton\'s visibility when anchored am: fc780bab91

2016-12-12 15:41:35 -08:00

lollipop/android/support/design/widget

Add compat padding to FloatingActionButton ala CardView am: 6d7a9a0276

2016-12-12 15:42:52 -08:00

res

Merge "Revert "Add default style attrs for design components"" into nyc-dev

2016-12-12 15:49:53 -08:00

res-public/values

Merge "Revert "Add default style attrs for design components"" into nyc-dev

2016-12-12 15:49:53 -08:00

src

resolve merge conflicts of c16e4c6eec to nyc-dev

2016-12-12 15:50:18 -08:00

tests

resolve merge conflicts of c16e4c6eec to nyc-dev

2016-12-12 15:50:18 -08:00

Android.mk

Pin support libraries to Java 1.7 so they can be used with dx

2016-12-12 15:50:02 -08:00

AndroidManifest.xml

Merge "Design support library skeleton"

2016-12-09 17:54:54 -08:00

build.gradle

Switch to dexmaker 1.2 am: a9f4a788b6

2016-12-12 15:47:57 -08:00

LICENSE

Merge "Design support library skeleton"

2016-12-09 17:54:54 -08:00

proguard-rules.pro

Merge "Revert "Tweak design proguard config"" into mnc-ub-dev am: 981309e1e7

2016-12-12 15:44:36 -08:00

Description

Modular and customizable Material Design UI components for Android

androidmaterial-componentsmaterial-design

Apache-2.0 191 MiB

Languages

Java 99.9%

Kotlin 0.1%