Chris Banes 873c901ff1 am 2af47f1e: am dbcb805d: am edc34919: am 92f49ee0: Merge "Update default elevation values to spec" into lmp-mr1-ub-dev ...

* commit '2af47f1ef1eaacad2c97182a48643151fefaee9c':
  Update default elevation values to spec

GitOrigin-RevId=68ff43f3c595e18ced8bd9862b8e971919734144

PiperOrigin-RevId: 140549192

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

api

am c8661e9b: am 1ee83f7c: am 7944dd73: am bb829e3d: Merge "Add APIs to set AppBarLayout to be expanded or not" into lmp-mr1-ub-dev

2016-12-09 18:21:38 -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 2af47f1e: am dbcb805d: am edc34919: am 92f49ee0: Merge "Update default elevation values to spec" into lmp-mr1-ub-dev

2016-12-12 15:35:01 -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 af8c9f7f: am 523d7566: am 02eb1cd6: am ff9bf0cc: Merge "Fix potential NPE when proguard is on" into lmp-mr1-ub-dev

2016-12-12 15:34:57 -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 8d16ad81: am dae3fa20: Declare design-lib\'s public resources

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

LICENSE

Merge "Design support library skeleton"

2016-12-09 17:54:54 -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%