Chris Banes 73edc2db58 am 652b23f3: am 15efaeb4: Merge "AppBarLayout layout/measure fixes" into mnc-ub-dev ...

* commit '652b23f34999bdddbf52356d4fb9f87830264f9f':
  AppBarLayout layout/measure fixes

GitOrigin-RevId=aa930593e0edb2b818a0f759efd03ed159b979e0

PiperOrigin-RevId: 140549636

2016-12-12 15:37:33 -08:00

api

am 581de875: am 25c8477a: Merge "Improvements around CollapsingToolbarLayout\'s scrims" into mnc-ub-dev

2016-12-12 15:37:29 -08:00

base/android/support/design/widget

am 437a2ac0: am 3d176d20: Merge "Fix tab indicator getting out of sync" into mnc-ub-dev

2016-12-12 15:37:07 -08:00

eclair-mr1/android/support/design/widget

am 437a2ac0: am 3d176d20: Merge "Fix tab indicator getting out of sync" into mnc-ub-dev

2016-12-12 15:37:07 -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 437a2ac0: am 3d176d20: Merge "Fix tab indicator getting out of sync" into mnc-ub-dev

2016-12-12 15:37:07 -08:00

lollipop/android/support/design/widget

am 05e809c8: am 1d18ce0b: am d375274c: am 76c2add1: am 83e76aa2: am c1392c0f: Merge "Mutate FAB backgrounds before tinting" into lmp-mr1-ub-dev

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

res

am a568e389: am 3a132609: Merge "Update TabLayout to Material Spec" into mnc-ub-dev

2016-12-12 15:37:24 -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 652b23f3: am 15efaeb4: Merge "AppBarLayout layout/measure fixes" into mnc-ub-dev

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