Chris Banes c4df863eec am e37e921e: am ea6ff8cc: am 82ba6aaa: am 5092226e: am 191d8450: resolved conflicts for merge of 7a13c848 to mnc-dev ...

* commit 'e37e921e0c9035a4b1fb0d019dc19b2ea0b03c00':
  Return the correct tint/mode from FloatingActionButton

GitOrigin-RevId=03c1bfb5f070231e3257cc2f16974fec94fce4f9

PiperOrigin-RevId: 140549365

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

api

am 17c194e2: am 07f75828: am 45049689: am f72ee1a4: am 1bb61e03: am eb344aa3: Merge "TextInputLayout fixes" into lmp-mr1-ub-dev

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

base/android/support/design/widget

am 1fddbd99: am fe71b8ba: am 025760e0: am 28193403: Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev

2016-12-09 18:21:16 -08:00

eclair-mr1/android/support/design/widget

am 1fddbd99: am fe71b8ba: am 025760e0: am 28193403: Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev

2016-12-09 18:21:16 -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 abc5dba2: am 827a2c0b: am 2970824d: am b6eaf30a: Merge "Show/hide FloatingActionButton improvements" into lmp-mr1-ub-dev

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

lollipop/android/support/design/widget

am abc5dba2: am 827a2c0b: am 2970824d: am b6eaf30a: Merge "Show/hide FloatingActionButton improvements" into lmp-mr1-ub-dev

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

res

am 17c194e2: am 07f75828: am 45049689: am f72ee1a4: am 1bb61e03: am eb344aa3: Merge "TextInputLayout fixes" into lmp-mr1-ub-dev

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

res-public/values

am 1b5d11f9: am 10597477: Merge "FloatingActionButton border" into mnc-dev

2016-12-09 18:15:53 -08:00

src

am e37e921e: am ea6ff8cc: am 82ba6aaa: am 5092226e: am 191d8450: resolved conflicts for merge of 7a13c848 to mnc-dev

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

Android.mk

am ab2f1834: am da94c144: Merge "Use doclava\'s new stubpackages wildcard support" into mnc-dev

2016-12-09 18:14:35 -08:00

AndroidManifest.xml

Merge "Design support library skeleton"

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

build.gradle

am d3d441f7: am c805940c: am 22d515e2: am c977dc91: Merge "Add proguard rule for CoordinatorLayout.Bahavior" into lmp-mr1-ub-dev

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

LICENSE

Merge "Design support library skeleton"

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

proguard-rules.pro

am d76f023b: am d124f123: am ff8b6da5: am ec497334: am 39e381fe: am ef27e5f8: Add default constructor to Proguard rules

2016-12-12 15:35:59 -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%