Chris Banes d344f52414 Merge "Fix error colours in design lib" into mnc-ub-dev am: c37d0d5de3 ...

am: ef445d0c1b

* commit 'ef445d0c1bed0992dcabfada1f96fea1b131b5bf':
  Fix error colours in design lib

GitOrigin-RevId=325ee6357c68ff444db3a9f8f0cbc3cf6ecdee82

PiperOrigin-RevId: 140559810

2016-12-12 15:48:26 -08:00

api

Make CoordinatorLayout Behavior scrim methods non-final am: 4d4b8a2a5b

2016-12-12 15:48:01 -08:00

base/android/support/design/widget

Add compat padding to FloatingActionButton ala CardView am: 6d7a9a0276

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

eclair-mr1/android/support/design/widget

Add compat padding to FloatingActionButton ala CardView am: 6d7a9a0276

2016-12-12 15:42:52 -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 "Fix error colours in design lib" into mnc-ub-dev am: c37d0d5de3

2016-12-12 15:48:26 -08:00

res-public/values

Merge "BottomSheetDialog and BottomSheetDialogFragment" into mnc-ub-dev am: 623321eab7

2016-12-12 15:45:04 -08:00

src

Merge "Fix error colours in design lib" into mnc-ub-dev am: c37d0d5de3

2016-12-12 15:48:26 -08:00

tests

Merge "Fix BottomSheetBehaviorTest on Gingerbread" into mnc-ub-dev am: 07b044cb62

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

Android.mk

Merge "Update support lib to use correct current SDK"

2016-12-12 15:47:33 -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%